X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=4a9e2ffbc97cb9a9a0d534f3ff57d0e2fe5d0bc0;hb=d9b86b7b2ebe0b2be3926656c3bbdcd060ee5811;hp=013993c02a80b859c3ba1b0e856f0a19ea20b041;hpb=e5a0a3097d6a6c3afea01b3deeee9b206982ec1d;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 013993c0..4a9e2ffb 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -452,6 +452,11 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   {
     if (dx && choice == 1)
       x = (dx < 0 ? 10 : 14);
+    else if (dx > 0)
+    {
+      if (choice == 4 || choice == 6)
+	button = MB_MENU_CHOICE;
+    }
     else if (dy)
       y = choice + dy;
   }
@@ -821,12 +826,15 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
     action = helpanim_info[j].action;
     direction = helpanim_info[j].direction;
 
+    if (element < 0)
+      element = EL_UNKNOWN;
+
     if (action != -1 && direction != -1)
       graphic = el_act_dir2img(element, action, direction);
     else if (action != -1)
       graphic = el_act2img(element, action);
     else if (direction != -1)
-      graphic = el_act2img(element, direction);
+      graphic = el_dir2img(element, direction);
     else
       graphic = el2img(element);
 
@@ -995,7 +1003,7 @@ void HandleInfoScreen_Elements(int button)
   }
   else
   {
-    if (DelayReached(&info_delay, GAME_FRAME_DELAY))
+    if (DelayReached(&info_delay, GameFrameDelay))
       if (page < num_pages)
 	DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, FALSE);
 
@@ -2039,6 +2047,7 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_SWITCH,	&setup.skip_levels,	"Skip Levels:"		},
   { TYPE_SWITCH,	&setup.time_limit,	"Timelimit:"		},
   { TYPE_SWITCH,	&setup.autorecord,	"Auto-Record:"		},
+  { TYPE_SWITCH,	&setup.quick_switch,	"Quick Switch:"		},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
 
@@ -3080,19 +3089,41 @@ void HandleGameActions()
     byte tape_action[MAX_PLAYERS];
     int i;
 
+#if 1
     if (level.native_em_level->lev->home == 0)	/* all players at home */
     {
+      local_player->LevelSolved = TRUE;
+      AllPlayersGone = TRUE;
+
+      level.native_em_level->lev->home = -1;
+    }
+
+    if (local_player->LevelSolved)
       GameWon();
 
-      if (!TAPE_IS_STOPPED(tape))
+    if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
+      TapeStop();
+
+    if (game_status != GAME_MODE_PLAYING)
+      return;
+#else
+    if (level.native_em_level->lev->home == 0)	/* all players at home */
+    {
+      if (local_player->LevelSolved)
+	GameWon();
+
+      if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
 	TapeStop();
 
       if (game_status != GAME_MODE_PLAYING)
 	return;
     }
+#endif
 
-    if (level.native_em_level->ply1->alive == 0 &&
-	level.native_em_level->ply2->alive == 0)	/* all dead */
+    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;
 
     if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
@@ -3146,7 +3177,39 @@ void HandleGameActions()
     if (tape.recording)
       TapeRecordAction(tape_action);
 
+#if 1
+    {
+      byte effective_action[MAX_PLAYERS];
+
+      for (i = 0; i < MAX_PLAYERS; i++)
+	effective_action[i] = stored_player[i].effective_action;
+
+
+#if 0
+      printf("::: %s: ",
+	     tape.playing ? "PLAYING" :
+	     tape.recording ? "RECORDING" :
+	     "STOPPED");
+
+      for (i = 1; i < MAX_PLAYERS; i++)
+	if ((recorded_player_action && recorded_player_action[i] != 0) ||
+	    tape_action[i] != 0 ||
+	    effective_action[i] != 0)
+	  printf("::: -----------------> WARNING!\n");
+
+      printf("::: %08d: %08x [%08x] [%08x]\n",
+	     FrameCounter,
+	     (recorded_player_action ? recorded_player_action[0] : -1),
+	     tape_action[0],
+	     effective_action[0]);
+#endif
+
+
+      GameActions_EM(effective_action);
+    }
+#else
     GameActions_EM(local_player->effective_action);
+#endif
 
     if (TimeFrames >= FRAMES_PER_SECOND)
     {
@@ -3207,8 +3270,15 @@ void HandleGameActions()
 void StartGameActions(boolean init_network_game, boolean record_tape,
 		      long random_seed)
 {
+#if 1
+  unsigned long new_random_seed = InitRND(random_seed);
+
+  if (record_tape)
+    TapeStartRecording(new_random_seed);
+#else
   if (record_tape)
     TapeStartRecording(random_seed);
+#endif
 
 #if defined(NETWORK_AVALIABLE)
   if (init_network_game)
@@ -3223,7 +3293,9 @@ void StartGameActions(boolean init_network_game, boolean record_tape,
 
   game_status = GAME_MODE_PLAYING;
 
+#if 0
   InitRND(random_seed);
+#endif
 
   InitGame();
 }