From e05dda5c8cc6687dcbc59e182a81aed627e262d0 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 19 Aug 2006 13:53:33 +0200 Subject: [PATCH] rnd-20060819-3-src --- Makefile | 2 +- src/Makefile | 2 +- src/conf_chr.c | 2 +- src/conf_chr.h | 2 +- src/conf_cus.c | 2 +- src/conf_cus.h | 2 +- src/conf_e2g.c | 2 +- src/conf_e2s.c | 2 +- src/conf_esg.c | 2 +- src/conf_fnt.c | 2 +- src/conf_g2m.c | 2 +- src/conf_g2s.c | 2 +- src/conf_gfx.c | 2 +- src/conf_gfx.h | 2 +- src/conf_grp.c | 2 +- src/conf_grp.h | 2 +- src/conf_hlp.c | 2 +- src/conf_mus.c | 2 +- src/conf_mus.h | 2 +- src/conf_snd.c | 2 +- src/conf_snd.h | 2 +- src/conftime.h | 2 +- src/events.c | 2 +- src/files.c | 2 +- src/game.c | 2 +- src/game_em/Makefile | 2 +- src/game_em/game_em.h | 2 +- src/init.c | 2 +- src/libgame/Makefile | 2 +- src/libgame/gadgets.c | 8 +--- src/libgame/gadgets.h | 2 +- src/libgame/hash.c | 2 +- src/libgame/hash.h | 2 +- src/libgame/image.c | 2 +- src/libgame/image.h | 2 +- src/libgame/joystick.c | 2 +- src/libgame/joystick.h | 2 +- src/libgame/libgame.h | 2 +- src/libgame/macosx.h | 2 +- src/libgame/misc.c | 90 +----------------------------------------- src/libgame/misc.h | 9 +---- src/libgame/msdos.c | 2 +- src/libgame/msdos.h | 2 +- src/libgame/pcx.c | 2 +- src/libgame/pcx.h | 2 +- src/libgame/platform.h | 2 +- src/libgame/random.c | 2 +- src/libgame/random.h | 2 +- src/libgame/sdl.c | 2 +- src/libgame/sdl.h | 2 +- src/libgame/setup.c | 4 +- src/libgame/setup.h | 2 +- src/libgame/sound.c | 2 +- src/libgame/sound.h | 2 +- src/libgame/system.c | 2 +- src/libgame/system.h | 2 +- src/libgame/text.c | 2 +- src/libgame/text.h | 2 +- src/libgame/toons.c | 2 +- src/libgame/toons.h | 2 +- src/libgame/types.h | 2 +- src/libgame/windows.h | 2 +- src/libgame/x11.c | 2 +- src/libgame/x11.h | 2 +- src/main.c | 2 +- src/netserv.c | 2 +- src/network.c | 2 +- src/screens.c | 2 +- src/tape.c | 2 +- src/tools.c | 2 +- 70 files changed, 70 insertions(+), 173 deletions(-) diff --git a/Makefile b/Makefile index f98a1211..7e91482d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile # ----------------------------------------------------------------------------- -# (c) 1995-2005 Holger Schemel +# (c) 1995-2006 Holger Schemel # ============================================================================= # ----------------------------------------------------------------------------- diff --git a/src/Makefile b/src/Makefile index 4cd0223f..5c273676 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile (src) # ----------------------------------------------------------------------------- -# (c) 1995-2005 Holger Schemel +# (c) 1995-2006 Holger Schemel # ============================================================================= # ----------------------------------------------------------------------------- diff --git a/src/conf_chr.c b/src/conf_chr.c index 63aee714..a3f0ed1b 100644 --- a/src/conf_chr.c +++ b/src/conf_chr.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_chr.h b/src/conf_chr.h index af90160a..5c586bb3 100644 --- a/src/conf_chr.h +++ b/src/conf_chr.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_cus.c b/src/conf_cus.c index dd54ef34..06f91a75 100644 --- a/src/conf_cus.c +++ b/src/conf_cus.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_cus.h b/src/conf_cus.h index 867cd125..dfc8e519 100644 --- a/src/conf_cus.h +++ b/src/conf_cus.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_e2g.c b/src/conf_e2g.c index d40c31b9..d597d1b3 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_e2s.c b/src/conf_e2s.c index 825dc7a6..e671b394 100644 --- a/src/conf_e2s.c +++ b/src/conf_e2s.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_esg.c b/src/conf_esg.c index 74b6a1cc..26706901 100644 --- a/src/conf_esg.c +++ b/src/conf_esg.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_fnt.c b/src/conf_fnt.c index 404adc6f..bc2f1d01 100644 --- a/src/conf_fnt.c +++ b/src/conf_fnt.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_g2m.c b/src/conf_g2m.c index 1ad1b39e..1be3ed4f 100644 --- a/src/conf_g2m.c +++ b/src/conf_g2m.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_g2s.c b/src/conf_g2s.c index 703f1453..059f8118 100644 --- a/src/conf_g2s.c +++ b/src/conf_g2s.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 3a5a7a86..3596063d 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_gfx.h b/src/conf_gfx.h index 6de36218..06f4ffe6 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_grp.c b/src/conf_grp.c index fa80f985..bf92917f 100644 --- a/src/conf_grp.c +++ b/src/conf_grp.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_grp.h b/src/conf_grp.h index ef1ca99f..564b5fbe 100644 --- a/src/conf_grp.h +++ b/src/conf_grp.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_hlp.c b/src/conf_hlp.c index 7f2b5bb6..0733cb7b 100644 --- a/src/conf_hlp.c +++ b/src/conf_hlp.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_mus.c b/src/conf_mus.c index bb5f5e79..83404171 100644 --- a/src/conf_mus.c +++ b/src/conf_mus.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_mus.h b/src/conf_mus.h index a8d757b8..8fce300c 100644 --- a/src/conf_mus.h +++ b/src/conf_mus.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_snd.c b/src/conf_snd.c index c15e0dec..1c3ce29a 100644 --- a/src/conf_snd.c +++ b/src/conf_snd.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conf_snd.h b/src/conf_snd.h index 6663812d..3c2fa46d 100644 --- a/src/conf_snd.h +++ b/src/conf_snd.h @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/conftime.h b/src/conftime.h index a8569826..7557ec42 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2006-08-19 12:53]" +#define COMPILE_DATE_STRING "[2006-08-19 13:52]" diff --git a/src/events.c b/src/events.c index c0bfafa1..d42acf56 100644 --- a/src/events.c +++ b/src/events.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/files.c b/src/files.c index 8c2b6e1b..1d0ca6df 100644 --- a/src/files.c +++ b/src/files.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/game.c b/src/game.c index 73c01c7b..72ae34a8 100644 --- a/src/game.c +++ b/src/game.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/game_em/Makefile b/src/game_em/Makefile index aec69d09..4fc21cd0 100644 --- a/src/game_em/Makefile +++ b/src/game_em/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile (game_em) # ----------------------------------------------------------------------------- -# (c) 1995-2005 Holger Schemel +# (c) 1995-2006 Holger Schemel # ----------------------------------------------------------------------------- # Emerald Mine for X11 © 2000,2001 David Tritscher # ============================================================================= diff --git a/src/game_em/game_em.h b/src/game_em/game_em.h index 0407fa5c..41747810 100644 --- a/src/game_em/game_em.h +++ b/src/game_em/game_em.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/init.c b/src/init.c index b25a9408..f5581896 100644 --- a/src/init.c +++ b/src/init.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/Makefile b/src/libgame/Makefile index 497fb24e..6148a985 100644 --- a/src/libgame/Makefile +++ b/src/libgame/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile (libgame) # ----------------------------------------------------------------------------- -# (c) 1995-2005 Holger Schemel +# (c) 1995-2006 Holger Schemel # ============================================================================= # ----------------------------------------------------------------------------- diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c index b3166c4d..7c140cbe 100644 --- a/src/libgame/gadgets.c +++ b/src/libgame/gadgets.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -1682,8 +1682,6 @@ boolean HandleGadgets(int mx, int my, int button) last_info_gi = new_gi; } -#if 1 - gadget_draggable = (gi && gi->type & GD_TYPE_SCROLLBAR); /* reset drag position for newly pressed scrollbar to "not dragging" */ @@ -1783,8 +1781,6 @@ boolean HandleGadgets(int mx, int my, int button) } } -#endif - if (gadget_pressed) { if (gi->type == GD_TYPE_CHECK_BUTTON) @@ -1965,9 +1961,7 @@ boolean HandleGadgets(int mx, int my, int button) if (gi->type & GD_TYPE_SCROLLBAR) DrawGadget(gi, DG_UNPRESSED, gi->direct_draw); -#if 1 gi->state = GD_BUTTON_UNPRESSED; -#endif gi->event.type = GD_EVENT_RELEASED; if (gi->event_mask & GD_EVENT_RELEASED && diff --git a/src/libgame/gadgets.h b/src/libgame/gadgets.h index a1271813..7f352a87 100644 --- a/src/libgame/gadgets.h +++ b/src/libgame/gadgets.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/hash.c b/src/libgame/hash.c index bce20519..e44313a8 100644 --- a/src/libgame/hash.c +++ b/src/libgame/hash.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2003 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/hash.h b/src/libgame/hash.h index 4be5cc8d..c8836fda 100644 --- a/src/libgame/hash.h +++ b/src/libgame/hash.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2003 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/image.c b/src/libgame/image.c index cb8de4c8..6cfa44f4 100644 --- a/src/libgame/image.c +++ b/src/libgame/image.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/image.h b/src/libgame/image.h index 3791c4bc..89f4f7c4 100644 --- a/src/libgame/image.h +++ b/src/libgame/image.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/joystick.c b/src/libgame/joystick.c index 8cf04cf6..b286de23 100644 --- a/src/libgame/joystick.c +++ b/src/libgame/joystick.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/joystick.h b/src/libgame/joystick.h index d571a130..efaaf5b8 100644 --- a/src/libgame/joystick.h +++ b/src/libgame/joystick.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/libgame.h b/src/libgame/libgame.h index 6c1dd346..6f4c20c2 100644 --- a/src/libgame/libgame.h +++ b/src/libgame/libgame.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/macosx.h b/src/libgame/macosx.h index 7cccf571..c4818e76 100644 --- a/src/libgame/macosx.h +++ b/src/libgame/macosx.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2003 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/misc.c b/src/libgame/misc.c index cd28493f..c4b351e7 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -790,8 +790,6 @@ char *GetError() return internal_error; } -#if 1 - void Error(int mode, char *format, ...) { static boolean last_line_was_separator = FALSE; @@ -853,87 +851,6 @@ void Error(int mode, char *format, ...) } } -#else - -void Error(int mode, char *format, ...) -{ - static boolean last_line_was_separator = FALSE; - char *process_name = ""; - FILE *error = stderr; - char *newline = "\n"; - - /* display warnings only when running in verbose mode */ - if (mode & ERR_WARN && !options.verbose) - return; - - if (mode == ERR_RETURN_LINE) - { - if (!last_line_was_separator) - fprintf_line(error, format, 79); - - last_line_was_separator = TRUE; - - return; - } - - last_line_was_separator = FALSE; - -#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS) - newline = "\r\n"; - - if ((error = openErrorFile()) == NULL) - { - printf("Cannot write to error output file!%s", newline); - - program.exit_function(1); - } -#endif - - if (mode & ERR_SOUND_SERVER) - process_name = " sound server"; - else if (mode & ERR_NETWORK_SERVER) - process_name = " network server"; - else if (mode & ERR_NETWORK_CLIENT) - process_name = " network client **"; - - if (format) - { - va_list ap; - - fprintf(error, "%s%s: ", program.command_basename, process_name); - - if (mode & ERR_WARN) - fprintf(error, "warning: "); - - va_start(ap, format); - vfprintf(error, format, ap); - va_end(ap); - - fprintf(error, "%s", newline); - } - - if (mode & ERR_HELP) - fprintf(error, "%s: Try option '--help' for more information.%s", - program.command_basename, newline); - - if (mode & ERR_EXIT) - fprintf(error, "%s%s: aborting%s", - program.command_basename, process_name, newline); - - if (error != stderr) - fclose(error); - - if (mode & ERR_EXIT) - { - if (mode & ERR_FROM_SERVER) - exit(1); /* child process: normal exit */ - else - program.exit_function(1); /* main process: clean up stuff */ - } -} - -#endif - /* ------------------------------------------------------------------------- */ /* checked memory allocation and freeing functions */ @@ -1320,13 +1237,8 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode) sprintf(name_buffer, "%c", '0' + (char)(key - KSYM_0)); else if (key >= KSYM_KP_0 && key <= KSYM_KP_9) sprintf(name_buffer, "keypad %c", '0' + (char)(key - KSYM_KP_0)); -#if 1 else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST) sprintf(name_buffer, "F%d", (int)(key - KSYM_FKEY_FIRST + 1)); -#else - else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST) - sprintf(name_buffer, "function F%d", (int)(key - KSYM_FKEY_FIRST + 1)); -#endif else if (key == KSYM_UNDEFINED) strcpy(name_buffer, "(undefined)"); else diff --git a/src/libgame/misc.h b/src/libgame/misc.h index 4319ceed..1bafb463 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -81,13 +81,6 @@ boolean FrameReached(unsigned long *, unsigned long); boolean DelayReached(unsigned long *, unsigned long); void WaitUntilDelayReached(unsigned long *, unsigned long); -#if 0 -unsigned int SimpleRND(unsigned int); -unsigned int InitSimpleRND(long); -unsigned int RND(unsigned int); -unsigned int InitRND(long); -#endif - unsigned int init_random_number(int, long); unsigned int get_random_number(int, int); diff --git a/src/libgame/msdos.c b/src/libgame/msdos.c index a82da6cd..60728bef 100644 --- a/src/libgame/msdos.c +++ b/src/libgame/msdos.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/msdos.h b/src/libgame/msdos.h index 8307a054..95e0dbc0 100644 --- a/src/libgame/msdos.h +++ b/src/libgame/msdos.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/pcx.c b/src/libgame/pcx.c index 8bf4d6c1..4c93e39c 100644 --- a/src/libgame/pcx.c +++ b/src/libgame/pcx.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/pcx.h b/src/libgame/pcx.h index bf5bacfa..566c28d3 100644 --- a/src/libgame/pcx.h +++ b/src/libgame/pcx.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/platform.h b/src/libgame/platform.h index baabd7e1..d8773420 100644 --- a/src/libgame/platform.h +++ b/src/libgame/platform.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/random.c b/src/libgame/random.c index 1bf4ce31..92f6ca3a 100644 --- a/src/libgame/random.c +++ b/src/libgame/random.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/random.h b/src/libgame/random.h index ed01196d..bde1214d 100644 --- a/src/libgame/random.h +++ b/src/libgame/random.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index a0232fc9..2395cd04 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h index a3104360..625b89e6 100644 --- a/src/libgame/sdl.h +++ b/src/libgame/sdl.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 4fea0cde..ff8485bc 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -2285,14 +2285,12 @@ void LoadLevelInfo() LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory); LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(NULL)); -#if 1 /* after loading all level set information, clone the level directory tree and remove all level sets without levels (these may still contain artwork to be offered in the setup menu as "custom artwork", and are therefore checked for existing artwork in the function "LoadLevelArtworkInfo()") */ leveldir_first_all = leveldir_first; cloneTree(&leveldir_first, leveldir_first_all, TRUE); -#endif AdjustGraphicsForEMC(); diff --git a/src/libgame/setup.h b/src/libgame/setup.h index 8002e96f..55440806 100644 --- a/src/libgame/setup.h +++ b/src/libgame/setup.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/sound.c b/src/libgame/sound.c index d75acaf3..be88d8e1 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/sound.h b/src/libgame/sound.h index ca1e26a6..fc111e9b 100644 --- a/src/libgame/sound.h +++ b/src/libgame/sound.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/system.c b/src/libgame/system.c index 264a3366..f3696277 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/system.h b/src/libgame/system.h index 8fdc7881..cc249311 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/text.c b/src/libgame/text.c index 45de4987..bfd2a7c4 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/text.h b/src/libgame/text.h index 7c331d57..f49346e4 100644 --- a/src/libgame/text.h +++ b/src/libgame/text.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/toons.c b/src/libgame/toons.c index 855e54f7..0b7ca552 100644 --- a/src/libgame/toons.c +++ b/src/libgame/toons.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/toons.h b/src/libgame/toons.h index 4d3e0be8..2f1044b6 100644 --- a/src/libgame/toons.h +++ b/src/libgame/toons.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/types.h b/src/libgame/types.h index 9970c9ea..f4d0e820 100644 --- a/src/libgame/types.h +++ b/src/libgame/types.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/windows.h b/src/libgame/windows.h index d96d4b71..7aaa69a2 100644 --- a/src/libgame/windows.h +++ b/src/libgame/windows.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2003 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/x11.c b/src/libgame/x11.c index 88deb3f5..a9f23431 100644 --- a/src/libgame/x11.c +++ b/src/libgame/x11.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/libgame/x11.h b/src/libgame/x11.h index c14a23a1..692fe5e9 100644 --- a/src/libgame/x11.h +++ b/src/libgame/x11.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/main.c b/src/main.c index ddc3042f..ccf8e42a 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/netserv.c b/src/netserv.c index 8a41aee5..4e65cf3d 100644 --- a/src/netserv.c +++ b/src/netserv.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/network.c b/src/network.c index 6f1855c1..412d2bd8 100644 --- a/src/network.c +++ b/src/network.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/screens.c b/src/screens.c index 6e770327..dbd2dc2a 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/tape.c b/src/tape.c index e55be65d..1259c0d5 100644 --- a/src/tape.c +++ b/src/tape.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * diff --git a/src/tools.c b/src/tools.c index 9dff9b9e..eafeb524 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * -- 2.34.1