rnd-20060715-1-src

diff --git a/Makefile b/Makefile
index a9bd3d004b88a42347120ffd1f5f5aa358aff6cd..30606058631400d2af313b231dcdbd569e7289b2 100644 (file)
--- 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 c1180fe0336b978db068d00fa5f569edc8be52fb..f9abc8de76920bfc82a6d503e1906e235eea3f40 100644 (file)
--- 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 8d299b6740cf134221914242269c045ab7e9ed01..152d6528b6648dcb164d9f1b7f41a4ca66f104a5 100644 (file)
--- 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 7d0351a6f804a0a823f3d8dafb936b147294a4fa..3c460375b03aa4ec67d7a0474413726a298a5d2f 100644 (file)
--- 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 */