From c9433eab5c4317ed4f89164b386a7d33562e29be Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 3 Aug 2002 02:37:53 +0200 Subject: [PATCH] rnd-20020803-1-src --- Makefile | 22 +++++++++++++++------- src/Makefile | 12 +++++++++--- src/cartoons.c | 2 +- src/cartoons.h | 2 +- src/config.c | 2 +- src/conftime.h | 1 + src/editor.c | 2 +- src/editor.h | 2 +- src/events.c | 2 +- src/events.h | 2 +- src/files.c | 2 +- src/files.h | 2 +- src/game.c | 2 +- src/game.h | 2 +- src/init.c | 20 ++++++++++++++++++-- src/init.h | 2 +- src/libgame/Makefile | 2 +- src/libgame/gadgets.c | 2 +- src/libgame/gadgets.h | 2 +- src/libgame/image.c | 2 +- src/libgame/image.h | 2 +- src/libgame/joystick.c | 2 +- src/libgame/libgame.h | 2 +- src/libgame/misc.c | 29 ++++++++++++++++++----------- src/libgame/misc.h | 2 +- src/libgame/msdos.c | 2 +- src/libgame/msdos.h | 6 +++--- src/libgame/pcx.c | 2 +- src/libgame/pcx.h | 2 +- src/libgame/platform.h | 18 ++++++++++++++++-- src/libgame/random.c | 2 +- src/libgame/random.h | 2 +- src/libgame/sdl.c | 2 +- src/libgame/sdl.h | 2 +- src/libgame/setup.c | 7 ++++--- src/libgame/sound.c | 7 ++++--- src/libgame/sound.h | 2 +- src/libgame/system.c | 6 ++++-- src/libgame/system.h | 10 +++++++++- src/libgame/text.c | 2 +- src/libgame/text.h | 2 +- src/libgame/types.h | 2 +- src/libgame/x11.c | 2 +- src/libgame/x11.h | 2 +- src/main.c | 5 +++-- src/main.h | 2 +- src/netserv.c | 6 ++---- src/netserv.h | 2 +- src/network.c | 6 ++---- src/network.h | 2 +- src/screens.c | 4 ++-- src/screens.h | 2 +- src/tape.c | 2 +- src/tape.h | 2 +- src/timestamp.h | 1 - src/tools.c | 2 +- src/tools.h | 2 +- 57 files changed, 151 insertions(+), 91 deletions(-) create mode 100644 src/conftime.h delete mode 100644 src/timestamp.h diff --git a/Makefile b/Makefile index 74814455..0496dc3c 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,22 @@ #=============================================================================# # Makefile for Rocks'n'Diamonds # -# (c) 1995-2000 Holger Schemel, info@artsoft.org # +# (c) 1995-2002 Holger Schemel, info@artsoft.org # #=============================================================================# #-----------------------------------------------------------------------------# # configuration section # #-----------------------------------------------------------------------------# -# specify your favorite ANSI C compiler +# specify command name of your favorite ANSI C compiler +# (this must be set to "cc" for some systems) CC = gcc +# specify command name of GNU make on your system +# (this must be set to "gmake" for some systems) +MAKE = make + # specify path to X11 on your system -# if undefined, use system defaults (works with Linux/gcc/libc5) -X11_PATH = /usr/X11 +X11_PATH = /usr/X11R6 # specify directory for read-only game data (like graphics, sounds, levels) # default is '.', so you can play without installing game data somewhere @@ -42,8 +46,6 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc .EXPORT_ALL_VARIABLES: -MAKE = make - SRC_DIR = src MAKE_CMD = $(MAKE) -C $(SRC_DIR) @@ -62,6 +64,9 @@ solaris: solaris-sdl: @$(MAKE_CMD) PLATFORM=solaris TARGET=sdl +mac: + @$(MAKE_CMD) PLATFORM=macosx + msdos: @$(MAKE_CMD) PLATFORM=msdos @@ -100,6 +105,9 @@ dist-msdos: dist-win32: ./Scripts/make_dist.sh win . +dist-macosx: + ./Scripts/make_dist.sh mac . $(MAKE) + dist-clean: @$(MAKE_CMD) dist-clean @@ -109,7 +117,7 @@ dist-build-all: @BUILD_DIST=TRUE $(MAKE) cross-win32 ; $(MAKE) dist-clean @BUILD_DIST=TRUE $(MAKE) cross-msdos ; $(MAKE) dist-clean -dist-all: dist-build-all dist-unix dist-msdos dist-win32 +dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx depend dep: $(MAKE_CMD) depend diff --git a/src/Makefile b/src/Makefile index 4d26807e..ad10d1fe 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ #=============================================================================# # Makefile for Rocks'n'Diamonds # -# (c) 1995-2000 Holger Schemel, info@artsoft.org # +# (c) 1995-2002 Holger Schemel, info@artsoft.org # #=============================================================================# .EXPORT_ALL_VARIABLES: @@ -48,6 +48,12 @@ EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH) PLATFORM = unix endif +ifeq ($(PLATFORM),macosx) +# PROGNAME = ../Rocks\'n\'Diamonds.app/Contents/MacOS/$(PROGBASE) +PLATFORM = unix +TARGET=sdl +endif + ifeq ($(PLATFORM),unix) PROFILING_FLAGS = -pg endif @@ -144,7 +150,7 @@ OBJS = main.o \ network.o \ netserv.o -TIMESTAMP_FILE = timestamp.h +TIMESTAMP_FILE = conftime.h LIBDIR = libgame LIBGAME = $(LIBDIR)/libgame.a @@ -158,7 +164,7 @@ endif all: libgame_dir $(PROGNAME) -$(PROGNAME): $(LIBGAME) $(OBJS) $(ICON) +$(PROGNAME): $(LIBGAME) $(TIMESTAMP_FILE) $(OBJS) $(ICON) $(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME) libgame_dir: diff --git a/src/cartoons.c b/src/cartoons.c index cf5a0736..e97005dd 100644 --- a/src/cartoons.c +++ b/src/cartoons.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/cartoons.h b/src/cartoons.h index 0cfd8c12..44cfb6d2 100644 --- a/src/cartoons.h +++ b/src/cartoons.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/config.c b/src/config.c index 9c6ff21e..2d21f408 100644 --- a/src/config.c +++ b/src/config.c @@ -14,7 +14,7 @@ #include "libgame/libgame.h" #include "config.h" -#include "timestamp.h" +#include "conftime.h" /* use timestamp created at compile-time */ #define PROGRAM_BUILD_STRING PROGRAM_IDENT_STRING " " COMPILE_DATE_STRING diff --git a/src/conftime.h b/src/conftime.h new file mode 100644 index 00000000..6379b4f9 --- /dev/null +++ b/src/conftime.h @@ -0,0 +1 @@ +#define COMPILE_DATE_STRING "[2002-07-31 22:20]" diff --git a/src/editor.c b/src/editor.c index 3ab7a71c..eaf1aa29 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/editor.h b/src/editor.h index e23c7329..7966bda1 100644 --- a/src/editor.h +++ b/src/editor.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/events.c b/src/events.c index dd94b75f..fc6140fc 100644 --- a/src/events.c +++ b/src/events.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/events.h b/src/events.h index 6cc08ef8..8c5d74df 100644 --- a/src/events.h +++ b/src/events.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/files.c b/src/files.c index 65ab618d..58cc705c 100644 --- a/src/files.c +++ b/src/files.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/files.h b/src/files.h index 1405651c..1409ba9c 100644 --- a/src/files.h +++ b/src/files.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/game.c b/src/game.c index ea9bdb33..bc31c194 100644 --- a/src/game.c +++ b/src/game.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/game.h b/src/game.h index 074662a0..607e34e2 100644 --- a/src/game.h +++ b/src/game.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/init.c b/src/init.c index 4da3ddb1..41bdc360 100644 --- a/src/init.c +++ b/src/init.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -1678,19 +1678,35 @@ void InitElementProperties() void Execute_Debug_Command(char *command) { - if (strcmp(command, "create soundinfo.conf") == 0) + if (strcmp(command, "create graphicsinfo.conf") == 0) + { + printf("# (Currently only the \"name\" directive is recognized.)\n"); + printf("\n"); + printf("%s\n", getFormattedSetupEntry("name", "Classic Graphics")); + printf("\n"); + } + else if (strcmp(command, "create soundsinfo.conf") == 0) { int i; printf("# You can configure additional/alternative sound effects here\n"); printf("# (The sounds below are default and therefore commented out.)\n"); printf("\n"); + printf("%s\n", getFormattedSetupEntry("name", "Classic Sounds")); + printf("\n"); for (i=0; ipw_name; + if (login_name == NULL) + { + struct passwd *pwd; + + if ((pwd = getpwuid(getuid())) == NULL) + login_name = ANONYMOUS_NAME; + else + login_name = getStringCopy(pwd->pw_name); + } + + return login_name; #endif } @@ -357,16 +364,16 @@ char *getHomeDir() #if defined(PLATFORM_UNIX) static char *home_dir = NULL; - if (!home_dir) + if (home_dir == NULL) { - if (!(home_dir = getenv("HOME"))) + if ((home_dir = getenv("HOME")) == NULL) { struct passwd *pwd; - if ((pwd = getpwuid(getuid()))) - home_dir = pwd->pw_dir; - else + if ((pwd = getpwuid(getuid())) == NULL) home_dir = "."; + else + home_dir = getStringCopy(pwd->pw_dir); } } diff --git a/src/libgame/misc.h b/src/libgame/misc.h index 0febc7a9..e7dd846f 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/msdos.c b/src/libgame/msdos.c index 724338ce..29cc0360 100644 --- a/src/libgame/msdos.c +++ b/src/libgame/msdos.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/msdos.h b/src/libgame/msdos.h index ab0ea083..5ddb3eef 100644 --- a/src/libgame/msdos.h +++ b/src/libgame/msdos.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -19,10 +19,10 @@ /* symbol 'window' is defined in DJGPP cross-compiler in libc.a(conio.o) */ -#define window window_djgpp +#define window window_internal /* symbol 'font' is defined in "allegro.h" */ -#define font font_allegro +#define font font_internal /* system dependent definitions */ diff --git a/src/libgame/pcx.c b/src/libgame/pcx.c index f6ef16c9..7f6d7f2d 100644 --- a/src/libgame/pcx.c +++ b/src/libgame/pcx.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/pcx.h b/src/libgame/pcx.h index 8bfd0777..bf5bacfa 100644 --- a/src/libgame/pcx.h +++ b/src/libgame/pcx.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/platform.h b/src/libgame/platform.h index 352e3562..94c5c4a8 100644 --- a/src/libgame/platform.h +++ b/src/libgame/platform.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -14,7 +14,9 @@ #ifndef PLATFORM_H #define PLATFORM_H -/* define keywords for supported main platforms */ +/* ========================================================================= */ +/* define keywords for supported main platforms (Unix, DOS and Windows) */ +/* ========================================================================= */ #if defined(MSDOS) #define PLATFORM_MSDOS @@ -60,6 +62,18 @@ #define PLATFORM_NETBSD #endif +#if defined(__bsdi__) +#define PLATFORM_BSDI +#endif + +#if defined(sparc) || defined(sun) +#define PLATFORM_SOLARIS +#endif + +#if defined(__APPLE__) && defined(__MACH__) +#define PLATFORM_MACOSX +#endif + /* detecting HP-UX by the following compiler keyword definitions: - in K&R mode (the default), the HP C compiler defines "hpux" - in ANSI mode (-Aa or -Ae), the HP C compiler defines "__hpux" diff --git a/src/libgame/random.c b/src/libgame/random.c index d65bc532..08626fca 100644 --- a/src/libgame/random.c +++ b/src/libgame/random.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/random.h b/src/libgame/random.h index 6464286c..540bc667 100644 --- a/src/libgame/random.h +++ b/src/libgame/random.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 42e6286b..14d4830b 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h index 962754af..64db7795 100644 --- a/src/libgame/sdl.h +++ b/src/libgame/sdl.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 6c49cac9..2567ebb1 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -11,8 +11,9 @@ * setup.c * ***********************************************************/ -#include +#include #include +#include #include #include @@ -1932,8 +1933,8 @@ static void SaveUserLevelInfo() /* always start with reliable default values */ setTreeInfoToDefaults(&ldi, TREE_TYPE_LEVEL_DIR); - ldi.name = getLoginName(); - ldi.author = getRealName(); + ldi.name = getStringCopy(getLoginName()); + ldi.author = getStringCopy(getRealName()); ldi.levels = 100; ldi.first_level = 1; ldi.sort_priority = LEVELCLASS_USER_START; diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 68fe64b0..cd34b284 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -11,8 +11,9 @@ * sound.c * ***********************************************************/ -#include +#include #include +#include #include #include #include @@ -1304,7 +1305,7 @@ static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl) mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME; /* might be needed for u-law /dev/audio */ -#if 0 +#if 1 for(j=0; jkeysym.unicode != 0) + if (with_modifiers && + event->keysym.unicode > 0x0000 && + event->keysym.unicode < 0x2000) return event->keysym.unicode; else return event->keysym.sym; diff --git a/src/libgame/system.h b/src/libgame/system.h index 6fe5f12f..0f6d5e2b 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -27,6 +27,14 @@ #include "x11.h" #endif +#if defined(PLATFORM_MACOSX) +/* some symbols are already defined on Mac OS X */ +#define Delay Delay_internal +#define DrawLine DrawLine_internal +#define DrawText DrawText_internal +#define GetPixel GetPixel_internal +#endif + /* the additional 'b' is needed for Win32 to open files in binary mode */ #define MODE_READ "rb" diff --git a/src/libgame/text.c b/src/libgame/text.c index 19dc2471..16381e49 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/text.h b/src/libgame/text.h index f7f4ddb3..f459e3fd 100644 --- a/src/libgame/text.h +++ b/src/libgame/text.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/types.h b/src/libgame/types.h index 5a1df5bd..2ee05af0 100644 --- a/src/libgame/types.h +++ b/src/libgame/types.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/x11.c b/src/libgame/x11.c index 7d45a493..4ef1bd16 100644 --- a/src/libgame/x11.c +++ b/src/libgame/x11.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/x11.h b/src/libgame/x11.h index d19b75e7..c42f25cc 100644 --- a/src/libgame/x11.h +++ b/src/libgame/x11.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/main.c b/src/main.c index 2ab68cdf..2a0d6566 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -739,5 +739,6 @@ int main(int argc, char *argv[]) EventLoop(); CloseAllAndExit(0); - exit(0); /* to keep compilers happy */ + + return 0; /* to keep compilers happy */ } diff --git a/src/main.h b/src/main.h index 5f5f835a..17136765 100644 --- a/src/main.h +++ b/src/main.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/netserv.c b/src/netserv.c index e6ba74ab..21a48572 100644 --- a/src/netserv.c +++ b/src/netserv.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -11,7 +11,7 @@ * network.c * ***********************************************************/ -#include "libgame/libgame.h" +#include "libgame/platform.h" #if defined(PLATFORM_UNIX) @@ -26,9 +26,7 @@ #include #include -#if 0 #include "libgame/libgame.h" -#endif #include "netserv.h" diff --git a/src/netserv.h b/src/netserv.h index 88bceaf8..e3c20b72 100644 --- a/src/netserv.h +++ b/src/netserv.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/network.c b/src/network.c index 32e2db2b..2b0ac6c2 100644 --- a/src/network.c +++ b/src/network.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -11,7 +11,7 @@ * network.c * ***********************************************************/ -#include "libgame/libgame.h" +#include "libgame/platform.h" #if defined(PLATFORM_UNIX) @@ -24,9 +24,7 @@ #include #include -#if 0 #include "libgame/libgame.h" -#endif #include "network.h" #include "netserv.h" diff --git a/src/network.h b/src/network.h index 9bd89c70..6819bf27 100644 --- a/src/network.h +++ b/src/network.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/screens.c b/src/screens.c index 627ba807..ac88cbbe 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -2097,7 +2097,7 @@ void CustomizeKeyboard(int player_nr) { case EVENT_KEYPRESS: { - Key key = GetEventKey((KeyEvent *)&event, TRUE); + Key key = GetEventKey((KeyEvent *)&event, FALSE); if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { diff --git a/src/screens.h b/src/screens.h index 86281579..60f31016 100644 --- a/src/screens.h +++ b/src/screens.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/tape.c b/src/tape.c index 14341da9..b219109f 100644 --- a/src/tape.c +++ b/src/tape.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/tape.h b/src/tape.h index 3617700a..6a41a94d 100644 --- a/src/tape.h +++ b/src/tape.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/timestamp.h b/src/timestamp.h deleted file mode 100644 index c1c160ce..00000000 --- a/src/timestamp.h +++ /dev/null @@ -1 +0,0 @@ -#define COMPILE_DATE_STRING "[2002-07-13 18:18]" diff --git a/src/tools.c b/src/tools.c index 9aea7b4c..e5055eda 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/tools.h b/src/tools.h index f6a05abb..1ed8d163 100644 --- a/src/tools.h +++ b/src/tools.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * -- 2.34.1