1 files changed, 9 insertions, 8 deletions

diff --git a/Game.cpp b/Game.cpp
index e4c0438..5a3f833 100644
--- a/Game.cpp
+++ b/Game.cpp
@@ -67,7 +67,7 @@ void Game(const struct tGameConfig& sGameConfig)
 
         /* Do not calculate a new frame
          * until refresh flag is set. */
-        while (gb.update() == false);
+        while (not gb.update());
     } while (GamePause() != PAUSE_MENU_CHOICE_QUIT);
 }
 
@@ -82,19 +82,20 @@ void Game(const struct tGameConfig& sGameConfig)
  *********************************************************************/
 static void GameNextFrame(const struct tGameConfig& sGameConfig)
 {
-    for (uint8_t i = 0; i < sGameConfig.u8NHumanPlayers; i++)
+    for (size_t szHumanPlayer = 0; szHumanPlayer < sGameConfig.u8NHumanPlayers; szHumanPlayer++)
     {
-        HumanPlayer* pHumanPlayerData = &sGameConfig.pHumanPlayerData[i];
+        HumanPlayer* const pHumanPlayerData = &sGameConfig.pHumanPlayerData[szHumanPlayer];
 
         if (pHumanPlayerData != NULL)
         {
+            /* Execute handler for selected HumanPlayer. */
             pHumanPlayerData->handler();
         }
+        else
+        {
+            /* HumanPlayer handler callback not available. */
+        }
     }
-
-    /* Update camera position according
-     * to button pressed events. */
-    sGameConfig.cam.handler();
 }
 
 /*****************************************************************//**
@@ -118,7 +119,7 @@ static enum tPauseMenuChoice GamePause(void)
             [PAUSE_MENU_CHOICE_QUIT]    = strPauseMenuOption_1
         };
 
-        return (enum tPauseMenuChoice)gb.menu(astrPauseMenuOptions, MAX_PAUSE_MENU_CHOICES);
+        return static_cast<enum tPauseMenuChoice>(gb.menu(astrPauseMenuOptions, MAX_PAUSE_MENU_CHOICES));
     }
     else
     {