added functions to check if game is over (and solved or not) (not used yet)
[rocksndiamonds.git] / src / game.c
index 78a371e33896c5b7fd2af2d322f1b28792855935..5bfa71db14d69900b035c2d31a0e60df472027bd 100644 (file)
@@ -81,7 +81,7 @@
 #define EX_TYPE_DYNA           (1 << 4)
 #define EX_TYPE_SINGLE_TILE    (EX_TYPE_CENTER | EX_TYPE_BORDER)
 
-#define PANEL_OFF()            (local_player->LevelSolved_PanelOff)
+#define PANEL_OFF()            (game.panel.active == FALSE)
 #define        PANEL_DEACTIVATED(p)    ((p)->x < 0 || (p)->y < 0 || PANEL_OFF())
 #define PANEL_XPOS(p)          (DX + ALIGNED_TEXT_XPOS(p))
 #define PANEL_YPOS(p)          (DY + ALIGNED_TEXT_YPOS(p))
@@ -1085,8 +1085,8 @@ static void PlayLevelSoundElementAction(int, int, int, int);
 static void PlayLevelSoundElementActionIfLoop(int, int, int, int);
 static void PlayLevelSoundActionIfLoop(int, int, int);
 static void StopLevelSoundActionIfLoop(int, int, int);
-static void PlayLevelMusic();
-static void FadeLevelSoundsAndMusic();
+static void PlayLevelMusic(void);
+static void FadeLevelSoundsAndMusic(void);
 
 static void HandleGameButtons(struct GadgetInfo *);
 
@@ -1096,7 +1096,7 @@ void ContinueMoving(int, int);
 void Bang(int, int);
 void InitMovDir(int, int);
 void InitAmoebaNr(int, int);
-int NewHiScore(void);
+int NewHiScore(int);
 
 void TestIfGoodThingHitsBadThing(int, int, int);
 void TestIfBadThingHitsGoodThing(int, int, int);
@@ -1112,6 +1112,7 @@ void TestIfGoodThingGetsHitByBadThing(int, int, int);
 void KillPlayer(struct PlayerInfo *);
 void BuryPlayer(struct PlayerInfo *);
 void RemovePlayer(struct PlayerInfo *);
+void ExitPlayer(struct PlayerInfo *);
 
 static int getInvisibleActiveFromInvisibleElement(int);
 static int getInvisibleFromInvisibleActiveElement(int);
@@ -1561,7 +1562,7 @@ static int playfield_scan_delta_y = 1;
                                     (x) += playfield_scan_delta_x)
 
 #ifdef DEBUG
-void DEBUG_SetMaximumDynamite()
+void DEBUG_SetMaximumDynamite(void)
 {
   int i;
 
@@ -1572,7 +1573,7 @@ void DEBUG_SetMaximumDynamite()
 }
 #endif
 
