From: Holger Schemel <info@artsoft.org>
Date: Wed, 16 Dec 2009 09:57:13 +0000 (+0100)
Subject: rnd-20091216-1-src
X-Git-Tag: 3.3.0.0^2~53
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=0d3657c231b2a0a50582965140e42b85a4e02c7d;p=rocksndiamonds.git

rnd-20091216-1-src
---

diff --git a/src/conftime.h b/src/conftime.h
index d58b141b..90e1e427 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2009-12-11 00:08"
+#define COMPILE_DATE_STRING "2009-12-16 10:52"
diff --git a/src/files.c b/src/files.c
index b16bc6ca..cd288bce 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;
   }
@@ -6659,13 +6687,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;
   }
 }