From af6d23594a7e4b35f47665aa8a66d34bd0484931 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 15 Jan 2003 02:42:41 +0000 Subject: [PATCH] changed path for SDL headers --- arch/ogl/sdlgl.c | 26 +++----------------------- arch/sdl/digi.c | 5 ++--- arch/sdl/event.c | 6 +++--- arch/sdl/gr.c | 4 ++-- arch/sdl/init.c | 6 ++++-- arch/sdl/joy.c | 4 ++-- arch/sdl/key.c | 10 ++-------- arch/sdl/mouse.c | 6 +++++- arch/sdl/rbaudio.c | 8 +++++--- arch/sdl/timer.c | 13 ++----------- include/error.h | 30 +++++++++++++++--------------- main/gamecntl.c | 4 ++-- main/inferno.c | 4 ++-- 13 files changed, 49 insertions(+), 77 deletions(-) diff --git a/arch/ogl/sdlgl.c b/arch/ogl/sdlgl.c index 9e80cf7f..88b5b9c1 100644 --- a/arch/ogl/sdlgl.c +++ b/arch/ogl/sdlgl.c @@ -1,29 +1,8 @@ +/* $Id: sdlgl.c,v 1.5 2003-01-15 02:42:41 btb Exp $ */ /* - * $Source: /cvs/cvsroot/d2x/arch/ogl/sdlgl.c,v $ - * $Revision: 1.4 $ - * $Author: bradleyb $ - * $Date: 2001-11-08 10:19:52 $ * * Graphics functions for SDL-GL. * - * $Log: not supported by cvs2svn $ - * Revision 1.3 2001/11/04 09:02:18 bradleyb - * Hack to keep SDL from screwing up X when it crashes - * - * Revision 1.2 2001/10/31 07:35:48 bradleyb - * Sync with d1x - * - * Revision 1.1 2001/10/25 08:25:34 bradleyb - * Finished moving stuff to arch/blah. I know, it's ugly, but It'll be easier to sync with d1x. - * - * Revision 1.4 2001/10/09 08:17:07 bradleyb - * changed window caption to include version info - * - * Revision 1.3 2001/10/09 02:58:20 bradleyb - * Added window caption, hide mouse cursor - * - * Revision 1.2 2001/01/29 13:47:52 bradleyb - * Fixed build, some minor cleanups. * */ @@ -31,7 +10,8 @@ #include #endif -#include +#include + #include "ogl_init.h" #include "vers_id.h" #include "error.h" diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c index a86b4cab..1e7f0bd0 100644 --- a/arch/sdl/digi.c +++ b/arch/sdl/digi.c @@ -1,4 +1,4 @@ -/* $Id: digi.c,v 1.4 2002-08-02 11:05:25 btb Exp $ */ +/* $Id: digi.c,v 1.5 2003-01-15 02:42:41 btb Exp $ */ /* * * SDL digital audio support @@ -14,8 +14,7 @@ #include #include -#include -#include +#include #include "pstypes.h" #include "error.h" diff --git a/arch/sdl/event.c b/arch/sdl/event.c index d8560669..a4aa926a 100644 --- a/arch/sdl/event.c +++ b/arch/sdl/event.c @@ -1,9 +1,9 @@ -/* $Id: event.c,v 1.7 2003-01-01 00:55:03 btb Exp $ */ - +/* $Id: event.c,v 1.8 2003-01-15 02:42:41 btb Exp $ */ /* * * SDL Event related stuff * + * */ #ifdef HAVE_CONFIG_H @@ -13,7 +13,7 @@ #include #include -#include +#include extern void key_handler(SDL_KeyboardEvent *event); extern void mouse_button_handler(SDL_MouseButtonEvent *mbe); diff --git a/arch/sdl/gr.c b/arch/sdl/gr.c index 28abced0..716ad5d9 100644 --- a/arch/sdl/gr.c +++ b/arch/sdl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.8 2002-10-11 03:37:58 btb Exp $ */ +/* $Id: gr.c,v 1.9 2003-01-15 02:42:41 btb Exp $ */ /* * * SDL video functions. @@ -12,7 +12,7 @@ #include #include -#include +#include #include "gr.h" #include "grdef.h" diff --git a/arch/sdl/init.c b/arch/sdl/init.c index 093ad888..9801aaa6 100644 --- a/arch/sdl/init.c +++ b/arch/sdl/init.c @@ -1,4 +1,4 @@ -/* $ Id: $ */ +/* $Id: init.c,v 1.11 2003-01-15 02:42:41 btb Exp $ */ /* * * SDL architecture support @@ -12,7 +12,9 @@ #include #include -#include + +#include + #include "text.h" #include "event.h" #include "error.h" diff --git a/arch/sdl/joy.c b/arch/sdl/joy.c index bec7e36a..3a8b64de 100644 --- a/arch/sdl/joy.c +++ b/arch/sdl/joy.c @@ -1,4 +1,4 @@ -/* $Id: joy.c,v 1.8 2003-01-11 02:57:39 btb Exp $ */ +/* $Id: joy.c,v 1.9 2003-01-15 02:42:41 btb Exp $ */ /* * * SDL joystick support @@ -11,7 +11,7 @@ #endif #include // for memset -#include +#include #include "joy.h" #include "error.h" diff --git a/arch/sdl/key.c b/arch/sdl/key.c index d6229a45..088437c0 100644 --- a/arch/sdl/key.c +++ b/arch/sdl/key.c @@ -1,14 +1,8 @@ +/* $Id: key.c,v 1.2 2003-01-15 02:42:41 btb Exp $ */ /* - * $Source: /cvs/cvsroot/d2x/arch/sdl/key.c,v $ - * $Revision: 1.1 $ - * $Author: bradleyb $ - * $Date: 2001-10-24 09:25:05 $ * * SDL keyboard input support * - * $Log: not supported by cvs2svn $ - * Revision 1.2 2001/01/29 14:03:57 bradleyb - * Fixed build, minor fixes * */ @@ -19,7 +13,7 @@ #include #include -#include +#include #include "event.h" #include "error.h" diff --git a/arch/sdl/mouse.c b/arch/sdl/mouse.c index ddfd584c..85ef5289 100644 --- a/arch/sdl/mouse.c +++ b/arch/sdl/mouse.c @@ -1,7 +1,9 @@ +/* $Id: mouse.c,v 1.5 2003-01-15 02:42:41 btb Exp $ */ /* * * SDL mouse driver. * + * */ #ifdef HAVE_CONFIG_H @@ -9,7 +11,9 @@ #endif #include -#include + +#include + #include "fix.h" #include "timer.h" #include "event.h" diff --git a/arch/sdl/rbaudio.c b/arch/sdl/rbaudio.c index b4773c62..d5766053 100644 --- a/arch/sdl/rbaudio.c +++ b/arch/sdl/rbaudio.c @@ -1,8 +1,9 @@ -/* $Id: rbaudio.c,v 1.2 2002-08-04 23:19:37 btb Exp $ */ +/* $Id: rbaudio.c,v 1.3 2003-01-15 02:42:41 btb Exp $ */ /* * * SDL CD Audio functions * + * */ #ifdef HAVE_CONFIG_H @@ -11,8 +12,9 @@ #include #include -#include -#include + +#include + #include "pstypes.h" #include "error.h" #include "args.h" diff --git a/arch/sdl/timer.c b/arch/sdl/timer.c index 385627b0..a1f4e762 100644 --- a/arch/sdl/timer.c +++ b/arch/sdl/timer.c @@ -1,17 +1,8 @@ +/* $Id: timer.c,v 1.5 2003-01-15 02:42:41 btb Exp $ */ /* - * $Source: /cvs/cvsroot/d2x/arch/sdl/timer.c,v $ - * $Revision: 1.4 $ - * $Author: btb $ - * $Date: 2002-09-01 02:46:06 $ * * SDL library timer functions * - * $Log: not supported by cvs2svn $ - * Revision 1.3 2001/10/19 09:45:02 bradleyb - * Moved arch/sdl_* to arch/sdl - * - * Revision 1.2 2001/01/29 13:35:09 bradleyb - * Fixed build system, minor fixes * */ @@ -19,7 +10,7 @@ #include #endif -#include +#include #include "maths.h" #include "timer.h" diff --git a/include/error.h b/include/error.h index 3f091197..b7b1639c 100644 --- a/include/error.h +++ b/include/error.h @@ -1,4 +1,4 @@ -/* $Id: error.h,v 1.6 2002-08-02 11:05:25 btb Exp $ */ +/* $Id: error.h,v 1.7 2003-01-15 02:42:41 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* @@ -18,41 +18,41 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * Old Log: * Revision 1.12 1994/06/17 15:22:46 matt * Added pragma for Error() for when NDEBUG - * + * * Revision 1.11 1994/03/07 13:22:14 matt * Since the Error() function has 'aborts' set in pragma, we do a jmp * to the function rather than call. - * + * * Revision 1.10 1994/02/17 12:37:15 matt * Combined two pragma's for Error(), since second superseded the first - * + * * Revision 1.9 1994/02/10 18:02:53 matt * Changed 'if DEBUG_ON' to 'ifndef NDEBUG' - * + * * Revision 1.8 1994/02/09 15:18:29 matt * Added pragma saying that Error() never returns - * + * * Revision 1.7 1993/10/19 12:57:53 matt * If DEBUG_ON not defined, define it to be 1 - * + * * Revision 1.6 1993/10/15 21:40:39 matt * Made error functions generate int3's if debugging on - * + * * Revision 1.5 1993/10/14 15:29:22 matt * Added new function clear_warn_func() - * + * * Revision 1.4 1993/10/08 16:16:47 matt * Made Assert() call function _Assert(), rather to do 'if...' inline. - * + * * Revision 1.3 1993/09/29 11:39:07 matt * Added Assert() macro, like the system one, but calls Error() - * + * * Revision 1.2 1993/09/27 11:47:03 matt * Added function set_warn_func() - * + * * Revision 1.1 1993/09/23 20:17:46 matt * Initial revision - * + * * */ @@ -87,7 +87,7 @@ void Int3(); #define Int3() ((void)0) #else #ifdef SDL_INPUT -#include +#include #endif #include "args.h" static inline void _Int3() diff --git a/main/gamecntl.c b/main/gamecntl.c index 2c365496..70824e1b 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -1,4 +1,4 @@ -/* $Id: gamecntl.c,v 1.13 2002-10-03 03:46:34 btb Exp $ */ +/* $Id: gamecntl.c,v 1.14 2003-01-15 02:42:41 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -121,7 +121,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef SDL_INPUT -#include +#include #endif extern void full_palette_save(void); diff --git a/main/inferno.c b/main/inferno.c index 3e105e31..d5d47edc 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -1,4 +1,4 @@ -/* $Id: inferno.c,v 1.52 2003-01-01 00:56:24 btb Exp $ */ +/* $Id: inferno.c,v 1.53 2003-01-15 02:42:41 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -803,7 +803,7 @@ extern int Current_display_mode; //$$ there's got to be a better way than #endif #ifdef SDL_INPUT -#include +#include #endif #include "vers_id.h" -- 2.39.2