X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=7f575ebb983b2c7eddbbfc1621da26353819becc;hb=6b83db8bee17d70c4e89dc3e3b703b7032aa5f27;hp=73cab1164f2c8c48b934128ce355bf0f85784376;hpb=cc17a49a1a63c1df0e55a5afd510698e21b71dfe;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 73cab116..7f575ebb 100644
--- a/src/game.c
+++ b/src/game.c
@@ -405,16 +405,8 @@ void InitGame()
   ScreenMovPos = 0;
   ScreenGfxPos = 0;
 
-  if (level.high_speed)
-  {
-    MoveSpeed = 4;
-    ScrollStepSize = TILEX/4;
-  }
-  else
-  {
-    MoveSpeed = 8;
-    ScrollStepSize = TILEX/8;
-  }
+  MoveSpeed = (level.double_speed ? 4 : 8);
+  ScrollStepSize = TILEX / MoveSpeed;
 
   AllPlayersGone = FALSE;
   SiebAktiv = FALSE;
@@ -4887,18 +4879,18 @@ static struct
 
 void CreateGameButtons()
 {
-  Pixmap gd_pixmap = pix[PIX_DOOR];
-  struct GadgetInfo *gi;
-  unsigned long event_mask;
   int i;
 
   for (i=0; i<NUM_GAME_BUTTONS; i++)
   {
-    int id = i;
-    int gd_xoffset, gd_yoffset;
-    int gd_x1, gd_x2, gd_y1, gd_y2;
+    Pixmap gd_pixmap = pix[PIX_DOOR];
+    struct GadgetInfo *gi;
     int button_type;
     boolean checked;
+    unsigned long event_mask;
+    int gd_xoffset, gd_yoffset;
+    int gd_x1, gd_x2, gd_y1, gd_y2;
+    int id = i;
 
     gd_xoffset = gamebutton_info[i].x;
     gd_yoffset = gamebutton_info[i].y;