-static void InitPlayfieldScanModeVars()
+static void InitPlayfieldScanModeVars(void)
 {
   if (game.use_reverse_scan_direction)
   {
@@ -1635,7 +1636,7 @@ static void SetPlayerMoveSpeed(struct PlayerInfo *player, int move_stepsize,
   }
 }
 
-void GetPlayerConfig()
+void GetPlayerConfig(void)
 {
   GameFrameDelay = setup.game_frame_delay;
 
@@ -1731,7 +1732,7 @@ static void InitPlayerField(int x, int y, int element, boolean init_game)
     if (game.use_block_last_field_bug)
       player->block_delay_adjustment = (player->block_last_field ? -1 : 1);
 
-    if (!options.network || player->connected_network)
+    if (!network.enabled || player->connected_network)
     {
       player->active = TRUE;
 
@@ -2102,7 +2103,7 @@ int getPlayerInventorySize(int player_nr)
     return stored_player[player_nr].inventory_size;
 }
 
-void InitGameControlValues()
+static void InitGameControlValues(void)
 {
   int i;
 
@@ -2147,7 +2148,7 @@ void InitGameControlValues()
        sizeof(struct GamePanelOrderInfo), compareGamePanelOrderInfo);
 }
 
-void UpdatePlayfieldElementCount()
+static void UpdatePlayfieldElementCount(void)
 {
   boolean use_element_count = FALSE;
   int i, j, x, y;
@@ -2175,7 +2176,7 @@ void UpdatePlayfieldElementCount()
          element_info[j].element_count;
 }
 
-void UpdateGameControlValues()
+static void UpdateGameControlValues(void)
 {
   int i, k;
   int time = (local_player->LevelSolved ?
@@ -2223,7 +2224,8 @@ void UpdateGameControlValues()
 
   /* update game panel control values */
 
-  game_panel_controls[GAME_PANEL_LEVEL_NUMBER].value = level_nr;
+  /* used instead of "level_nr" (for network games) */
+  game_panel_controls[GAME_PANEL_LEVEL_NUMBER].value = levelset.level_nr;
   game_panel_controls[GAME_PANEL_GEMS].value = gems;
 
   game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value = 0;
@@ -2505,7 +2507,7 @@ void UpdateGameControlValues()
   }
 }
 
-void DisplayGameControlValues()
+static void DisplayGameControlValues(void)
 {
   boolean redraw_panel = FALSE;
   int i;
@@ -2756,7 +2758,7 @@ void DisplayGameControlValues()
   SetGameStatus(GAME_MODE_PLAYING);
 }
 
-void UpdateAndDisplayGameControlValues()
+void UpdateAndDisplayGameControlValues(void)
 {
   if (tape.deactivate_display)
     return;
@@ -2765,12 +2767,14 @@ void UpdateAndDisplayGameControlValues()
   DisplayGameControlValues();
 }
 
-void UpdateGameDoorValues()
+#if 0
+static void UpdateGameDoorValues(void)
 {
   UpdateGameControlValues();
 }
+#endif
 
-void DrawGameDoorValues()
+void DrawGameDoorValues(void)
 {
   DisplayGameControlValues();
 }
@@ -2784,7 +2788,7 @@ void DrawGameDoorValues()
   =============================================================================
 */
 
-static void InitGameEngine()
+static void InitGameEngine(void)
 {
   int i, j, k, l, x, y;
 
@@ -3241,7 +3245,8 @@ static void InitGameEngine()
     level.time = 0;
 }
 
-int get_num_special_action(int element, int action_first, int action_last)
+static int get_num_special_action(int element, int action_first,
+                                 int action_last)
 {
   int num_special_action = 0;
   int i, j;
@@ -3273,7 +3278,37 @@ int get_num_special_action(int element, int action_first, int action_last)
   =============================================================================
 */
 
-void InitGame()
+#if DEBUG_INIT_PLAYER
+static void DebugPrintPlayerStatus(char *message)
+{
+  int i;
+
+  if (!options.debug)
+    return;
+
+  printf("%s:\n", message);
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    struct PlayerInfo *player = &stored_player[i];
+
+    printf("- player %d: present == %d, connected == %d [%d/%d], active == %d",
+          i + 1,
+          player->present,
+          player->connected,
+          player->connected_locally,
+          player->connected_network,
+          player->active);
+
+    if (local_player == player)
+      printf(" (local player)");
+
+    printf("\n");
+  }
+}
+#endif
+
+void InitGame(void)
 {
   int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
   int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
@@ -3305,8 +3340,7 @@ void InitGame()
 
   ExpireSoundLoops(TRUE);
 
-  if (!level_editor_test_game)
-    FadeOut(fade_mask);
+  FadeOut(fade_mask);
 
   /* needed if different viewport properties defined for playing */
   ChangeViewportPropertiesIfNeeded();
@@ -3321,7 +3355,7 @@ void InitGame()
   InitGameControlValues();
 
   /* don't play tapes over network */
-  network_playing = (options.network && !tape.playing);
+  network_playing = (network.enabled && !tape.playing);
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
@@ -3361,6 +3395,7 @@ void InitGame()
     player->gems_still_needed = level.gems_needed;
     player->sokobanfields_still_needed = 0;
     player->lights_still_needed = 0;
+    player->players_still_needed = 0;
     player->friends_still_needed = 0;
 
     for (j = 0; j < MAX_NUM_KEYS; j++)
@@ -3490,7 +3525,6 @@ void InitGame()
 
     player->LevelSolved_GameWon = FALSE;
     player->LevelSolved_GameEnd = FALSE;
-    player->LevelSolved_PanelOff = FALSE;
     player->LevelSolved_SaveTape = FALSE;
     player->LevelSolved_SaveScore = FALSE;
 
@@ -3503,11 +3537,9 @@ void InitGame()
 
   network_player_action_received = FALSE;
 
-#if defined(NETWORK_AVALIABLE)
   /* initial null action */
   if (network_playing)
     SendToServer_MovePlayer(MV_NONE);
-#endif
 
   ZX = ZY = -1;
   ExitX = ExitY = -1;
@@ -3526,6 +3558,8 @@ void InitGame()
 
   AllPlayersGone = FALSE;
 
+  game.panel.active = TRUE;
+
   game.no_time_limit = (level.time == 0);
 
   game.yamyam_content_nr = 0;
@@ -3543,6 +3577,8 @@ void InitGame()
   game.ball_state = level.ball_state_initial;
   game.ball_content_nr = 0;
 
+  game.explosions_delayed = TRUE;
+
   game.envelope_active = FALSE;
 
   for (i = 0; i < NUM_BELTS; i++)
@@ -3555,33 +3591,12 @@ void InitGame()
     AmoebaCnt[i] = AmoebaCnt2[i] = 0;
 
 #if DEBUG_INIT_PLAYER
-  if (options.debug)
-  {
-    printf("Player status at level initialization:\n");
-
-    for (i = 0; i < MAX_PLAYERS; i++)
-    {
-      struct PlayerInfo *player = &stored_player[i];
-
-      printf("- player %d: present == %d, connected == %d [%d/%d], active == %d",
-            i + 1,
-            player->present,
-            player->connected,
-            player->connected_locally,
-            player->connected_network,
-            player->active);
-
-      if (local_player == player)
-       printf(" (local player)");
-
-      printf("\n");
-    }
-  }
+  DebugPrintPlayerStatus("Player status at level initialization");
 #endif
 
   SCAN_PLAYFIELD(x, y)
   {
-    Feld[x][y] = level.field[x][y];
+    Feld[x][y] = Last[x][y] = level.field[x][y];
     MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
     ChangeDelay[x][y] = 0;
     ChangePage[x][y] = -1;
@@ -3699,7 +3714,7 @@ void InitGame()
       local_player = &stored_player[i];
   }
 
-  if (!options.network)
+  if (!network.enabled)
     local_player->connected = TRUE;
 
   if (tape.playing)
@@ -3707,7 +3722,7 @@ void InitGame()
     for (i = 0; i < MAX_PLAYERS; i++)
       stored_player[i].connected = tape.player_participates[i];
   }
-  else if (options.network)
+  else if (network.enabled)
   {
     /* add team mode players connected over the network (needed for correct
        assignment of player figures from level to locally playing players) */
@@ -3728,28 +3743,7 @@ void InitGame()
   }
 
 #if DEBUG_INIT_PLAYER
-  if (options.debug)
-  {
-    printf("Player status after level initialization:\n");
-
-    for (i = 0; i < MAX_PLAYERS; i++)
-    {
-      struct PlayerInfo *player = &stored_player[i];
-
-      printf("- player %d: present == %d, connected == %d [%d/%d], active == %d",
-            i + 1,
-            player->present,
-            player->connected,
-            player->connected_locally,
-            player->connected_network,
-            player->active);
-
-      if (local_player == player)
-       printf(" (local player)");
-
-      printf("\n");
-    }
-  }
+  DebugPrintPlayerStatus("Player status after level initialization");
 #endif
 
 #if DEBUG_INIT_PLAYER
@@ -3836,28 +3830,7 @@ void InitGame()
   }
 
 #if DEBUG_INIT_PLAYER
-  if (options.debug)
-  {
-    printf("Player status after player assignment (first stage):\n");
-
-    for (i = 0; i < MAX_PLAYERS; i++)
-    {
-      struct PlayerInfo *player = &stored_player[i];
-
-      printf("- player %d: present == %d, connected == %d [%d/%d], active == %d",
-            i + 1,
-            player->present,
-            player->connected,
-            player->connected_locally,
-            player->connected_network,
-            player->active);
-
-      if (local_player == player)
-       printf(" (local player)");
-
-      printf("\n");
-    }
-  }
+  DebugPrintPlayerStatus("Player status after player assignment (first stage)");
 #endif
 
 #else
@@ -3962,32 +3935,34 @@ void InitGame()
     }
 #endif
   }
-  else if (!options.network && !game.team_mode)                /* && !tape.playing */
+  else if (!network.enabled && !game.team_mode)                /* && !tape.playing */
   {
-    /* when in single player mode, eliminate all but the first active player */
+    /* when in single player mode, eliminate all but the local player */
 
     for (i = 0; i < MAX_PLAYERS; i++)
     {
-      if (stored_player[i].active)
+      struct PlayerInfo *player = &stored_player[i];
+
+      if (player->active && player != local_player)
       {
-       for (j = i + 1; j < MAX_PLAYERS; j++)
-       {
-         if (stored_player[j].active)
-         {
-           struct PlayerInfo *player = &stored_player[j];
-           int jx = player->jx, jy = player->jy;
+       int jx = player->jx, jy = player->jy;
 
-           player->active = FALSE;
-           player->present = FALSE;
+       player->active = FALSE;
+       player->present = FALSE;
 
-           StorePlayer[jx][jy] = 0;
-           Feld[jx][jy] = EL_EMPTY;
-         }
-       }
+       StorePlayer[jx][jy] = 0;
+       Feld[jx][jy] = EL_EMPTY;
       }
     }
   }
 
+  for (i = 0; i < MAX_PLAYERS; i++)
+    if (stored_player[i].active)
+      local_player->players_still_needed++;
+
+  if (level.solved_by_one_player)
+    local_player->players_still_needed = 1;
+
   /* when recording the game, store which players take part in the game */
   if (tape.recording)
   {
@@ -4003,28 +3978,7 @@ void InitGame()
   }
 
 #if DEBUG_INIT_PLAYER
