aboutsummaryrefslogtreecommitdiff
path: root/games/scorched3d/files
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2005-02-20 07:55:19 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2005-02-20 07:55:19 +0000
commiteb673b49fa51d23e3188377e6c3d675999ec02c1 (patch)
tree8610be95923c61fe8735ef405e57a738a7c871d9 /games/scorched3d/files
parenta9f1a84f73240f70919e50a17d549961f09cdeae (diff)
downloadports-eb673b49fa51d23e3188377e6c3d675999ec02c1.tar.gz
ports-eb673b49fa51d23e3188377e6c3d675999ec02c1.zip
[maintainer update] upgrade of games/scorched3d-devel to
Bumping up of the Scorched3D game to the last official release : 38. Note that net players need it to connect to current servers. PR: ports/76712 Submitted by: Guy P.<guy@device.dyndns.org>
Notes
Notes: svn path=/head/; revision=129337
Diffstat (limited to 'games/scorched3d/files')
-rw-r--r--games/scorched3d/files/patch-configure.ac13
-rw-r--r--games/scorched3d/files/patch-scripts-createAMMakefile.pl18
-rw-r--r--games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp15
-rw-r--r--games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp4
-rw-r--r--games/scorched3d/files/patch-src-GLEXT-GLState.h4
-rw-r--r--games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp4
-rw-r--r--games/scorched3d/files/patch-src-XML-XMLParser.cpp11
-rw-r--r--games/scorched3d/files/patch-src-client-ClientMain.cpp6
-rw-r--r--games/scorched3d/files/patch-src-client-SoftwareMouse.cpp4
-rw-r--r--games/scorched3d/files/patch-src-client-UniqueIdStore.cpp11
-rw-r--r--games/scorched3d/files/patch-src-common-Clock.cpp6
-rw-r--r--games/scorched3d/files/patch-src-common-Display.h6
-rw-r--r--games/scorched3d/files/patch-src-common-Gamma.cpp4
-rw-r--r--games/scorched3d/files/patch-src-common-Gamma.h4
-rw-r--r--games/scorched3d/files/patch-src-common-KeyStateTranslate.h4
-rw-r--r--games/scorched3d/files/patch-src-common-KeyTranslate.h6
-rw-r--r--games/scorched3d/files/patch-src-common-KeyboardHistory.h4
-rw-r--r--games/scorched3d/files/patch-src-common-Logger.cpp4
-rw-r--r--games/scorched3d/files/patch-src-common-Mouse.h4
-rw-r--r--games/scorched3d/files/patch-src-common-RandomGenerator.cpp4
-rw-r--r--games/scorched3d/files/patch-src-common-Sound.cpp11
-rw-r--r--games/scorched3d/files/patch-src-common-Sound.h4
-rw-r--r--games/scorched3d/files/patch-src-coms-NetBuffer.cpp4
-rw-r--r--games/scorched3d/files/patch-src-coms-NetBuffer.h8
-rw-r--r--games/scorched3d/files/patch-src-coms-NetMessageHandler.h4
-rw-r--r--games/scorched3d/files/patch-src-coms-NetMessagePool.h4
-rw-r--r--games/scorched3d/files/patch-src-engine-MainLoop.cpp8
-rw-r--r--games/scorched3d/files/patch-src-ode-config.h4
-rw-r--r--games/scorched3d/files/patch-src-scorched-MainDialog.cpp6
-rw-r--r--games/scorched3d/files/patch-src-scorched-main.cpp4
-rw-r--r--games/scorched3d/files/patch-src-server-ServerMain.cpp8
31 files changed, 98 insertions, 103 deletions
diff --git a/games/scorched3d/files/patch-configure.ac b/games/scorched3d/files/patch-configure.ac
index e25bb76ccf30..79ff6d3b43ca 100644
--- a/games/scorched3d/files/patch-configure.ac
+++ b/games/scorched3d/files/patch-configure.ac
@@ -1,5 +1,14 @@
---- ./configure.ac.orig Wed May 26 14:01:15 2004
-+++ ./configure.ac Sun May 30 22:43:42 2004
+--- configure.ac.orig Mon Sep 6 16:03:58 2004
++++ configure.ac Tue Jan 25 23:16:00 2005
+@@ -14,7 +14,7 @@
+ AC_PROG_RANLIB
+
+ LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
++CPPFLAGS="-I/usr/include -I/usr -I/usr/X11R6/include -I/usr/X11R6"
+ if test `uname` == Darwin; then
+ LDFLAGS="$LDFLAGS -lmx"
+ CPPFLAGS="$CPPFLAGS -D__DARWIN__"
@@ -37,8 +37,8 @@
have_SDLmixer=yes
if test "x$enable_sdltest" = "xyes" ; then
diff --git a/games/scorched3d/files/patch-scripts-createAMMakefile.pl b/games/scorched3d/files/patch-scripts-createAMMakefile.pl
deleted file mode 100644
index acc189f65b2a..000000000000
--- a/games/scorched3d/files/patch-scripts-createAMMakefile.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- scripts/createAMMakefile.pl.orig Sun May 30 14:41:40 2004
-+++ scripts/createAMMakefile.pl Sun May 30 14:42:35 2004
-@@ -56,6 +56,7 @@
- }
- }
-
-+chmod 0644, "../Makefile.am";
- open (CLIENT, ">../Makefile.am") || die "ERROR: Failed to write to ../Makefile.am";
- print CLIENT "SUBDIRS = src\n\n";
- print CLIENT "docdir = \@docdir\@\n\n";
-@@ -65,6 +66,7 @@
-
- my @clientfiles = getFiles("../src/scorched/scorched.vcproj");
-
-+chmod 0644, "../src/scorched/Makefile.am";
- open (CLIENT, ">../src/scorched/Makefile.am") || die "../src/scorched/Makefile.am";
-
- print CLIENT << "EOF";
diff --git a/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp b/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp
new file mode 100644
index 000000000000..f9a2dc93c718
--- /dev/null
+++ b/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp
@@ -0,0 +1,15 @@
+--- ./src/3dsparse/aseFile.tab.cpp.orig Mon Mar 1 18:48:17 2004
++++ ./src/3dsparse/aseFile.tab.cpp Tue Jan 25 19:34:16 2005
+@@ -327,10 +327,10 @@
+ #include <alloca.h>
+ #else /* not sparc */
+ #if defined (MSDOS) && !defined (__TURBOC__)
+-#include <malloc.h>
++#include <stdlib.h>
+ #else /* not MSDOS, or __TURBOC__ */
+ #if defined(_AIX)
+-#include <malloc.h>
++#include <stdlib.h>
+ #pragma alloca
+ #else /* not MSDOS, __TURBOC__, or _AIX */
+ #ifdef __hpux
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp b/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
index 4489ed1811ba..c3521d60e393 100644
--- a/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
+++ b/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
@@ -1,5 +1,5 @@
---- ./src/GLEXT/GLBitmap.cpp.orig Thu Feb 26 23:00:26 2004
-+++ ./src/GLEXT/GLBitmap.cpp Sun May 30 22:43:45 2004
+--- ./src/GLEXT/GLBitmap.cpp.orig Mon Sep 6 02:36:23 2004
++++ ./src/GLEXT/GLBitmap.cpp Tue Jan 25 19:34:16 2005
@@ -22,7 +22,7 @@
#include <math.h>
#include <GLEXT/GLState.h>
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLState.h b/games/scorched3d/files/patch-src-GLEXT-GLState.h
index 22a58e459adc..c75b8de527ec 100644
--- a/games/scorched3d/files/patch-src-GLEXT-GLState.h
+++ b/games/scorched3d/files/patch-src-GLEXT-GLState.h
@@ -1,5 +1,5 @@
---- ./src/GLEXT/GLState.h.orig Fri Jan 23 17:59:00 2004
-+++ ./src/GLEXT/GLState.h Fri Jan 23 18:01:27 2004
+--- ./src/GLEXT/GLState.h.orig Thu Jul 10 18:29:20 2003
++++ ./src/GLEXT/GLState.h Tue Jan 25 19:34:17 2005
@@ -27,7 +27,7 @@
#define AFX_GLSTATE_H__32B0E2D0_566D_4438_94E4_B12FE82430B1__INCLUDED_
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp b/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp
index 46a88aed015a..b7c562c03738 100644
--- a/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp
+++ b/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp
@@ -1,5 +1,5 @@
---- ./src/GLEXT/GLStateExtension.cpp.orig Fri Jan 23 17:59:00 2004
-+++ ./src/GLEXT/GLStateExtension.cpp Fri Jan 23 18:01:28 2004
+--- ./src/GLEXT/GLStateExtension.cpp.orig Thu Sep 9 20:03:49 2004
++++ ./src/GLEXT/GLStateExtension.cpp Tue Jan 25 19:34:17 2005
@@ -21,7 +21,7 @@
#include <GLEXT/GLStateExtension.h>
#include <GLEXT/GLConsole.h>
diff --git a/games/scorched3d/files/patch-src-XML-XMLParser.cpp b/games/scorched3d/files/patch-src-XML-XMLParser.cpp
deleted file mode 100644
index 3b410df25ab4..000000000000
--- a/games/scorched3d/files/patch-src-XML-XMLParser.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/XML/XMLParser.cpp.orig Sun May 30 21:18:51 2004
-+++ src/XML/XMLParser.cpp Sun May 30 21:19:29 2004
-@@ -28,7 +28,7 @@
- static const char *getSpacer(int space)
- {
- static std::string spacestr;
-- spacestr.clear();
-+ spacestr.erase();
- for (int i=0; i<space; i++) spacestr+="\t";
- return spacestr.c_str();
- }
diff --git a/games/scorched3d/files/patch-src-client-ClientMain.cpp b/games/scorched3d/files/patch-src-client-ClientMain.cpp
index 8ec4282cbcca..7f206b298dd5 100644
--- a/games/scorched3d/files/patch-src-client-ClientMain.cpp
+++ b/games/scorched3d/files/patch-src-client-ClientMain.cpp
@@ -1,6 +1,6 @@
---- ./src/client/ClientMain.cpp.orig Fri May 28 00:24:45 2004
-+++ ./src/client/ClientMain.cpp Sun May 30 22:43:47 2004
-@@ -66,7 +66,7 @@
+--- ./src/client/ClientMain.cpp.orig Mon Nov 29 19:08:50 2004
++++ ./src/client/ClientMain.cpp Tue Jan 25 19:34:20 2005
+@@ -71,7 +71,7 @@
#include <common/Gamma.h>
#include <common/Sound.h>
#include <common/Clock.h>
diff --git a/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp b/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp
index ca784ee6a41c..55c7939c7b1e 100644
--- a/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp
+++ b/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp
@@ -1,5 +1,5 @@
---- ./src/client/SoftwareMouse.cpp.orig Mon Apr 5 19:10:34 2004
-+++ ./src/client/SoftwareMouse.cpp Sun May 30 22:43:47 2004
+--- ./src/client/SoftwareMouse.cpp.orig Fri Sep 10 14:45:45 2004
++++ ./src/client/SoftwareMouse.cpp Tue Jan 25 19:34:21 2005
@@ -25,7 +25,7 @@
#include <GLEXT/GLState.h>
#include <common/Defines.h>
diff --git a/games/scorched3d/files/patch-src-client-UniqueIdStore.cpp b/games/scorched3d/files/patch-src-client-UniqueIdStore.cpp
new file mode 100644
index 000000000000..9d674ab512cd
--- /dev/null
+++ b/games/scorched3d/files/patch-src-client-UniqueIdStore.cpp
@@ -0,0 +1,11 @@
+--- ./src/client/UniqueIdStore.cpp.orig Sat Dec 4 13:14:34 2004
++++ ./src/client/UniqueIdStore.cpp Tue Jan 25 19:34:21 2005
+@@ -23,7 +23,7 @@
+ #include <common/Logger.h>
+ #include <coms/NetInterface.h>
+ #include <XML/XMLFile.h>
+-#include <SDL/SDL_net.h>
++#include <SDL11/SDL_net.h>
+ #include <stdlib.h>
+
+ UniqueIdStore::UniqueIdStore()
diff --git a/games/scorched3d/files/patch-src-common-Clock.cpp b/games/scorched3d/files/patch-src-common-Clock.cpp
index f422ce5488ec..67e02ce1c125 100644
--- a/games/scorched3d/files/patch-src-common-Clock.cpp
+++ b/games/scorched3d/files/patch-src-common-Clock.cpp
@@ -1,5 +1,5 @@
---- ./src/common/Clock.cpp.orig Fri Jan 23 17:59:03 2004
-+++ ./src/common/Clock.cpp Fri Jan 23 18:01:54 2004
+--- ./src/common/Clock.cpp.orig Mon Jun 7 21:42:19 2004
++++ ./src/common/Clock.cpp Tue Jan 25 19:34:21 2005
@@ -20,7 +20,7 @@
#include <common/Defines.h>
@@ -7,5 +7,5 @@
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
- Clock::Clock() : isPaused_(false)
+ Clock::Clock()
{
diff --git a/games/scorched3d/files/patch-src-common-Display.h b/games/scorched3d/files/patch-src-common-Display.h
index 1331d574df9d..0aa0445bf6ba 100644
--- a/games/scorched3d/files/patch-src-common-Display.h
+++ b/games/scorched3d/files/patch-src-common-Display.h
@@ -1,6 +1,6 @@
---- ./src/common/Display.h.orig Fri Jan 23 17:59:03 2004
-+++ ./src/common/Display.h Fri Jan 23 18:01:55 2004
-@@ -23,7 +23,7 @@
+--- ./src/common/Display.h.orig Fri Jul 30 17:43:37 2004
++++ ./src/common/Display.h Tue Jan 25 19:34:21 2005
+@@ -22,7 +22,7 @@
#define _DISPLAY_H_
#include <stdlib.h>
diff --git a/games/scorched3d/files/patch-src-common-Gamma.cpp b/games/scorched3d/files/patch-src-common-Gamma.cpp
index 0f02eb0c886b..c42d2034dd08 100644
--- a/games/scorched3d/files/patch-src-common-Gamma.cpp
+++ b/games/scorched3d/files/patch-src-common-Gamma.cpp
@@ -1,5 +1,5 @@
---- ./src/common/Gamma.cpp.orig Fri Jan 23 17:59:03 2004
-+++ ./src/common/Gamma.cpp Fri Jan 23 18:01:56 2004
+--- ./src/common/Gamma.cpp.orig Thu Jul 10 18:28:51 2003
++++ ./src/common/Gamma.cpp Tue Jan 25 19:34:22 2005
@@ -27,7 +27,7 @@
#include <common/Gamma.h>
#include <common/Defines.h>
diff --git a/games/scorched3d/files/patch-src-common-Gamma.h b/games/scorched3d/files/patch-src-common-Gamma.h
index 4e4432cf864b..bfec061690bf 100644
--- a/games/scorched3d/files/patch-src-common-Gamma.h
+++ b/games/scorched3d/files/patch-src-common-Gamma.h
@@ -1,5 +1,5 @@
---- ./src/common/Gamma.h.orig Fri Jan 23 17:59:03 2004
-+++ ./src/common/Gamma.h Fri Jan 23 18:01:56 2004
+--- ./src/common/Gamma.h.orig Thu Jul 10 18:28:51 2003
++++ ./src/common/Gamma.h Tue Jan 25 19:34:22 2005
@@ -26,7 +26,7 @@
//
//////////////////////////////////////////////////////////////////////
diff --git a/games/scorched3d/files/patch-src-common-KeyStateTranslate.h b/games/scorched3d/files/patch-src-common-KeyStateTranslate.h
index b79016223c1f..90ed0ac0568a 100644
--- a/games/scorched3d/files/patch-src-common-KeyStateTranslate.h
+++ b/games/scorched3d/files/patch-src-common-KeyStateTranslate.h
@@ -1,5 +1,5 @@
---- ./src/common/KeyStateTranslate.h.orig Fri Jan 23 17:59:03 2004
-+++ ./src/common/KeyStateTranslate.h Fri Jan 23 18:01:56 2004
+--- ./src/common/KeyStateTranslate.h.orig Mon Sep 8 01:03:23 2003
++++ ./src/common/KeyStateTranslate.h Tue Jan 25 19:34:22 2005
@@ -19,7 +19,7 @@
////////////////////////////////////////////////////////////////////////////////
diff --git a/games/scorched3d/files/patch-src-common-KeyTranslate.h b/games/scorched3d/files/patch-src-common-KeyTranslate.h
index 797e7af136cc..4b47873ed1d3 100644
--- a/games/scorched3d/files/patch-src-common-KeyTranslate.h
+++ b/games/scorched3d/files/patch-src-common-KeyTranslate.h
@@ -1,9 +1,9 @@
---- ./src/common/KeyTranslate.h.orig Fri Jan 23 17:59:03 2004
-+++ ./src/common/KeyTranslate.h Fri Jan 23 18:01:57 2004
+--- ./src/common/KeyTranslate.h.orig Mon Nov 1 20:15:43 2004
++++ ./src/common/KeyTranslate.h Tue Jan 25 19:34:22 2005
@@ -19,7 +19,7 @@
////////////////////////////////////////////////////////////////////////////////
-
+ #include <wx/defs.h>
-#include <SDL/SDL_keysym.h>
+#include <SDL11/SDL_keysym.h>
diff --git a/games/scorched3d/files/patch-src-common-KeyboardHistory.h b/games/scorched3d/files/patch-src-common-KeyboardHistory.h
index 582fd94e5d7a..4c211306443c 100644
--- a/games/scorched3d/files/patch-src-common-KeyboardHistory.h
+++ b/games/scorched3d/files/patch-src-common-KeyboardHistory.h
@@ -1,5 +1,5 @@
---- ./src/common/KeyboardHistory.h.orig Fri Jan 23 17:59:03 2004
-+++ ./src/common/KeyboardHistory.h Fri Jan 23 18:01:57 2004
+--- ./src/common/KeyboardHistory.h.orig Thu Jul 10 18:28:52 2003
++++ ./src/common/KeyboardHistory.h Tue Jan 25 19:34:22 2005
@@ -26,7 +26,7 @@
#if !defined(AFX_HISTORY_H__EFFEAE97_E779_4737_8DB4_B76AD9431BBC__INCLUDED_)
#define AFX_HISTORY_H__EFFEAE97_E779_4737_8DB4_B76AD9431BBC__INCLUDED_
diff --git a/games/scorched3d/files/patch-src-common-Logger.cpp b/games/scorched3d/files/patch-src-common-Logger.cpp
index 5ba301a2ceca..3472aee97f1d 100644
--- a/games/scorched3d/files/patch-src-common-Logger.cpp
+++ b/games/scorched3d/files/patch-src-common-Logger.cpp
@@ -1,5 +1,5 @@
---- ./src/common/Logger.cpp.orig Fri Jan 23 17:59:04 2004
-+++ ./src/common/Logger.cpp Fri Jan 23 18:01:58 2004
+--- ./src/common/Logger.cpp.orig Tue Jul 13 23:02:56 2004
++++ ./src/common/Logger.cpp Tue Jan 25 19:34:22 2005
@@ -21,7 +21,7 @@
#include <common/Defines.h>
#include <common/Logger.h>
diff --git a/games/scorched3d/files/patch-src-common-Mouse.h b/games/scorched3d/files/patch-src-common-Mouse.h
index 442a39c0757b..76de559c16c0 100644
--- a/games/scorched3d/files/patch-src-common-Mouse.h
+++ b/games/scorched3d/files/patch-src-common-Mouse.h
@@ -1,5 +1,5 @@
---- ./src/common/Mouse.h.orig Fri Jan 23 17:59:04 2004
-+++ ./src/common/Mouse.h Fri Jan 23 18:01:59 2004
+--- ./src/common/Mouse.h.orig Thu Jul 10 18:28:52 2003
++++ ./src/common/Mouse.h Tue Jan 25 19:34:22 2005
@@ -23,7 +23,7 @@
#define _MOUSE_H_
diff --git a/games/scorched3d/files/patch-src-common-RandomGenerator.cpp b/games/scorched3d/files/patch-src-common-RandomGenerator.cpp
index 101bc62413c7..9c92e3514ad1 100644
--- a/games/scorched3d/files/patch-src-common-RandomGenerator.cpp
+++ b/games/scorched3d/files/patch-src-common-RandomGenerator.cpp
@@ -1,5 +1,5 @@
---- ./src/common/RandomGenerator.cpp.orig Fri Jan 23 17:59:04 2004
-+++ ./src/common/RandomGenerator.cpp Fri Jan 23 18:02:00 2004
+--- ./src/common/RandomGenerator.cpp.orig Mon Jul 26 16:31:15 2004
++++ ./src/common/RandomGenerator.cpp Tue Jan 25 19:34:22 2005
@@ -20,7 +20,7 @@
#include <common/RandomGenerator.h>
diff --git a/games/scorched3d/files/patch-src-common-Sound.cpp b/games/scorched3d/files/patch-src-common-Sound.cpp
deleted file mode 100644
index ffb48d3d872a..000000000000
--- a/games/scorched3d/files/patch-src-common-Sound.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/Sound.cpp.orig Sun May 30 23:32:44 2004
-+++ src/common/Sound.cpp Sun May 30 23:07:33 2004
-@@ -73,7 +73,7 @@
-
- bool Sound::init()
- {
-- if ( Mix_OpenAudio(11025, AUDIO_U8, 1, 512) < 0 )
-+ if ( Mix_OpenAudio(11025, AUDIO_U8, 1, 2048) < 0 )
- {
- dialogMessage(SDL_GetError(),
- "Warning: Couldn't set 11025 Hz 8-bit audio");
diff --git a/games/scorched3d/files/patch-src-common-Sound.h b/games/scorched3d/files/patch-src-common-Sound.h
index 69f9eb6dc9ba..da7ac5192c06 100644
--- a/games/scorched3d/files/patch-src-common-Sound.h
+++ b/games/scorched3d/files/patch-src-common-Sound.h
@@ -1,5 +1,5 @@
---- ./src/common/Sound.h.orig Fri Jan 23 17:59:04 2004
-+++ ./src/common/Sound.h Fri Jan 23 18:02:01 2004
+--- ./src/common/Sound.h.orig Mon Nov 29 19:08:51 2004
++++ ./src/common/Sound.h Tue Jan 25 19:34:22 2005
@@ -26,7 +26,7 @@
//////////////////////////////////////////////////////////////////////
diff --git a/games/scorched3d/files/patch-src-coms-NetBuffer.cpp b/games/scorched3d/files/patch-src-coms-NetBuffer.cpp
index 93d0ef1e1195..6ad9f94c6c23 100644
--- a/games/scorched3d/files/patch-src-coms-NetBuffer.cpp
+++ b/games/scorched3d/files/patch-src-coms-NetBuffer.cpp
@@ -1,5 +1,5 @@
---- ./src/coms/NetBuffer.cpp.orig Fri Jan 23 17:59:07 2004
-+++ ./src/coms/NetBuffer.cpp Fri Jan 23 18:02:08 2004
+--- ./src/coms/NetBuffer.cpp.orig Wed Jun 30 18:35:46 2004
++++ ./src/coms/NetBuffer.cpp Tue Jan 25 19:34:24 2005
@@ -20,7 +20,7 @@
diff --git a/games/scorched3d/files/patch-src-coms-NetBuffer.h b/games/scorched3d/files/patch-src-coms-NetBuffer.h
index 1e24a2e647dc..e04aaea4366c 100644
--- a/games/scorched3d/files/patch-src-coms-NetBuffer.h
+++ b/games/scorched3d/files/patch-src-coms-NetBuffer.h
@@ -1,9 +1,9 @@
---- ./src/coms/NetBuffer.h.orig Fri Jan 23 17:59:08 2004
-+++ ./src/coms/NetBuffer.h Fri Jan 23 18:02:09 2004
-@@ -22,8 +22,8 @@
- #define _NETBUFFER_H_
+--- ./src/coms/NetBuffer.h.orig Wed Jun 30 18:35:46 2004
++++ ./src/coms/NetBuffer.h Tue Jan 25 19:34:23 2005
+@@ -23,8 +23,8 @@
#include <string>
+ #include <common/Vector.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_net.h>
+#include <SDL11/SDL.h>
diff --git a/games/scorched3d/files/patch-src-coms-NetMessageHandler.h b/games/scorched3d/files/patch-src-coms-NetMessageHandler.h
index 3a4b71e65752..ea0b1f201583 100644
--- a/games/scorched3d/files/patch-src-coms-NetMessageHandler.h
+++ b/games/scorched3d/files/patch-src-coms-NetMessageHandler.h
@@ -1,5 +1,5 @@
---- ./src/coms/NetMessageHandler.h.orig Fri Jan 23 17:59:08 2004
-+++ ./src/coms/NetMessageHandler.h Fri Jan 23 18:02:10 2004
+--- ./src/coms/NetMessageHandler.h.orig Thu Sep 18 22:28:06 2003
++++ ./src/coms/NetMessageHandler.h Tue Jan 25 19:34:24 2005
@@ -23,7 +23,7 @@
#define __INCLUDE_NetMessageHandlerh_INCLUDE__
diff --git a/games/scorched3d/files/patch-src-coms-NetMessagePool.h b/games/scorched3d/files/patch-src-coms-NetMessagePool.h
index 0545a88c76eb..26f864a78d71 100644
--- a/games/scorched3d/files/patch-src-coms-NetMessagePool.h
+++ b/games/scorched3d/files/patch-src-coms-NetMessagePool.h
@@ -1,5 +1,5 @@
---- ./src/coms/NetMessagePool.h.orig Fri Jan 23 17:59:08 2004
-+++ ./src/coms/NetMessagePool.h Fri Jan 23 18:02:11 2004
+--- ./src/coms/NetMessagePool.h.orig Mon Nov 29 19:08:54 2004
++++ ./src/coms/NetMessagePool.h Tue Jan 25 19:34:24 2005
@@ -24,7 +24,7 @@
#include <coms/NetMessage.h>
diff --git a/games/scorched3d/files/patch-src-engine-MainLoop.cpp b/games/scorched3d/files/patch-src-engine-MainLoop.cpp
index 79bf54394a75..4d3e51c16ebd 100644
--- a/games/scorched3d/files/patch-src-engine-MainLoop.cpp
+++ b/games/scorched3d/files/patch-src-engine-MainLoop.cpp
@@ -1,9 +1,9 @@
---- ./src/engine/MainLoop.cpp.orig Mon Feb 23 01:35:25 2004
-+++ ./src/engine/MainLoop.cpp Sun May 30 22:43:49 2004
-@@ -22,7 +22,7 @@
- #include <common/OptionsDisplay.h>
+--- ./src/engine/MainLoop.cpp.orig Wed Sep 8 23:28:49 2004
++++ ./src/engine/MainLoop.cpp Tue Jan 25 19:34:25 2005
+@@ -23,7 +23,7 @@
#include <common/Defines.h>
#include <GLEXT/GLState.h>
+ #include <GLEXT/GLInfo.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
diff --git a/games/scorched3d/files/patch-src-ode-config.h b/games/scorched3d/files/patch-src-ode-config.h
index d8880cbd8da9..b3a96f9ad404 100644
--- a/games/scorched3d/files/patch-src-ode-config.h
+++ b/games/scorched3d/files/patch-src-ode-config.h
@@ -1,5 +1,5 @@
---- ./src/ode/config.h.orig Mon May 24 21:02:31 2004
-+++ ./src/ode/config.h Sun May 30 14:38:24 2004
+--- ./src/ode/config.h.orig Tue Nov 2 10:20:35 2004
++++ ./src/ode/config.h Tue Jan 25 19:34:28 2005
@@ -36,7 +36,7 @@
#if defined(__DARWIN__)
#include <sys/malloc.h>
diff --git a/games/scorched3d/files/patch-src-scorched-MainDialog.cpp b/games/scorched3d/files/patch-src-scorched-MainDialog.cpp
index db73b41c92ae..99c0eb7b8dce 100644
--- a/games/scorched3d/files/patch-src-scorched-MainDialog.cpp
+++ b/games/scorched3d/files/patch-src-scorched-MainDialog.cpp
@@ -1,6 +1,6 @@
---- ./src/scorched/MainDialog.cpp.orig Tue May 18 00:45:23 2004
-+++ ./src/scorched/MainDialog.cpp Sun May 30 22:43:49 2004
-@@ -25,8 +25,8 @@
+--- ./src/scorched/MainDialog.cpp.orig Fri Dec 3 19:36:32 2004
++++ ./src/scorched/MainDialog.cpp Tue Jan 25 19:34:29 2005
+@@ -26,8 +26,8 @@
#include <wx/msgdlg.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/games/scorched3d/files/patch-src-scorched-main.cpp b/games/scorched3d/files/patch-src-scorched-main.cpp
index a9d185fe3f4e..02167020b84d 100644
--- a/games/scorched3d/files/patch-src-scorched-main.cpp
+++ b/games/scorched3d/files/patch-src-scorched-main.cpp
@@ -1,5 +1,5 @@
---- ./src/scorched/main.cpp.orig Fri May 28 00:24:45 2004
-+++ ./src/scorched/main.cpp Sun May 30 22:43:49 2004
+--- ./src/scorched/main.cpp.orig Sat Nov 27 03:56:04 2004
++++ ./src/scorched/main.cpp Tue Jan 25 19:34:30 2005
@@ -20,7 +20,7 @@
#include <wx/wx.h>
diff --git a/games/scorched3d/files/patch-src-server-ServerMain.cpp b/games/scorched3d/files/patch-src-server-ServerMain.cpp
index 98a3d3657325..df39b7255127 100644
--- a/games/scorched3d/files/patch-src-server-ServerMain.cpp
+++ b/games/scorched3d/files/patch-src-server-ServerMain.cpp
@@ -1,8 +1,8 @@
---- ./src/server/ServerMain.cpp.orig Thu May 27 22:11:23 2004
-+++ ./src/server/ServerMain.cpp Sun May 30 22:43:52 2004
-@@ -53,7 +53,7 @@
- #include <server/ServerState.h>
+--- ./src/server/ServerMain.cpp.orig Thu Nov 25 21:19:34 2004
++++ ./src/server/ServerMain.cpp Tue Jan 25 19:34:39 2005
+@@ -61,7 +61,7 @@
#include <server/ServerCommon.h>
+ #include <server/ServerBanned.h>
#include <server/ScorchedServer.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>