19 files changed, 111 insertions, 153 deletions

diff --git a/games/scorched3d/files/patch-Makefile.am b/games/scorched3d/files/patch-Makefile.am
deleted file mode 100644
index a0a0e983d1da..000000000000
--- a/games/scorched3d/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig	Sat Jan 31 00:53:31 2004
-+++ Makefile.am	Sat Jan 31 00:53:58 2004
-@@ -1,6 +1,6 @@
- ## Process with automake to produce Makefile.in
- 
--pkgdir = $(prefix)/@PACKAGE@
-+pkgdir = $(prefix)/games/@PACKAGE@
- 
- SUBDIRS = src
- 
diff --git a/games/scorched3d/files/patch-configure.ac b/games/scorched3d/files/patch-configure.ac
index f4a5f2b71c69..e25bb76ccf30 100644
--- a/games/scorched3d/files/patch-configure.ac
+++ b/games/scorched3d/files/patch-configure.ac
@@ -1,36 +1,24 @@
---- configure.ac.orig	Wed Jan 14 12:08:10 2004
-+++ configure.ac	Sat Jan 31 18:10:28 2004
-@@ -34,8 +34,8 @@
- dnl Check for SDL_mixer lib
- have_SDLmixer=no
- AC_TRY_COMPILE([
--   	#include <SDL/SDL.h>
--	#include <SDL/SDL_mixer.h>
-+   	#include <SDL11/SDL.h>
-+	#include <SDL11/SDL_mixer.h>
+--- ./configure.ac.orig	Wed May 26 14:01:15 2004
++++ ./configure.ac	Sun May 30 22:43:42 2004
+@@ -37,8 +37,8 @@
+ have_SDLmixer=yes
+ if test "x$enable_sdltest" = "xyes" ; then
+ 	AC_TRY_COMPILE([
+-		#include <SDL/SDL.h>
+-		#include <SDL/SDL_mixer.h>
++		#include <SDL11/SDL.h>
++		#include <SDL11/SDL_mixer.h>
  
- int main(int argc, char *argv[])
- { return 0; }
-@@ -54,8 +54,8 @@
- dnl Check for SDL_net lib
- have_SDLnet=no
- AC_TRY_COMPILE([
--   	#include <SDL/SDL.h>
--	#include <SDL/SDL_net.h>
-+   	#include <SDL11/SDL.h>
-+	#include <SDL11/SDL_net.h>
+ 		int main(int argc, char *argv[])
+ 		{ return 0; }
+@@ -64,8 +64,8 @@
+ have_SDLnet=yes
+ if test "x$enable_sdltest" = "xyes" ; then
+ 	AC_TRY_COMPILE([
+-		#include <SDL/SDL.h>
+-		#include <SDL/SDL_net.h>
++		#include <SDL11/SDL.h>
++		#include <SDL11/SDL_net.h>
  
- int main(int argc, char *argv[])
- { return 0; }
-@@ -144,9 +144,9 @@
- 
- dnl Define install prefix 
- if test x$prefix = xNONE; then
--	prefix=/usr/local/games
-+	prefix=/usr/local
- fi
--AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/$PACKAGE/", [install directory])
-+AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/games/$PACKAGE/", [install directory])
- 
- # extra fixed flags
- CFLAGS="$CFLAGS -DdDOUBLE"
+ 		int main(int argc, char *argv[])
+ 		{ return 0; }
diff --git a/games/scorched3d/files/patch-scripts-createAMMakefile.pl b/games/scorched3d/files/patch-scripts-createAMMakefile.pl
new file mode 100644
index 000000000000..acc189f65b2a
--- /dev/null
+++ b/games/scorched3d/files/patch-scripts-createAMMakefile.pl
@@ -0,0 +1,18 @@
+--- 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
deleted file mode 100644
index 505201c9d88b..000000000000
--- a/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/3dsparse/aseFile.tab.cpp.orig	Fri Jan 23 17:58:58 2004
-+++ ./src/3dsparse/aseFile.tab.cpp	Fri Jan 23 18:01:17 2004
-@@ -330,10 +330,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 1e21ac6d0306..4489ed1811ba 100644
--- a/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
+++ b/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
@@ -1,11 +1,11 @@
---- ./src/GLEXT/GLBitmap.cpp.orig	Fri Jan 23 17:58:59 2004
-+++ ./src/GLEXT/GLBitmap.cpp	Fri Jan 23 18:01:21 2004
-@@ -27,7 +27,7 @@
+--- ./src/GLEXT/GLBitmap.cpp.orig	Thu Feb 26 23:00:26 2004
++++ ./src/GLEXT/GLBitmap.cpp	Sun May 30 22:43:45 2004
+@@ -22,7 +22,7 @@
  #include <math.h>
  #include <GLEXT/GLState.h>
  #include <GLEXT/GLBitmap.h>
 -#include <SDL/SDL.h>
 +#include <SDL11/SDL.h>
  
- //////////////////////////////////////////////////////////////////////
- // Construction/Destruction
+ GLBitmap::GLBitmap() :
+ 	width_(0), height_(0), alpha_(false), newbits_(0)
diff --git a/games/scorched3d/files/patch-src-XML-XMLParser.cpp b/games/scorched3d/files/patch-src-XML-XMLParser.cpp
new file mode 100644
index 000000000000..3b410df25ab4
--- /dev/null
+++ b/games/scorched3d/files/patch-src-XML-XMLParser.cpp
@@ -0,0 +1,11 @@
+--- 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 b29271564a0c..8ec4282cbcca 100644
--- a/games/scorched3d/files/patch-src-client-ClientMain.cpp
+++ b/games/scorched3d/files/patch-src-client-ClientMain.cpp
@@ -1,11 +1,11 @@
---- ./src/client/ClientMain.cpp.orig	Fri Jan 23 17:59:02 2004
-+++ ./src/client/ClientMain.cpp	Fri Jan 23 18:01:47 2004
-@@ -57,7 +57,7 @@
- #include <common/Display.h>
+--- ./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 @@
  #include <common/Gamma.h>
  #include <common/Sound.h>
+ #include <common/Clock.h>
 -#include <SDL/SDL.h>
 +#include <SDL11/SDL.h>
  
- void startClient()
+ bool initHardware(ProgressCounter *progressCounter)
  {
diff --git a/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp b/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp
new file mode 100644
index 000000000000..ca784ee6a41c
--- /dev/null
+++ b/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp
@@ -0,0 +1,11 @@
+--- ./src/client/SoftwareMouse.cpp.orig	Mon Apr  5 19:10:34 2004
++++ ./src/client/SoftwareMouse.cpp	Sun May 30 22:43:47 2004
+@@ -25,7 +25,7 @@
+ #include <GLEXT/GLState.h>
+ #include <common/Defines.h>
+ #include <common/OptionsDisplay.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ SoftwareMouse *SoftwareMouse::instance_ = 0;
+ 
diff --git a/games/scorched3d/files/patch-src-common-Sound.cpp b/games/scorched3d/files/patch-src-common-Sound.cpp
new file mode 100644
index 000000000000..ffb48d3d872a
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-Sound.cpp
@@ -0,0 +1,11 @@
+--- 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-engine-MainLoop.cpp b/games/scorched3d/files/patch-src-engine-MainLoop.cpp
index ff095e62045b..79bf54394a75 100644
--- a/games/scorched3d/files/patch-src-engine-MainLoop.cpp
+++ b/games/scorched3d/files/patch-src-engine-MainLoop.cpp
@@ -1,5 +1,5 @@
---- ./src/engine/MainLoop.cpp.orig	Fri Jan 23 17:59:09 2004
-+++ ./src/engine/MainLoop.cpp	Fri Jan 23 18:02:17 2004
+--- ./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>
  #include <common/Defines.h>
@@ -7,5 +7,5 @@
 -#include <SDL/SDL.h>
 +#include <SDL11/SDL.h>
  
- MainLoop::MainLoop() :  exitLoop_(false), lastDrawTime_(0.0f)
+ MainLoop::MainLoop() :  exitLoop_(false), lastDrawTime_(0.0f), flip_(false)
  {
diff --git a/games/scorched3d/files/patch-src-irc-GameInfoEntry.h b/games/scorched3d/files/patch-src-irc-GameInfoEntry.h
deleted file mode 100644
index c070faecfdb1..000000000000
--- a/games/scorched3d/files/patch-src-irc-GameInfoEntry.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/irc/GameInfoEntry.h.orig	Fri Jan 23 17:59:10 2004
-+++ ./src/irc/GameInfoEntry.h	Fri Jan 23 18:02:32 2004
-@@ -1,8 +1,8 @@
- #ifndef _GAMEINFOENTRY_H_
- #define _GAMEINFOENTRY_H_
- 
--#include <SDL/SDL.h>
--#include <SDL/SDL_net.h>
-+#include <SDL11/SDL.h>
-+#include <SDL11/SDL_net.h>
- 
- #include <string>
- 
diff --git a/games/scorched3d/files/patch-src-irc-GameInfoList.h b/games/scorched3d/files/patch-src-irc-GameInfoList.h
deleted file mode 100644
index 831b1e198f0d..000000000000
--- a/games/scorched3d/files/patch-src-irc-GameInfoList.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/irc/GameInfoList.h.orig	Fri Jan 23 17:59:10 2004
-+++ ./src/irc/GameInfoList.h	Fri Jan 23 18:02:32 2004
-@@ -1,7 +1,7 @@
- #ifndef _GAMEINFOLIST_H_
- #define _GAMEINFOLIST_H_
- 
--#include <SDL/SDL_mutex.h>
-+#include <SDL11/SDL_mutex.h>
- 
- #include <list>
- #include "irc/GameInfoEntry.h"
diff --git a/games/scorched3d/files/patch-src-irc-GameInfoMessage.h b/games/scorched3d/files/patch-src-irc-GameInfoMessage.h
deleted file mode 100644
index 9a817d7f459a..000000000000
--- a/games/scorched3d/files/patch-src-irc-GameInfoMessage.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/irc/GameInfoMessage.h.orig	Fri Jan 23 17:59:10 2004
-+++ ./src/irc/GameInfoMessage.h	Fri Jan 23 18:02:33 2004
-@@ -1,9 +1,9 @@
- #ifndef _GAMEINFOMESSAGE_H_
- #define _GAMEINFOMESSAGE_H_
- 
--#include <SDL/SDL.h>
--#include <SDL/SDL_net.h>
--#include <SDL/SDL_thread.h>
-+#include <SDL11/SDL.h>
-+#include <SDL11/SDL_net.h>
-+#include <SDL11/SDL_thread.h>
- #include "irc/GameInfoEntry.h"
- #include <string>
- 
diff --git a/games/scorched3d/files/patch-src-irc-IrcConnection.h b/games/scorched3d/files/patch-src-irc-IrcConnection.h
deleted file mode 100644
index ee45c4cf025c..000000000000
--- a/games/scorched3d/files/patch-src-irc-IrcConnection.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/irc/IrcConnection.h.orig	Fri Jan 23 17:59:10 2004
-+++ ./src/irc/IrcConnection.h	Fri Jan 23 18:02:33 2004
-@@ -1,9 +1,9 @@
- #ifndef _IRC_CLIENT_H_
- #define _IRC_CLIENT_H_
- 
--#include <SDL/SDL.h>
--#include <SDL/SDL_thread.h>
--#include <SDL/SDL_net.h>
-+#include <SDL11/SDL.h>
-+#include <SDL11/SDL_thread.h>
-+#include <SDL11/SDL_net.h>
- 
- #include "irc/IrcDefines.h"
- 
diff --git a/games/scorched3d/files/patch-src-irc-UdpHandler.h b/games/scorched3d/files/patch-src-irc-UdpHandler.h
deleted file mode 100644
index 05048c1b5224..000000000000
--- a/games/scorched3d/files/patch-src-irc-UdpHandler.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/irc/UdpHandler.h.orig	Fri Jan 23 17:59:11 2004
-+++ ./src/irc/UdpHandler.h	Fri Jan 23 18:02:35 2004
-@@ -1,9 +1,9 @@
- #ifndef _UDPHANDLER_H_
- #define _UDPHANDLER_H_
- 
--#include <SDL/SDL.h>
--#include <SDL/SDL_net.h>
--#include <SDL/SDL_thread.h>
-+#include <SDL11/SDL.h>
-+#include <SDL11/SDL_net.h>
-+#include <SDL11/SDL_thread.h>
- #include "irc/GameInfoEntry.h"
- 
- 
diff --git a/games/scorched3d/files/patch-src-ode-config.h b/games/scorched3d/files/patch-src-ode-config.h
index 7df954c181de..d8880cbd8da9 100644
--- a/games/scorched3d/files/patch-src-ode-config.h
+++ b/games/scorched3d/files/patch-src-ode-config.h
@@ -1,6 +1,6 @@
---- ./src/ode/config.h.orig	Fri Jan 23 17:59:18 2004
-+++ ./src/ode/config.h	Fri Jan 23 18:03:31 2004
-@@ -35,7 +35,7 @@
+--- ./src/ode/config.h.orig	Mon May 24 21:02:31 2004
++++ ./src/ode/config.h	Sun May 30 14:38:24 2004
+@@ -36,7 +36,7 @@
  #if defined(__DARWIN__)
  #include <sys/malloc.h>
  #else
diff --git a/games/scorched3d/files/patch-src-scorched-MainDialog.cpp b/games/scorched3d/files/patch-src-scorched-MainDialog.cpp
new file mode 100644
index 000000000000..db73b41c92ae
--- /dev/null
+++ b/games/scorched3d/files/patch-src-scorched-MainDialog.cpp
@@ -0,0 +1,13 @@
+--- ./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 @@
+ #include <wx/msgdlg.h>
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+-#include <SDL/SDL.h>
+-#include <SDL/SDL_net.h>
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_net.h>
+ #include <scorched/MainDialog.h>
+ #include <scorched/HtmlHelpDialog.h>
+ #include <scorched/NetDialog.h>
diff --git a/games/scorched3d/files/patch-src-scorched-main.cpp b/games/scorched3d/files/patch-src-scorched-main.cpp
index 2735b09fe57c..a9d185fe3f4e 100644
--- a/games/scorched3d/files/patch-src-scorched-main.cpp
+++ b/games/scorched3d/files/patch-src-scorched-main.cpp
@@ -1,11 +1,11 @@
---- ./src/scorched/main.cpp.orig	Fri Jan 23 17:59:15 2004
-+++ ./src/scorched/main.cpp	Fri Jan 23 18:03:16 2004
+--- ./src/scorched/main.cpp.orig	Fri May 28 00:24:45 2004
++++ ./src/scorched/main.cpp	Sun May 30 22:43:49 2004
 @@ -20,7 +20,7 @@
  
- 
  #include <wx/wx.h>
+ #include <wx/utils.h>
 -#include <SDL/SDL.h>
 +#include <SDL11/SDL.h>
  #include <client/ClientMain.h>
- #include <common/OptionsDisplay.h>
- #include <common/OptionsParam.h>
+ #include <client/ClientSave.h>
+ #include <client/ScorchedClient.h>
diff --git a/games/scorched3d/files/patch-src-server-ServerMain.cpp b/games/scorched3d/files/patch-src-server-ServerMain.cpp
index a8572fbd5a56..98a3d3657325 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	Fri Jan 23 17:59:16 2004
-+++ ./src/server/ServerMain.cpp	Fri Jan 23 18:03:17 2004
-@@ -48,7 +48,7 @@
- #include <server/ServerBrowserInfo.h>
+--- ./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>
+ #include <server/ServerCommon.h>
  #include <server/ScorchedServer.h>
 -#include <SDL/SDL.h>
 +#include <SDL11/SDL.h>