-  if (options.debug)
-  {
-    printf("Player status after player assignment (final stage):\n");
-
-    for (i = 0; i < MAX_PLAYERS; i++)
-    {
-      struct PlayerInfo *player = &stored_player[i];
-
-      printf("- player %d: present == %d, connected == %d [%d/%d], active == %d",
-            i + 1,
-            player->present,
-            player->connected,
-            player->connected_locally,
-            player->connected_network,
-            player->active);
-
-      if (local_player == player)
-       printf(" (local player)");
-
-      printf("\n");
-    }
-  }
+  DebugPrintPlayerStatus("Player status after player assignment (final stage)");
 #endif
 
   if (BorderElement == EL_EMPTY)
@@ -4224,28 +4178,7 @@ void InitGame()
     KeyboardAutoRepeatOffUnlessAutoplay();
 
 #if DEBUG_INIT_PLAYER
-    if (options.debug)
-    {
-      printf("Player status (final):\n");
-
-      for (i = 0; i < MAX_PLAYERS; i++)
-      {
-       struct PlayerInfo *player = &stored_player[i];
-
-       printf("- player %d: present == %d, connected == %d [%d/%d], active == %d",
-              i + 1,
-              player->present,
-              player->connected,
-              player->connected_locally,
-              player->connected_network,
-              player->active);
-
-       if (local_player == player)
-         printf(" (local player)");
-
-       printf("\n");
-      }
-    }
+    DebugPrintPlayerStatus("Player status (final)");
 #endif
   }
 
@@ -4263,6 +4196,7 @@ void InitGame()
 
   game.restart_level = FALSE;
   game.restart_game_message = NULL;
+  game.request_active = FALSE;
 
   if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     InitGameActions_MM();
@@ -4498,6 +4432,10 @@ void InitAmoebaNr(int x, int y)
 
 static void PlayerWins(struct PlayerInfo *player)
 {
+  if (level.game_engine_type == GAME_ENGINE_TYPE_RND &&
+      local_player->players_still_needed > 0)
+    return;
+
   player->LevelSolved = TRUE;
   player->GameOver = TRUE;
 
@@ -4516,7 +4454,7 @@ static void PlayerWins(struct PlayerInfo *player)
   player->LevelSolved_CountingHealth = player->health_final;
 }
 
-void GameWon()
+void GameWon(void)
 {
   static int time_count_steps;
   static int time, time_final;
@@ -4620,8 +4558,8 @@ void GameWon()
 
          Feld[ExitX][ExitY] =
            (element == EL_EXIT_OPEN            ? EL_EXIT_CLOSING :
-            element == EL_EM_EXIT_OPEN ? EL_EM_EXIT_CLOSING :
-            element == EL_SP_EXIT_OPEN ? EL_SP_EXIT_CLOSING:
+            element == EL_EM_EXIT_OPEN         ? EL_EM_EXIT_CLOSING :
+            element == EL_SP_EXIT_OPEN         ? EL_SP_EXIT_CLOSING:
             element == EL_STEEL_EXIT_OPEN      ? EL_STEEL_EXIT_CLOSING:
             EL_EM_STEEL_EXIT_CLOSING);
 
@@ -4717,7 +4655,7 @@ void GameWon()
     return;
   }
 
-  local_player->LevelSolved_PanelOff = TRUE;
+  game.panel.active = FALSE;
 
   if (game_over_delay_3 > 0)
   {
@@ -4729,10 +4667,11 @@ void GameWon()
   GameEnd();
 }
 
-void GameEnd()
+void GameEnd(void)
 {
+  /* used instead of "level_nr" (needed for network games) */
+  int last_level_nr = levelset.level_nr;
   int hi_pos;
-  boolean raise_level = FALSE;
 
   local_player->LevelSolved_GameEnd = TRUE;
 
@@ -4774,36 +4713,43 @@ void GameEnd()
   }
 
   if (setup.increment_levels &&
-      level_nr < leveldir_current->last_level)
-    raise_level = TRUE;                        /* advance to next level */
-
-  if ((hi_pos = NewHiScore()) >= 0) 
+      level_nr < leveldir_current->last_level &&
+      !network_playing)
   {
-    SetGameStatus(GAME_MODE_SCORES);
+    level_nr++;                /* advance to next level */
+    TapeErase();       /* start with empty tape */
 
-    DrawHallOfFame(hi_pos);
-
-    if (raise_level)
+    if (setup.auto_play_next_level)
     {
-      level_nr++;
-      TapeErase();
+      LoadLevel(level_nr);
+
+      SaveLevelSetup_SeriesInfo();
     }
   }
+
+  hi_pos = NewHiScore(last_level_nr);
+
+  if (hi_pos >= 0 && !setup.skip_scores_after_game)
+  {
+    SetGameStatus(GAME_MODE_SCORES);
+
+    DrawHallOfFame(last_level_nr, hi_pos);
+  }
+  else if (setup.auto_play_next_level && setup.increment_levels &&
+          last_level_nr < leveldir_current->last_level &&
+          !network_playing)
+  {
+    StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+  }
   else
   {
     SetGameStatus(GAME_MODE_MAIN);
 
-    if (raise_level)
-    {
-      level_nr++;
-      TapeErase();
-    }
-
     DrawMainMenu();
   }
 }
 
-int NewHiScore()
+int NewHiScore(int level_nr)
 {
   int k, l;
   int position = -1;
@@ -4934,7 +4880,7 @@ static void ResetRandomAnimationValue(int x, int y)
   GfxRandom[x][y] = INIT_GFX_RANDOM();
 }
 
-void InitMovingField(int x, int y, int direction)
+static void InitMovingField(int x, int y, int direction)
 {
   int element = Feld[x][y];
   int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0);
@@ -5007,7 +4953,7 @@ void Blocked2Moving(int x, int y, int *comes_from_x, int *comes_from_y)
   *comes_from_y = oldy;
 }
 
-int MovingOrBlocked2Element(int x, int y)
+static int MovingOrBlocked2Element(int x, int y)
 {
   int element = Feld[x][y];
 
@@ -5065,7 +5011,7 @@ static void RemoveField(int x, int y)
   GfxDir[x][y] = MV_NONE;
 }
 
-void RemoveMovingField(int x, int y)
+static void RemoveMovingField(int x, int y)
 {
   int oldx = x, oldy = y, newx = x, newy = y;
   int element = Feld[x][y];
@@ -5146,7 +5092,7 @@ void DrawDynamite(int x, int y)
     DrawGraphic(sx, sy, graphic, frame);
 }
 
-void CheckDynamite(int x, int y)
+static void CheckDynamite(int x, int y)
 {
   if (MovDelay[x][y] != 0)     /* dynamite is still waiting to explode */
   {
@@ -5196,7 +5142,7 @@ static void setMinimalPlayerBoundaries(int *sx1, int *sy1, int *sx2, int *sy2)
   }
 }
 
-static boolean checkIfAllPlayersFitToScreen_RND()
+static boolean checkIfAllPlayersFitToScreen_RND(void)
 {
   int sx1 = 0, sy1 = 0, sx2 = 0, sy2 = 0;
 
@@ -5216,8 +5162,8 @@ static void setScreenCenteredToAllPlayers(int *sx, int *sy)
   *sy = (sy1 + sy2) / 2;
 }
 
-void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
-                       boolean center_screen, boolean quick_relocation)
+static void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
+                              boolean center_screen, boolean quick_relocation)
 {
   unsigned int frame_delay_value_old = GetVideoFrameDelay();
   boolean ffwd_delay = (tape.playing && tape.fast_forward);
@@ -5307,7 +5253,7 @@ void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
   SetVideoFrameDelay(frame_delay_value_old);
 }
 
