From e583f4e44daf014b97e357629a9d99f5c2444914 Mon Sep 17 00:00:00 2001 From: AlexVinS Date: Fri, 28 Nov 2014 20:39:23 +0300 Subject: [PATCH] Fix #1928 * disallow geneie to cast teleport --- lib/CBattleCallback.cpp | 1 + lib/NetPacksLib.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/CBattleCallback.cpp b/lib/CBattleCallback.cpp index 775e0ad36..21895a02f 100644 --- a/lib/CBattleCallback.cpp +++ b/lib/CBattleCallback.cpp @@ -2295,6 +2295,7 @@ SpellID CBattleInfoCallback::getRandomBeneficialSpell(const CStack * subject) co continue; } break; + case SpellID::TELEPORT: //issue 1928 case SpellID::CLONE: //not allowed continue; break; diff --git a/lib/NetPacksLib.cpp b/lib/NetPacksLib.cpp index 4da5c5d13..96d25aa13 100644 --- a/lib/NetPacksLib.cpp +++ b/lib/NetPacksLib.cpp @@ -1197,6 +1197,7 @@ void BattleResult::applyGs( CGameState *gs ) void BattleStackMoved::applyGs( CGameState *gs ) { CStack *s = gs->curB->getStack(stack); + assert(s); BattleHex dest = tilesToMove.back(); //if unit ended movement on quicksands that were created by enemy, that quicksand patch becomes visible for owner