added support for sound configuration parameters (not used yet)

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 872b4e9b2b769f61906a6063006cfd0b1a5f51e8..3f02c087311b7d840ab261b0ac890664a11a064b 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -1017,19 +1017,22 @@ static struct GamePanelControlInfo game_panel_controls[] =
 #define GAME_CTRL_ID_SAVE              5
 #define GAME_CTRL_ID_PAUSE2            6
 #define GAME_CTRL_ID_LOAD              7
-#define GAME_CTRL_ID_PANEL_STOP                8
-#define GAME_CTRL_ID_PANEL_PAUSE       9
-#define GAME_CTRL_ID_PANEL_PLAY                10
-#define GAME_CTRL_ID_TOUCH_STOP                11
-#define GAME_CTRL_ID_TOUCH_PAUSE       12
-#define SOUND_CTRL_ID_MUSIC            13
-#define SOUND_CTRL_ID_LOOPS            14
-#define SOUND_CTRL_ID_SIMPLE           15
-#define SOUND_CTRL_ID_PANEL_MUSIC      16
-#define SOUND_CTRL_ID_PANEL_LOOPS      17
-#define SOUND_CTRL_ID_PANEL_SIMPLE     18
-
-#define NUM_GAME_BUTTONS               19
+#define GAME_CTRL_ID_RESTART           8
+#define GAME_CTRL_ID_PANEL_STOP                9
+#define GAME_CTRL_ID_PANEL_PAUSE       10
+#define GAME_CTRL_ID_PANEL_PLAY                11
+#define GAME_CTRL_ID_PANEL_RESTART     12
+#define GAME_CTRL_ID_TOUCH_STOP                13
+#define GAME_CTRL_ID_TOUCH_PAUSE       14
+#define GAME_CTRL_ID_TOUCH_RESTART     15
+#define SOUND_CTRL_ID_MUSIC            16
+#define SOUND_CTRL_ID_LOOPS            17
+#define SOUND_CTRL_ID_SIMPLE           18
+#define SOUND_CTRL_ID_PANEL_MUSIC      19
+#define SOUND_CTRL_ID_PANEL_LOOPS      20
+#define SOUND_CTRL_ID_PANEL_SIMPLE     21
+
+#define NUM_GAME_BUTTONS               22
 
 
 // forward declaration for internal use
@@ -9445,7 +9448,7 @@ static 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 xx = ax + x1, yy = ay + y1;
     int old_element = Tile[xx][yy];
     int num_neighbours = 0;
 
@@ -9454,7 +9457,7 @@ static void Life(int ax, int ay)
 
     for (y2 = -1; y2 < 2; y2++) for (x2 = -1; x2 < 2; x2++)
     {
-      int x = xx+x2, y = yy+y2;
+      int x = xx + x2, y = yy + y2;
 
       if (!IN_LEV_FIELD(x, y) || (x == xx && y == yy))
        continue;
@@ -15702,7 +15705,9 @@ void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
     }
 
     if (network.enabled)
+    {
       SendToServer_StopPlaying(NETWORK_STOP_BY_PLAYER);
+    }
     else
     {
       if (quick_quit)
@@ -16246,6 +16251,11 @@ static struct
     GAME_CTRL_ID_LOAD,                         NULL,
     TRUE, FALSE,                               "load game"
   },
+  {
+    IMG_GFX_GAME_BUTTON_RESTART,               &game.button.restart,
+    GAME_CTRL_ID_RESTART,                      NULL,
+    TRUE, FALSE,                               "restart game"
+  },
   {
     IMG_GFX_GAME_BUTTON_PANEL_STOP,            &game.button.panel_stop,
     GAME_CTRL_ID_PANEL_STOP,                   NULL,
@@ -16261,6 +16271,11 @@ static struct
     GAME_CTRL_ID_PANEL_PLAY,                   NULL,
     FALSE, FALSE,                              "play game"
   },
+  {
+    IMG_GFX_GAME_BUTTON_PANEL_RESTART,         &game.button.panel_restart,
+    GAME_CTRL_ID_PANEL_RESTART,                        NULL,
+    FALSE, FALSE,                              "restart game"
+  },
   {
     IMG_GFX_GAME_BUTTON_TOUCH_STOP,            &game.button.touch_stop,
     GAME_CTRL_ID_TOUCH_STOP,                   NULL,
@@ -16271,6 +16286,11 @@ static struct
     GAME_CTRL_ID_TOUCH_PAUSE,                  NULL,
     FALSE, TRUE,                               "pause game"
   },
+  {
+    IMG_GFX_GAME_BUTTON_TOUCH_RESTART,         &game.button.touch_restart,
+    GAME_CTRL_ID_TOUCH_RESTART,                        NULL,
+    FALSE, TRUE,                               "restart game"
+  },
   {
     IMG_GFX_GAME_BUTTON_SOUND_MUSIC,           &game.button.sound_music,
     SOUND_CTRL_ID_MUSIC,                       &setup.sound_music,
@@ -16350,7 +16370,10 @@ void CreateGameButtons(void)
        id == GAME_CTRL_ID_PLAY ||
        id == GAME_CTRL_ID_PANEL_PLAY ||
        id == GAME_CTRL_ID_SAVE ||
-       id == GAME_CTRL_ID_LOAD)
+       id == GAME_CTRL_ID_LOAD ||
+       id == GAME_CTRL_ID_RESTART ||
+       id == GAME_CTRL_ID_PANEL_RESTART ||
+       id == GAME_CTRL_ID_TOUCH_RESTART)
     {
       button_type = GD_TYPE_NORMAL_BUTTON;
       checked = FALSE;
@@ -16698,6 +16721,13 @@ static void HandleGameButtonsExt(int id, int button)
       TapeQuickLoad();
       break;
 
+    case GAME_CTRL_ID_RESTART:
+    case GAME_CTRL_ID_PANEL_RESTART:
+    case GAME_CTRL_ID_TOUCH_RESTART:
+      TapeRestartGame();
+
+      break;
+
     case SOUND_CTRL_ID_MUSIC:
     case SOUND_CTRL_ID_PANEL_MUSIC:
       if (setup.sound_music)