From 2ae6ae8ed951e87fcba7c363705cd6ddea8de91c Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Tue, 5 Dec 2000 01:42:08 +0100 Subject: [PATCH] rnd-20001205-3-src --- src/cartoons.c | 16 +++--- src/cartoons.h | 16 +++--- src/editor.c | 16 +++--- src/editor.h | 16 +++--- src/events.c | 16 +++--- src/events.h | 16 +++--- src/files.c | 16 +++--- src/files.h | 16 +++--- src/game.c | 16 +++--- src/game.h | 16 +++--- src/init.c | 117 ++++++++----------------------------------- src/init.h | 16 +++--- src/joystick.c | 16 +++--- src/joystick.h | 16 +++--- src/libgame/sdl.c | 3 -- src/libgame/system.c | 37 ++++++++++++-- src/libgame/system.h | 2 + src/main.c | 16 +++--- src/main.h | 21 +++----- src/netserv.c | 16 +++--- src/netserv.h | 16 +++--- src/network.c | 16 +++--- src/network.h | 16 +++--- src/screens.c | 16 +++--- src/screens.h | 16 +++--- src/tape.c | 16 +++--- src/tape.h | 16 +++--- src/tools.c | 16 +++--- src/tools.h | 16 +++--- 29 files changed, 256 insertions(+), 308 deletions(-) diff --git a/src/cartoons.c b/src/cartoons.c index 164fcf22..2ede557a 100644 --- a/src/cartoons.c +++ b/src/cartoons.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* cartoons.c * +* cartoons.c * ***********************************************************/ #include "cartoons.h" diff --git a/src/cartoons.h b/src/cartoons.h index fdde0cbc..b93c2156 100644 --- a/src/cartoons.h +++ b/src/cartoons.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* cartoons.h * +* cartoons.h * ***********************************************************/ #ifndef CARTOONS_H diff --git a/src/editor.c b/src/editor.c index 6003fc91..89e8d438 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* editor.c * +* editor.c * ***********************************************************/ #include diff --git a/src/editor.h b/src/editor.h index 5864d0d4..60bb32d7 100644 --- a/src/editor.h +++ b/src/editor.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* editor.h * +* editor.h * ***********************************************************/ #ifndef EDITOR_H diff --git a/src/events.c b/src/events.c index 604345d9..1e2ca168 100644 --- a/src/events.c +++ b/src/events.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* events.c * +* events.c * ***********************************************************/ #include "libgame/libgame.h" diff --git a/src/events.h b/src/events.h index d0865609..b5e52281 100644 --- a/src/events.h +++ b/src/events.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* events.h * +* events.h * ***********************************************************/ #ifndef EVENTS_H diff --git a/src/files.c b/src/files.c index 2c0117dd..884571eb 100644 --- a/src/files.c +++ b/src/files.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* files.h * +* files.c * ***********************************************************/ #include diff --git a/src/files.h b/src/files.h index 994a503e..a4aeda09 100644 --- a/src/files.h +++ b/src/files.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* files.h * +* files.h * ***********************************************************/ #ifndef FILES_H diff --git a/src/game.c b/src/game.c index 6febbddb..ab7dbb55 100644 --- a/src/game.c +++ b/src/game.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* game.c * +* game.c * ***********************************************************/ #include "libgame/libgame.h" diff --git a/src/game.h b/src/game.h index 20b8e89a..220bc1a7 100644 --- a/src/game.h +++ b/src/game.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* game.h * +* game.h * ***********************************************************/ #ifndef GAME_H diff --git a/src/init.c b/src/init.c index ae65640f..3b607274 100644 --- a/src/init.c +++ b/src/init.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* init.c * +* init.c * ***********************************************************/ #include @@ -32,7 +32,6 @@ static void InitLevelInfo(void); static void InitNetworkServer(void); static void InitSound(void); static void InitSoundServer(void); -static void InitDisplay(void); static void InitGfx(void); static void InitGfxBackground(void); static void InitGadgets(void); @@ -40,20 +39,14 @@ static void InitElementProperties(void); void OpenAll(void) { -#if !defined(PLATFORM_UNIX) - initErrorFile(); -#endif - if (options.serveronly) { #if defined(PLATFORM_UNIX) NetworkServer(options.server_port, options.serveronly); #else - Error(ERR_WARN, "networking not supported in Windows version"); + Error(ERR_WARN, "networking only supported in Unix version"); #endif - - /* never reached */ - exit(0); + exit(0); /* never reached */ } InitProgramInfo(UNIX_USERDATA_DIRECTORY, @@ -69,12 +62,12 @@ void OpenAll(void) InitJoysticks(); InitRND(NEW_RANDOMIZE); - signal(SIGINT, CloseAllAndExit); - signal(SIGTERM, CloseAllAndExit); - - InitDisplay(); InitEventFilter(FilterMouseMotionEvents); + InitVideoDisplay(); + InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, + setup.fullscreen); + InitGfx(); InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */ @@ -308,13 +301,6 @@ void InitJoysticks() #endif /* !TARGET_SDL */ } -void InitDisplay() -{ - InitVideoDisplay(); - InitVideoBuffer(&backbuffer, &window, WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, - setup.fullscreen); -} - void InitGfx() { int i; @@ -447,51 +433,7 @@ void InitGfx() InitFontInfo(pix[PIX_BIGFONT], pix[PIX_MEDIUMFONT], pix[PIX_SMALLFONT]); - /* create additional image buffers for masking of graphics */ - -#if defined(TARGET_SDL) - -#if 0 - /* initialize surface array to 'NULL' */ - for(i=0; i=0; i++) - { - for(j=0; jformat, 0x00, 0x00, 0x00)); - if ((tile_masked[tile] = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); - - SDL_FreeSurface(sdl_image_tmp); - - BlitBitmap(src_bitmap, tile_masked[tile], src_x,src_y, TILEX,TILEY, 0,0); - } - } -#endif - -#else /* !TARGET_SDL */ - +#if defined(TARGET_X11) /* create graphic context structures needed for clipping */ clip_gc_values.graphics_exposures = False; clip_gc_valuemask = GCGraphicsExposures; @@ -543,8 +485,7 @@ void InitGfx() src_x, src_y, TILEX, TILEY, 0, 0); } } - -#endif /* !TARGET_SDL */ +#endif /* TARGET_X11 */ } void InitGfxBackground() @@ -1727,40 +1668,22 @@ void CloseAllAndExit(int exit_value) { int i; -#if defined(TARGET_SDL) StopSounds(); FreeSounds(NUM_SOUNDS); -#else + +#if !defined(TARGET_SDL) if (audio.soundserver_pid) - { - StopSounds(); kill(audio.soundserver_pid, SIGTERM); - FreeSounds(NUM_SOUNDS); - } #endif for(i=0; ivfmt->BitsPerPixel; - - /* set exit function to automatically cleanup SDL stuff after exit() */ - atexit(SDL_Quit); } inline void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, diff --git a/src/libgame/system.c b/src/libgame/system.c index 7ee3e857..07d4de79 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -12,6 +12,7 @@ ***********************************************************/ #include +#include #include "platform.h" @@ -56,7 +57,7 @@ int FrameCounter = 0; /* ========================================================================= */ -/* init functions */ +/* init/close functions */ /* ========================================================================= */ void InitCommandName(char *argv0) @@ -68,6 +69,15 @@ void InitCommandName(char *argv0) void InitExitFunction(void (*exit_function)(int)) { program.exit_function = exit_function; + + /* set signal handlers to custom exit function */ + signal(SIGINT, exit_function); + signal(SIGTERM, exit_function); + +#if defined(TARGET_SDL) + /* set exit function to automatically cleanup SDL stuff after exit() */ + atexit(SDL_Quit); +#endif } void InitPlatformDependantStuff(void) @@ -75,6 +85,17 @@ void InitPlatformDependantStuff(void) #if defined(PLATFORM_MSDOS) _fmode = O_BINARY; #endif + +#if !defined(PLATFORM_UNIX) + initErrorFile(); +#endif +} + +void ClosePlatformDependantStuff(void) +{ +#if !defined(PLATFORM_UNIX) + dumpErrorFile(); +#endif } void InitProgramInfo(char *unix_userdata_directory, char *program_title, @@ -159,6 +180,14 @@ inline void InitVideoDisplay(void) #endif } +inline void CloseVideoDisplay(void) +{ +#if defined(TARGET_X11) + if (display) + XCloseDisplay(display); +#endif +} + inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, int width, int height, int depth, boolean fullscreen) @@ -452,7 +481,8 @@ inline void KeyboardAutoRepeatOn(void) SDL_DEFAULT_REPEAT_INTERVAL / 2); SDL_EnableUNICODE(1); #else - XAutoRepeatOn(display); + if (display) + XAutoRepeatOn(display); #endif } @@ -462,7 +492,8 @@ inline void KeyboardAutoRepeatOff(void) SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); SDL_EnableUNICODE(0); #else - XAutoRepeatOff(display); + if (display) + XAutoRepeatOff(display); #endif } diff --git a/src/libgame/system.h b/src/libgame/system.h index e65cd99a..3ff406f0 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -255,6 +255,7 @@ extern int FrameCounter; void InitCommandName(char *); void InitExitFunction(void (*exit_function)(int)); void InitPlatformDependantStuff(void); +void ClosePlatformDependantStuff(void); void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *); @@ -264,6 +265,7 @@ void InitGfxDoor2Info(int, int, int, int); void InitGfxScrollbufferInfo(int, int); inline void InitVideoDisplay(void); +inline void CloseVideoDisplay(void); inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean); inline Bitmap *CreateBitmapStruct(void); inline Bitmap *CreateBitmap(int, int, int); diff --git a/src/main.c b/src/main.c index a79aa4a6..4d2ca8f0 100644 --- a/src/main.c +++ b/src/main.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* main.c * +* main.c * ***********************************************************/ #include "libgame/libgame.h" diff --git a/src/main.h b/src/main.h index 4313bf7e..e1539d28 100644 --- a/src/main.h +++ b/src/main.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* main.h * +* main.h * ***********************************************************/ #ifndef MAIN_H @@ -24,15 +24,10 @@ #include #include -#ifdef DEBUG -#define DEBUG_TIMING 0 -#endif - #include "libgame/libgame.h" #define WIN_XSIZE 672 #define WIN_YSIZE 560 -#define WIN_SDL_DEPTH 16 /* !!! change this !!! */ #if !defined(PLATFORM_MSDOS) #define WIN_XPOS 0 diff --git a/src/netserv.c b/src/netserv.c index 6a2479e5..e6e9b104 100644 --- a/src/netserv.c +++ b/src/netserv.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* network.c * +* network.c * ***********************************************************/ #include "libgame/libgame.h" diff --git a/src/netserv.h b/src/netserv.h index 5177fb4a..5c251c77 100644 --- a/src/netserv.h +++ b/src/netserv.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* netserv.h * +* netserv.h * ***********************************************************/ #ifndef NETSERV_H diff --git a/src/network.c b/src/network.c index 410695be..822b7ee0 100644 --- a/src/network.c +++ b/src/network.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* network.c * +* network.c * ***********************************************************/ #include "libgame/libgame.h" diff --git a/src/network.h b/src/network.h index 162f0f7d..4a47091a 100644 --- a/src/network.h +++ b/src/network.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* network.h * +* network.h * ***********************************************************/ #ifndef NETWORK_H diff --git a/src/screens.c b/src/screens.c index 40bbdb4c..91aa31b8 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* screens.c * +* screens.c * ***********************************************************/ #include "libgame/libgame.h" diff --git a/src/screens.h b/src/screens.h index e5053667..0cae1835 100644 --- a/src/screens.h +++ b/src/screens.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* screens.h * +* screens.h * ***********************************************************/ #ifndef SCREENS_H diff --git a/src/tape.c b/src/tape.c index f3509cec..05d5956c 100644 --- a/src/tape.c +++ b/src/tape.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* tape.c * +* tape.c * ***********************************************************/ #include "libgame/libgame.h" diff --git a/src/tape.h b/src/tape.h index 1727ecf5..b41d9f3c 100644 --- a/src/tape.h +++ b/src/tape.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* tape.c * +* tape.h * ***********************************************************/ #ifndef TAPE_H diff --git a/src/tools.c b/src/tools.c index 0effe46b..3bd370dc 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* tools.c * +* tools.c * ***********************************************************/ #include diff --git a/src/tools.h b/src/tools.h index 63ae5c59..5501d705 100644 --- a/src/tools.h +++ b/src/tools.h @@ -1,14 +1,14 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* tools.h * +* tools.h * ***********************************************************/ #ifndef TOOLS_H -- 2.34.1