rnd-20020803-1-src

diff --git a/Makefile b/Makefile
index 74814455f1904c82c1a172cda2649a680c14cb33..0496dc3c38b4eee1d8f826081b0075f1df459ac0 100644 (file)
--- 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 4d26807e7f831fa3efc4eb707af0bffd5b281ca9..ad10d1fea9d186bbe6456f27d52b9dc0e07761d0 100644 (file)
--- 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 cf5a073675715dc52265995bd40e8a3dab05040d..e97005dd9635a51e17fd5109c2c4ee41d62b474f 100644 (file)
--- 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 0cfd8c123d3d8ce5e6683d3d74c9f4174a1caedf..44cfb6d21582bb4aac46242149271c348f450699 100644 (file)
--- 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 9c6ff21e791752bad96c49c10f1429d244c0ba40..2d21f40887c2e754e3caef2aa705ff6f49ce12d5 100644 (file)
--- 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 (file)
index 0000000..6379b4f
--- /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 3ab7a71ccf9a770eb86e07f57379d212eaa1d512..eaf1aa29c1102780beb2acd3cfcab5e75b5a3dfc 100644 (file)
--- 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 e23c7329d887dbfb02c2f62adb07df571c1eaf51..7966bda17b2a315539162db11d50cb6aba62c831 100644 (file)
--- 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 dd94b75fcbf2d85c2ef929387281245eb08c2d2e..fc6140fc84a0c959d5eaaeb5966acdd1c3fa2d95 100644 (file)
--- 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 6cc08ef8d829f281eabbf859a99778f8aa3cd481..8c5d74df1dcd5690a84369a79579b75498e26ad7 100644 (file)
--- 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 65ab618dfaf5c0f46e658810fe8e72f115c4dc61..58cc705c9c1c6f227ca7df73e3ad9065d5cda033 100644 (file)
--- 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 1405651c136d204760ea9940cbb02de8f3706d11..1409ba9c3063a0fcd0ebcd88da50d3fef1bbba4b 100644 (file)
--- 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 ea9bdb336d5e05ee60df278845e662a7561f239e..bc31c194de0672b1a07164c40710502c6d7562ca 100644 (file)
--- 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 074662a052a67bfbfd7f0fc44949b06823916279..607e34e2bf97836b7d88d4a42db730b5141d861c 100644 (file)
--- 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 4da3ddb1366698fa4530b86d139e6bf3a152af72..41bdc3604a698e15300013591b71861fd74cabd9 100644 (file)
--- 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; i<NUM_SOUND_EFFECTS; i++)
       printf("# %s\n",
             getFormattedSetupEntry(sound_effects[i].text,
                                    sound_effects[i].default_filename));
   }
+  else if (strcmp(command, "create musicinfo.conf") == 0)
+  {
+    printf("# (Currently only the \"name\" directive is recognized.)\n");
+    printf("\n");
+    printf("%s\n", getFormattedSetupEntry("name", "Classic Music"));
+    printf("\n");
+  }
 }
 
 void CloseAllAndExit(int exit_value)

diff --git a/src/init.h b/src/init.h
index ec3a1eb872f95be789c1f18111fc12b7d5f24483..9eb9fb628c79aa82c6c8ca780bdc4e6f4c9a89f6 100644 (file)
--- a/src/init.h
+++ b/src/init.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/libgame/Makefile b/src/libgame/Makefile
index a79475a4c0432408a856e0e75da71699961ef9f4..f9f306b6345144cd1b914e50c347a70348a99a51 100644 (file)
--- a/src/libgame/Makefile
+++ b/src/libgame/Makefile
@@ -1,6 +1,6 @@
 #=============================================================================#
 # Makefile for Artsoft Retro-Game Library                                     #
