mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-30 08:57:00 +02:00
Remove no longer used code
This commit is contained in:
parent
67eaef3520
commit
2be9664d26
@ -289,16 +289,6 @@ void CBattleAI::activeStack( const CStack * stack )
|
|||||||
|
|
||||||
logAi->trace("Spellcast attempt completed in %lld", timeElapsed(start));
|
logAi->trace("Spellcast attempt completed in %lld", timeElapsed(start));
|
||||||
|
|
||||||
if(cb->battleIsFinished() || !stack->alive())
|
|
||||||
{
|
|
||||||
//spellcast may finish battle or kill active stack
|
|
||||||
//send special preudo-action
|
|
||||||
BattleAction cancel;
|
|
||||||
cancel.actionType = EActionType::NO_ACTION;
|
|
||||||
cb->battleMakeUnitAction(cancel);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(auto action = considerFleeingOrSurrendering())
|
if(auto action = considerFleeingOrSurrendering())
|
||||||
{
|
{
|
||||||
cb->battleMakeUnitAction(*action);
|
cb->battleMakeUnitAction(*action);
|
||||||
|
@ -42,11 +42,6 @@
|
|||||||
#include "../../lib/spells/ObstacleCasterProxy.h"
|
#include "../../lib/spells/ObstacleCasterProxy.h"
|
||||||
#include "../../lib/spells/Problem.h"
|
#include "../../lib/spells/Problem.h"
|
||||||
|
|
||||||
#define COMPLAIN_RET_IF(cond, txt) do {if (cond){gameHandler->complain(txt); return;}} while(0)
|
|
||||||
#define COMPLAIN_RET_FALSE_IF(cond, txt) do {if (cond){gameHandler->complain(txt); return false;}} while(0)
|
|
||||||
#define COMPLAIN_RET(txt) {gameHandler->complain(txt); return false;}
|
|
||||||
#define COMPLAIN_RETF(txt, FORMAT) {gameHandler->complain(boost::str(boost::format(txt) % FORMAT)); return false;}
|
|
||||||
|
|
||||||
BattleProcessor::BattleProcessor(CGameHandler * gameHandler)
|
BattleProcessor::BattleProcessor(CGameHandler * gameHandler)
|
||||||
: gameHandler(gameHandler)
|
: gameHandler(gameHandler)
|
||||||
, flowProcessor(std::make_unique<BattleFlowProcessor>(this))
|
, flowProcessor(std::make_unique<BattleFlowProcessor>(this))
|
||||||
|
Loading…
Reference in New Issue
Block a user