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

Merged changes from trunk ( r1885 )

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-12-14 18:08:21 +00:00
parent 02e4ef507e 3989afd153
commit f7f917845c
12 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/CGameHandler.h
View File

@@ -164,7 +164,7 @@ public:
void stopHeroVisitCastle(int obj, int heroID);
void giveHeroArtifact(int artid, int hid, int position); //pos==-1 - first free slot in backpack; pos==-2 - default if available or backpack
void giveNewArtifact(int hid, int position);
bool removeArtifact(CArtifact* art, int hid);
bool removeArtifact(const CArtifact* art, int hid);
void startBattleI(const CArmedInstance *army1, const CArmedInstance *army2, int3 tile, const CGHeroInstance *hero1, const CGHeroInstance *hero2, bool creatureBank = false, boost::function<void(BattleResult*)> cb = 0, const CGTownInstance *town = NULL); //use hero=NULL for no hero
void startBattleI(const CArmedInstance *army1, const CArmedInstance *army2, int3 tile, boost::function<void(BattleResult*)> cb = 0, bool creatureBank = false); //if any of armies is hero, hero will be used
void startBattleI(const CArmedInstance *army1, const CArmedInstance *army2, boost::function<void(BattleResult*)> cb = 0, bool creatureBank = false); //if any of armies is hero, hero will be used, visitable tile of second obj is place of battle//void startBattleI(int heroID, CCreatureSet army, int3 tile, boost::function<void(BattleResult*)> cb); //for hero<=>neutral army
@@ -244,7 +244,7 @@ public:
void run(bool resume);
void newTurn();
void handleAfterAttackCasting( const BattleAttack & bat );
bool sacrificeArtifact(const IMarket * m, const CGHeroInstance * hero, CArtifact* art);
bool sacrificeArtifact(const IMarket * m, const CGHeroInstance * hero, const CArtifact* art);
friend class CVCMIServer;
friend class CScriptCallback;
};