From: Holger Schemel <info@artsoft.org>
Date: Sat, 19 Feb 2005 03:19:55 +0000 (+0100)
Subject: rnd-20050219-1-src
X-Git-Tag: 3.1.1^2~24
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=bc3204370ffde9a84d661ed58c35256ef0080292;p=rocksndiamonds.git

rnd-20050219-1-src
* added editor element descriptions written by Aaron Davidson
---

diff --git a/CHANGES b/CHANGES
index af8e379c..76bf7075 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
-Release Version 3.1.1 [?? ??? ????]
+Release Version 3.2.0 [?? ??? ????]
 -----------------------------------
+	- added tutorial level set created by Aaron Davidson
+	- added editor element descriptions written by Aaron Davidson
 
 Release Version 3.1.0 [07 JUN 2004]
 -----------------------------------
diff --git a/ChangeLog b/ChangeLog
index efa565d8..df68d095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2005-02-14
+	* added editor element descriptions written by Aaron Davidson
+
 2005-02-02
 	* improved fallback handling when configured artwork is not available
 	  (now using default artwork instead of exiting when files not found)
diff --git a/Makefile b/Makefile
index 5b47c5fc..ca46ab7a 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-DEFAULT_TARGET = x11
-# DEFAULT_TARGET = sdl
+# DEFAULT_TARGET = x11
+DEFAULT_TARGET = sdl
 
 
 # -----------------------------------------------------------------------------
@@ -103,7 +103,7 @@ run: all
 	@./rocksndiamonds --verbose
 
 gdb: all
-	@gdb ./rocksndiamonds
+	@gdb -batch -x GDB_COMMANDS ./rocksndiamonds
 
 valgrind: all
 	@valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
diff --git a/src/conftime.h b/src/conftime.h
index fd10b145..feafd967 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-02-03 03:27]"
+#define COMPILE_DATE_STRING "[2005-02-19 02:22]"
diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index c40eed93..8bcf586d 100644
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -352,7 +352,7 @@ int cleanup_em_level(unsigned char *src, int length)
   /* size of v6 cave */
   length = 2172;
 
-#if 0
+#if 1
   printf("::: EM level file version: %d\n", file_version);
 #endif