-void RelocatePlayer(int jx, int jy, int el_player_raw)
+static void RelocatePlayer(int jx, int jy, int el_player_raw)
 {
   int el_player = GET_PLAYER_ELEMENT(el_player_raw);
   int player_nr = GET_PLAYER_NR(el_player);
@@ -5412,7 +5358,7 @@ void RelocatePlayer(int jx, int jy, int el_player_raw)
   }
 }
 
-void Explode(int ex, int ey, int phase, int mode)
+static void Explode(int ex, int ey, int phase, int mode)
 {
   int x, y;
   int last_phase;
@@ -5715,7 +5661,7 @@ void Explode(int ex, int ey, int phase, int mode)
   }
 }
 
-void DynaExplode(int ex, int ey)
+static void DynaExplode(int ex, int ey)
 {
   int i, j;
   int dynabomb_element = Feld[ex][ey];
@@ -5840,7 +5786,7 @@ void Bang(int x, int y)
   CheckTriggeredElementChange(x, y, element, CE_EXPLOSION_OF_X);
 }
 
-void SplashAcid(int x, int y)
+static void SplashAcid(int x, int y)
 {
   if (IN_LEV_FIELD(x - 1, y - 1) && IS_FREE(x - 1, y - 1) &&
       (!IN_LEV_FIELD(x - 1, y - 2) ||
@@ -5855,7 +5801,7 @@ void SplashAcid(int x, int y)
   PlayLevelSound(x, y, SND_ACID_SPLASHING);
 }
 
-static void InitBeltMovement()
+static void InitBeltMovement(void)
 {
   static int belt_base_element[4] =
   {
@@ -6089,7 +6035,7 @@ static int getInvisibleFromInvisibleActiveElement(int element)
          element);
 }
 
-static void RedrawAllLightSwitchesAndInvisibleElements()
+static void RedrawAllLightSwitchesAndInvisibleElements(void)
 {
   int x, y;
 
@@ -6150,7 +6096,7 @@ static void RedrawAllLightSwitchesAndInvisibleElements()
   }
 }
 
-static void RedrawAllInvisibleElementsForLenses()
+static void RedrawAllInvisibleElementsForLenses(void)
 {
   int x, y;
 
@@ -6199,7 +6145,7 @@ static void RedrawAllInvisibleElementsForLenses()
   }
 }
 
-static void RedrawAllInvisibleElementsForMagnifier()
+static void RedrawAllInvisibleElementsForMagnifier(void)
 {
   int x, y;
 
@@ -6292,7 +6238,7 @@ static void ActivateTimegateSwitch(int x, int y)
                EL_DC_TIMEGATE_SWITCH_ACTIVE);
 }
 
-void Impact(int x, int y)
+static void Impact(int x, int y)
 {
   boolean last_line = (y == lev_fieldy - 1);
   boolean object_hit = FALSE;
@@ -7396,7 +7342,7 @@ static boolean JustBeingPushed(int x, int y)
   return FALSE;
 }
 
-void StartMoving(int x, int y)
+static void StartMoving(int x, int y)
 {
   boolean started_moving = FALSE;      /* some elements can fall _and_ move */
   int element = Feld[x][y];
@@ -8575,7 +8521,7 @@ int AmoebeNachbarNr(int ax, int ay)
   return group_nr;
 }
 
-void AmoebenVereinigen(int ax, int ay)
+static void AmoebenVereinigen(int ax, int ay)
 {
   int i, x, y, xx, yy;
   int new_group_nr = AmoebaNr[ax][ay];
@@ -8682,7 +8628,7 @@ void AmoebeUmwandeln(int ax, int ay)
   }
 }
 
-void AmoebeUmwandelnBD(int ax, int ay, int new_element)
+static void AmoebeUmwandelnBD(int ax, int ay, int new_element)
 {
   int x, y;
   int group_nr = AmoebaNr[ax][ay];
@@ -8718,7 +8664,7 @@ void AmoebeUmwandelnBD(int ax, int ay, int new_element)
                            SND_BD_AMOEBA_TURNING_TO_GEM));
 }
 
-void AmoebeWaechst(int x, int y)
+static void AmoebeWaechst(int x, int y)
 {
   static unsigned int sound_delay = 0;
   static unsigned int sound_delay_value = 0;
@@ -8754,7 +8700,7 @@ void AmoebeWaechst(int x, int y)
   }
 }
 
-void AmoebaDisappearing(int x, int y)
+static void AmoebaDisappearing(int x, int y)
 {
   static unsigned int sound_delay = 0;
   static unsigned int sound_delay_value = 0;
@@ -8790,7 +8736,7 @@ void AmoebaDisappearing(int x, int y)
   }
 }
 
-void AmoebeAbleger(int ax, int ay)
+static void AmoebeAbleger(int ax, int ay)
 {
   int i;
   int element = Feld[ax][ay];
@@ -8945,7 +8891,7 @@ void AmoebeAbleger(int ax, int ay)
   TEST_DrawLevelField(newax, neway);
 }
 
