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

Revert "Merge pull request #124 from vcmi/issue/1372"

Browse Source 
This reverts commit da01af319b, reversing
changes made to 8b6b4e2e0b.
This commit is contained in:
AlexVinS
2015-11-07 11:35:02 +03:00
parent bd12989ad6
commit e645b46aed
6 changed files with 31 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/GameConstants.cpp
View File

@@ -19,7 +19,6 @@
#include "spells/CSpellHandler.h"
const SlotID SlotID::COMMANDER_SLOT_PLACEHOLDER = SlotID(-2);
const SlotID SlotID::SUMMONED_SLOT_PLACEHOLDER = SlotID(255);
const PlayerColor PlayerColor::CANNOT_DETERMINE = PlayerColor(253);
const PlayerColor PlayerColor::UNFLAGGABLE = PlayerColor(254);
const PlayerColor PlayerColor::NEUTRAL = PlayerColor(255);

1
lib/GameConstants.h
View File

@@ -216,7 +216,6 @@ class SlotID : public BaseForID<SlotID, si32>
friend class CNonConstInfoCallback;
DLL_LINKAGE static const SlotID COMMANDER_SLOT_PLACEHOLDER;
DLL_LINKAGE static const SlotID SUMMONED_SLOT_PLACEHOLDER; ///<for all summoned creatures, only during battle
bool validSlot() const
{

2
lib/NetPacksLib.cpp
View File

@@ -1567,7 +1567,7 @@ DLL_LINKAGE void BattleStackAdded::applyGs(CGameState *gs)
}
CStackBasicDescriptor csbd(creID, amount);
CStack * addedStack = gs->curB->generateNewStack(csbd, attacker, SlotID::SUMMONED_SLOT_PLACEHOLDER, pos); //TODO: netpacks?
CStack * addedStack = gs->curB->generateNewStack(csbd, attacker, SlotID(255), pos); //TODO: netpacks?
if (summoned)
addedStack->state.insert(EBattleStackState::SUMMONED);