X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=a969861edebc5eca093742203a1ef693fedf7e52;hb=2919379746c92fd488b83c61b328ef17fe500985;hp=36939ac7d89ad264483dacae085317b3eadd64e7;hpb=b6847742a0713d8ed21bb6104476db54f8c1a4b9;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 36939ac7..a969861e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1959,9 +1959,33 @@ static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi)
   /* special case: level number is negative => check for level template file */
   if (nr < 0)
   {
+#if 1
+    /* global variable "leveldir_current" must be modified in the loop below */
+    LevelDirTree *leveldir_current_last = leveldir_current;
+
+    /* check for template level in path from current to topmost tree node */
+
+    while (leveldir_current != NULL)
+    {
+      setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND,
+					   "template.%s", LEVELFILE_EXTENSION);
+
+      if (fileExists(lfi->filename))
+	break;
+
+      leveldir_current = leveldir_current->node_parent;
+    }
+
+    /* restore global variable "leveldir_current" modified in above loop */
+    leveldir_current = leveldir_current_last;
+
+#else
+
     setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND,
 					 "template.%s", LEVELFILE_EXTENSION);
 
+#endif
+
     /* no fallback if template file not existing */
     return;
   }
@@ -3042,8 +3066,12 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
   {
     level->no_valid_file = TRUE;
 
+#if 1
+    Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
+#else
     if (level != &level_template)
       Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
+#endif
 
     return;
   }
@@ -4184,7 +4212,7 @@ void CopyNativeLevel_RND_to_SP(struct LevelInfo *level)
   LevelInfoType *header = &level_sp->header;
   int i, x, y;
 
-  level_sp->width = level->fieldx;
+  level_sp->width  = level->fieldx;
   level_sp->height = level->fieldy;
 
   for (x = 0; x < level->fieldx; x++)
@@ -4216,7 +4244,67 @@ void CopyNativeLevel_RND_to_SP(struct LevelInfo *level)
 
   header->InfotronsNeeded = level->gems_needed;
 
-  /* !!! ADD SPECIAL PORT DATABASE STUFF !!! */
+  header->SpecialPortCount = 0;
+
+  for (x = 0; x < level->fieldx; x++) for (y = 0; y < level->fieldy; y++)
+  {
+    boolean gravity_port_found = FALSE;
+    boolean gravity_port_valid = FALSE;
+    int gravity_port_flag;
+    int gravity_port_base_element;
+    int element = level->field[x][y];
+
+    if (element >= EL_SP_GRAVITY_ON_PORT_RIGHT &&
+	element <= EL_SP_GRAVITY_ON_PORT_UP)
+    {
+      gravity_port_found = TRUE;
+      gravity_port_valid = TRUE;
+      gravity_port_flag = 1;
+      gravity_port_base_element = EL_SP_GRAVITY_ON_PORT_RIGHT;
+    }
+    else if (element >= EL_SP_GRAVITY_OFF_PORT_RIGHT &&
+	     element <= EL_SP_GRAVITY_OFF_PORT_UP)
+    {
+      gravity_port_found = TRUE;
+      gravity_port_valid = TRUE;
+      gravity_port_flag = 0;
+      gravity_port_base_element = EL_SP_GRAVITY_OFF_PORT_RIGHT;
+    }
+    else if (element >= EL_SP_GRAVITY_PORT_RIGHT &&
+	     element <= EL_SP_GRAVITY_PORT_UP)
+    {
+      /* change R'n'D style gravity inverting special port to normal port
+	 (there are no gravity inverting ports in native Supaplex engine) */
+
+      gravity_port_found = TRUE;
+      gravity_port_valid = FALSE;
+      gravity_port_base_element = EL_SP_GRAVITY_PORT_RIGHT;
+    }
+
+    if (gravity_port_found)
+    {
+      if (gravity_port_valid &&
+	  header->SpecialPortCount < SP_MAX_SPECIAL_PORTS)
+      {
+	SpecialPortType *port = &header->SpecialPort[header->SpecialPortCount];
+
+	port->PortLocation = (y * level->fieldx + x) * 2;
+	port->Gravity = gravity_port_flag;
+
+	element += EL_SP_GRAVITY_PORT_RIGHT - gravity_port_base_element;
+
+	header->SpecialPortCount++;
+      }
+      else
+      {
+	/* change special gravity port to normal port */
+
+	element += EL_SP_PORT_RIGHT - gravity_port_base_element;
+      }
+
+      level_sp->playfield[x][y] = element - EL_SP_START;
+    }
+  }
 }
 
 void CopyNativeLevel_SP_to_RND(struct LevelInfo *level)
@@ -6331,6 +6419,40 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
 /* functions for loading SB level                                            */
 /* ------------------------------------------------------------------------- */
 
