rnd-20010101-1-src

diff --git a/CHANGES b/CHANGES
index 7a595f931f7bde970508192c405f85ace8b31fbd..304c14eac1bd14023aa4a40234da1836070d1581 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-Version 1.5.0
--------------
+Release Version 2.0.0 [01 JAN 2001]
+-----------------------------------
+       - major code redesign to maintain generic game functions in a separate
+         library and make it easier to port the game to new targets like SDL
        - can be compiled with SDL library to build native Windows version
+       - DOS and Windows versions can be compiled with gcc cross-compiler
        - trying to open already busy audio device does not block the game
        - fixed network playing bug (patch from web site)
        - SDL version can load and play music modules
@@ -80,13 +83,13 @@ Release Version 1.2.0 [5 DEC 1998]
          level directory, standalone server execution and verbose
          execution
 
-Release Version 1.1 [???] [NOT RELEASED]
-----------------------------------------
+Version 1.1 [???] [NOT RELEASED]
+--------------------------------
        - new (but broken) GIF graphics loader to be independent
          from the XPM library and to replace all graphics by GIF files
 
-Release Version 1.0 [9 APR 1997] [NOT RELEASED]
------------------------------------------------
+Version 1.0 [9 APR 1997] [NOT RELEASED]
+---------------------------------------
        - the game now contains many really playable levels,
          not only a few levels for testing
        - the game is now even better playable by keyboard
@@ -102,8 +105,8 @@ Release Version 1.0 [9 APR 1997] [NOT RELEASED]
          to make it possible to go on with a game at any tape
          position
 
-Prerelease Version 0.9b2 [21 NOV 1995] [NOT RELEASED]
------------------------------------------------------
+Version 0.9b2 [21 NOV 1995] [NOT RELEASED]
+------------------------------------------
        - new game elements
 
 Prerelease Version 0.9b [4 NOV 1995]

diff --git a/INSTALL b/INSTALL
index 697475a70f88f74f9bb6ff9efa16a8cd5b3d28f2..d014b7a93464e7a2de7ea636161befad45fb306d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,26 +1,31 @@
 
-Installation instructions for Rocks'n'Diamonds 1.2.0
-====================================================
+Installation instructions for Rocks'n'Diamonds
+==============================================
 
 Compilation
 -----------
 
-If your system supports Linux/i386/ELF/libc5 executables (Linux package)
+If your system supports Linux/i386/ELF/glibc executables (Linux package)
 or if you run DOS/Windows (DOS package), you can directly use the included
 precompiled binary.
 
 If you use a different system, just recompile the game:
 
-If you use Linux with gcc or DOS/Windows with djgpp, just try 'make'
+If you use Linux with gcc or DOS or Windows 3.x with djgpp, just try 'make'
 which should work without problems.
 
 If you use SUN/Solaris with gcc and GNU make, try 'make solaris'.
 
+To build the game with SDL support (needed for fullscreen and MOD support),
+type "make sdl". You need at least SDL version 1.1.x and the additional
+SDL libraries SDL_image and SDL_mixer. To get a recent version of the SDL
+library, see http://www.libsdl.org.
+
 If the above doesn't work, edit the Makefile in the top level directory.
 If it doesn't work either, edit the Makefile in the 'src' subdirectory.
 
 If you had to modify any Makefile to compile it, please drop me a note
-about it to 'aeglos@valinor.owl.de'. Thanks!
+about it to 'info@artsoft.org'. Thanks!
 
 
 Customization
@@ -80,6 +85,4 @@ INCL, LIBS    Maybe some more directories for include files and libraries
 
 
 If you have any comments, additions or modifications to the Makefile(s),
-please send me mail: 'aeglos@valinor.owl.de'. Thanks!
-
-05-DEC-1998, Holger Schemel
+please send me mail: 'info@artsoft.org'. Thanks!

diff --git a/Makefile b/Makefile
index e058339a40bac9af41053072f94398e98e231dc5..a4db1d9dc90ee599842e812c5a4241e3caba8171 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,13 @@ dist-unix:
 dist-msdos:
        ./Scripts/make_dist.sh dos .
 
-dist: dist-unix dist-msdos
+dist-win32:
+       ./Scripts/make_dist.sh win .
+
+dist-clean:
+       @$(MAKE_CMD) dist-clean
+
+dist: dist-unix dist-msdos dist-win32
 
 depend dep:
        $(MAKE_CMD) depend

