rnd-20050219-1-src

* added editor element descriptions written by Aaron Davidson

diff --git a/CHANGES b/CHANGES
index af8e379cb16ce63c3a0914aac4ccff97b1c41aa3..76bf7075a5bacc319c48a9865dd1a75e38958591 100644 (file)
--- 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 efa565d87fc6805f3522d103aae08fff0702a916..df68d09530f268fd0d71adac2b78224430b8103e 100644 (file)
--- 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 5b47c5fc0c800459d11a82776ebd0f049b122057..ca46ab7ada74a0fdbd987e0e6f7c18cc176737e1 100644 (file)
--- 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 fd10b14520389a4bd5b6316773818d2f09fd64d0..feafd9670295da7662ddeb8eb79859e8e53dc0ec 100644 (file)
--- 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 c40eed93dee9583f264b5c6f6bfe94d9fb18ad5d..8bcf586d98449bda6e45b4f00a8da257d0922f1a 100644 (file)
--- 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