Explorar el Código

Remove no longer used code

Ivan Savenko hace 2 años
padre
commit
2be9664d26
Se han modificado 2 ficheros con 0 adiciones y 15 borrados
  1. 0 10
      AI/BattleAI/BattleAI.cpp
  2. 0 5
      server/battles/BattleProcessor.cpp

+ 0 - 10
AI/BattleAI/BattleAI.cpp

@@ -289,16 +289,6 @@ void CBattleAI::activeStack( const CStack * stack )
 
 		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())
 		{
 			cb->battleMakeUnitAction(*action);

+ 0 - 5
server/battles/BattleProcessor.cpp

@@ -42,11 +42,6 @@
 #include "../../lib/spells/ObstacleCasterProxy.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)
 	: gameHandler(gameHandler)
 	, flowProcessor(std::make_unique<BattleFlowProcessor>(this))