-# (c) 1994-2000 Holger Schemel, info@artsoft.org                              #
+# (c) 1994-2002 Holger Schemel, info@artsoft.org                              #
 #=============================================================================#
 
 SRCS = system.c        \

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index 7f5125d20cd885cf059dc131b0d7eb761be9ff7d..9d709f3aba55d9359ae99c636d5a60f483ad2ebc 100644 (file)
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.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/gadgets.h b/src/libgame/gadgets.h
index 11a8578b854239bbf8a7280d0ab9c9b251af7f38..783e454f0a23f58bbe8a7ef30e2574dafd528957 100644 (file)
--- a/src/libgame/gadgets.h
+++ b/src/libgame/gadgets.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/image.c b/src/libgame/image.c
index 62b8fed355c5cd9bbf7931c3f53bcb5d0bd9b7fa..8299ad2b400e1ec20907442d04f575582d9ac830 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.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/image.h b/src/libgame/image.h
index feb1a973010a107088fbfdd8ca3a9454269bf7ca..6f473beeaf1c48b69b7b907dc2853c441affa216 100644 (file)
--- a/src/libgame/image.h
+++ b/src/libgame/image.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/joystick.c b/src/libgame/joystick.c
index af30a82067eb8812399b6c5eb26f5ca3fdf100e7..06ac654162e43f38da9f24b483d8d9de64db2691 100644 (file)
--- a/src/libgame/joystick.c
+++ b/src/libgame/joystick.c
@@ -326,7 +326,7 @@ int AnyJoystick()
 int AnyJoystickButton()
 {
   int i;
-  int result;
+  int result = JOY_BUTTON_NOT_PRESSED;
 
   for (i=0; i<MAX_PLAYERS; i++)
   {

diff --git a/src/libgame/libgame.h b/src/libgame/libgame.h
index f7c67bb86f31221115a5b500c4e4263b4fe4de6e..6c1dd346f0cb0323124628dee840e9684b8e94d3 100644 (file)
--- a/src/libgame/libgame.h
+++ b/src/libgame/libgame.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/misc.c b/src/libgame/misc.c
index 8fe3200d3c4a28b22675eeccd81a9fc00f7450da..acada2472e9754f5e15b775b0e74fae3832823f7 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.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                            *
@@ -306,12 +306,19 @@ char *getLoginName()
 #if defined(PLATFORM_WIN32)
   return ANONYMOUS_NAME;
 #else
-  struct passwd *pwd;
+  static char *login_name = NULL;
 
-  if ((pwd = getpwuid(getuid())) == NULL)
-    return ANONYMOUS_NAME;
-  else
-    return pwd->pw_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 0febc7a9815f16efc925db1fb09199b1d57f0cf5..e7dd846f9ef6c517f350004ee79e59eea8bc8bce 100644 (file)
--- 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 724338ce96538d8f4ca4560aaedeb91d5dd022be..29cc036028c7981817f400fa1f6e40037a342974 100644 (file)
--- 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 ab0ea0835b56adc0f29706b8cab4a2d0ed5e1727..5ddb3eef42aea353ed8e7ab3eeafd492d01143f3 100644 (file)
--- 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 f6ef16c99362e47e7364a173b46e4229395c0785..7f6d7f2da42ad9407a0a6fa7b4d779aaabf9ea92 100644 (file)
--- 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 8bfd0777fee23b719c691146bdac8511001609aa..bf5bacfab5a535343569b87d111f7e83324bc26e 100644 (file)
--- 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 352e3562ebf33c0214388eb4f6cc317040af0d80..94c5c4a8bc994d0785b49e359f4c46ed67fdf14d 100644 (file)
--- 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 d65bc532da49414c55a5b79f548742c2f19d0946..08626fcab08584cc38957324a2a5624e8fff9bbe 100644 (file)
--- 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 6464286cb294f75c4e7212b37b517dfd08f8f910..540bc6679c885cf910b8f0f7418ad2493b7fdfea 100644 (file)
--- 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 42e6286bf78697605e42c52cef07c04b636c5c60..14d4830b00587c9ef9ce43a0b132379b330b22df 100644 (file)
--- 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 962754afdbeccbf731bcbc88b65d7dbf3729e70e..64db7795c9df1094f8a18a5ff5e942b29d919a5f 100644 (file)
--- 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 6c49cac933aeff7402e042bb24677325ee9f1357..2567ebb1de35e0e874557384db81d37eeefa04e4 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -11,8 +11,9 @@
 * setup.c                                                  *
 ***********************************************************/
 
-#include <dirent.h>
+#include <sys/types.h>
 #include <sys/stat.h>
+#include <dirent.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -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 68fe64b0af0fee35704dc8c7264825f011737ee2..cd34b284473e3126a0191fc3074f7005793fd0e0 100644 (file)
--- 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 <string.h>
+#include <sys/types.h>
 #include <sys/time.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>
@@ -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; j<sample_size; j++)
     playing_buffer[j] =
       linear_to_ulaw(premix_first_buffer[j]);

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index d1826e1f02c94a17104d78fd9c5f6e638948debd..ec5a2a8b8c2a0a13d7382cb4a7e5a6dd73dfe72f 100644 (file)
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.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/system.c b/src/libgame/system.c
index 432787c2bdf4a5c04123e97b379846709775ef97..cc7dc2aa33fb4111ff5f737ca76a4a731437960c 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.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                            *
@@ -822,7 +822,9 @@ inline Key GetEventKey(KeyEvent *event, boolean with_modifiers)
         (int)SDL_GetModState());
 #endif
 
