games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

minor:

Browse Source 
- siege tower shooters use string ID's
- cmake will install vcmibuilder with correct permissions
- vcmibuilder will not extract outdated config files from core.zip
This commit is contained in:
Ivan Savenko 2012-12-10 20:08:00 +00:00
parent 1c5a4c669c
commit 16b72ee89b
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -114,7 +114,10 @@ if (NOT APPLE)
# copy only fs.json for WoG
install(FILES Mods/WoG/filesystem.json DESTINATION ${DATA_DIR}/Mods/WoG)
install(FILES vcmibuilder DESTINATION ${BIN_DIR})
install(FILES vcmibuilder DESTINATION ${BIN_DIR} PERMISSIONS
OWNER_WRITE OWNER_READ OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
endif()
if(WIN32)

18
config/buildings.json
View File

@ -196,7 +196,7 @@
"siege" :
{
"shooter" : 2,
"shooter" : "Archer",
"imagePrefix" : "SGCS",
"gate" :
{
@ -447,7 +447,7 @@
"siege" :
{
"shooter" : 18,
"shooter" : "WoodElf",
"imagePrefix" : "SGRM",
"gate" :
{
@ -691,7 +691,7 @@
"siege" :
{
"shooter" : 34,
"shooter" : "Mage",
"imagePrefix" : "SGTW",
"gate" :
{
@ -937,7 +937,7 @@
"siege" :
{
"shooter" : 44,
"shooter" : "Gog",
"imagePrefix" : "SGIN",
"gate" :
{
@ -1186,7 +1186,7 @@
"siege" :
{
"shooter" : 64,
"shooter" : "Lich",
"imagePrefix" : "SGNC",
"gate" :
{
@ -1429,7 +1429,7 @@
"siege" :
{
"shooter" : 76,
"shooter" : "Beholder",
"imagePrefix" : "SGDN",
"gate" :
{
@ -1671,7 +1671,7 @@
"siege" :
{
"shooter" : 88,
"shooter" : "Orc",
"imagePrefix" : "SGST",
"gate" :
{
@ -1916,7 +1916,7 @@
"siege" :
{
"shooter" : 100,
"shooter" : "PrimitiveLizardman",
"imagePrefix" : "SGFR",
"gate" :
{
@ -2164,7 +2164,7 @@
"siege" :
{
"shooter" : 127,
"shooter" : "StormElemental",
"imagePrefix" : "SGEL",
"gate" :
{

6
lib/CTownHandler.cpp
View File

@ -334,7 +334,11 @@ CTown::ClientInfo::Point JsonToPoint(const JsonNode & node)
void CTownHandler::loadSiegeScreen(CTown &town, const JsonNode & source)
{
town.clientInfo.siegePrefix = source["imagePrefix"].String();
town.clientInfo.siegeShooter = source["shooter"].Float();
VLC->modh->identifiers.requestIdentifier(std::string("creature.") + source["shooter"].String(), [&town](si32 creature)
{
town.clientInfo.siegeShooter = creature;
});
town.clientInfo.siegeShooterCropHeight = source["shooterHeight"].Float();
auto & pos = town.clientInfo.siegePositions;

5
vcmibuilder
View File

@ -235,7 +235,10 @@ fi
if [[ -n "$vcmi_archive" ]]
then
echo "decompressing $vcmi_archive"
unzip -qo $vcmi_archive -d $dest_dir || fail "Error: failed to extract VCMI archive!"
# exlude *json - temporary solution for autotools -> cmake transition period
# 0.90 packages made by autotools do not have .json files available in svn
# cmake however can install them correctly so they should not be extracted from .zip in case of cmake package
unzip -qo $vcmi_archive -d $dest_dir -x "*.json" "*.txt" "*.PAL" || fail "Error: failed to extract VCMI archive!"
fi
if [[ -n "$validate" ]]