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

Cleanup

Browse Source
This commit is contained in:
AlexVinS
2016-09-29 12:13:06 +03:00
parent e91a6d45e8
commit 8f18dec5e3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/CGameHandler.cpp
View File

@@ -56,9 +56,6 @@ extern bool end2;
#define COMPLAIN_RET_FALSE_IF(cond, txt) do {if(cond){complain(txt); return false;}} while(0)
#define COMPLAIN_RET(txt) {complain(txt); return false;}
#define COMPLAIN_RETF(txt, FORMAT) {complain(boost::str(boost::format(txt) % FORMAT)); return false;}
#define NEW_ROUND BattleNextRound bnr;\
bnr.round = gs->curB->round + 1;\
sendAndApply(&bnr);
class ServerSpellCastEnvironment: public SpellCastEnvironment
{
@@ -5651,7 +5648,10 @@ void CGameHandler::runBattle()
//main loop
while(!battleResult.get()) //till the end of the battle ;]
{
NEW_ROUND;
BattleNextRound bnr;
bnr.round = gs->curB->round + 1;
sendAndApply(&bnr);
auto obstacles = gs->curB->obstacles; //we copy container, because we're going to modify it
for(auto &obstPtr : obstacles)
{