From: Holger Schemel <info@artsoft.org>
Date: Sat, 15 Jul 2006 20:06:21 +0000 (+0200)
Subject: rnd-20060715-1-src
X-Git-Tag: 3.2.0^2~1
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=921499c5e7fa7f2c760305d7ec007e4e4a965125;p=rocksndiamonds.git

rnd-20060715-1-src
---

diff --git a/Makefile b/Makefile
index a9bd3d00..30606058 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ dist-all: dist-build-all dist-unix dist-win32 dist-macosx
 test-setup:
 #	$(MAKE) clean
 #	$(MAKE) dist-build-win32
-#	$(MAKE) clean
+#	$(MAKE) dist-clean
 
 	$(MAKE) dist-win32
 
diff --git a/src/conftime.h b/src/conftime.h
index c1180fe0..f9abc8de 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-06-23 20:52]"
+#define COMPILE_DATE_STRING "[2006-07-15 11:23]"
diff --git a/src/files.c b/src/files.c
index 8d299b67..152d6528 100644
--- a/src/files.c
+++ b/src/files.c
@@ -6989,8 +6989,19 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.override_level_music,    "override_level_music"	},
 };
 
+static boolean not_used = FALSE;
 static struct TokenInfo editor_setup_tokens[] =
 {
+#if 1
+  { TYPE_SWITCH, &not_used,		"editor.el_boulderdash"		},
+  { TYPE_SWITCH, &not_used,		"editor.el_emerald_mine"	},
+  { TYPE_SWITCH, &not_used,		"editor.el_emerald_mine_club"	},
+  { TYPE_SWITCH, &not_used,		"editor.el_more"		},
+  { TYPE_SWITCH, &not_used,		"editor.el_sokoban"		},
+  { TYPE_SWITCH, &not_used,		"editor.el_supaplex"		},
+  { TYPE_SWITCH, &not_used,		"editor.el_diamond_caves"	},
+  { TYPE_SWITCH, &not_used,		"editor.el_dx_boulderdash"	},
+#else
   { TYPE_SWITCH, &sei.el_boulderdash,	"editor.el_boulderdash"		},
   { TYPE_SWITCH, &sei.el_emerald_mine,	"editor.el_emerald_mine"	},
   { TYPE_SWITCH, &sei.el_emerald_mine_club,"editor.el_emerald_mine_club"},
@@ -6999,9 +7010,14 @@ static struct TokenInfo editor_setup_tokens[] =
   { TYPE_SWITCH, &sei.el_supaplex,	"editor.el_supaplex"		},
   { TYPE_SWITCH, &sei.el_diamond_caves,	"editor.el_diamond_caves"	},
   { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash"	},
+#endif
   { TYPE_SWITCH, &sei.el_chars,		"editor.el_chars"		},
   { TYPE_SWITCH, &sei.el_custom,	"editor.el_custom"		},
+#if 1
+  { TYPE_SWITCH, &not_used,		"editor.el_headlines"		},
+#else
   { TYPE_SWITCH, &sei.el_headlines,	"editor.el_headlines"		},
+#endif
   { TYPE_SWITCH, &sei.el_user_defined,	"editor.el_user_defined"	},
   { TYPE_SWITCH, &sei.el_dynamic,	"editor.el_dynamic"		},
   { TYPE_SWITCH, &sei.el_by_game,	"editor.el_by_game"		},
diff --git a/src/libgame/system.c b/src/libgame/system.c
index 7d0351a6..3c460375 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -818,6 +818,9 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
   else
     tmp_bitmap_1 = old_bitmap;
 
+  /* this is only needed to make compilers happy */
+  tmp_bitmap_2 = tmp_bitmap_8 = NULL;
+
   if (create_small_bitmaps)
   {
     /* calculate new image dimensions for small images */