X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=5164505efa8a7e7d0dd81b163095a7fd3335756e;hb=58ea80c54f5a1e6605e2c33b554dff1fcc0c26b5;hp=e281c12727d650b10176bb4b72431a3aa26d34ce;hpb=afeec80878187293b10f7dcdd6ff3c094cc97e5d;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index e281c127..5164505e 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2126,9 +2126,9 @@ static int compareGamePanelOrderInfo(const void *object1, const void *object2)
 int getPlayerInventorySize(int player_nr)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-    return level.native_em_level->ply[player_nr]->dynamite;
+    return game_em.ply[player_nr]->dynamite;
   else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-    return level.native_sp_level->game_sp->red_disk_count;
+    return game_sp.red_disk_count;
   else
     return stored_player[player_nr].inventory_size;
 }
@@ -2212,32 +2212,32 @@ static void UpdateGameControlValues(void)
   int time = (game.LevelSolved ?
 	      game.LevelSolved_CountingTime :
 	      level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-	      level.native_em_level->lev->time :
+	      game_em.lev->time :
 	      level.game_engine_type == GAME_ENGINE_TYPE_SP ?
-	      level.native_sp_level->game_sp->time_played :
+	      game_sp.time_played :
 	      level.game_engine_type == GAME_ENGINE_TYPE_MM ?
 	      game_mm.energy_left :
 	      game.no_time_limit ? TimePlayed : TimeLeft);
   int score = (game.LevelSolved ?
 	       game.LevelSolved_CountingScore :
 	       level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-	       level.native_em_level->lev->score :
+	       game_em.lev->score :
 	       level.game_engine_type == GAME_ENGINE_TYPE_SP ?
-	       level.native_sp_level->game_sp->score :
+	       game_sp.score :
 	       level.game_engine_type == GAME_ENGINE_TYPE_MM ?
 	       game_mm.score :
 	       game.score);
   int gems = (level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-	      level.native_em_level->lev->required :
+	      game_em.lev->gems_needed :
 	      level.game_engine_type == GAME_ENGINE_TYPE_SP ?
-	      level.native_sp_level->game_sp->infotrons_still_needed :
+	      game_sp.infotrons_still_needed :
 	      level.game_engine_type == GAME_ENGINE_TYPE_MM ?
 	      game_mm.kettles_still_needed :
 	      game.gems_still_needed);
   int exit_closed = (level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-		     level.native_em_level->lev->required > 0 :
+		     game_em.lev->gems_needed > 0 :
 		     level.game_engine_type == GAME_ENGINE_TYPE_SP ?
-		     level.native_sp_level->game_sp->infotrons_still_needed > 0 :
+		     game_sp.infotrons_still_needed > 0 :
 		     level.game_engine_type == GAME_ENGINE_TYPE_MM ?
 		     game_mm.kettles_still_needed > 0 ||
 		     game_mm.lights_still_needed > 0 :
@@ -2277,7 +2277,7 @@ static void UpdateGameControlValues(void)
       {
 	if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
 	{
-	  if (level.native_em_level->ply[i]->keys & (1 << k))
+	  if (game_em.ply[i]->keys & (1 << k))
 	    game_panel_controls[GAME_PANEL_KEY_1 + k].value =
 	      get_key_element_from_nr(k);
 	}
@@ -2305,7 +2305,7 @@ static void UpdateGameControlValues(void)
     {
       if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
       {
-	if (level.native_em_level->ply[player_nr]->keys & (1 << k))
+	if (game_em.ply[player_nr]->keys & (1 << k))
 	  game_panel_controls[GAME_PANEL_KEY_1 + k].value =
 	    get_key_element_from_nr(k);
       }
@@ -2906,12 +2906,17 @@ static void InitGameEngine(void)
   game.use_block_last_field_bug =
     (game.engine_version < VERSION_IDENT(3,1,1,0));
 
+  /* various special flags and settings for native Emerald Mine game engine */
+
   game_em.use_single_button =
     (game.engine_version > VERSION_IDENT(4,0,0,2));
 
   game_em.use_snap_key_bug =
     (game.engine_version < VERSION_IDENT(4,0,1,0));
 
+  game_em.use_old_explosions =
+    (game.engine_version < VERSION_IDENT(4,1,4,2));
+
   // --------------------------------------------------------------------------
 
   // set maximal allowed number of custom element changes per game frame
@@ -3933,6 +3938,7 @@ void InitGame(void)
   game.centered_player_nr = (network_playing ? local_player->index_nr : -1);
   game.centered_player_nr_next = game.centered_player_nr;
   game.set_centered_player = FALSE;
+  game.set_centered_player_fast = FALSE;
 
   if (network_playing && tape.recording)
   {
@@ -4491,7 +4497,7 @@ static void LevelSolved(void)
   game.GameOver = TRUE;
 
   game.score_final = (level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-		      level.native_em_level->lev->score :
+		      game_em.lev->score :
 		      level.game_engine_type == GAME_ENGINE_TYPE_MM ?
 		      game_mm.score :
 		      game.score);
@@ -11239,7 +11245,7 @@ static void CheckLevelTime(void)
 	if (!TimeLeft && setup.time_limit)
 	{
 	  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-	    level.native_em_level->lev->killed_out_of_time = TRUE;
+	    game_em.lev->killed_out_of_time = TRUE;
 	  else
 	    for (i = 0; i < MAX_PLAYERS; i++)
 	      KillPlayer(&stored_player[i]);
@@ -11250,8 +11256,7 @@ static void CheckLevelTime(void)
 	game_panel_controls[GAME_PANEL_TIME].value = TimePlayed;
       }
 
-      level.native_em_level->lev->time =
-	(game.no_time_limit ? TimePlayed : TimeLeft);
+      game_em.lev->time = (game.no_time_limit ? TimePlayed : TimeLeft);
     }
 
     if (tape.recording || tape.playing)
@@ -14701,7 +14706,7 @@ static void PlayLevelMusic(void)
 
 void PlayLevelSound_EM(int xx, int yy, int element_em, int sample)
 {
-  int element = (element_em > -1 ? map_element_EM_to_RND(element_em) : 0);
+  int element = (element_em > -1 ? map_element_EM_to_RND_game(element_em) : 0);
   int offset = (BorderElement == EL_STEELWALL ? 1 : 0);
   int x = xx - 1 - offset;
   int y = yy - 1 - offset;
@@ -14805,7 +14810,7 @@ void PlayLevelSound_EM(int xx, int yy, int element_em, int sample)
       PlayLevelSoundElementAction(x, y, element, ACTION_DROPPING);
       break;
 
-    case SOUND_slidewall:
+    case SOUND_slide:
       PlayLevelSoundElementAction(x, y, element, ACTION_GROWING);
       break;