Fixed a major regression preventing cloaking from working with the co…

…mmand optimizer. May also affect other commands.
bwapi · Jan 25, 2015 · 27bcd3c · 27bcd3c
1 parent e36a52d
commit 27bcd3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/bwapi/BWAPI/Source/GameUpdate.cpp b/bwapi/BWAPI/Source/GameUpdate.cpp
@@ -430,12 +430,12 @@ void GameImpl::updateCommandOptimizer()
         while ( cmd != commandOptimizer[i].end() )
         {
           // Ignore anything but the command that the unit last processed
-          if ( //static_cast<UnitImpl*>(cmd->unit)->lastImmediateCommandFrame == this->getFrameCount() &&
+          /*if ( //static_cast<UnitImpl*>(cmd->unit)->lastImmediateCommandFrame == this->getFrameCount() &&
                   static_cast<UnitImpl*>(cmd->unit)->lastImmediateCommand != *cmd )
           {
             cmd = commandOptimizer[i].erase(cmd);
             continue;
-          }
+          }*/
 
           // If we are starting a new command grouping
           if ( groupOf12.empty() )

diff --git a/bwapi/DevAIModule/Source/DevAIModule.cpp b/bwapi/DevAIModule/Source/DevAIModule.cpp
@@ -33,7 +33,7 @@ void DevAIModule::onStart()
   //bw->setFrameSkip(16);
 
   // set command optimization
-  bw->setCommandOptimizationLevel(3);
+  bw->setCommandOptimizationLevel(0);
 }
 
 void DevAIModule::onEnd(bool isWinner)
@@ -55,7 +55,11 @@ void DevAIModule::onFrame()
     Unitset myUnits = bw->getSelectedUnits();
     for ( auto &u : myUnits )
     {
-      bw->drawTextMap(u->getPosition(), "%s %s %s", bools(u->isStartingAttack()), bools(u->isAttacking()), bools(u->isAttackFrame()));
+      if (!u->cloak())
+      {
+        bw->drawTextMap(u->getPosition(), "%s", bw->getLastError().c_str());
+      }
+
     } // for
   }
 }