+#if 1
+
+static boolean check_special_flags(char *flag)
+{
+#if 0
+  printf("::: '%s', '%s', '%s'\n",
+	 flag,
+	 options.special_flags,
+	 leveldir_current->special_flags);
+#endif
+
+  if (strEqual(options.special_flags, flag) ||
+      strEqual(leveldir_current->special_flags, flag))
+    return TRUE;
+
+  return FALSE;
+}
+
+#else
+
+#define SPECIAL_FLAG_LOAD_XSB_TO_CES	(1 << 0)
+
+static unsigned long get_special_flags(char *flags_string)
+{
+  unsigned long flags_value = 0;
+
+  if (strEqual(flags_string, "load_xsb_to_ces"))
+    flags_value = SPECIAL_FLAG_LOAD_XSB_TO_CES;
+
+  return flags_value;
+}
+
+#endif
+
 int getMappedElement_SB(int element_ascii, boolean use_ces)
 {
   static struct
@@ -6376,7 +6498,11 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
   boolean reading_playfield = FALSE;
   boolean got_valid_playfield_line = FALSE;
   boolean invalid_playfield_char = FALSE;
-  boolean load_xsb_to_ces = options.cmd_switches & CMD_SWITCH_LOAD_XSB_TO_CES;
+#if 1
+  boolean load_xsb_to_ces = check_special_flags("load_xsb_to_ces");
+#else
+  boolean load_xsb_to_ces = options.special_flags & SPECIAL_FLAG_LOAD_XSB_TO_CES;
+#endif
   int file_level_nr = 0;
   int line_nr = 0;
   int x, y;
@@ -6621,13 +6747,41 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
 		     level->field, level->fieldx, level->fieldy);
   }
 
+  /* set special level settings for Sokoban levels */
+
+  level->time = 0;
+  level->use_step_counter = TRUE;
+
   if (load_xsb_to_ces)
   {
-    level->time = 0;
-    level->use_step_counter = TRUE;
-
     level->initial_player_stepsize[0] = STEPSIZE_SLOW;
 
+    /* fill smaller playfields with padding "beyond border wall" elements */
+    if (level->fieldx < SCR_FIELDX ||
+	level->fieldy < SCR_FIELDY)
+    {
+      short field[level->fieldx][level->fieldy];
+      int new_fieldx = MAX(level->fieldx, SCR_FIELDX);
+      int new_fieldy = MAX(level->fieldy, SCR_FIELDY);
+      int pos_fieldx = (new_fieldx - level->fieldx) / 2;
+      int pos_fieldy = (new_fieldy - level->fieldy) / 2;
+
+      /* copy old playfield (which is smaller than the visible area) */
+      for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
+	field[x][y] = level->field[x][y];
+
+      /* fill new, larger playfield with "beyond border wall" elements */
+      for (y = 0; y < new_fieldy; y++) for (x = 0; x < new_fieldx; x++)
+	level->field[x][y] = getMappedElement_SB('_', load_xsb_to_ces);
+
+      /* copy the old playfield to the middle of the new playfield */
+      for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
+	level->field[pos_fieldx + x][pos_fieldy + y] = field[x][y];
+
+      level->fieldx = new_fieldx;
+      level->fieldy = new_fieldy;
+    }
+
     level->use_custom_template = TRUE;
   }
 }
@@ -8701,14 +8855,15 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_INPUT_ON_FOCUS		22
 #define SETUP_TOKEN_PREFER_AGA_GRAPHICS		23
 #define SETUP_TOKEN_GAME_FRAME_DELAY		24
-#define SETUP_TOKEN_GRAPHICS_SET		25
-#define SETUP_TOKEN_SOUNDS_SET			26
-#define SETUP_TOKEN_MUSIC_SET			27
-#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	28
-#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	29
-#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	30
+#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS	25
+#define SETUP_TOKEN_GRAPHICS_SET		26
+#define SETUP_TOKEN_SOUNDS_SET			27
+#define SETUP_TOKEN_MUSIC_SET			28
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	29
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	30
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	31
 
-#define NUM_GLOBAL_SETUP_TOKENS			31
+#define NUM_GLOBAL_SETUP_TOKENS			32
 
 /* editor setup */
 #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
