games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

fix mingw build

Browse Source 
(?) does this brake *nix build?
This commit is contained in:
AlexVinS
2014-06-24 18:17:25 +04:00
parent 13bc4cb24f
commit c7dc4c05b8
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/NetPacks.h
View File

@@ -1527,7 +1527,7 @@ struct ObstaclesRemoved : public CPackForClient //3014
}
};
struct DLL_LINKAGE CatapultAttack : public CPackForClient //3015
struct CatapultAttack : public CPackForClient //3015
{
struct AttackInfo
{
@@ -1543,7 +1543,8 @@ struct DLL_LINKAGE CatapultAttack : public CPackForClient //3015
}
};
CatapultAttack() {type = 3015;}
DLL_LINKAGE CatapultAttack();
DLL_LINKAGE ~CatapultAttack();
DLL_LINKAGE void applyGs(CGameState *gs);
void applyCl(CClient *cl);

2
lib/NetPacksBase.h
View File

@@ -37,7 +37,7 @@ struct DLL_LINKAGE CPack
logNetwork->errorStream() << "CPack serialized... this should not happen!";
}
void applyGs(CGameState *gs) { }
DLL_LINKAGE virtual std::string toString() const { return boost::str(boost::format("{CPack: type '%d'}") % type); }
virtual std::string toString() const { return boost::str(boost::format("{CPack: type '%d'}") % type); }
};
std::ostream & operator<<(std::ostream & out, const CPack * pack);

10
lib/NetPacksLib.cpp
View File

@@ -1495,6 +1495,16 @@ DLL_LINKAGE void ObstaclesRemoved::applyGs( CGameState *gs )
}
}
DLL_LINKAGE CatapultAttack::CatapultAttack()
{
type = 3015;
}
DLL_LINKAGE CatapultAttack::~CatapultAttack()
{
}
DLL_LINKAGE void CatapultAttack::applyGs( CGameState *gs )
{
if(gs->curB && gs->curB->siege != CGTownInstance::NONE) //if there is a battle and it's a siege