X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=53c877712b787c7140744c4de06c1b75a2d7d076;hb=add3f75baa4b9a072bccd72537f0f5ccb5f225a5;hp=38f142585ac07cf49157ae22cd4050149e1e5796;hpb=54bde2d76b7a652fa2afd7b99bd8dbe6c5bb5112;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 38f14258..53c87771 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2334,6 +2334,11 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change)
 
 static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
 {
+  boolean add_border = FALSE;
+  int x1 = 0;
+  int y1 = 0;
+  int x2 = STD_LEV_FIELDX - 1;
+  int y2 = STD_LEV_FIELDY - 1;
   int i, x, y;
 
   li = *level;		// copy level data into temporary buffer
@@ -2372,15 +2377,35 @@ static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
   // set default game engine type
   level->game_engine_type = setup.default_game_engine_type;
 
+  // some game engines should have a default playfield with border elements
+  if (level->game_engine_type == GAME_ENGINE_TYPE_BD ||
+      level->game_engine_type == GAME_ENGINE_TYPE_EM ||
+      level->game_engine_type == GAME_ENGINE_TYPE_SP)
+  {
+    add_border = TRUE;
+    x1++;
+    y1++;
+    x2--;
+    y2--;
+  }
+
   // set level playfield to playable default level with player and exit
   for (x = 0; x < MAX_LEV_FIELDX; x++)
+  {
     for (y = 0; y < MAX_LEV_FIELDY; y++)
-      level->field[x][y] = EL_SAND;
+    {
+      if (add_border && (x == 0 || x == STD_LEV_FIELDX - 1 ||
+			 y == 0 || y == STD_LEV_FIELDY - 1))
+	level->field[x][y] = getEngineElement(EL_STEELWALL);
+      else
+	level->field[x][y] = getEngineElement(EL_SAND);
+    }
+  }
 
-  level->field[0][0] = EL_PLAYER_1;
-  level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED;
+  level->field[x1][y1] = getEngineElement(EL_PLAYER_1);
+  level->field[x2][y2] = getEngineElement(EL_EXIT_CLOSED);
 
-  BorderElement = EL_STEELWALL;
+  BorderElement = getEngineElement(EL_STEELWALL);
 
   // detect custom elements when loading them
   level->file_has_custom_elements = FALSE;
@@ -10750,6 +10775,18 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_SWITCH3,
     &setup.bd_smooth_movements,			"bd_smooth_movements"
   },
+  {
+    TYPE_SWITCH3,
+    &setup.bd_pushing_graphics,			"bd_pushing_graphics"
+  },
+  {
+    TYPE_SWITCH3,
+    &setup.bd_up_down_graphics,			"bd_up_down_graphics"
+  },
+  {
+    TYPE_SWITCH3,
+    &setup.bd_skip_falling_sounds,		"bd_skip_falling_sounds"
+  },
   {
     TYPE_INTEGER,
     &setup.bd_palette_c64,			"bd_palette_c64"
@@ -10766,6 +10803,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_INTEGER,
     &setup.bd_default_color_type,		"bd_default_color_type"
   },
+  {
+    TYPE_SWITCH,
+    &setup.bd_random_colors,			"bd_random_colors"
+  },
   {
     TYPE_SWITCH,
     &setup.sp_show_border_elements,		"sp_show_border_elements"
@@ -11591,10 +11632,14 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->bd_skip_hatching = FALSE;
   si->bd_scroll_delay = TRUE;
   si->bd_smooth_movements = AUTO;
+  si->bd_pushing_graphics = TRUE;
+  si->bd_up_down_graphics = TRUE;
+  si->bd_skip_falling_sounds = AUTO;
   si->bd_palette_c64 = GD_DEFAULT_PALETTE_C64;
   si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
   si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
   si->bd_default_color_type = GD_DEFAULT_COLOR_TYPE;
+  si->bd_random_colors = FALSE;
   si->sp_show_border_elements = FALSE;
   si->small_game_graphics = FALSE;
   si->show_load_save_buttons = FALSE;