games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Fixed #869.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2012-02-18 20:50:06 +00:00
parent 5c86d32903
commit b35636d5e9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/NetPacksLib.cpp
View File

@@ -1270,7 +1270,11 @@ DLL_LINKAGE void BattleStacksRemoved::applyGs( CGameState *gs )
{
if(gs->curB->stacks[b]->ID == *it) //if found
{
CStack *toRemove = gs->curB->stacks[b];
gs->curB->stacks.erase(gs->curB->stacks.begin() + b); //remove
toRemove->detachFromAll();
delete toRemove;
break;
}
}
@@ -1286,7 +1290,8 @@ DLL_LINKAGE void BattleStackAdded::applyGs(CGameState *gs)
}
CStackInstance *csi = new CStackInstance(creID, amount);
csi->setArmyObj(gs->curB->belligerents[attacker ? 0 : 1]);
CStack * summonedStack = gs->curB->generateNewStack(*csi, gs->curB->stacks.size(), attacker, 255, pos); //TODO: netpacks?
int newStackID = gs->curB->stacks.size() ? gs->curB->stacks.back()->ID+1 : 0; //stacks IDs may not be contiguous, so we need to give after-last ID
CStack * summonedStack = gs->curB->generateNewStack(*csi, newStackID, attacker, 255, pos); //TODO: netpacks?
if (summoned)
summonedStack->state.insert(EBattleStackState::SUMMONED);
summonedStack->attachTo(csi);