1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00

[refactor] extract often used classes from lib\NetPacks.h to separate header - less dependecies on whole packets class tree

[mingw build] fix linking issues with netpacks. 
Mingw build is finally fixed! 

[c::b] update projects

[config] fix and cleanup spell_info.json
This commit is contained in:
alexvins
2014-01-16 20:24:06 +00:00
parent 47c91e03b5
commit 16d6292be9
15 changed files with 256 additions and 227 deletions

View File

@ -15,9 +15,6 @@
#include "BattleState.h"
#include "CTownHandler.h"
#undef min
#undef max
/*
* NetPacksLib.cpp, part of VCMI engine
*
@ -28,12 +25,9 @@
*
*/
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
std::ostream & operator<<(std::ostream & out, const CPack * pack)
{
@ -1484,6 +1478,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