SDL2: Fixes in the "end of game" turboMode

Javanaise · Jan 14, 2019 · 82feec9 · 82feec9
1 parent f7dba25
commit 82feec9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/ai/MrboomHelper.cpp b/ai/MrboomHelper.cpp
@@ -107,6 +107,11 @@ int nbLives(int player)
    }
 }
 
+bool isDead(int player)
+{
+   return(m.vie[player] == 16);
+}
+
 bool isAlive(int player)
 {
    return(m.vie[player] == 1);
@@ -531,7 +536,7 @@ bool isSuicideOK(int player)
    return((nbLivesFriends > 1) && (nbLivesEnemies == 1));
 }
 
-bool someHumanPlayersAlive()
+bool someHumanPlayersAlive() // About to die players are considered dead
 {
    for (int i = 0; i < numberOfPlayers(); i++)
    {
@@ -545,3 +550,18 @@ bool someHumanPlayersAlive()
    }
    return(false);
 }
+
+bool someHumanPlayersNotDead() // About to die players are considered alive
+{
+   for (int i = 0; i < numberOfPlayers(); i++)
+   {
+      if (isAIActiveForPlayer(i) == false)
+      {
+         if (!isDead(i))
+         {
+            return(true);
+         }
+      }
+   }
+   return(false);
+}
diff --git a/ai/MrboomHelper.hpp b/ai/MrboomHelper.hpp
@@ -47,6 +47,7 @@ enum Bonus
 };
 
 bool someHumanPlayersAlive();
+bool someHumanPlayersNotDead();
 bool isInTheApocalypse();
 bool isAlive(int player);
 bool isAIActiveForPlayer(int player);

diff --git a/sdl2/sdl2.cpp b/sdl2/sdl2.cpp
@@ -778,13 +778,13 @@ loop()
    {
       anyButtonPushedMaskSave = 0;
    }
-   if (someHumanPlayersAlive())
+   if (someHumanPlayersNotDead())
    {
       anyButtonPushedMaskSave = anyButtonPushedMask;
    }
    else
    {
-      if (isGameActive())
+      if (!isAboutToWin() && isGameActive())
       {
          if (anyButtonPushedMaskSave != anyButtonPushedMask)                   // to avoid speeding straight away when still holding current keys
          {