From: Holger Schemel <info@artsoft.org>
Date: Sun, 16 Jul 2006 00:29:17 +0000 (+0200)
Subject: rocksndiamonds-3.2.0
X-Git-Tag: 3.2.0^2
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=9618cdb31ec89b5f68f79a0d6011cd0c6c580a85;p=rocksndiamonds.git

rocksndiamonds-3.2.0
---

diff --git a/Makefile b/Makefile
index 30606058..f98a1211 100644
--- a/Makefile
+++ b/Makefile
@@ -189,14 +189,6 @@ dist-build-all:
 # dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
 dist-all: dist-build-all dist-unix dist-win32 dist-macosx
 
-# !!! TEST ONLY !!!
-test-setup:
-#	$(MAKE) clean
-#	$(MAKE) dist-build-win32
-#	$(MAKE) dist-clean
-
-	$(MAKE) dist-win32
-
 # upload-all: upload-unix upload-msdos upload-win32 upload-macosx
 upload-all: upload-unix upload-win32 upload-macosx
 
diff --git a/src/Makefile b/src/Makefile
index 4cd0223f..973fdead 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -125,7 +125,7 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
 
 CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
-DEBUG = -DDEBUG -g
+# DEBUG = -DDEBUG -g
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index d5af705a..a0ce19eb 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -3827,14 +3827,14 @@ struct ConfigInfo image_config[] =
 #if 1
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
-  /* (for testing, change filename back to "emc_object dot pcx") */
-  { "emc_object",				"emc_objects.pcx"	},
+  /* (for testing, change filename back to "emc_objects dot pcx") */
+  { "emc_object",				"RocksEMC.pcx"		},
 #if 0
   { "emc_object.scale_up_factor",		"2"			},
 #endif
 
-  /* (for testing, change filename back to "emc_sprite dot pcx") */
-  { "emc_sprite",				"emc_players.pcx"	},
+  /* (for testing, change filename back to "emc_players dot pcx") */
+  { "emc_sprite",				"RocksEMC.pcx"		},
 #if 0
   { "emc_sprite.scale_up_factor",		"2"			},
 #endif
diff --git a/src/conftime.h b/src/conftime.h
index f9abc8de..98dea38d 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-07-15 11:23]"
+#define COMPILE_DATE_STRING "[2006-07-16 02:28]"
diff --git a/src/editor.c b/src/editor.c
index 86adfc6f..f80d82e0 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1026,7 +1026,7 @@ static struct
     NULL,				" ", "height",
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(6),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(5),
     0,					999,
     GADGET_ID_LEVEL_GEMSLIMIT_DOWN,	GADGET_ID_LEVEL_GEMSLIMIT_UP,
     GADGET_ID_LEVEL_GEMSLIMIT_TEXT,	GADGET_ID_NONE,
@@ -1034,7 +1034,7 @@ static struct
     NULL, "number of gems to collect:",	NULL
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(8),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(7),
     0,					9999,
     GADGET_ID_LEVEL_TIMELIMIT_DOWN,	GADGET_ID_LEVEL_TIMELIMIT_UP,
     GADGET_ID_LEVEL_TIMELIMIT_TEXT,	GADGET_ID_NONE,
@@ -1042,7 +1042,7 @@ static struct
     "time or step limit to solve level:", NULL, NULL
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(10),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(9),
     0,					255,
     GADGET_ID_LEVEL_TIMESCORE_DOWN,	GADGET_ID_LEVEL_TIMESCORE_UP,
     GADGET_ID_LEVEL_TIMESCORE_TEXT,	GADGET_ID_NONE,
@@ -2003,7 +2003,7 @@ static struct
   /* ---------- level and editor settings ---------------------------------- */
 
   {
-    -1,					ED_LEVEL_SETTINGS_YPOS(8),
+    -1,					ED_LEVEL_SETTINGS_YPOS(7),
     GADGET_ID_TIME_OR_STEPS,		GADGET_ID_LEVEL_TIMELIMIT_UP,
     -1,
     options_time_or_steps,
@@ -2011,7 +2011,7 @@ static struct
     NULL, "(0 => no limit)",		"time or step limit"
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(5),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(11),
     GADGET_ID_GAME_ENGINE_TYPE,		GADGET_ID_NONE,
     -1,
     options_game_engine_type,
@@ -2019,7 +2019,7 @@ static struct
     "game engine:", NULL,		"game engine"
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(12),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(10),
     GADGET_ID_WIND_DIRECTION,		GADGET_ID_NONE,
     -1,
     options_wind_direction,