diff --git a/README b/README
index 8843b3b4d457c37e7abd4b24e6ba0b3311624e88..a8671ceccb2e96d35c4fd89232c7fe3ae45a2c67 100644 (file)
--- a/README
+++ b/README
@@ -52,7 +52,7 @@ button and enter a new name.
 This menu will show the text 'team' instead of 'name' if you activated
 the team (local multiplayer) mode in the setup menu. See below.
 
-The menue 'level'
+The menu 'level'
 -----------------
 Choose any level from the current level series you want. The former
 'handicap' limitation in choosing levels has been removed because of

diff --git a/src/Makefile b/src/Makefile
index 18efb9d99ddb5aca2cc28450dfceba27afba9d21..511fb3159bab19e2600282a5320bebfc42c0cce5 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,7 +42,7 @@ PLATFORM = unix
 endif
 
 ifeq ($(PLATFORM),unix)
-PROFILING = -pg
+PROFILING_FLAGS = -pg
 endif
 
 ifeq ($(PLATFORM),cross-msdos)
@@ -90,12 +90,13 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
 CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
 DEBUG = -DDEBUG -g
+# PROFILING = $(PROFILING_FLAGS)
 
-OPTIONS = $(DEBUG) -Wall                       # only for debugging purposes
+# OPTIONS = $(DEBUG) -Wall                     # only for debugging purposes
 # OPTIONS = $(DEBUG) -O3 -Wall                 # only for debugging purposes
 # OPTIONS = $(DEBUG) -Wall -ansi -pedantic     # only for debugging purposes
 # OPTIONS = -O3 -Wall -ansi -pedantic
-# OPTIONS = -O3 -Wall
+OPTIONS = -O3 -Wall
 # OPTIONS = -O3
 # OPTIONS = -DSYSV -Ae                         # may be needed for HP-UX
 
@@ -146,18 +147,24 @@ $(LIBGAME):
 .c.o:
        $(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
-clean:
+clean-obj:
        $(MAKE) -C $(LIBDIR) clean
        $(RM) $(OBJS)
        $(RM) $(LIBGAME)
+
+clean-bin:
        $(RM) $(PROGNAME)
        $(RM) ../*.exe
 
+clean: clean-obj clean-bin
+
 
 #-----------------------------------------------------------------------------#
 # development only stuff                                                      #
 #-----------------------------------------------------------------------------#
 
+dist-clean: clean-obj
+
 depend:
        $(MAKE) -C $(LIBDIR) depend
        for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 196bd8e71c1aee17c67aaf12cf3f2c959715b8f3..d8356fbb63b658031f46a5a97032cea6e06c33f1 100644 (file)
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -98,7 +98,9 @@ static DrawWindow *X11InitWindow()
   Pixmap icon_pixmap, iconmask_pixmap;
   unsigned int icon_width, icon_height;
   int icon_hot_x, icon_hot_y;
+#if 0
   char icon_filename[256];
+#endif
   XSizeHints size_hints;
   XWMHints wm_hints;
   XClassHint class_hints;
@@ -148,22 +150,24 @@ static DrawWindow *X11InitWindow()
          options.ro_base_directory, GRAPHICS_DIRECTORY,
          icon_pic.picture_filename);
 #endif
-  XReadBitmapFile(display, new_window->drawable, program.x11_icon_filename,
-                 &icon_width, &icon_height,
-                 &icon_pixmap, &icon_hot_x, &icon_hot_y);
-  if (!icon_pixmap)
-    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
+  if (XReadBitmapFile(display, new_window->drawable,
+                     program.x11_icon_filename,
+                     &icon_width, &icon_height, &icon_pixmap,
+                     &icon_hot_x, &icon_hot_y) != BitmapSuccess)
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'",
+         program.x11_icon_filename);
 
 #if 0
   sprintf(icon_filename, "%s/%s/%s",
          options.ro_base_directory, GRAPHICS_DIRECTORY,
          icon_pic.picturemask_filename);
 #endif
-  XReadBitmapFile(display, new_window->drawable, program.x11_iconmask_filename,
-                 &icon_width, &icon_height,
-                 &iconmask_pixmap, &icon_hot_x, &icon_hot_y);
-  if (!iconmask_pixmap)
-    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
+  if (XReadBitmapFile(display, new_window->drawable,
+                     program.x11_iconmask_filename,
+                     &icon_width, &icon_height, &iconmask_pixmap,
+                     &icon_hot_x, &icon_hot_y) != BitmapSuccess)
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'",
+         program.x11_iconmask_filename);
 
   size_hints.width  = size_hints.min_width  = size_hints.max_width  = width;
   size_hints.height = size_hints.min_height = size_hints.max_height = height;