games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

- fixed some compiler warnings, gcc\clang work fine

Browse Source 
- better handling of innoextract in vcmibuilder.
This commit is contained in:
Ivan Savenko
2013-02-11 22:36:12 +00:00
parent ba3fbe05a7
commit 5a8787b74d
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Global.h
View File

@@ -483,7 +483,7 @@ namespace vstd
}); });
} }
static int retreiveRandNum(const boost::function<int()> &randGen) static inline int retreiveRandNum(const boost::function<int()> &randGen)
{ {
if (randGen) if (randGen)
return randGen(); return randGen();

2
client/BattleInterface/CBattleInterface.h
View File

@@ -47,7 +47,7 @@ struct ProjectileInfo;
class CClickableHex; class CClickableHex;
struct BattleHex; struct BattleHex;
struct InfoAboutHero; struct InfoAboutHero;
class BattleAction; struct BattleAction;
/// Class which manages the locked hex fields that are blocked e.g. by obstacles /// Class which manages the locked hex fields that are blocked e.g. by obstacles
class CBattleObstacle class CBattleObstacle

2
lib/NetPacks.h
View File

@@ -1838,7 +1838,7 @@ struct DisbandCreature : public CPackForServer
struct BuildStructure : public CPackForServer struct BuildStructure : public CPackForServer
{ {
BuildStructure(){}; BuildStructure(){};
BuildStructure(si32 TID, BuildingID BID):bid(BID),tid(TID){}; BuildStructure(si32 TID, BuildingID BID):tid(TID), bid(BID){};
si32 tid; //town id si32 tid; //town id
BuildingID bid; //structure id BuildingID bid; //structure id

2
lib/RegisterTypes.h
View File

@@ -253,7 +253,7 @@ void registerTypes4(Serializer &s)
} }
template<typename Serializer> template<typename Serializer>
void registerTypes(Serializer &s) DLL_LINKAGE void registerTypes(Serializer &s)
{ {
registerTypes1(s); registerTypes1(s);
registerTypes2(s); registerTypes2(s);

3
vcmibuilder
View File

@@ -168,9 +168,8 @@ if [[ -n "$gog_file" ]]
then then
# innoextract always reports error (iconv 84 error). Just test file for presence # innoextract always reports error (iconv 84 error). Just test file for presence
test -f "$gog_file" || fail "Error: gog.com executable was not found!" test -f "$gog_file" || fail "Error: gog.com executable was not found!"
innoextract -s -p 1 "$gog_file" (gog_file=`readlink -f "$gog_file"` && cd "$temp_dir" && innoextract -s -p 1 "$gog_file")
mv ./app "$temp_dir"
data_dir="$temp_dir"/app data_dir="$temp_dir"/app
fi fi