-  if (with_modifiers && event->keysym.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 6fe5f12f7d19ea40f63183bbf316ad289b4c0f68..0f6d5e2b897b9387ce753301b57ca8e2d5025ef9 100644 (file)
--- 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 19dc2471b71463d2a5a89b87ca001f43e7051ec6..16381e494438e8872531972fb045c6eb1a884a76 100644 (file)
--- 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 f7f4ddb32bab9c90b618ebdd3c821763910ce929..f459e3fd9f392366c2fd37f176b51deb22568693 100644 (file)
--- 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 5a1df5bd30fbc6f10c1269ebd8f9724e7bfc5242..2ee05af0c7e961cbe16555889488fb1f7d708712 100644 (file)
--- 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 7d45a493a28b771e3a4c6bb3dc1183b92aa9d7b2..4ef1bd16f258cbb3c6eb3cb206cdf98bdd870410 100644 (file)
--- 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 d19b75e75625c81e2bdd3b325f168fa564651701..c42f25cc54fe4d896277a192c5348b01351e2d2f 100644 (file)
--- 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 2ab68cdf7d506798a6be9ac49c1dfe467406571f..2a0d656655036ea0cbab99364b0d171b9245674f 100644 (file)
--- 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 5f5f835a634df425f63cc4b383b9cd8736815626..17136765340ef86cc56b8c5368f4a9af4452b3cd 100644 (file)
--- 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 e6ba74ab06c1fe618da823fba9bce0017f3af2a9..21a48572d08af642fc09fbb42cd94630971fa0b6 100644 (file)
--- 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 <arpa/inet.h>
 #include <netdb.h>
 
-#if 0
 #include "libgame/libgame.h"
-#endif
 
 #include "netserv.h"
 

diff --git a/src/netserv.h b/src/netserv.h
index 88bceaf84c284717ca5a6afdf55de7dd1309dfbf..e3c20b72d397edf74ad06f9b39db78f64a838c9d 100644 (file)
--- 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 32e2db2bb147fc78f3461db802d01af83a76cf69..2b0ac6c205ecf7a9cafe378e1c95f733405b4ee0 100644 (file)
--- 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 <arpa/inet.h>
 #include <netdb.h>
 
-#if 0
 #include "libgame/libgame.h"
-#endif
 
 #include "network.h"
 #include "netserv.h"

diff --git a/src/network.h b/src/network.h
index 9bd89c707a4d9f55b9e814e9b0e63d737489ce98..6819bf27279a6dd823a15d65bea124b9005c0d58 100644 (file)
--- 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 627ba8074b7998fac809b922aad5261659b23e97..ac88cbbedf89372adb10fff53e13f7a9a158695c 100644 (file)
--- 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 862815799a3bf4df1daf857877f1969cbf7f93cd..60f310165c0a8d2c5882ca97d96ca9a137631c4b 100644 (file)
--- 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 14341da9338f33adfe147a11a27196f34a6e05cf..b219109fb3528b85246a1059312da05891ea742f 100644 (file)
--- 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 3617700a3f3a914d62fda499493b61932124f922..6a41a94d8bdf96ae53763d725bc4550aa3d8fbb6 100644 (file)
--- 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 (file)
index c1c160c..0000000
--- 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 9aea7b4c7fcc64e29f951c2d214a1c4b365d79bb..e5055eda6513d061b8f6eaab76c1922a3f4f6158 100644 (file)
--- 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 f6a05abb3f8b3b0d52ea89374332e0a69900d056..1ed8d163f08be0095d64c67702b77a515caa2237 100644 (file)
--- 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                            *