-void Life(int ax, int ay)
+static void Life(int ax, int ay)
 {
   int x1, y1, x2, y2;
   int life_time = 40;
@@ -8974,7 +8920,8 @@ void Life(int ax, int ay)
   for (y1 = -1; y1 < 2; y1++) for (x1 = -1; x1 < 2; x1++)
   {
     int xx = ax+x1, yy = ay+y1;
-    int nachbarn = 0;
+    int old_element = Feld[xx][yy];
+    int num_neighbours = 0;
 
     if (!IN_LEV_FIELD(xx, yy))
       continue;
@@ -8986,33 +8933,48 @@ void Life(int ax, int ay)
       if (!IN_LEV_FIELD(x, y) || (x == xx && y == yy))
        continue;
 
-      if (((Feld[x][y] == element ||
-           (element == EL_GAME_OF_LIFE && IS_PLAYER(x, y))) &&
-          !Stop[x][y]) ||
-         (IS_FREE(x, y) && Stop[x][y]))
-       nachbarn++;
+      boolean is_player_cell = (element == EL_GAME_OF_LIFE && IS_PLAYER(x, y));
+      boolean is_neighbour = FALSE;
+
+      if (level.use_life_bugs)
+       is_neighbour =
+         (((Feld[x][y] == element || is_player_cell) && !Stop[x][y]) ||
+          (IS_FREE(x, y)                             &&  Stop[x][y]));
+      else
+       is_neighbour =
+         (Last[x][y] == element || is_player_cell);
+
+      if (is_neighbour)
+       num_neighbours++;
     }
 
+    boolean is_free = FALSE;
+
+    if (level.use_life_bugs)
+      is_free = (IS_FREE(xx, yy));
+    else
+      is_free = (IS_FREE(xx, yy) && Last[xx][yy] == EL_EMPTY);
+
     if (xx == ax && yy == ay)          /* field in the middle */
     {
-      if (nachbarn < life_parameter[0] ||
-         nachbarn > life_parameter[1])
+      if (num_neighbours < life_parameter[0] ||
+         num_neighbours > life_parameter[1])
       {
        Feld[xx][yy] = EL_EMPTY;
-       if (!Stop[xx][yy])
+       if (Feld[xx][yy] != old_element)
          TEST_DrawLevelField(xx, yy);
        Stop[xx][yy] = TRUE;
        changed = TRUE;
       }
     }
-    else if (IS_FREE(xx, yy) || CAN_GROW_INTO(Feld[xx][yy]))
+    else if (is_free || CAN_GROW_INTO(Feld[xx][yy]))
     {                                  /* free border field */
-      if (nachbarn >= life_parameter[2] &&
-         nachbarn <= life_parameter[3])
+      if (num_neighbours >= life_parameter[2] &&
+         num_neighbours <= life_parameter[3])
       {
        Feld[xx][yy] = element;
        MovDelay[xx][yy] = (element == EL_GAME_OF_LIFE ? 0 : life_time-1);
-       if (!Stop[xx][yy])
+       if (Feld[xx][yy] != old_element)
          TEST_DrawLevelField(xx, yy);
        Stop[xx][yy] = TRUE;
        changed = TRUE;
@@ -9092,7 +9054,7 @@ static void ActivateMagicBall(int bx, int by)
   game.ball_content_nr = (game.ball_content_nr + 1) % level.num_ball_contents;
 }
 
-void CheckExit(int x, int y)
+static void CheckExit(int x, int y)
 {
   if (local_player->gems_still_needed > 0 ||
       local_player->sokobanfields_still_needed > 0 ||
@@ -9115,7 +9077,7 @@ void CheckExit(int x, int y)
   PlayLevelSoundNearest(x, y, SND_CLASS_EXIT_OPENING);
 }
 
-void CheckExitEM(int x, int y)
+static void CheckExitEM(int x, int y)
 {
   if (local_player->gems_still_needed > 0 ||
       local_player->sokobanfields_still_needed > 0 ||
@@ -9138,7 +9100,7 @@ void CheckExitEM(int x, int y)
   PlayLevelSoundNearest(x, y, SND_CLASS_EM_EXIT_OPENING);
 }
 
-void CheckExitSteel(int x, int y)
+static void CheckExitSteel(int x, int y)
 {
   if (local_player->gems_still_needed > 0 ||
       local_player->sokobanfields_still_needed > 0 ||
@@ -9161,7 +9123,7 @@ void CheckExitSteel(int x, int y)
   PlayLevelSoundNearest(x, y, SND_CLASS_STEEL_EXIT_OPENING);
 }
 
-void CheckExitSteelEM(int x, int y)
+static void CheckExitSteelEM(int x, int y)
 {
   if (local_player->gems_still_needed > 0 ||
       local_player->sokobanfields_still_needed > 0 ||
@@ -9184,7 +9146,7 @@ void CheckExitSteelEM(int x, int y)
   PlayLevelSoundNearest(x, y, SND_CLASS_EM_STEEL_EXIT_OPENING);
 }
 
-void CheckExitSP(int x, int y)
+static void CheckExitSP(int x, int y)
 {
   if (local_player->gems_still_needed > 0)
   {
@@ -9205,7 +9167,7 @@ void CheckExitSP(int x, int y)
   PlayLevelSoundNearest(x, y, SND_CLASS_SP_EXIT_OPENING);
 }
 
-static void CloseAllOpenTimegates()
+static void CloseAllOpenTimegates(void)
 {
   int x, y;
 
@@ -9222,7 +9184,7 @@ static void CloseAllOpenTimegates()
   }
 }
 
-void DrawTwinkleOnField(int x, int y)
+static void DrawTwinkleOnField(int x, int y)
 {
   if (!IN_SCR_FIELD(SCREENX(x), SCREENY(y)) || IS_MOVING(x, y))
     return;
@@ -9249,7 +9211,7 @@ void DrawTwinkleOnField(int x, int y)
   }
 }
 
-void MauerWaechst(int x, int y)
+static void MauerWaechst(int x, int y)
 {
   int delay = 6;
 
@@ -9299,7 +9261,7 @@ void MauerWaechst(int x, int y)
   }
 }
 
-void MauerAbleger(int ax, int ay)
+static void MauerAbleger(int ax, int ay)
 {
   int element = Feld[ax][ay];
   int graphic = el2img(element);
@@ -9407,7 +9369,7 @@ void MauerAbleger(int ax, int ay)
     PlayLevelSoundAction(ax, ay, ACTION_GROWING);
 }
 
-void MauerAblegerStahl(int ax, int ay)
+static void MauerAblegerStahl(int ax, int ay)
 {
   int element = Feld[ax][ay];
   int graphic = el2img(element);
@@ -9509,7 +9471,7 @@ void MauerAblegerStahl(int ax, int ay)
     PlayLevelSoundAction(ax, ay, ACTION_GROWING);
 }
 
-void CheckForDragon(int x, int y)
+static void CheckForDragon(int x, int y)
 {
   int i, j;
   boolean dragon_found = FALSE;
@@ -9853,7 +9815,10 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
     {
       for (i = 0; i < MAX_PLAYERS; i++)
        if (action_arg_player_bits & (1 << i))
-         PlayerWins(&stored_player[i]);
+         ExitPlayer(&stored_player[i]);
+
+      if (AllPlayersGone)
+       PlayerWins(local_player);
 
       break;
     }
@@ -10837,7 +10802,7 @@ static void PlayPlayerSound(struct PlayerInfo *player)
   }
 }
 
-static void PlayAllPlayersSound()
+static void PlayAllPlayersSound(void)
 {
   int i;
 
@@ -11118,11 +11083,8 @@ static void SetTapeActionFromMouseAction(byte *tape_action,
   tape_action[TAPE_ACTION_BUTTON] = mouse_action->button;
 }
 
-static void CheckLevelTime()
+static void CheckLevelSolved(void)
 {
-  int i;
-
-  /* !!! SAME CODE AS IN "GameActions()" -- FIX THIS !!! */
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
   {
     if (level.native_em_level->lev->home == 0) /* all players at home */
@@ -11170,6 +11132,11 @@ static void CheckLevelTime()
     if (game_mm.game_over)                             /* game lost */
       AllPlayersGone = TRUE;
   }
+}
+
+static void CheckLevelTime(void)
+{
+  int i;
 
   if (TimeFrames >= FRAMES_PER_SECOND)
   {
@@ -11290,19 +11257,18 @@ void StartGameActions(boolean init_network_game, boolean record_tape,
   if (record_tape)
     TapeStartRecording(new_random_seed);
 
-#if defined(NETWORK_AVALIABLE)
   if (init_network_game)
   {
+    SendToServer_LevelFile();
     SendToServer_StartPlaying();
 
     return;
   }
-#endif
 
   InitGame();
 }
 
-void GameActionsExt()
+static void GameActionsExt(void)
 {
 #if 0
   static unsigned int game_frame_delay = 0;
@@ -11333,56 +11299,9 @@ void GameActionsExt()
   }
 
   if (game.restart_level)
-    StartGameActions(options.network, setup.autorecord, level.random_seed);
+    StartGameActions(network.enabled, setup.autorecord, level.random_seed);
 
-  /* !!! SAME CODE AS IN "CheckLevelTime()" -- FIX THIS !!! */
-  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-  {
-    if (level.native_em_level->lev->home == 0) /* all players at home */
-    {
-      PlayerWins(local_player);
-
-      AllPlayersGone = TRUE;
-
-      level.native_em_level->lev->home = -1;
-    }
-
-    if (level.native_em_level->ply[0]->alive == 0 &&
-       level.native_em_level->ply[1]->alive == 0 &&
-       level.native_em_level->ply[2]->alive == 0 &&
-       level.native_em_level->ply[3]->alive == 0)      /* all dead */
-      AllPlayersGone = TRUE;
-  }
-  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-  {
-    if (game_sp.LevelSolved &&
-       !game_sp.GameOver)                              /* game won */
-    {
-      PlayerWins(local_player);
-
-      game_sp.GameOver = TRUE;
-
-      AllPlayersGone = TRUE;
-    }
-
-    if (game_sp.GameOver)                              /* game lost */
-      AllPlayersGone = TRUE;
-  }
-  else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
-  {
-    if (game_mm.level_solved &&
-       !game_mm.game_over)                             /* game won */
-    {
-      PlayerWins(local_player);
-
-      game_mm.game_over = TRUE;
-
-      AllPlayersGone = TRUE;
-    }
-
-    if (game_mm.game_over)                             /* game lost */
-      AllPlayersGone = TRUE;
-  }
+  CheckLevelSolved();
 
   if (local_player->LevelSolved && !local_player->LevelSolved_GameEnd)
     GameWon();
@@ -11420,10 +11339,8 @@ void GameActionsExt()
   {
     /* try to get network player actions in time */
 
-#if defined(NETWORK_AVALIABLE)
     /* last chance to get network player actions without main loop delay */
     HandleNetworking();
-#endif
 
     /* game was quit by network peer */
     if (game_status != GAME_MODE_PLAYING)
@@ -11469,14 +11386,12 @@ void GameActionsExt()
       stored_player[i].effective_action = stored_player[i].action;
   }
 
-#if defined(NETWORK_AVALIABLE)
   if (network_playing)
     SendToServer_MovePlayer(summarized_player_action);
-#endif
 
   // summarize all actions at local players mapped input device position
   // (this allows using different input devices in single player mode)
-  if (!options.network && !game.team_mode)
+  if (!network.enabled && !game.team_mode)
     stored_player[map_player_action[local_player->index_nr]].effective_action =
       summarized_player_action;
 
@@ -11585,6 +11500,7 @@ void GameActionsExt()
 
   BlitScreenToBitmap(backbuffer);
 
+  CheckLevelSolved();
   CheckLevelTime();
 
   AdvanceFrameAndPlayerCounters(-1);   /* advance counters for all players */
@@ -11614,7 +11530,7 @@ void GameActionsExt()
   }
 }
 
-static void GameActions_CheckSaveEngineSnapshot()
+static void GameActions_CheckSaveEngineSnapshot(void)
 {
   if (!game.snapshot.save_snapshot)
     return;
@@ -11625,14 +11541,14 @@ static void GameActions_CheckSaveEngineSnapshot()
   SaveEngineSnapshotToList();
 }
 
-void GameActions()
+void GameActions(void)
 {
   GameActionsExt();
 
   GameActions_CheckSaveEngineSnapshot();
 }
 
-void GameActions_EM_Main()
+void GameActions_EM_Main(void)
 {
   byte effective_action[MAX_PLAYERS];
   boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
@@ -11644,7 +11560,7 @@ void GameActions_EM_Main()
   GameActions_EM(effective_action, warp_mode);
 }
 
-void GameActions_SP_Main()
+void GameActions_SP_Main(void)
 {
   byte effective_action[MAX_PLAYERS];
   boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
@@ -11664,19 +11580,19 @@ void GameActions_SP_Main()
   }
 }
 
-void GameActions_MM_Main()
+void GameActions_MM_Main(void)
 {
   boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
 
   GameActions_MM(local_player->effective_mouse_action, warp_mode);
 }
 
-void GameActions_RND_Main()
+void GameActions_RND_Main(void)
 {
   GameActions_RND();
 }
 
-void GameActions_RND()
+void GameActions_RND(void)
 {
   int magic_wall_x = 0, magic_wall_y = 0;
   int i, x, y, element, graphic, last_gfx_frame;
@@ -11792,6 +11708,8 @@ void GameActions_RND()
 
   SCAN_PLAYFIELD(x, y)
   {
+    Last[x][y] = Feld[x][y];
+
     ChangeCount[x][y] = 0;
     ChangeEvent[x][y] = -1;
 
@@ -12219,7 +12137,7 @@ static boolean AllPlayersInSight(struct PlayerInfo *player, int x, int y)
   return (max_x - min_x < SCR_FIELDX && max_y - min_y < SCR_FIELDY);
 }
 
-static boolean AllPlayersInVisibleScreen()
+static boolean AllPlayersInVisibleScreen(void)
 {
   int i;
 
@@ -12386,7 +12304,7 @@ boolean MovePlayerOneStep(struct PlayerInfo *player,
     }
   }
 
-  if (!options.network && game.centered_player_nr == -1 &&
+  if (!network.enabled && game.centered_player_nr == -1 &&
       !AllPlayersInSight(player, new_jx, new_jy))
     return MP_NO_ACTION;
 
@@ -12573,7 +12491,7 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
 
     if (scroll_x != old_scroll_x || scroll_y != old_scroll_y)
     {
-      if (!options.network && game.centered_player_nr == -1 &&
+      if (!network.enabled && game.centered_player_nr == -1 &&
          !AllPlayersInVisibleScreen())
       {
        scroll_x = old_scroll_x;
@@ -12725,12 +12643,12 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
        Feld[jx][jy] == EL_SP_EXIT_OPEN ||
        Feld[jx][jy] == EL_SP_EXIT_OPENING)     /* <-- special case */
     {
-      DrawPlayer(player);      /* needed here only to cleanup last field */
-      RemovePlayer(player);
+      ExitPlayer(player);
 
-      if (local_player->friends_still_needed == 0 ||
-         IS_SP_ELEMENT(Feld[jx][jy]))
-       PlayerWins(player);
+      if ((local_player->friends_still_needed == 0 ||
+          IS_SP_ELEMENT(Feld[jx][jy])) &&
+         AllPlayersGone)
+       PlayerWins(local_player);
     }
 
     /* this breaks one level: "machine", level 000 */
@@ -13486,6 +13404,19 @@ void RemovePlayer(struct PlayerInfo *player)
   ExitY = ZY = jy;
 }
 
+void ExitPlayer(struct PlayerInfo *player)
+{
+  DrawPlayer(player);  /* needed here only to cleanup last field */
+  RemovePlayer(player);
+
+  if (local_player->players_still_needed > 0)
+    local_player->players_still_needed--;
+
+  /* also set if some players not yet gone, but not needed to solve level */
+  if (local_player->players_still_needed == 0)
+    AllPlayersGone = TRUE;
+}
+
 static void setFieldForSnapping(int x, int y, int element, int direction)
 {
   struct ElementInfo *ei = &element_info[element];
@@ -14031,6 +13962,8 @@ static int DigField(struct PlayerInfo *player,
       if (local_player->sokobanfields_still_needed == 0 &&
          (game.emulation == EMU_SOKOBAN || level.auto_exit_sokoban))
       {
+       local_player->players_still_needed = 0;
+
        PlayerWins(player);
 
        PlayLevelSound(x, y, SND_GAME_SOKOBAN_SOLVING);
@@ -14513,7 +14446,7 @@ static boolean DropElement(struct PlayerInfo *player)
 static int *loop_sound_frame = NULL;
 static int *loop_sound_volume = NULL;
 
-void InitPlayLevelSound()
+void InitPlayLevelSound(void)
 {
   int num_sounds = getSoundListSize();
 
@@ -14616,7 +14549,7 @@ static void StopLevelSoundActionIfLoop(int x, int y, int action)
     StopSound(sound_effect);
 }
 
-static int getLevelMusicNr()
+static int getLevelMusicNr(void)
 {
   if (levelset.music[level_nr] != MUS_UNDEFINED)
     return levelset.music[level_nr];           /* from config file */
@@ -14624,12 +14557,12 @@ static int getLevelMusicNr()
     return MAP_NOCONF_MUSIC(level_nr);         /* from music dir */
 }
 
-static void FadeLevelSounds()
+static void FadeLevelSounds(void)
 {
   FadeSounds();
 }
 
-static void FadeLevelMusic()
+static void FadeLevelMusic(void)
 {
   int music_nr = getLevelMusicNr();
   char *curr_music = getCurrentlyPlayingMusicFilename();
@@ -14639,20 +14572,20 @@ static void FadeLevelMusic()
     FadeMusic();
 }
 
-void FadeLevelSoundsAndMusic()
+void FadeLevelSoundsAndMusic(void)
 {
   FadeLevelSounds();
   FadeLevelMusic();
 }
 
-static void PlayLevelMusic()
+static void PlayLevelMusic(void)
 {
   int music_nr = getLevelMusicNr();
   char *curr_music = getCurrentlyPlayingMusicFilename();
   char *next_music = getMusicInfoEntryFilename(music_nr);
 
   if (!strEqual(curr_music, next_music))
-    PlayMusic(music_nr);
+    PlayMusicLoop(music_nr);
 }
 
 void PlayLevelSound_EM(int xx, int yy, int element_em, int sample)
@@ -14967,11 +14900,9 @@ void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
     if (!skip_request)
       CloseDoor(DOOR_CLOSE_1);
 
-#if defined(NETWORK_AVALIABLE)
-    if (options.network)
+    if (network.enabled)
       SendToServer_StopPlaying(NETWORK_STOP_BY_PLAYER);
     else
-#endif
     {
       if (quick_quit)
        FadeSkipNextFadeIn();
@@ -15008,7 +14939,7 @@ void RequestRestartGame(char *message)
 
   if (Request(message, REQ_ASK | REQ_STAY_CLOSED))
   {
-    StartGameActions(options.network, setup.autorecord, level.random_seed);
+    StartGameActions(network.enabled, setup.autorecord, level.random_seed);
   }
   else
   {
@@ -15018,6 +14949,32 @@ void RequestRestartGame(char *message)
   }
 }
 
+boolean checkGameSolved(void)
+{
+  /* set for all game engines if level was solved */
+  return local_player->LevelSolved_GameEnd;
+}
+
+boolean checkGameFailed(void)
+{
+  if (!AllPlayersGone)
+    return FALSE;
+
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+    return (level.native_em_level->lev->home > 0);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+    return (game_sp.GameOver && !game_sp.LevelSolved);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    return (game_mm.game_over && !game_mm.level_solved);
+  else                         /* GAME_ENGINE_TYPE_RND */
+    return (local_player->GameOver && !local_player->LevelSolved);
+}
+
+boolean checkGameEnded(void)
+{
+  return (checkGameSolved() || checkGameFailed());
+}
+
 
 /* ------------------------------------------------------------------------- */
 /* random generator functions                                                */
@@ -15064,7 +15021,7 @@ static struct EngineSnapshotInfo engine_snapshot_rnd;
 static char *snapshot_level_identifier = NULL;
 static int snapshot_level_nr = -1;
 
-static void SaveEngineSnapshotValues_RND()
+static void SaveEngineSnapshotValues_RND(void)
 {
   static int belt_base_active_element[4] =
   {
@@ -15103,7 +15060,7 @@ static void SaveEngineSnapshotValues_RND()
   }
 }
 
-static void LoadEngineSnapshotValues_RND()
+static void LoadEngineSnapshotValues_RND(void)
 {
   unsigned int num_random_calls = game.num_random_calls;
   int i, j;
@@ -15149,7 +15106,7 @@ static void LoadEngineSnapshotValues_RND()
   }
 }
 
-void FreeEngineSnapshotSingle()
+void FreeEngineSnapshotSingle(void)
 {
   FreeSnapshotSingle();
 
@@ -15157,12 +15114,12 @@ void FreeEngineSnapshotSingle()
   snapshot_level_nr = -1;
 }
 
-void FreeEngineSnapshotList()
+void FreeEngineSnapshotList(void)
 {
   FreeSnapshotList();
 }
 
-ListNode *SaveEngineSnapshotBuffers()
+static ListNode *SaveEngineSnapshotBuffers(void)
 {
   ListNode *buffers = NULL;
 
@@ -15271,7 +15228,7 @@ ListNode *SaveEngineSnapshotBuffers()
   return buffers;
 }
 
-void SaveEngineSnapshotSingle()
+void SaveEngineSnapshotSingle(void)
 {
   ListNode *buffers = SaveEngineSnapshotBuffers();
 
@@ -15283,7 +15240,7 @@ void SaveEngineSnapshotSingle()
   snapshot_level_nr = level_nr;
 }
 
-boolean CheckSaveEngineSnapshotToList()
+boolean CheckSaveEngineSnapshotToList(void)
 {
   boolean save_snapshot =
     ((game.snapshot.mode == SNAPSHOT_MODE_EVERY_STEP) ||
@@ -15299,7 +15256,7 @@ boolean CheckSaveEngineSnapshotToList()
   return save_snapshot;
 }
 
-void SaveEngineSnapshotToList()
+void SaveEngineSnapshotToList(void)
 {
   if (game.snapshot.mode == SNAPSHOT_MODE_OFF ||
       tape.quick_resume)
@@ -15311,14 +15268,14 @@ void SaveEngineSnapshotToList()
   SaveSnapshotToList(buffers);
 }
 
-void SaveEngineSnapshotToListInitial()
+void SaveEngineSnapshotToListInitial(void)
 {
   FreeEngineSnapshotList();
 
   SaveEngineSnapshotToList();
 }
 
-void LoadEngineSnapshotValues()
+static void LoadEngineSnapshotValues(void)
 {
   /* restore special values from snapshot structure */
 
@@ -15332,34 +15289,34 @@ void LoadEngineSnapshotValues()
     LoadEngineSnapshotValues_MM();
 }
 
-void LoadEngineSnapshotSingle()
+void LoadEngineSnapshotSingle(void)
 {
   LoadSnapshotSingle();
 
   LoadEngineSnapshotValues();
 }
 
-void LoadEngineSnapshot_Undo(int steps)
+static void LoadEngineSnapshot_Undo(int steps)
 {
   LoadSnapshotFromList_Older(steps);
 
   LoadEngineSnapshotValues();
 }
 
-void LoadEngineSnapshot_Redo(int steps)
+static void LoadEngineSnapshot_Redo(int steps)
 {
   LoadSnapshotFromList_Newer(steps);
 
   LoadEngineSnapshotValues();
 }
 
-boolean CheckEngineSnapshotSingle()
+boolean CheckEngineSnapshotSingle(void)
 {
   return (strEqual(snapshot_level_identifier, leveldir_current->identifier) &&
          snapshot_level_nr == level_nr);
 }
 
-boolean CheckEngineSnapshotList()
+boolean CheckEngineSnapshotList(void)
 {
   return CheckSnapshotList();
 }
@@ -15464,13 +15421,14 @@ static struct
   }
 };
 
-void CreateGameButtons()
+void CreateGameButtons(void)
 {
   int i;
 
   for (i = 0; i < NUM_GAME_BUTTONS; i++)
   {
-    struct GraphicInfo *gfx = &graphic_info[gamebutton_info[i].graphic];
+    int graphic = gamebutton_info[i].graphic;
+    struct GraphicInfo *gfx = &graphic_info[graphic];
     struct XY *pos = gamebutton_info[i].pos;
     struct GadgetInfo *gi;
     int button_type;
@@ -15524,6 +15482,7 @@ void CreateGameButtons()
     }
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, gamebutton_info[i].infotext,
                      GDI_X, base_x + GDI_ACTIVE_POS(pos->x),
                      GDI_Y, base_y + GDI_ACTIVE_POS(pos->y),
@@ -15548,7 +15507,7 @@ void CreateGameButtons()
   }
 }
 
-void FreeGameButtons()
+void FreeGameButtons(void)
 {
   int i;
 
@@ -15567,7 +15526,7 @@ static void UnmapGameButtonsAtSamePosition(int id)
       UnmapGadget(game_gadget[i]);
 }
 
-static void UnmapGameButtonsAtSamePosition_All()
+static void UnmapGameButtonsAtSamePosition_All(void)
 {
   if (setup.show_snapshot_buttons)
   {
@@ -15600,7 +15559,7 @@ static void MapGameButtonsAtSamePosition(int id)
   UnmapGameButtonsAtSamePosition_All();
 }
 
-void MapUndoRedoButtons()
+void MapUndoRedoButtons(void)
 {
   UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_UNDO);
   UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_REDO);
@@ -15611,7 +15570,7 @@ void MapUndoRedoButtons()
   ModifyGadget(game_gadget[GAME_CTRL_ID_PAUSE2], GDI_CHECKED, TRUE, GDI_END);
 }
 
-void UnmapUndoRedoButtons()
+void UnmapUndoRedoButtons(void)
 {
   UnmapGadget(game_gadget[GAME_CTRL_ID_UNDO]);
   UnmapGadget(game_gadget[GAME_CTRL_ID_REDO]);
@@ -15622,7 +15581,7 @@ void UnmapUndoRedoButtons()
   ModifyGadget(game_gadget[GAME_CTRL_ID_PAUSE2], GDI_CHECKED, FALSE, GDI_END);
 }
 
-void MapGameButtonsExt(boolean on_tape)
+static void MapGameButtonsExt(boolean on_tape)
 {
   int i;
 
@@ -15637,7 +15596,7 @@ void MapGameButtonsExt(boolean on_tape)
   RedrawGameButtons();
 }
 
-void UnmapGameButtonsExt(boolean on_tape)
+static void UnmapGameButtonsExt(boolean on_tape)
 {
   int i;
 
@@ -15646,7 +15605,7 @@ void UnmapGameButtonsExt(boolean on_tape)
       UnmapGadget(game_gadget[i]);
 }
 
-void RedrawGameButtonsExt(boolean on_tape)
+static void RedrawGameButtonsExt(boolean on_tape)
 {
   int i;
 
@@ -15658,7 +15617,7 @@ void RedrawGameButtonsExt(boolean on_tape)
   redraw_mask &= ~REDRAW_ALL;
 }
 
-void SetGadgetState(struct GadgetInfo *gi, boolean state)
+static void SetGadgetState(struct GadgetInfo *gi, boolean state)
 {
   if (gi == NULL)
     return;
@@ -15666,7 +15625,7 @@ void SetGadgetState(struct GadgetInfo *gi, boolean state)
   gi->checked = state;
 }
 
-void RedrawSoundButtonGadget(int id)
+static void RedrawSoundButtonGadget(int id)
 {
   int id2 = (id == SOUND_CTRL_ID_MUSIC        ? SOUND_CTRL_ID_PANEL_MUSIC :
             id == SOUND_CTRL_ID_LOOPS        ? SOUND_CTRL_ID_PANEL_LOOPS :
@@ -15680,37 +15639,37 @@ void RedrawSoundButtonGadget(int id)
   RedrawGadget(game_gadget[id2]);
 }
 
-void MapGameButtons()
+void MapGameButtons(void)
 {
   MapGameButtonsExt(FALSE);
 }
 
-void UnmapGameButtons()
+void UnmapGameButtons(void)
 {
   UnmapGameButtonsExt(FALSE);
 }
 
-void RedrawGameButtons()
+void RedrawGameButtons(void)
 {
   RedrawGameButtonsExt(FALSE);
 }
 
-void MapGameButtonsOnTape()
+void MapGameButtonsOnTape(void)
 {
   MapGameButtonsExt(TRUE);
 }
 
-void UnmapGameButtonsOnTape()
+void UnmapGameButtonsOnTape(void)
 {
   UnmapGameButtonsExt(TRUE);
 }
 
-void RedrawGameButtonsOnTape()
+void RedrawGameButtonsOnTape(void)
 {
   RedrawGameButtonsExt(TRUE);
 }
 
-void GameUndoRedoExt()
+static void GameUndoRedoExt(void)
 {
   ClearPlayerAction();
 
@@ -15727,7 +15686,7 @@ void GameUndoRedoExt()
   BackToFront();
 }
 
-void GameUndo(int steps)
+static void GameUndo(int steps)
 {
   if (!CheckEngineSnapshotList())
     return;
@@ -15737,7 +15696,7 @@ void GameUndo(int steps)
   GameUndoRedoExt();
 }
 
-void GameRedo(int steps)
+static void GameRedo(int steps)
 {
   if (!CheckEngineSnapshotList())
     return;
@@ -15775,14 +15734,12 @@ static void HandleGameButtonsExt(int id, int button)
     case GAME_CTRL_ID_PAUSE:
     case GAME_CTRL_ID_PAUSE2:
     case GAME_CTRL_ID_PANEL_PAUSE:
-      if (options.network && game_status == GAME_MODE_PLAYING)
+      if (network.enabled && game_status == GAME_MODE_PLAYING)
       {
-#if defined(NETWORK_AVALIABLE)
        if (tape.pausing)
          SendToServer_ContinuePlaying();
        else
          SendToServer_PausePlaying();
-#endif
       }
       else
        TapeTogglePause(TAPE_TOGGLE_MANUAL);
@@ -15795,15 +15752,13 @@ static void HandleGameButtonsExt(int id, int button)
     case GAME_CTRL_ID_PANEL_PLAY:
       if (game_status == GAME_MODE_MAIN)
       {
-        StartGameActions(options.network, setup.autorecord, level.random_seed);
+        StartGameActions(network.enabled, setup.autorecord, level.random_seed);
       }
       else if (tape.pausing)
       {
-#if defined(NETWORK_AVALIABLE)
-       if (options.network)
+       if (network.enabled)
          SendToServer_ContinuePlaying();
        else
-#endif
          TapeTogglePause(TAPE_TOGGLE_MANUAL | TAPE_TOGGLE_PLAY_PAUSE);
       }
       break;