@@ -8805,34 +8960,35 @@ static struct OptionInfo soi;
 
 static struct TokenInfo global_setup_tokens[] =
 {
-  { TYPE_STRING, &si.player_name,	"player_name"			},
-  { TYPE_SWITCH, &si.sound,		"sound"				},
-  { TYPE_SWITCH, &si.sound_loops,	"repeating_sound_loops"		},
-  { TYPE_SWITCH, &si.sound_music,	"background_music"		},
-  { TYPE_SWITCH, &si.sound_simple,	"simple_sound_effects"		},
-  { TYPE_SWITCH, &si.toons,		"toons"				},
-  { TYPE_SWITCH, &si.scroll_delay,	"scroll_delay"			},
-  { TYPE_INTEGER,&si.scroll_delay_value,"scroll_delay_value"		},
-  { TYPE_SWITCH, &si.soft_scrolling,	"soft_scrolling"		},
-  { TYPE_SWITCH, &si.fade_screens,	"fade_screens"			},
-  { TYPE_SWITCH, &si.autorecord,	"automatic_tape_recording"	},
-  { TYPE_SWITCH, &si.show_titlescreen,	"show_titlescreen"		},
-  { TYPE_SWITCH, &si.quick_doors,	"quick_doors"			},
-  { TYPE_SWITCH, &si.team_mode,		"team_mode"			},
-  { TYPE_SWITCH, &si.handicap,		"handicap"			},
-  { TYPE_SWITCH, &si.skip_levels,	"skip_levels"			},
-  { TYPE_SWITCH, &si.time_limit,	"time_limit"			},
-  { TYPE_SWITCH, &si.fullscreen,	"fullscreen"			},
-  { TYPE_STRING, &si.fullscreen_mode,	"fullscreen_mode"		},
-  { TYPE_SWITCH, &si.ask_on_escape,	"ask_on_escape"			},
-  { TYPE_SWITCH, &si.ask_on_escape_editor, "ask_on_escape_editor"	},
-  { TYPE_SWITCH, &si.quick_switch,	"quick_player_switch"		},
-  { TYPE_SWITCH, &si.input_on_focus,	"input_on_focus"		},
-  { TYPE_SWITCH, &si.prefer_aga_graphics, "prefer_aga_graphics"		},
-  { TYPE_INTEGER,&si.game_frame_delay,	"game_frame_delay"		},
-  { TYPE_STRING, &si.graphics_set,	"graphics_set"			},
-  { TYPE_STRING, &si.sounds_set,	"sounds_set"			},
-  { TYPE_STRING, &si.music_set,		"music_set"			},
+  { TYPE_STRING, &si.player_name,             "player_name"		},
+  { TYPE_SWITCH, &si.sound,                   "sound"			},
+  { TYPE_SWITCH, &si.sound_loops,             "repeating_sound_loops"	},
+  { TYPE_SWITCH, &si.sound_music,             "background_music"	},
+  { TYPE_SWITCH, &si.sound_simple,            "simple_sound_effects"	},
+  { TYPE_SWITCH, &si.toons,                   "toons"			},
+  { TYPE_SWITCH, &si.scroll_delay,            "scroll_delay"		},
+  { TYPE_INTEGER,&si.scroll_delay_value,      "scroll_delay_value"	},
+  { TYPE_SWITCH, &si.soft_scrolling,          "soft_scrolling"		},
+  { TYPE_SWITCH, &si.fade_screens,            "fade_screens"		},
+  { TYPE_SWITCH, &si.autorecord,              "automatic_tape_recording"},
+  { TYPE_SWITCH, &si.show_titlescreen,        "show_titlescreen"	},
+  { TYPE_SWITCH, &si.quick_doors,             "quick_doors"		},
+  { TYPE_SWITCH, &si.team_mode,               "team_mode"		},
+  { TYPE_SWITCH, &si.handicap,                "handicap"		},
+  { TYPE_SWITCH, &si.skip_levels,             "skip_levels"		},
+  { TYPE_SWITCH, &si.time_limit,              "time_limit"		},
+  { TYPE_SWITCH, &si.fullscreen,              "fullscreen"		},
+  { TYPE_STRING, &si.fullscreen_mode,         "fullscreen_mode"		},
+  { TYPE_SWITCH, &si.ask_on_escape,           "ask_on_escape"		},
+  { TYPE_SWITCH, &si.ask_on_escape_editor,    "ask_on_escape_editor"	},
+  { TYPE_SWITCH, &si.quick_switch,            "quick_player_switch"	},
+  { TYPE_SWITCH, &si.input_on_focus,          "input_on_focus"		},
+  { TYPE_SWITCH, &si.prefer_aga_graphics,     "prefer_aga_graphics"	},
+  { TYPE_INTEGER,&si.game_frame_delay,        "game_frame_delay"	},
+  { TYPE_SWITCH, &si.sp_show_border_elements, "sp_show_border_elements"	},
+  { TYPE_STRING, &si.graphics_set,            "graphics_set"		},
+  { TYPE_STRING, &si.sounds_set,              "sounds_set"		},
+  { TYPE_STRING, &si.music_set,               "music_set"		},
   { TYPE_SWITCH3,&si.override_level_graphics, "override_level_graphics"	},
   { TYPE_SWITCH3,&si.override_level_sounds,   "override_level_sounds"	},
   { TYPE_SWITCH3,&si.override_level_music,    "override_level_music"	},
@@ -8983,6 +9139,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->input_on_focus = FALSE;
   si->prefer_aga_graphics = TRUE;
   si->game_frame_delay = GAME_FRAME_DELAY;
+  si->sp_show_border_elements = FALSE;
 
   si->graphics_set = getStringCopy(GFX_DEFAULT_SUBDIR);
   si->sounds_set = getStringCopy(SND_DEFAULT_SUBDIR);