rnd-19981026-1

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 4693132bb6cce29def0d0bf882895ae82c1aa4cf..5de902ee040948e2592db7bac1a772c07bf7274e 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -25,16 +25,24 @@
 
 void GetPlayerConfig()
 {
+#if 0
   int old_joystick_nr = setup.input[0].joystick_nr;
+#endif
+
+
+  if (sound_status == SOUND_OFF)
+    setup.sound_on = FALSE;
 
-  if (sound_status==SOUND_OFF)
-    local_player->setup &= ~SETUP_SOUND;
   if (!sound_loops_allowed)
   {
-    local_player->setup &= ~SETUP_SOUND_LOOPS;
-    local_player->setup &= ~SETUP_SOUND_MUSIC;
+    setup.sound_loops_on = FALSE;
+    setup.sound_music_on = FALSE;
   }
 
+  setup.sound_simple_on = setup.sound_on;
+
+
+#if 0
   setup.sound_on = setup.sound_simple_on = SETUP_SOUND_ON(local_player->setup);
   setup.sound_loops_on = SETUP_SOUND_LOOPS_ON(local_player->setup);
   setup.sound_music_on = SETUP_SOUND_MUSIC_ON(local_player->setup);
@@ -61,6 +69,9 @@ void GetPlayerConfig()
     InitJoystick();
   }
 #endif
+
+#endif
+
 }
 
 void InitGame()
@@ -572,13 +583,22 @@ void GameWon()
     SaveLevelTape(tape.level_nr);      /* Ask to save tape */
   }
 
+
+  /*
   if (level_nr == local_player->handicap &&
       level_nr < leveldir[leveldir_nr].levels-1)
   { 
     local_player->handicap++; 
     bumplevel = TRUE;
+
+
+#if 0
     SavePlayerInfo(PLAYER_LEVEL);
+#endif
+
   }
+  */
+
 
   if ((hi_pos=NewHiScore()) >= 0) 
   {
@@ -3371,13 +3391,6 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
 
     if (!IN_VIS_FIELD(SCREENX(jx),SCREENY(jy)))
     {
-
-
-      printf("prevent player %d from leaving visible screen\n",
-            player->index_nr);
-
-
-
       /* actual player has left the screen -- scroll in that direction */
       if (jx != old_jx)                /* player has moved horizontally */
        scroll_x += (jx - old_jx);
@@ -3456,23 +3469,11 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
     {
       if (!options.network && !AllPlayersInVisibleScreen())
       {
-
-
-       printf("oops! not all players visible if we scroll now\n");
-
-
-
        scroll_x = old_scroll_x;
        scroll_y = old_scroll_y;
       }
       else
       {
-
-
-       printf("ok, scrolling screen...\n");
-
-
-
        ScrollScreen(player, SCROLL_INIT);
        ScrollLevel(old_scroll_x - scroll_x, old_scroll_y - scroll_y);
       }