rnd-19991024-2-src

diff --git a/Makefile b/Makefile
index 2d575c76df3929737727f5a33167a30077e6daec..d1bc33a88cd5de0f12740b02e3587fd2313db003 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,71 @@
 #=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.2                                           #
-# (c) 1995-98 Holger Schemel, aeglos@valinor.owl.de                           #
+# Makefile for Rocks'n'Diamonds 1.4.0                                         #
+# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de                         #
 #=============================================================================#
 
 #-----------------------------------------------------------------------------#
 # configuration section                                                       #
 #-----------------------------------------------------------------------------#
 
+# specify your favorite ANSI C compiler
+CC = gcc
+
+# explicitely choose your platform, if defaults doesn't work right
+# needed for SUN/Solaris; Linux and DOS work fine with auto detection
+# PLATFORM = solaris
+# PLATFORM = unix
+# PLATFORM = dos
+
+# specify path to X11 on your system
+# if undefined, use system defaults (works with Linux/gcc/libc5)
+# X11_PATH = /usr/X11
+
+# specify directory for read-only game data (like graphics, sounds, levels)
+# default is '.', so you can play without installing game data somewhere
+# RO_GAME_DIR = /usr/games
+
+# specify directory for writable game data (like highscore files)
+# default is '.', so you can play without installing game data somewhere
+# RW_GAME_DIR = /var/games
+
+# uncomment this if your system has no joystick include file
+# JOYSTICK = -DNO_JOYSTICK
+
+# uncomment this if your system has no sound
+# SOUNDS = -DNO_SOUNDS
+
+# choose if you want to allow many global score file entries for one player
+# default is 'MANY_PER_NAME'
+# when installing the game in a multi user environment, choose this
+# SCORE_ENTRIES = ONE_PER_NAME
+# when installing the game in a single user environment, choose this
+# SCORE_ENTRIES = MANY_PER_NAME
+
 #-----------------------------------------------------------------------------#
-# you shouldn't need to change anything below                                 #
+# you should not need to change anything below                                #
 #-----------------------------------------------------------------------------#
 
+.EXPORT_ALL_VARIABLES:
+
 MAKE = make
 
 SRC_DIR = src
 MAKE_CMD = @$(MAKE) -C $(SRC_DIR)
 
-
 all:
        $(MAKE_CMD)
 
+solaris:
+       $(MAKE_CMD) PLATFORM=solaris
+
 clean:
        $(MAKE_CMD) clean
 
+
+#-----------------------------------------------------------------------------#
+# development only stuff                                                      #
+#-----------------------------------------------------------------------------#
+
 backup:
        ./Scripts/make_backup.sh src
 
@@ -33,10 +76,10 @@ backup_gfx:
        ./Scripts/make_backup.sh gfx
 
 dist-unix:
-       ./Scripts/make_dist_unix.sh .
+       ./Scripts/make_dist.sh unix .
 
 dist-dos:
-       ./Scripts/make_dist_dos.sh .
+       ./Scripts/make_dist.sh dos .
 
 dist: dist-unix dist-dos
 

diff --git a/src/Makefile b/src/Makefile
index 4a065da30c83d35377a455aace7d9b5ee13a0373..f9c1e232a04432d805a85ce34c5ba5ed78372b95 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,111 +1,71 @@
 #=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.2                                           #
-# (c) 1995-98 Holger Schemel, aeglos@valinor.owl.de                           #
+# Makefile for Rocks'n'Diamonds 1.4.0                                         #
+# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de                         #
 #=============================================================================#
 
-#-----------------------------------------------------------------------------#
-# configuration section                                                       #
-#-----------------------------------------------------------------------------#
-
-# change this to your favorite ANSI C compiler
-CC = gcc
-
-# on Solaris and similar systems, you'll need to uncomment this
-# EXTRA_LIBS = -lnsl -lsocket 
-
-# specify X11 library path on your system
-XLIB_PATH = /usr/X11/lib
-
-# choose directory for read-only game data (like graphics, sounds, levels)
-# RO_GAME_DIR = /usr/games
-
-# choose directory for writable game data (like highscore files)
-# RW_GAME_DIR = /var/games
-
-# uncomment this if your system has no joystick include file
-# JOYSTICK = -DNO_JOYSTICK
-
-# uncomment this if your system has no sound
-# SOUNDS = -DNO_SOUNDS
-
-# choose if you want to allow many global score file entries for one player
-# when installing the game in a multi user environment, choose this
-# SCORE_ENTRIES = ONE_PER_NAME
-# when installing the game in a single user environment, choose this (default)
-# SCORE_ENTRIES = MANY_PER_NAME
-
-# The XPM-Library is no longer needed to build this program,
-# but is used to load graphics if XPM_INCLUDE_FILE is defined,
-# because the GIF loading routines are still a bit beta.
-# If you want to use the Xpm library, convert the GIF files to Xpm
-# files (and you need corresponding mask files in xbm format).
-
-# XPM_INCLUDE_FILE = -DXPM_INCLUDE_FILE="<X11/xpm.h>"
-# EXTRA_X11_LIBS = -lXpm
-
-#-----------------------------------------------------------------------------#
-# you shouldn't need to change anything below                                 #
-#-----------------------------------------------------------------------------#
-
+ifndef PLATFORM                        # platform not specified -- try auto detection
 ifdef COMSPEC
 PLATFORM = dos
 else
 PLATFORM = unix
 endif
