games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

Several compile/link fixes.

Browse Source
This commit is contained in:
Frank Zago 2010-09-04 14:47:39 +00:00
parent 4ba3c68ced
commit 4b8be22fb6
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/CPreGame.cpp
View File

@ -102,6 +102,8 @@ static void clearInfo()
playerNames.clear();
}
template <typename T> class CApplyOnPG;
class CBaseForPGApply
{
public:
@ -123,7 +125,7 @@ public:
}
};
CApplier<CBaseForPGApply> *applier = NULL;
static CApplier<CBaseForPGApply> *applier = NULL;
void CMapInfo::countPlayers()
{

2
client/Client.cpp
View File

@ -75,7 +75,7 @@ public:
}
};
CApplier<CBaseForCLApply> *applier = NULL;
static CApplier<CBaseForCLApply> *applier = NULL;
void CClient::init()
{

3
lib/CGameState.cpp
View File

@ -60,6 +60,7 @@ void foofoofoo()
registerTypes((CTypeList&)*ccc);
}
template <typename T> class CApplyOnGS;
class CBaseForGSApply
{
@ -85,7 +86,7 @@ public:
}
};
CApplier<CBaseForGSApply> *applierGs = NULL;
static CApplier<CBaseForGSApply> *applierGs = NULL;
class IObjectCaller
{

2
lib/Connection.h
View File

@ -876,7 +876,7 @@ public:
~CApplier()
{
std::map<ui16,T*>::iterator iter;
typename std::map<ui16, T*>::iterator iter;
for(iter = apps.begin(); iter != apps.end(); iter++)
delete iter->second;

6
server/CGameHandler.cpp
View File

@ -60,6 +60,7 @@ CondSh<BattleResult *> battleResult(NULL);
std::ptrdiff_t randomizer (ptrdiff_t i) {return rand();}
std::ptrdiff_t (*p_myrandom)(std::ptrdiff_t) = randomizer;
template <typename T> class CApplyOnGH;
class CBaseForGHApply
{
@ -71,6 +72,7 @@ public:
return new CApplyOnGH<U>;
}
};
template <typename T> class CApplyOnGH : public CBaseForGHApply
{
public:
@ -82,7 +84,7 @@ public:
}
};
CApplier<CBaseForGHApply> *applier = NULL;
static CApplier<CBaseForGHApply> *applier = NULL;
CMP_stack cmpst ;
@ -5220,4 +5222,4 @@ bool CGameHandler::sacrificeArtifact(const IMarket * m, const CGHeroInstance * h
m->getOffer(artID, 0, dmp, expToGive, ARTIFACT_EXP);
changePrimSkill(hero->id, 4, expToGive);
return true;
}
}