From d12226d88f7873261e86fb3b32029c2da20301d3 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Wed, 9 Dec 1998 10:19:41 +0100 Subject: [PATCH] rnd-19981209-1 --- Makefile | 51 +++++++----------------- src/Makefile | 110 ++++++++++++++++++++++++++++++++------------------- src/game.c | 60 +++++++++++++++++++++++++++- 3 files changed, 143 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile index 3e80fafd..4616aecb 100644 --- a/Makefile +++ b/Makefile @@ -7,42 +7,10 @@ # 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 fine with Linux/gcc) -# X11_PATH = /usr/X11 - -# specify path to install game data (graphics, sounds, levels, scores) -# default is '.', so you can play without installing game data somewhere -# GAME_DIR = /usr/local/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 should not need to change anything below # +# you shouldn't need to change anything below # #-----------------------------------------------------------------------------# -.EXPORT_ALL_VARIABLES: - MAKE = make SRC_DIR = src @@ -52,8 +20,19 @@ MAKE_CMD = @$(MAKE) -C $(SRC_DIR) all: $(MAKE_CMD) -solaris: - $(MAKE_CMD) PLATFORM=solaris - clean: $(MAKE_CMD) clean + +backup: + ./Scripts/make_backup.sh + +dist-unix: + ./Scripts/make_dist_unix.sh . + +dist-dos: + ./Scripts/make_dist_dos.sh . + +dist: dist-unix dist-dos + +depend: + $(MAKE_CMD) depend diff --git a/src/Makefile b/src/Makefile index 965c0588..4c0a427b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,59 +3,64 @@ # (c) 1995-98 Holger Schemel, aeglos@valinor.owl.de # #=============================================================================# -ifndef PLATFORM # platform not defined -- try auto detection -ifdef COMSPEC -PLATFORM = dos -else -PLATFORM = unix -endif -endif +#-----------------------------------------------------------------------------# +# configuration section # +#-----------------------------------------------------------------------------# -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 +# 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 -ifndef GAME_DIR # path to game data not defined -- try '.' +# change this to the directory where you want to install game data like levels GAME_DIR = . -endif -ifndef SCORE_ENTRIES # number of score entries per player undefined -SCORE_ENTRIES = MANY_PER_NAME -endif +# 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 +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. -# If you want to use the Xpm library, convert the PCX files to XPM -# files (and you need corresponding mask files in X11 Bitmap format). +# 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="" # EXTRA_X11_LIBS = -lXpm +#-----------------------------------------------------------------------------# +# you shouldn't need to change anything below # +#-----------------------------------------------------------------------------# -ifeq ($(PLATFORM),dos) # DOS / Windows +ifdef COMSPEC +PLATFORM = dos +else +PLATFORM = unix +endif +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 = -lm -lalleg - -else # Unix - -RM = rm -f -PROGNAME = ../rocksndiamonds - -ifeq ($(PLATFORM),solaris) -EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH) -endif - -INCL = $(X11_INCL) -LIBS = $(X11_LIBS) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS) - endif +CPP = $(CC) -E CONFIG_GAME_DIR = -DGAME_DIR="\"$(GAME_DIR)\"" CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES) @@ -63,12 +68,30 @@ CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES) CONFIG = $(CONFIG_GAME_DIR) $(SOUNDS) $(JOYSTICK) \ $(CONFIG_SCORE_ENTRIES) $(XPM_INCLUDE_FILE) -# OPTIONS = -DDEBUG -g -Wall # only for debugging purposes -OPTIONS = -O3 +# 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 -# SYSTEM = -DSYSV -Ae # maybe needed for HP-UX +# LIBS = -L/usr/X11R6/lib $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS) -CFLAGS = $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG) +# LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS) + +# CFLAGS = -O2 $(CONFIG) $(SYSTEM) +CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL) SRCS = main.c \ init.c \ @@ -123,3 +146,10 @@ $(PROGNAME): $(OBJS) clean: $(RM) *.o $(RM) $(PROGNAME) + +depend: + for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend + +ifeq (.depend,$(wildcard .depend)) +include .depend +endif diff --git a/src/game.c b/src/game.c index 26cc84cc..64a7c1aa 100644 --- a/src/game.c +++ b/src/game.c @@ -99,6 +99,62 @@ /* to control special behaviour of certain game elements */ int game_emulation = EMU_NONE; + + + +#ifdef DEBUG +#if 1 +static unsigned int getStateCheckSum(int counter) +{ + int x, y; + unsigned int mult = 1; + unsigned int checksum = 0; + /* + static short lastFeld[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; + */ + static boolean first_game = TRUE; + + for (y=0; ygone) { extern unsigned int last_RND(); @@ -3204,7 +3260,7 @@ void GameActions() last_RND(), getStateCheckSum(level.time - TimeLeft)); } - */ + #endif -- 2.34.1