+endif
+
+ifdef X11_PATH                 # path to X11 specified by top level Makefile
+XINC_PATH = $(X11_PATH)/include
+XLIB_PATH = $(X11_PATH)/lib
+X11_INCL = -I$(XINC_PATH)
+X11_LIBS = -L$(XLIB_PATH)
+endif
+
+
+ifeq ($(PLATFORM),dos)         # DOS / Windows
 
-ifeq ($(PLATFORM),unix)
-RM = rm -f
-PROGNAME = ../rocksndiamonds
-LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
-else
 RM = del
 PROGNAME = ../rocks.exe
 LIBS = -s -lm -lalleg
+
+else                           # Unix
+
+RM = rm -f
+PROGNAME = ../rocksndiamonds
+
+ifeq ($(PLATFORM),solaris)
+EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
 endif
 
-CPP = $(CC) -E
+INCL = $(X11_INCL)
+LIBS = $(X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
 
-ifdef RO_GAME_DIR
+endif
+
+
+ifdef RO_GAME_DIR              # path to read-only game data specified
 CONFIG_RO_GAME_DIR = -DRO_GAME_DIR="\"$(RO_GAME_DIR)\""
 endif
 
-ifdef RW_GAME_DIR
+ifdef RW_GAME_DIR              # path to writable game data specified
 CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
 endif
 
-ifdef SCORE_ENTRIES
+ifdef SCORE_ENTRIES            # number of score entries per player specified
 CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
 endif
 
 CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
-CONFIG = $(CONFIG_GAME_DIR) $(SOUNDS) $(JOYSTICK)      \
-        $(CONFIG_SCORE_ENTRIES) $(XPM_INCLUDE_FILE)
-
-# DEBUG = -DDEBUG -g -Wall -ansi -pedantic
-DEBUG = -DDEBUG -g -Wall
-# DEBUG = -O3 -Wall -ansi -pedantic
-# DEBUG = -O3 -Wall
-# DEBUG = -O3
-
-# SYSTEM = -Aa -D_HPUX_SOURCE -Dhpux   # for HP-UX (obsolete)
-# SYSTEM = -DSYSV -Ae                  # for HP-UX
-# INCL = -I/usr/include/X11R5          # for HP-UX and others
-# INCL = -I/usr/local/X11/include      # for SunOS and others
-# LIBS = -L/usr/lib/X11R5 -lXpm -lX11 -lm
-#                                      # for HP-UX and others
-# LIBS = -L/usr/local/X11/lib -lXpm -lX11 -lm -lsocket -R/usr/local/X11/lib
-#                                      # for SunOS and others
 
-# LIBS = -L/usr/X11R6/lib -lXpm -lX11 -lm
-# LIBS = -L/usr/X11R6/lib -lX11 -lm
+CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(SOUNDS) $(JOYSTICK)
 
-# LIBS = -L/usr/X11R6/lib $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+# OPTIONS = -DDEBUG -g -Wall -ansi -pedantic   # only for debugging purposes
+OPTIONS = -DDEBUG -g -Wall                     # only for debugging purposes
+# OPTIONS = -O3 -Wall -ansi -pedantic
+# OPTIONS = -O3 -Wall
+# OPTIONS = -O3
 
-# LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+# SYSTEM = -DSYSV -Ae          # may be needed for HP-UX
 
-# CFLAGS = -O2 $(CONFIG) $(SYSTEM)
-CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
+CFLAGS = $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG)
 
 SRCS = main.c          \
        init.c          \
@@ -161,6 +121,11 @@ clean:
        $(RM) *.o
        $(RM) $(PROGNAME)
 
+
+#-----------------------------------------------------------------------------#
+# development only stuff                                                      #
+#-----------------------------------------------------------------------------#
+
 depend:
        for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 

diff --git a/src/main.h b/src/main.h
index b3783268654a4a5fe329dc8107dcf0cccd4d612d..add49d76a76f13b59fcfa5d6cd06bb7b401aee4b 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -455,6 +455,7 @@ struct GameInfo
 
 struct GlobalInfo
 {
+  int dummy;
 };
 
 extern Display        *display;
@@ -1661,7 +1662,7 @@ extern char               *element_info[];
 #define TAPES_DIRECTORY                "tapes"
 #define SCORES_DIRECTORY       "scores"
 
-#define PROGRAM_VERSION_STRING "1.3.5"
+#define PROGRAM_VERSION_STRING "1.4.0"
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"
 #define WINDOW_TITLE_STRING    PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING

diff --git a/src/misc.c b/src/misc.c
index b6f8f940acb5817e270ec39e71c88fc69336508c..c32aa55515b13650e2ba97a7f21cdfd85c38def3 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -443,7 +443,7 @@ void GetOptions(char *argv[])
             "Options:\n"
             "  -d, --display machine:0       X server display\n"
             "  -b, --basepath directory      alternative base directory\n"
-            "  -l, --levels directory        alternative level directory\n"
+            "  -l, --level directory        alternative level directory\n"
             "  -s, --serveronly              only start network server\n"
             "  -n, --network                 network multiplayer game\n"
             "  -v, --verbose                 verbose mode\n",