From: Holger Schemel <info@artsoft.org>
Date: Mon, 28 Dec 1998 02:18:24 +0000 (+0100)
Subject: rnd-19981228-2
X-Git-Tag: 1.3.0^2~44
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=667288cc3f60989bfc84ac50bb69dae0c7bb5b22;p=rocksndiamonds.git

rnd-19981228-2
---

diff --git a/src/editor.c b/src/editor.c
index 2adf93c8..2d20b09e 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -364,6 +364,11 @@ int editor_element[] =
   EL_MAUER_Y,
   EL_MAUER_XY,
 
+  EL_SPEED_PILL,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+
   EL_CHAR_A + ('S' - 'A'),
   EL_CHAR_A + ('O' - 'A'),
   EL_CHAR_A + ('K' - 'A'),
diff --git a/src/files.c b/src/files.c
index eb87f87e..e1765fd8 100644
--- a/src/files.c
+++ b/src/files.c
@@ -253,6 +253,8 @@ static void setLevelInfoToDefaults()
   level.dauer_ablenk = 10;
   level.amoebe_inhalt = EL_DIAMANT;
 
+  level.high_speed = FALSE;
+
   strcpy(level.name, "Nameless Level");
 
   for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
@@ -395,6 +397,13 @@ void LoadLevel(int level_nr)
 
   if (level.time <= 10)		/* minimum playing time of each level */
     level.time = 10;
+
+  if (file_version == FILE_VERSION_1_0)
+  {
+    Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
+    Error(ERR_WARN, "using high speed movement for player");
+    level.high_speed = TRUE;
+  }
 }
 
 void SaveLevel(int level_nr)
diff --git a/src/game.c b/src/game.c
index fbaccc24..e69b1e61 100644
--- a/src/game.c
+++ b/src/game.c
@@ -389,6 +389,17 @@ void InitGame()
   ScreenMovPos = 0;
   ScreenGfxPos = 0;
 
+  if (level.high_speed)
+  {
+    MoveSpeed = 4;
+    ScrollStepSize = TILEX/4;
+  }
+  else
+  {
+    MoveSpeed = 8;
+    ScrollStepSize = TILEX/8;
+  }
+
   AllPlayersGone = FALSE;
   SiebAktiv = FALSE;
   SiebCount = 0;
@@ -4109,6 +4120,13 @@ int DigField(struct PlayerInfo *player,
       PlaySoundLevel(x, y, SND_PONG);
       break;
 
+    case EL_SPEED_PILL:
+      RemoveField(x, y);
+      MoveSpeed = 4;
+      ScrollStepSize = TILEX/4;
+      PlaySoundLevel(x, y, SND_PONG);
+      break;
+
     case EL_DYNAMIT_AUS:
       RemoveField(x, y);
       player->dynamite++;
diff --git a/src/init.c b/src/init.c
index 6b4bece7..ad4cad8b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -947,6 +947,7 @@ void InitElementProperties()
     EL_SP_CHIP_RIGHT,
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
+    EL_SPEED_PILL
   };
   static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
 
diff --git a/src/main.h b/src/main.h
index 077fab94..11588dd9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -339,6 +339,7 @@ struct LevelInfo
   int dauer_sieb;
   int dauer_ablenk;
   int amoebe_inhalt;
+  boolean high_speed;
 };
 
 struct LevelDirInfo
@@ -551,9 +552,7 @@ extern int		num_bg_loops;
 #define EL_TROPFEN		18
 #define EL_BOMBE		19
 #define EL_SIEB_INAKTIV		20
-
-#define EL_UNUSED_21		21
-
+#define EL_SPEED_PILL		21
 #define EL_SALZSAEURE		22
 #define EL_AMOEBE_NASS		23
 #define EL_AMOEBE_NORM		24
@@ -916,6 +915,7 @@ extern int		num_bg_loops;
 #define GFX_EDELSTEIN_ROT	152
 #define GFX_EDELSTEIN_LILA	154
 #define GFX_DYNABOMB_XL		156
+#define GFX_SPEED_PILL		158
 #define GFX_SONDE		159
 /* Zeile 10 (160) */
 #define GFX_EDELSTEIN_BD	163
diff --git a/src/tools.c b/src/tools.c
index 3184acaa..498a44f8 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1933,6 +1933,7 @@ int el2gfx(int element)
     case EL_PFEIL_R:		return GFX_PFEIL_R;
     case EL_PFEIL_O:		return GFX_PFEIL_O;
     case EL_PFEIL_U:		return GFX_PFEIL_U;
+    case EL_SPEED_PILL:		return GFX_SPEED_PILL;
     default:
     {
       if (IS_CHAR(element))