aboutsummaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2004-05-26 20:17:59 +0000
committerPav Lucistnik <pav@FreeBSD.org>2004-05-26 20:17:59 +0000
commit2841ea4ebd313f0e3612418fabf07fc7f5aa5cb8 (patch)
treeba7df176c475387bd25b5776f5c94f87bfd4b550 /games
parent438b9dc00191125ab5e800d2dc927c27de49f128 (diff)
downloadports-2841ea4ebd313f0e3612418fabf07fc7f5aa5cb8.tar.gz
ports-2841ea4ebd313f0e3612418fabf07fc7f5aa5cb8.zip
Notes
Diffstat (limited to 'games')
-rw-r--r--games/scorched3d-devel/Makefile20
-rw-r--r--games/scorched3d-devel/distinfo2
-rw-r--r--games/scorched3d-devel/files/patch-Makefile.am4
-rw-r--r--games/scorched3d-devel/files/patch-configure.ac45
-rw-r--r--games/scorched3d-devel/files/patch-src-3dsparse-aseFile.tab.cpp26
-rw-r--r--games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp11
-rw-r--r--games/scorched3d-devel/files/patch-src-GLEXT-GLLuminance.cpp11
-rw-r--r--games/scorched3d-devel/files/patch-src-GLEXT-GLState.h4
-rw-r--r--games/scorched3d-devel/files/patch-src-GLEXT-GLStateExtension.cpp12
-rw-r--r--games/scorched3d-devel/files/patch-src-client-ClientMain.cpp14
-rw-r--r--games/scorched3d-devel/files/patch-src-client-GLSetup.cpp11
-rw-r--r--games/scorched3d-devel/files/patch-src-common-Clock.cpp11
-rw-r--r--games/scorched3d-devel/files/patch-src-common-Display.h8
-rw-r--r--games/scorched3d-devel/files/patch-src-common-Gamma.cpp4
-rw-r--r--games/scorched3d-devel/files/patch-src-common-Gamma.h4
-rw-r--r--games/scorched3d-devel/files/patch-src-common-KeyStateTranslate.h11
-rw-r--r--games/scorched3d-devel/files/patch-src-common-KeyTranslate.h11
-rw-r--r--games/scorched3d-devel/files/patch-src-common-KeyboardHistory.h4
-rw-r--r--games/scorched3d-devel/files/patch-src-common-Logger.cpp (renamed from games/scorched3d-devel/files/patch-src-commonLogger.cpp)4
-rw-r--r--games/scorched3d-devel/files/patch-src-common-Mouse.h4
-rw-r--r--games/scorched3d-devel/files/patch-src-common-RandomGenerator.cpp4
-rw-r--r--games/scorched3d-devel/files/patch-src-common-Sound.h4
-rw-r--r--games/scorched3d-devel/files/patch-src-common-SoundStore.h11
-rw-r--r--games/scorched3d-devel/files/patch-src-common-Timer.cpp11
-rw-r--r--games/scorched3d-devel/files/patch-src-coms-NetBuffer.cpp4
-rw-r--r--games/scorched3d-devel/files/patch-src-coms-NetBuffer.h10
-rw-r--r--games/scorched3d-devel/files/patch-src-coms-NetClient.cpp11
-rw-r--r--games/scorched3d-devel/files/patch-src-coms-NetMessageHandler.h4
-rw-r--r--games/scorched3d-devel/files/patch-src-coms-NetMessagePool.h4
-rw-r--r--games/scorched3d-devel/files/patch-src-engine-ActionMeta.h11
-rw-r--r--games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp12
-rw-r--r--games/scorched3d-devel/files/patch-src-irc-GameInfoEntry.h13
-rw-r--r--games/scorched3d-devel/files/patch-src-irc-GameInfoList.h11
-rw-r--r--games/scorched3d-devel/files/patch-src-irc-GameInfoMessage.h15
-rw-r--r--games/scorched3d-devel/files/patch-src-irc-IrcConnection.h15
-rw-r--r--games/scorched3d-devel/files/patch-src-irc-UdpHandler.h15
-rw-r--r--games/scorched3d-devel/files/patch-src-ode-common.h11
-rw-r--r--games/scorched3d-devel/files/patch-src-ode-config.h18
-rw-r--r--games/scorched3d-devel/files/patch-src-scorched-main.cpp4
-rw-r--r--games/scorched3d-devel/files/patch-src-server-ServerMain.cpp12
-rw-r--r--games/scorched3d-devel/pkg-descr5
-rw-r--r--games/scorched3d-devel/pkg-plist458
-rw-r--r--games/scorched3d/Makefile20
-rw-r--r--games/scorched3d/distinfo2
-rw-r--r--games/scorched3d/files/patch-Makefile.am4
-rw-r--r--games/scorched3d/files/patch-configure.ac45
-rw-r--r--games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp26
-rw-r--r--games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp11
-rw-r--r--games/scorched3d/files/patch-src-GLEXT-GLLuminance.cpp11
-rw-r--r--games/scorched3d/files/patch-src-GLEXT-GLState.h4
-rw-r--r--games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp12
-rw-r--r--games/scorched3d/files/patch-src-client-ClientMain.cpp14
-rw-r--r--games/scorched3d/files/patch-src-client-GLSetup.cpp11
-rw-r--r--games/scorched3d/files/patch-src-common-Clock.cpp11
-rw-r--r--games/scorched3d/files/patch-src-common-Display.h8
-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.h11
-rw-r--r--games/scorched3d/files/patch-src-common-KeyTranslate.h11
-rw-r--r--games/scorched3d/files/patch-src-common-KeyboardHistory.h4
-rw-r--r--games/scorched3d/files/patch-src-common-Logger.cpp (renamed from games/scorched3d/files/patch-src-commonLogger.cpp)4
-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.h4
-rw-r--r--games/scorched3d/files/patch-src-common-SoundStore.h11
-rw-r--r--games/scorched3d/files/patch-src-common-Timer.cpp11
-rw-r--r--games/scorched3d/files/patch-src-coms-NetBuffer.cpp4
-rw-r--r--games/scorched3d/files/patch-src-coms-NetBuffer.h10
-rw-r--r--games/scorched3d/files/patch-src-coms-NetClient.cpp11
-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-ActionMeta.h11
-rw-r--r--games/scorched3d/files/patch-src-engine-MainLoop.cpp12
-rw-r--r--games/scorched3d/files/patch-src-irc-GameInfoEntry.h13
-rw-r--r--games/scorched3d/files/patch-src-irc-GameInfoList.h11
-rw-r--r--games/scorched3d/files/patch-src-irc-GameInfoMessage.h15
-rw-r--r--games/scorched3d/files/patch-src-irc-IrcConnection.h15
-rw-r--r--games/scorched3d/files/patch-src-irc-UdpHandler.h15
-rw-r--r--games/scorched3d/files/patch-src-ode-common.h11
-rw-r--r--games/scorched3d/files/patch-src-ode-config.h18
-rw-r--r--games/scorched3d/files/patch-src-scorched-main.cpp4
-rw-r--r--games/scorched3d/files/patch-src-server-ServerMain.cpp12
-rw-r--r--games/scorched3d/pkg-descr5
-rw-r--r--games/scorched3d/pkg-plist458
84 files changed, 1206 insertions, 562 deletions
diff --git a/games/scorched3d-devel/Makefile b/games/scorched3d-devel/Makefile
index f36d151af474..48b20956aa62 100644
--- a/games/scorched3d-devel/Makefile
+++ b/games/scorched3d-devel/Makefile
@@ -7,7 +7,6 @@
PORTNAME= scorched3d
PORTVERSION= 0.${SCORCH_VERSION}
-PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scorched3d
@@ -18,14 +17,18 @@ COMMENT= Scorched is a game based loosely on the classic DOS game
LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
+.if defined(WITH_MYSQL)
+USE_MYSQL= yes
+.endif
+
USE_SDL= mixer net sdl
-SCORCH_VERSION= 35
+SCORCH_VERSION= 36.2
WRKSRC= ${WRKDIR}/scorched
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
USE_GL= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 257
AUTOMAKE_ARGS= --foreign
CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
@@ -33,6 +36,10 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \
AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}"
+.if defined(WITH_MYSQL)
+CONFIGURE_ARGS+= --with-mysql
+.endif
+
.include <bsd.port.pre.mk>
.if ${ARCH} != "i386"
@@ -48,5 +55,10 @@ pre-install:
post-install:
@ln -fs ${PREFIX}/games/scorched3d/scorched3d ${PREFIX}/bin/scorched3d
+ @chmod ugo+rw ${PREFIX}/games/scorched3d/data/display.xml
+ @chmod ugo+rw ${PREFIX}/games/scorched3d/data/server.xml
+.if defined(WITH_MYSQL)
+ @chmod ugo+rw ${PREFIX}/games/scorched3d/data/mysql.xml
+.endif
.include <bsd.port.post.mk>
diff --git a/games/scorched3d-devel/distinfo b/games/scorched3d-devel/distinfo
index 7ea5d150f000..77dbad786101 100644
--- a/games/scorched3d-devel/distinfo
+++ b/games/scorched3d-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (Scorched3D-35-src.tar.gz) = c43507e805b482cc0a37b8cd37a3a26b
+MD5 (Scorched3D-36.2-src.tar.gz) = 7388dfaadd7bc568d2c341539fb27184
SIZE (Scorched3D-35-src.tar.gz) = 10798751
diff --git a/games/scorched3d-devel/files/patch-Makefile.am b/games/scorched3d-devel/files/patch-Makefile.am
index c86896f703dd..a0a0e983d1da 100644
--- a/games/scorched3d-devel/files/patch-Makefile.am
+++ b/games/scorched3d-devel/files/patch-Makefile.am
@@ -1,5 +1,5 @@
---- Makefile.am.orig Sun Aug 3 20:12:01 2003
-+++ Makefile.am Sun Aug 3 20:11:43 2003
+--- 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
diff --git a/games/scorched3d-devel/files/patch-configure.ac b/games/scorched3d-devel/files/patch-configure.ac
index d0204c5943f0..f4a5f2b71c69 100644
--- a/games/scorched3d-devel/files/patch-configure.ac
+++ b/games/scorched3d-devel/files/patch-configure.ac
@@ -1,47 +1,28 @@
---- configure.ac.orig Wed Jul 30 17:44:18 2003
-+++ configure.ac Sun Aug 3 10:15:54 2003
-@@ -13,6 +13,9 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-
-+CFLAGS="$CFLAGS -I/usr/X11R6/include"
-+LIBS="$LIBS -L/usr/X11R6/lib"
-+
- dnl Check for SDL
- SDL_VERSION=1.0.1
- AM_PATH_SDL($SDL_VERSION,
-@@ -28,8 +31,8 @@
+--- 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
- have_opengl=no
AC_TRY_COMPILE([
- #include <SDL/SDL.h>
- #include <SDL/SDL_mixer.h>
+ #include <SDL11/SDL.h>
+ #include <SDL11/SDL_mixer.h>
- ],[
- ],[
- have_SDLmixer=yes
-@@ -44,8 +47,8 @@
+
+ int main(int argc, char *argv[])
+ { return 0; }
+@@ -54,8 +54,8 @@
+ dnl Check for SDL_net lib
have_SDLnet=no
- have_opengl=no
AC_TRY_COMPILE([
- #include <SDL/SDL.h>
- #include <SDL/SDL_net.h>
+ #include <SDL11/SDL.h>
+ #include <SDL11/SDL_net.h>
- ],[
- ],[
- have_SDLnet=yes
-@@ -72,7 +75,7 @@
- AC_MSG_ERROR([*** Can't find the OpenGL library Try: http://www.opengl.org])
- fi
-
--OPENGL_LIBS="-lGL -lGLU -lpthread"
-+OPENGL_LIBS="-lGL -lGLU"
- LIBS="$LIBS $OPENGL_LIBS"
- dnl Check for wxwindows
-@@ -97,9 +100,9 @@
+ int main(int argc, char *argv[])
+ { return 0; }
+@@ -144,9 +144,9 @@
dnl Define install prefix
if test x$prefix = xNONE; then
@@ -52,4 +33,4 @@
+AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/games/$PACKAGE/", [install directory])
# extra fixed flags
- CFLAGS="$CFLAGS -DdDOUBLE -D_NO_SERVER_ASE_"
+ CFLAGS="$CFLAGS -DdDOUBLE"
diff --git a/games/scorched3d-devel/files/patch-src-3dsparse-aseFile.tab.cpp b/games/scorched3d-devel/files/patch-src-3dsparse-aseFile.tab.cpp
index a14e1375cd5f..505201c9d88b 100644
--- a/games/scorched3d-devel/files/patch-src-3dsparse-aseFile.tab.cpp
+++ b/games/scorched3d-devel/files/patch-src-3dsparse-aseFile.tab.cpp
@@ -1,11 +1,15 @@
---- src/3dsparse/aseFile.tab.cpp.orig Mon Nov 3 20:54:39 2003
-+++ src/3dsparse/aseFile.tab.cpp Mon Nov 3 20:55:14 2003
-@@ -5,7 +5,7 @@
-
- #define YYBISON 1 /* Identify Bison output. */
-
--#define alloca
-+/* #define alloca */
-
- #define yyparse aseparse
- #define yylex aselex
+--- ./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-devel/files/patch-src-GLEXT-GLBitmap.cpp b/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp
index 5a5f63d292c1..1e21ac6d0306 100644
--- a/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp
+++ b/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp
@@ -1,11 +1,6 @@
---- src/GLEXT/GLBitmap.cpp.orig Wed Jul 30 17:41:26 2003
-+++ src/GLEXT/GLBitmap.cpp Sun Aug 3 09:07:12 2003
-@@ -24,11 +24,11 @@
- //////////////////////////////////////////////////////////////////////
-
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
+--- ./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 @@
#include <math.h>
#include <GLEXT/GLState.h>
#include <GLEXT/GLBitmap.h>
diff --git a/games/scorched3d-devel/files/patch-src-GLEXT-GLLuminance.cpp b/games/scorched3d-devel/files/patch-src-GLEXT-GLLuminance.cpp
deleted file mode 100644
index c6ae73b18cae..000000000000
--- a/games/scorched3d-devel/files/patch-src-GLEXT-GLLuminance.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/GLEXT/GLLuminance.cpp.orig Wed Jul 30 17:41:26 2003
-+++ src/GLEXT/GLLuminance.cpp Sun Aug 3 09:07:13 2003
-@@ -24,7 +24,7 @@
- //////////////////////////////////////////////////////////////////////
-
- #include <GLEXT/GLLuminance.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- //////////////////////////////////////////////////////////////////////
- // Construction/Destruction
diff --git a/games/scorched3d-devel/files/patch-src-GLEXT-GLState.h b/games/scorched3d-devel/files/patch-src-GLEXT-GLState.h
index b78a8d5c817a..22a58e459adc 100644
--- a/games/scorched3d-devel/files/patch-src-GLEXT-GLState.h
+++ b/games/scorched3d-devel/files/patch-src-GLEXT-GLState.h
@@ -1,5 +1,5 @@
---- src/GLEXT/GLState.h.orig Wed Jul 30 17:41:29 2003
-+++ src/GLEXT/GLState.h Sun Aug 3 09:07:13 2003
+--- ./src/GLEXT/GLState.h.orig Fri Jan 23 17:59:00 2004
++++ ./src/GLEXT/GLState.h Fri Jan 23 18:01:27 2004
@@ -27,7 +27,7 @@
#define AFX_GLSTATE_H__32B0E2D0_566D_4438_94E4_B12FE82430B1__INCLUDED_
diff --git a/games/scorched3d-devel/files/patch-src-GLEXT-GLStateExtension.cpp b/games/scorched3d-devel/files/patch-src-GLEXT-GLStateExtension.cpp
index 7b7a970748a4..46a88aed015a 100644
--- a/games/scorched3d-devel/files/patch-src-GLEXT-GLStateExtension.cpp
+++ b/games/scorched3d-devel/files/patch-src-GLEXT-GLStateExtension.cpp
@@ -1,11 +1,11 @@
---- src/GLEXT/GLStateExtension.cpp.orig Wed Jul 30 17:41:26 2003
-+++ src/GLEXT/GLStateExtension.cpp Sun Aug 3 09:07:13 2003
-@@ -20,7 +20,7 @@
-
-
+--- ./src/GLEXT/GLStateExtension.cpp.orig Fri Jan 23 17:59:00 2004
++++ ./src/GLEXT/GLStateExtension.cpp Fri Jan 23 18:01:28 2004
+@@ -21,7 +21,7 @@
#include <GLEXT/GLStateExtension.h>
+ #include <GLEXT/GLConsole.h>
+ #include <common/OptionsDisplay.h> // Hmm library code pollution
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
#include <string.h>
+ #include <string>
- bool GLStateExtension::noExtensions_ = false;
diff --git a/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp b/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp
index 152cfc2296ec..b29271564a0c 100644
--- a/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp
+++ b/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp
@@ -1,11 +1,11 @@
---- src/client/ClientMain.cpp.orig Wed Jul 30 17:41:23 2003
-+++ src/client/ClientMain.cpp Sun Aug 3 09:07:11 2003
-@@ -35,7 +35,7 @@
- #include <coms/NetClient.h>
- #include <engine/MainLoop.h>
- #include <engine/GameState.h>
+--- ./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>
+ #include <common/Gamma.h>
+ #include <common/Sound.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
- void clientCleanup()
+ void startClient()
{
diff --git a/games/scorched3d-devel/files/patch-src-client-GLSetup.cpp b/games/scorched3d-devel/files/patch-src-client-GLSetup.cpp
deleted file mode 100644
index bafac21645a5..000000000000
--- a/games/scorched3d-devel/files/patch-src-client-GLSetup.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/client/GLSetup.cpp.orig Wed Jul 30 17:41:24 2003
-+++ src/client/GLSetup.cpp Sun Aug 3 09:07:11 2003
-@@ -25,7 +25,7 @@
-
- #include <client/GLSetup.h>
- #include <GLEXT/GLStateExtension.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- void GLSetup::setup()
- {
diff --git a/games/scorched3d-devel/files/patch-src-common-Clock.cpp b/games/scorched3d-devel/files/patch-src-common-Clock.cpp
new file mode 100644
index 000000000000..f422ce5488ec
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-Clock.cpp
@@ -0,0 +1,11 @@
+--- ./src/common/Clock.cpp.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/Clock.cpp Fri Jan 23 18:01:54 2004
+@@ -20,7 +20,7 @@
+
+ #include <common/Defines.h>
+ #include <common/Clock.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+
+ Clock::Clock() : isPaused_(false)
+ {
diff --git a/games/scorched3d-devel/files/patch-src-common-Display.h b/games/scorched3d-devel/files/patch-src-common-Display.h
index 46e62eef2bab..1331d574df9d 100644
--- a/games/scorched3d-devel/files/patch-src-common-Display.h
+++ b/games/scorched3d-devel/files/patch-src-common-Display.h
@@ -1,7 +1,7 @@
---- src/common/Display.h.orig Wed Jul 30 17:41:28 2003
-+++ src/common/Display.h Sun Aug 3 09:07:11 2003
-@@ -27,7 +27,7 @@
- //////////////////////////////////////////////////////////////////////
+--- ./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 @@
+ #define _DISPLAY_H_
#include <stdlib.h>
-#include <SDL/SDL.h>
diff --git a/games/scorched3d-devel/files/patch-src-common-Gamma.cpp b/games/scorched3d-devel/files/patch-src-common-Gamma.cpp
index 72258e753748..0f02eb0c886b 100644
--- a/games/scorched3d-devel/files/patch-src-common-Gamma.cpp
+++ b/games/scorched3d-devel/files/patch-src-common-Gamma.cpp
@@ -1,5 +1,5 @@
---- src/common/Gamma.cpp.orig Wed Jul 30 17:41:24 2003
-+++ src/common/Gamma.cpp Sun Aug 3 09:07:11 2003
+--- ./src/common/Gamma.cpp.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/Gamma.cpp Fri Jan 23 18:01:56 2004
@@ -27,7 +27,7 @@
#include <common/Gamma.h>
#include <common/Defines.h>
diff --git a/games/scorched3d-devel/files/patch-src-common-Gamma.h b/games/scorched3d-devel/files/patch-src-common-Gamma.h
index 2342ab615b77..4e4432cf864b 100644
--- a/games/scorched3d-devel/files/patch-src-common-Gamma.h
+++ b/games/scorched3d-devel/files/patch-src-common-Gamma.h
@@ -1,5 +1,5 @@
---- src/common/Gamma.h.orig Wed Jul 30 17:41:28 2003
-+++ src/common/Gamma.h Sun Aug 3 09:07:12 2003
+--- ./src/common/Gamma.h.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/Gamma.h Fri Jan 23 18:01:56 2004
@@ -26,7 +26,7 @@
//
//////////////////////////////////////////////////////////////////////
diff --git a/games/scorched3d-devel/files/patch-src-common-KeyStateTranslate.h b/games/scorched3d-devel/files/patch-src-common-KeyStateTranslate.h
new file mode 100644
index 000000000000..b79016223c1f
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-KeyStateTranslate.h
@@ -0,0 +1,11 @@
+--- ./src/common/KeyStateTranslate.h.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/KeyStateTranslate.h Fri Jan 23 18:01:56 2004
+@@ -19,7 +19,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+
+
+-#include <SDL/SDL_keysym.h>
++#include <SDL11/SDL_keysym.h>
+
+ struct KeyStateTranslation
+ {
diff --git a/games/scorched3d-devel/files/patch-src-common-KeyTranslate.h b/games/scorched3d-devel/files/patch-src-common-KeyTranslate.h
new file mode 100644
index 000000000000..797e7af136cc
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-KeyTranslate.h
@@ -0,0 +1,11 @@
+--- ./src/common/KeyTranslate.h.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/KeyTranslate.h Fri Jan 23 18:01:57 2004
+@@ -19,7 +19,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+
+
+-#include <SDL/SDL_keysym.h>
++#include <SDL11/SDL_keysym.h>
+
+ struct KeyTranslation
+ {
diff --git a/games/scorched3d-devel/files/patch-src-common-KeyboardHistory.h b/games/scorched3d-devel/files/patch-src-common-KeyboardHistory.h
index c6724cc127c5..582fd94e5d7a 100644
--- a/games/scorched3d-devel/files/patch-src-common-KeyboardHistory.h
+++ b/games/scorched3d-devel/files/patch-src-common-KeyboardHistory.h
@@ -1,5 +1,5 @@
---- src/common/KeyboardHistory.h.orig Wed Jul 30 17:41:28 2003
-+++ src/common/KeyboardHistory.h Sun Aug 3 09:07:12 2003
+--- ./src/common/KeyboardHistory.h.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/KeyboardHistory.h Fri Jan 23 18:01:57 2004
@@ -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-devel/files/patch-src-commonLogger.cpp b/games/scorched3d-devel/files/patch-src-common-Logger.cpp
index d2df36ffecc7..5ba301a2ceca 100644
--- a/games/scorched3d-devel/files/patch-src-commonLogger.cpp
+++ b/games/scorched3d-devel/files/patch-src-common-Logger.cpp
@@ -1,5 +1,5 @@
---- src/common/Logger.cpp.orig Wed Jul 30 17:41:24 2003
-+++ src/common/Logger.cpp Sun Aug 3 09:07:12 2003
+--- ./src/common/Logger.cpp.orig Fri Jan 23 17:59:04 2004
++++ ./src/common/Logger.cpp Fri Jan 23 18:01:58 2004
@@ -21,7 +21,7 @@
#include <common/Defines.h>
#include <common/Logger.h>
diff --git a/games/scorched3d-devel/files/patch-src-common-Mouse.h b/games/scorched3d-devel/files/patch-src-common-Mouse.h
index c37d4faefa3a..442a39c0757b 100644
--- a/games/scorched3d-devel/files/patch-src-common-Mouse.h
+++ b/games/scorched3d-devel/files/patch-src-common-Mouse.h
@@ -1,5 +1,5 @@
---- src/common/Mouse.h.orig Wed Jul 30 17:41:28 2003
-+++ src/common/Mouse.h Sun Aug 3 09:07:12 2003
+--- ./src/common/Mouse.h.orig Fri Jan 23 17:59:04 2004
++++ ./src/common/Mouse.h Fri Jan 23 18:01:59 2004
@@ -23,7 +23,7 @@
#define _MOUSE_H_
diff --git a/games/scorched3d-devel/files/patch-src-common-RandomGenerator.cpp b/games/scorched3d-devel/files/patch-src-common-RandomGenerator.cpp
index 8ea2dc8b8022..101bc62413c7 100644
--- a/games/scorched3d-devel/files/patch-src-common-RandomGenerator.cpp
+++ b/games/scorched3d-devel/files/patch-src-common-RandomGenerator.cpp
@@ -1,5 +1,5 @@
---- src/common/RandomGenerator.cpp.orig Wed Jul 30 17:41:24 2003
-+++ src/common/RandomGenerator.cpp Sun Aug 3 09:07:12 2003
+--- ./src/common/RandomGenerator.cpp.orig Fri Jan 23 17:59:04 2004
++++ ./src/common/RandomGenerator.cpp Fri Jan 23 18:02:00 2004
@@ -20,7 +20,7 @@
#include <common/RandomGenerator.h>
diff --git a/games/scorched3d-devel/files/patch-src-common-Sound.h b/games/scorched3d-devel/files/patch-src-common-Sound.h
index dd61fac1ab78..69f9eb6dc9ba 100644
--- a/games/scorched3d-devel/files/patch-src-common-Sound.h
+++ b/games/scorched3d-devel/files/patch-src-common-Sound.h
@@ -1,5 +1,5 @@
---- src/common/Sound.h.orig Wed Jul 30 17:41:28 2003
-+++ src/common/Sound.h Sun Aug 3 09:07:12 2003
+--- ./src/common/Sound.h.orig Fri Jan 23 17:59:04 2004
++++ ./src/common/Sound.h Fri Jan 23 18:02:01 2004
@@ -26,7 +26,7 @@
//////////////////////////////////////////////////////////////////////
diff --git a/games/scorched3d-devel/files/patch-src-common-SoundStore.h b/games/scorched3d-devel/files/patch-src-common-SoundStore.h
deleted file mode 100644
index 148c097f7839..000000000000
--- a/games/scorched3d-devel/files/patch-src-common-SoundStore.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/SoundStore.h.orig Wed Jul 30 17:41:28 2003
-+++ src/common/SoundStore.h Sun Aug 3 09:07:12 2003
-@@ -29,7 +29,7 @@
- #include <string>
-
- #define CACHE_SOUND(var, filename) \
-- static SoundBuffer* ##var = SoundStore::instance()->fetchOrCreateBuffer(##filename);
-+ static SoundBuffer* var = SoundStore::instance()->fetchOrCreateBuffer(filename);
-
- class SoundStore
- {
diff --git a/games/scorched3d-devel/files/patch-src-common-Timer.cpp b/games/scorched3d-devel/files/patch-src-common-Timer.cpp
deleted file mode 100644
index 4f145ba31045..000000000000
--- a/games/scorched3d-devel/files/patch-src-common-Timer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/Timer.cpp.orig Wed Jul 30 17:41:24 2003
-+++ src/common/Timer.cpp Sun Aug 3 09:07:12 2003
-@@ -25,7 +25,7 @@
-
- #include <common/Defines.h>
- #include <common/Timer.h>
--#include <SDL/SDL.h>
-+#include <SDL11/SDL.h>
-
- //////////////////////////////////////////////////////////////////////
- // Construction/Destruction
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetBuffer.cpp b/games/scorched3d-devel/files/patch-src-coms-NetBuffer.cpp
index a2fab8cfd972..93d0ef1e1195 100644
--- a/games/scorched3d-devel/files/patch-src-coms-NetBuffer.cpp
+++ b/games/scorched3d-devel/files/patch-src-coms-NetBuffer.cpp
@@ -1,5 +1,5 @@
---- src/coms/NetBuffer.cpp.orig Wed Jul 30 17:41:25 2003
-+++ src/coms/NetBuffer.cpp Sun Aug 3 09:07:12 2003
+--- ./src/coms/NetBuffer.cpp.orig Fri Jan 23 17:59:07 2004
++++ ./src/coms/NetBuffer.cpp Fri Jan 23 18:02:08 2004
@@ -20,7 +20,7 @@
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetBuffer.h b/games/scorched3d-devel/files/patch-src-coms-NetBuffer.h
index 5689ad84e008..1e24a2e647dc 100644
--- a/games/scorched3d-devel/files/patch-src-coms-NetBuffer.h
+++ b/games/scorched3d-devel/files/patch-src-coms-NetBuffer.h
@@ -1,6 +1,6 @@
---- src/coms/NetBuffer.h.orig Wed Jul 30 17:41:28 2003
-+++ src/coms/NetBuffer.h Sun Aug 3 09:07:12 2003
-@@ -23,8 +23,8 @@
+--- ./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_
#include <string>
@@ -9,5 +9,5 @@
+#include <SDL11/SDL.h>
+#include <SDL11/SDL_net.h>
- typedef TCPsocket NetPlayerID;
-
+ class NetBuffer
+ {
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetClient.cpp b/games/scorched3d-devel/files/patch-src-coms-NetClient.cpp
deleted file mode 100644
index 0b27e2f40e73..000000000000
--- a/games/scorched3d-devel/files/patch-src-coms-NetClient.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/coms/NetClient.cpp.orig Wed Jul 30 17:41:25 2003
-+++ src/coms/NetClient.cpp Sun Aug 3 09:07:12 2003
-@@ -24,7 +24,7 @@
- #include <coms/NetMessageHandler.h>
- #include <coms/NetMessagePool.h>
- #include <common/Logger.h>
--#include <SDL/SDL_thread.h>
-+#include <SDL11/SDL_thread.h>
-
- NetClient *NetClient::instance_ = 0;
-
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetMessageHandler.h b/games/scorched3d-devel/files/patch-src-coms-NetMessageHandler.h
index 6187b25974e0..3a4b71e65752 100644
--- a/games/scorched3d-devel/files/patch-src-coms-NetMessageHandler.h
+++ b/games/scorched3d-devel/files/patch-src-coms-NetMessageHandler.h
@@ -1,5 +1,5 @@
---- src/coms/NetMessageHandler.h.orig Wed Jul 30 17:41:28 2003
-+++ src/coms/NetMessageHandler.h Sun Aug 3 09:07:12 2003
+--- ./src/coms/NetMessageHandler.h.orig Fri Jan 23 17:59:08 2004
++++ ./src/coms/NetMessageHandler.h Fri Jan 23 18:02:10 2004
@@ -23,7 +23,7 @@
#define __INCLUDE_NetMessageHandlerh_INCLUDE__
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetMessagePool.h b/games/scorched3d-devel/files/patch-src-coms-NetMessagePool.h
index 65ef15fc471c..0545a88c76eb 100644
--- a/games/scorched3d-devel/files/patch-src-coms-NetMessagePool.h
+++ b/games/scorched3d-devel/files/patch-src-coms-NetMessagePool.h
@@ -1,5 +1,5 @@
---- src/coms/NetMessagePool.h.orig Wed Jul 30 17:41:28 2003
-+++ src/coms/NetMessagePool.h Sun Aug 3 09:07:12 2003
+--- ./src/coms/NetMessagePool.h.orig Fri Jan 23 17:59:08 2004
++++ ./src/coms/NetMessagePool.h Fri Jan 23 18:02:11 2004
@@ -24,7 +24,7 @@
#include <coms/NetMessage.h>
diff --git a/games/scorched3d-devel/files/patch-src-engine-ActionMeta.h b/games/scorched3d-devel/files/patch-src-engine-ActionMeta.h
deleted file mode 100644
index 5b3ef2fe98e6..000000000000
--- a/games/scorched3d-devel/files/patch-src-engine-ActionMeta.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/engine/ActionMeta.h.orig Wed Jul 30 17:41:29 2003
-+++ src/engine/ActionMeta.h Sun Aug 3 09:07:12 2003
-@@ -29,7 +29,7 @@
-
- #define REGISTER_ACTION_HEADER(x) \
- virtual const char *getActionName() { return #x ; } \
-- ##x *getActionCopy() { return new x ; } \
-+ x *getActionCopy() { return new x ; } \
- virtual bool getReferenced() { return true; }
- #define REGISTER_ACTION_SOURCE(x) \
- struct META_##x { META_##x() { ActionMetaRegistration::addMap(#x , new x ); } }; \
diff --git a/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp b/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp
index 279c87435635..ff095e62045b 100644
--- a/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp
+++ b/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp
@@ -1,11 +1,11 @@
---- src/engine/MainLoop.cpp.orig Wed Jul 30 17:41:26 2003
-+++ src/engine/MainLoop.cpp Sun Aug 3 09:07:12 2003
-@@ -28,7 +28,7 @@
+--- ./src/engine/MainLoop.cpp.orig Fri Jan 23 17:59:09 2004
++++ ./src/engine/MainLoop.cpp Fri Jan 23 18:02:17 2004
+@@ -22,7 +22,7 @@
+ #include <common/OptionsDisplay.h>
#include <common/Defines.h>
- #include <common/Timer.h>
#include <GLEXT/GLState.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
- //////////////////////////////////////////////////////////////////////
- // Construction/Destruction
+ MainLoop::MainLoop() : exitLoop_(false), lastDrawTime_(0.0f)
+ {
diff --git a/games/scorched3d-devel/files/patch-src-irc-GameInfoEntry.h b/games/scorched3d-devel/files/patch-src-irc-GameInfoEntry.h
new file mode 100644
index 000000000000..c070faecfdb1
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-irc-GameInfoEntry.h
@@ -0,0 +1,13 @@
+--- ./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-devel/files/patch-src-irc-GameInfoList.h b/games/scorched3d-devel/files/patch-src-irc-GameInfoList.h
new file mode 100644
index 000000000000..831b1e198f0d
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-irc-GameInfoList.h
@@ -0,0 +1,11 @@
+--- ./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-devel/files/patch-src-irc-GameInfoMessage.h b/games/scorched3d-devel/files/patch-src-irc-GameInfoMessage.h
new file mode 100644
index 000000000000..9a817d7f459a
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-irc-GameInfoMessage.h
@@ -0,0 +1,15 @@
+--- ./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-devel/files/patch-src-irc-IrcConnection.h b/games/scorched3d-devel/files/patch-src-irc-IrcConnection.h
new file mode 100644
index 000000000000..ee45c4cf025c
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-irc-IrcConnection.h
@@ -0,0 +1,15 @@
+--- ./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-devel/files/patch-src-irc-UdpHandler.h b/games/scorched3d-devel/files/patch-src-irc-UdpHandler.h
new file mode 100644
index 000000000000..05048c1b5224
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-irc-UdpHandler.h
@@ -0,0 +1,15 @@
+--- ./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-devel/files/patch-src-ode-common.h b/games/scorched3d-devel/files/patch-src-ode-common.h
deleted file mode 100644
index 7f17caf18bf4..000000000000
--- a/games/scorched3d-devel/files/patch-src-ode-common.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ode/common.h.orig Wed Jul 30 17:41:29 2003
-+++ src/ode/common.h Sun Aug 3 09:07:13 2003
-@@ -25,7 +25,7 @@
-
- #include <ode/config.h>
- #include <ode/error.h>
--#ifndef WIN32
-+#if !defined(WIN32) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <stdlib.h>
diff --git a/games/scorched3d-devel/files/patch-src-ode-config.h b/games/scorched3d-devel/files/patch-src-ode-config.h
index c30d3ec4e9e0..7df954c181de 100644
--- a/games/scorched3d-devel/files/patch-src-ode-config.h
+++ b/games/scorched3d-devel/files/patch-src-ode-config.h
@@ -1,11 +1,11 @@
---- src/ode/config.h.orig Wed Jul 30 17:41:29 2003
-+++ src/ode/config.h Sun Aug 3 09:07:13 2003
-@@ -31,7 +31,7 @@
+--- ./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 @@
+ #if defined(__DARWIN__)
+ #include <sys/malloc.h>
+ #else
+-#include <malloc.h> // for alloca under windows
++#include <stdlib.h> // for alloca under windows
+ #endif
- #include <stdio.h>
- #include <stdarg.h>
--#include <malloc.h> // for alloca under windows
-+#include <stdlib.h> // for alloca under windows
#include <string.h>
- #include <math.h>
-
diff --git a/games/scorched3d-devel/files/patch-src-scorched-main.cpp b/games/scorched3d-devel/files/patch-src-scorched-main.cpp
index f786738cf0c8..2735b09fe57c 100644
--- a/games/scorched3d-devel/files/patch-src-scorched-main.cpp
+++ b/games/scorched3d-devel/files/patch-src-scorched-main.cpp
@@ -1,5 +1,5 @@
---- src/scorched/main.cpp.orig Wed Jul 30 17:41:27 2003
-+++ src/scorched/main.cpp Sun Aug 3 09:07:13 2003
+--- ./src/scorched/main.cpp.orig Fri Jan 23 17:59:15 2004
++++ ./src/scorched/main.cpp Fri Jan 23 18:03:16 2004
@@ -20,7 +20,7 @@
diff --git a/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp b/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp
index 1e1884d5f7d0..a8572fbd5a56 100644
--- a/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp
+++ b/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp
@@ -1,11 +1,11 @@
---- src/server/ServerMain.cpp.orig Wed Jul 30 17:41:27 2003
-+++ src/server/ServerMain.cpp Sun Aug 3 09:07:13 2003
-@@ -46,7 +46,7 @@
- #include <server/ServerBuyAccessoryHandler.h>
- #include <server/ServerConnectHandler.h>
+--- ./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>
#include <server/ServerState.h>
+ #include <server/ScorchedServer.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
- Timer serverTimer;
+ Clock serverTimer;
diff --git a/games/scorched3d-devel/pkg-descr b/games/scorched3d-devel/pkg-descr
index cade5199432e..f284483c1d18 100644
--- a/games/scorched3d-devel/pkg-descr
+++ b/games/scorched3d-devel/pkg-descr
@@ -12,6 +12,9 @@ to recreate the simple yet addictive game play of the original game,
adding amongst other new features a 3D island environment and LAN and
internet play.
-You must run X11 in 16bpp mode in order for the game to run.
+
+You must run X in 24bpp mode or higher to be able to run the game.
+You should have 3D hardware accelleration enabled to enjoy a playable
+ FPS rate.
WWW: http://www.scorched3d.co.uk/
diff --git a/games/scorched3d-devel/pkg-plist b/games/scorched3d-devel/pkg-plist
index b0c78a48803a..d9ef0c4bf26c 100644
--- a/games/scorched3d-devel/pkg-plist
+++ b/games/scorched3d-devel/pkg-plist
@@ -1,25 +1,157 @@
bin/scorched3d
-games/scorched3d/scorched3d
+games/scorched3d/README
+games/scorched3d/data/accessories.xml
+games/scorched3d/data/accessories/barrage/barrage.txt
+games/scorched3d/data/accessories/barrage/gradient.bmp
+games/scorched3d/data/accessories/barrage/white.bmp
+games/scorched3d/data/accessories/barrage/yellow.bmp
+games/scorched3d/data/accessories/bomb/black.bmp
+games/scorched3d/data/accessories/bomb/bomb.txt
+games/scorched3d/data/accessories/bomb/white.bmp
+games/scorched3d/data/accessories/bomblet/bomblet.txt
+games/scorched3d/data/accessories/bomblet/yellow.bmp
+games/scorched3d/data/accessories/bouncingbetty/black.bmp
+games/scorched3d/data/accessories/bouncingbetty/bouncingbetty.txt
+games/scorched3d/data/accessories/clusterbomb.ase
+games/scorched3d/data/accessories/clusterbomb2.ase
+games/scorched3d/data/accessories/default.ase
+games/scorched3d/data/accessories/default.bmp
+games/scorched3d/data/accessories/digger/black.bmp
+games/scorched3d/data/accessories/digger/digger.txt
+games/scorched3d/data/accessories/digger/swirl.bmp
+games/scorched3d/data/accessories/fatman/black.bmp
+games/scorched3d/data/accessories/fatman/fatman.txt
+games/scorched3d/data/accessories/flare.txt
+games/scorched3d/data/accessories/hawkmissile/gradient.bmp
+games/scorched3d/data/accessories/hawkmissile/hawk.txt
+games/scorched3d/data/accessories/hawkmissile/white.bmp
+games/scorched3d/data/accessories/hawkmissile/yellow.bmp
+games/scorched3d/data/accessories/icbm/black.bmp
+games/scorched3d/data/accessories/icbm/gradient.bmp
+games/scorched3d/data/accessories/icbm/icbm.txt
+games/scorched3d/data/accessories/icbm/white.bmp
+games/scorched3d/data/accessories/icbm/yellow.bmp
+games/scorched3d/data/accessories/littleboy/black.bmp
+games/scorched3d/data/accessories/littleboy/littleboy.txt
+games/scorched3d/data/accessories/m48/gradient.bmp
+games/scorched3d/data/accessories/m48/m48.txt
+games/scorched3d/data/accessories/m48/white.bmp
+games/scorched3d/data/accessories/m48/yellow.bmp
+games/scorched3d/data/accessories/mirvwarhead/black.bmp
+games/scorched3d/data/accessories/mirvwarhead/mirvwarhead.txt
+games/scorched3d/data/accessories/palmtree/black.bmp
+games/scorched3d/data/accessories/palmtree/burntpalm.txt
+games/scorched3d/data/accessories/palmtree/burntpalm2.txt
+games/scorched3d/data/accessories/palmtree/green.bmp
+games/scorched3d/data/accessories/palmtree/palm.txt
+games/scorched3d/data/accessories/palmtree/palm2.txt
+games/scorched3d/data/accessories/palmtree/tan.bmp
+games/scorched3d/data/accessories/patriot/gradient.bmp
+games/scorched3d/data/accessories/patriot/patriot.txt
+games/scorched3d/data/accessories/patriot/white.bmp
+games/scorched3d/data/accessories/patriot/yellow.bmp
+games/scorched3d/data/accessories/sa6/gradient.bmp
+games/scorched3d/data/accessories/sa6/sa6.txt
+games/scorched3d/data/accessories/sa6/white.bmp
+games/scorched3d/data/accessories/sa6/yellow.bmp
+games/scorched3d/data/accessories/shell/black.bmp
+games/scorched3d/data/accessories/shell/shell.txt
+games/scorched3d/data/accessories/smallpine/black.bmp
+games/scorched3d/data/accessories/smallpine/burntsmallpine.txt
+games/scorched3d/data/accessories/smallpine/green.bmp
+games/scorched3d/data/accessories/smallpine/smallpine.txt
+games/scorched3d/data/accessories/smallpine/smallpine2.txt
+games/scorched3d/data/accessories/smallpine/smallpine3.txt
+games/scorched3d/data/accessories/smallpine/tan.bmp
+games/scorched3d/data/accessories/smallpine/wintergreen.bmp
+games/scorched3d/data/accessories/smallpine/wintersmallpine.txt
+games/scorched3d/data/accessories/smallpine/wintersmallpine2.txt
+games/scorched3d/data/accessories/smallpine/wintersmallpine3.txt
+games/scorched3d/data/accessories/v2missile/black.bmp
+games/scorched3d/data/accessories/v2missile/checker.bmp
+games/scorched3d/data/accessories/v2missile/gradient.bmp
+games/scorched3d/data/accessories/v2missile/v2missile.txt
+games/scorched3d/data/accessories/v2missile/yellow.bmp
+games/scorched3d/data/accessories/white.bmp
+games/scorched3d/data/ainames.txt
+games/scorched3d/data/autoexec.xml
+games/scorched3d/data/display.xml
+games/scorched3d/data/fonts/data.bmp
+games/scorched3d/data/fonts/datainv.bmp
+games/scorched3d/data/keys.xml
+games/scorched3d/data/meshes/autoaim.ase
games/scorched3d/data/meshes/rock1.ase
games/scorched3d/data/meshes/rock2.ase
+games/scorched3d/data/meshes/survivalraft.txt
games/scorched3d/data/meshes/wind.ase
+games/scorched3d/data/motd.txt
+games/scorched3d/data/mysql.xml
+games/scorched3d/data/playernames.txt
+games/scorched3d/data/random.no
+games/scorched3d/data/resource.xml
+games/scorched3d/data/server.xml
+games/scorched3d/data/singlecustom.xml
+games/scorched3d/data/singleeasy.xml
+games/scorched3d/data/singlehard.xml
+games/scorched3d/data/singlenormal.xml
+games/scorched3d/data/statstables.sql
+games/scorched3d/data/talk/german/talk1.txt
+games/scorched3d/data/talk/german/talk2.txt
games/scorched3d/data/talk/polish/talk1.txt
games/scorched3d/data/talk/polish/talk2.txt
games/scorched3d/data/talk/talk1.txt
games/scorched3d/data/talk/talk2.txt
-games/scorched3d/data/tanks/wespe.bmp
+games/scorched3d/data/tankais.xml
+games/scorched3d/data/tanks.xml
+games/scorched3d/data/tanks/a7v.ase
+games/scorched3d/data/tanks/a7v.bmp
+games/scorched3d/data/tanks/aat.ase
+games/scorched3d/data/tanks/aat.bmp
+games/scorched3d/data/tanks/apache-long.ase
games/scorched3d/data/tanks/apache-long.bmp
games/scorched3d/data/tanks/apache.ase
games/scorched3d/data/tanks/apache.bmp
+games/scorched3d/data/tanks/atst.ase
+games/scorched3d/data/tanks/atst.bmp
+games/scorched3d/data/tanks/battleship/battleship.txt
+games/scorched3d/data/tanks/battleship/grey.bmp
games/scorched3d/data/tanks/bm13.ase
games/scorched3d/data/tanks/bm13.bmp
+games/scorched3d/data/tanks/bm13/bigtire.bmp
+games/scorched3d/data/tanks/bm13/bm13-2.txt
+games/scorched3d/data/tanks/bm13/cab.bmp
+games/scorched3d/data/tanks/bm13/dot.bmp
+games/scorched3d/data/tanks/bm13/tan.bmp
+games/scorched3d/data/tanks/bm13/white.bmp
games/scorched3d/data/tanks/bradley.ase
games/scorched3d/data/tanks/bradley.bmp
+games/scorched3d/data/tanks/bradley2/bradley.bmp
+games/scorched3d/data/tanks/bradley2/bradley2.txt
games/scorched3d/data/tanks/bradleyb.bmp
+games/scorched3d/data/tanks/flakpanzerwirbelwind.ase
+games/scorched3d/data/tanks/flakpanzerwirbelwind.bmp
+games/scorched3d/data/tanks/guntower/guntower.bmp
+games/scorched3d/data/tanks/guntower/guntower.txt
+games/scorched3d/data/tanks/guntower/guntower2.bmp
+games/scorched3d/data/tanks/harpoon.ase
+games/scorched3d/data/tanks/harpoon.bmp
games/scorched3d/data/tanks/hawk.ase
games/scorched3d/data/tanks/hawk.bmp
+games/scorched3d/data/tanks/hawk/bigtire.bmp
+games/scorched3d/data/tanks/hawk/chrome.bmp
+games/scorched3d/data/tanks/hawk/hawk.txt
+games/scorched3d/data/tanks/hawk/tan.bmp
+games/scorched3d/data/tanks/hawk/white.bmp
+games/scorched3d/data/tanks/helder/helder.txt
+games/scorched3d/data/tanks/helder/helder2.txt
+games/scorched3d/data/tanks/helder/redspace.bmp
+games/scorched3d/data/tanks/helder/whitespace.bmp
games/scorched3d/data/tanks/hind.ase
games/scorched3d/data/tanks/hind.bmp
+games/scorched3d/data/tanks/hothgun.ase
+games/scorched3d/data/tanks/hothgun.bmp
+games/scorched3d/data/tanks/hothgun2.ase
+games/scorched3d/data/tanks/hothgun2.bmp
games/scorched3d/data/tanks/howitzer.ase
games/scorched3d/data/tanks/howitzer.bmp
games/scorched3d/data/tanks/hummermlrs.ase
@@ -28,30 +160,83 @@ games/scorched3d/data/tanks/hummersam.ase
games/scorched3d/data/tanks/hummersam.bmp
games/scorched3d/data/tanks/hummertow.ase
games/scorched3d/data/tanks/hummertow.bmp
+games/scorched3d/data/tanks/kenny02.bmp
+games/scorched3d/data/tanks/kenny2.txt
+games/scorched3d/data/tanks/lav-25/bigtire.bmp
+games/scorched3d/data/tanks/lav-25/camo.bmp
+games/scorched3d/data/tanks/lav-25/lav-25.txt
games/scorched3d/data/tanks/m110.ase
games/scorched3d/data/tanks/m110.bmp
games/scorched3d/data/tanks/m198.ase
games/scorched3d/data/tanks/m198.bmp
games/scorched3d/data/tanks/m1a1.ase
games/scorched3d/data/tanks/m1a1.bmp
+games/scorched3d/data/tanks/m1a1/black.bmp
+games/scorched3d/data/tanks/m1a1/camo.bmp
+games/scorched3d/data/tanks/m1a1/m1a1.txt
+games/scorched3d/data/tanks/m1a1/tread.bmp
+games/scorched3d/data/tanks/m48/camo.bmp
+games/scorched3d/data/tanks/m48/chrome.bmp
+games/scorched3d/data/tanks/m48/m48.txt
+games/scorched3d/data/tanks/m48/tread.bmp
+games/scorched3d/data/tanks/m48/white.bmp
games/scorched3d/data/tanks/m7priest.ase
games/scorched3d/data/tanks/m7priest.bmp
+games/scorched3d/data/tanks/mark1.ase
+games/scorched3d/data/tanks/mark1.bmp
+games/scorched3d/data/tanks/mlrs/camo.bmp
+games/scorched3d/data/tanks/mlrs/chrome.bmp
+games/scorched3d/data/tanks/mlrs/mlrs.txt
+games/scorched3d/data/tanks/mlrs/tread.bmp
games/scorched3d/data/tanks/paladin.ase
games/scorched3d/data/tanks/paladin.bmp
+games/scorched3d/data/tanks/panzer3.ase
+games/scorched3d/data/tanks/panzer3.bmp
games/scorched3d/data/tanks/patriot.ase
games/scorched3d/data/tanks/patriot.bmp
+games/scorched3d/data/tanks/patriot/bigtire.bmp
+games/scorched3d/data/tanks/patriot/camo.bmp
+games/scorched3d/data/tanks/patriot/chrome.bmp
+games/scorched3d/data/tanks/patriot/kaki.bmp
+games/scorched3d/data/tanks/patriot/patriot.txt
+games/scorched3d/data/tanks/phalanx.ase
+games/scorched3d/data/tanks/phalanx.bmp
games/scorched3d/data/tanks/question.ase
games/scorched3d/data/tanks/question.bmp
+games/scorched3d/data/tanks/railgun.ase
+games/scorched3d/data/tanks/railgun.bmp
+games/scorched3d/data/tanks/ram.ase
+games/scorched3d/data/tanks/ram.bmp
+games/scorched3d/data/tanks/rapier.ase
+games/scorched3d/data/tanks/rapier.bmp
+games/scorched3d/data/tanks/sa-19.ase
+games/scorched3d/data/tanks/sa-19.bmp
games/scorched3d/data/tanks/sa6.ase
games/scorched3d/data/tanks/sa6.bmp
+games/scorched3d/data/tanks/sa6/black.bmp
+games/scorched3d/data/tanks/sa6/chrome.bmp
+games/scorched3d/data/tanks/sa6/guncover.bmp
+games/scorched3d/data/tanks/sa6/guncoveralpha.bmp
+games/scorched3d/data/tanks/sa6/sa6.txt
+games/scorched3d/data/tanks/sa6/white.bmp
+games/scorched3d/data/tanks/sa6/zsu23.bmp
games/scorched3d/data/tanks/scud.ase
games/scorched3d/data/tanks/scud.bmp
+games/scorched3d/data/tanks/seasparrow.ase
+games/scorched3d/data/tanks/seasparrow.bmp
+games/scorched3d/data/tanks/siegetank.ase
+games/scorched3d/data/tanks/siegetank.bmp
+games/scorched3d/data/tanks/siegetank2.ase
+games/scorched3d/data/tanks/siegetank2.bmp
games/scorched3d/data/tanks/t55.ase
games/scorched3d/data/tanks/t55.bmp
games/scorched3d/data/tanks/t55b.bmp
games/scorched3d/data/tanks/t74.ase
games/scorched3d/data/tanks/t74.bmp
games/scorched3d/data/tanks/t74b.bmp
+games/scorched3d/data/tanks/t90/black.bmp
+games/scorched3d/data/tanks/t90/t90.bmp
+games/scorched3d/data/tanks/t90/t90.txt
games/scorched3d/data/tanks/tank2.ase
games/scorched3d/data/tanks/tank2.bmp
games/scorched3d/data/tanks/tank3.ase
@@ -65,20 +250,38 @@ games/scorched3d/data/tanks/tank6.ase
games/scorched3d/data/tanks/tank6.bmp
games/scorched3d/data/tanks/tank6a.bmp
games/scorched3d/data/tanks/tank6b.bmp
+games/scorched3d/data/tanks/thel/black.bmp
+games/scorched3d/data/tanks/thel/chrome.bmp
+games/scorched3d/data/tanks/thel/green.bmp
+games/scorched3d/data/tanks/thel/kaki.bmp
+games/scorched3d/data/tanks/thel/thel.txt
games/scorched3d/data/tanks/tos1.ase
games/scorched3d/data/tanks/tos1.bmp
games/scorched3d/data/tanks/towedartillery.ase
games/scorched3d/data/tanks/towedartillery.bmp
+games/scorched3d/data/tanks/towedartillery2/bigtire.bmp
+games/scorched3d/data/tanks/towedartillery2/chrome.bmp
+games/scorched3d/data/tanks/towedartillery2/tan.bmp
+games/scorched3d/data/tanks/towedartillery2/towedartillery2.txt
games/scorched3d/data/tanks/towedartilleryb.bmp
+games/scorched3d/data/tanks/v2.ase
+games/scorched3d/data/tanks/v2.bmp
games/scorched3d/data/tanks/wespe.ase
-games/scorched3d/data/tanks/apache-long.ase
-games/scorched3d/data/fonts/data.bmp
-games/scorched3d/data/fonts/datainv.bmp
+games/scorched3d/data/tanks/wespe.bmp
+games/scorched3d/data/tanks/zsu-24-1.ase
+games/scorched3d/data/tanks/zsu-24-1.bmp
+games/scorched3d/data/tanks/zsu23/black.bmp
+games/scorched3d/data/tanks/zsu23/white.bmp
+games/scorched3d/data/tanks/zsu23/zsu23.bmp
+games/scorched3d/data/tanks/zsu23/zsu23.txt
+games/scorched3d/data/tanks/zsu57/black.bmp
+games/scorched3d/data/tanks/zsu57/zsu57.bmp
+games/scorched3d/data/tanks/zsu57/zsu57.txt
games/scorched3d/data/textures/bordershield/grid.bmp
games/scorched3d/data/textures/bordershield/grid2.bmp
games/scorched3d/data/textures/bordershield/grid22.bmp
games/scorched3d/data/textures/bordershield/hit.bmp
-games/scorched3d/data/textures/explode/exp05_7.bmp
+games/scorched3d/data/textures/explode/exp00_1.bmp
games/scorched3d/data/textures/explode/exp00_10.bmp
games/scorched3d/data/textures/explode/exp00_2.bmp
games/scorched3d/data/textures/explode/exp00_3.bmp
@@ -106,8 +309,8 @@ games/scorched3d/data/textures/explode/exp05_3.bmp
games/scorched3d/data/textures/explode/exp05_4.bmp
games/scorched3d/data/textures/explode/exp05_5.bmp
games/scorched3d/data/textures/explode/exp05_6.bmp
-games/scorched3d/data/textures/explode/exp00_1.bmp
-games/scorched3d/data/textures/flame/flame33.bmp
+games/scorched3d/data/textures/explode/exp05_7.bmp
+games/scorched3d/data/textures/flame/flame01.bmp
games/scorched3d/data/textures/flame/flame02.bmp
games/scorched3d/data/textures/flame/flame03.bmp
games/scorched3d/data/textures/flame/flame04.bmp
@@ -139,25 +342,11 @@ games/scorched3d/data/textures/flame/flame29.bmp
games/scorched3d/data/textures/flame/flame30.bmp
games/scorched3d/data/textures/flame/flame31.bmp
games/scorched3d/data/textures/flame/flame32.bmp
-games/scorched3d/data/textures/flame/flame01.bmp
-games/scorched3d/data/textures/lensflare/shine9.bw
-games/scorched3d/data/textures/lensflare/flare1.bw
-games/scorched3d/data/textures/lensflare/flare2.bw
-games/scorched3d/data/textures/lensflare/flare3.bw
-games/scorched3d/data/textures/lensflare/flare4.bw
-games/scorched3d/data/textures/lensflare/flare5.bw
-games/scorched3d/data/textures/lensflare/shine0.bw
-games/scorched3d/data/textures/lensflare/shine1.bw
-games/scorched3d/data/textures/lensflare/shine2.bw
-games/scorched3d/data/textures/lensflare/shine3.bw
-games/scorched3d/data/textures/lensflare/shine4.bw
-games/scorched3d/data/textures/lensflare/shine5.bw
-games/scorched3d/data/textures/lensflare/shine6.bw
-games/scorched3d/data/textures/lensflare/shine7.bw
-games/scorched3d/data/textures/lensflare/shine8.bw
-games/scorched3d/data/textures/lensflare/flare0.bw
-games/scorched3d/data/textures/landscape/default/texture4.bmp
+games/scorched3d/data/textures/flame/flame33.bmp
+games/scorched3d/data/textures/glow1.bmp
+games/scorched3d/data/textures/landscape/default/cloud1.bmp
games/scorched3d/data/textures/landscape/default/cubemap.bmp
+games/scorched3d/data/textures/landscape/default/detail.bmp
games/scorched3d/data/textures/landscape/default/magma-small.bmp
games/scorched3d/data/textures/landscape/default/rockside.bmp
games/scorched3d/data/textures/landscape/default/scorch.bmp
@@ -166,8 +355,9 @@ games/scorched3d/data/textures/landscape/default/texture0.bmp
games/scorched3d/data/textures/landscape/default/texture1.bmp
games/scorched3d/data/textures/landscape/default/texture2.bmp
games/scorched3d/data/textures/landscape/default/texture3.bmp
-games/scorched3d/data/textures/landscape/default/cloud1.bmp
-games/scorched3d/data/textures/landscape/hell/texture4.bmp
+games/scorched3d/data/textures/landscape/default/texture4.bmp
+games/scorched3d/data/textures/landscape/default/water.bmp
+games/scorched3d/data/textures/landscape/hell/cloud1.bmp
games/scorched3d/data/textures/landscape/hell/cubemap.bmp
games/scorched3d/data/textures/landscape/hell/rockside.bmp
games/scorched3d/data/textures/landscape/hell/scorch.bmp
@@ -176,8 +366,8 @@ games/scorched3d/data/textures/landscape/hell/texture0.bmp
games/scorched3d/data/textures/landscape/hell/texture1.bmp
games/scorched3d/data/textures/landscape/hell/texture2.bmp
games/scorched3d/data/textures/landscape/hell/texture3.bmp
-games/scorched3d/data/textures/landscape/hell/cloud1.bmp
-games/scorched3d/data/textures/landscape/sand/texture4.bmp
+games/scorched3d/data/textures/landscape/hell/texture4.bmp
+games/scorched3d/data/textures/landscape/sand/cloud1.bmp
games/scorched3d/data/textures/landscape/sand/cubemap.bmp
games/scorched3d/data/textures/landscape/sand/rockside.bmp
games/scorched3d/data/textures/landscape/sand/scorch.bmp
@@ -186,8 +376,8 @@ games/scorched3d/data/textures/landscape/sand/texture0.bmp
games/scorched3d/data/textures/landscape/sand/texture1.bmp
games/scorched3d/data/textures/landscape/sand/texture2.bmp
games/scorched3d/data/textures/landscape/sand/texture3.bmp
-games/scorched3d/data/textures/landscape/sand/cloud1.bmp
-games/scorched3d/data/textures/landscape/snow/texture4.bmp
+games/scorched3d/data/textures/landscape/sand/texture4.bmp
+games/scorched3d/data/textures/landscape/snow/cloud1.bmp
games/scorched3d/data/textures/landscape/snow/cubemap.bmp
games/scorched3d/data/textures/landscape/snow/rockside.bmp
games/scorched3d/data/textures/landscape/snow/scorch.bmp
@@ -196,16 +386,96 @@ games/scorched3d/data/textures/landscape/snow/texture0.bmp
games/scorched3d/data/textures/landscape/snow/texture1.bmp
games/scorched3d/data/textures/landscape/snow/texture2.bmp
games/scorched3d/data/textures/landscape/snow/texture3.bmp
-games/scorched3d/data/textures/landscape/snow/cloud1.bmp
+games/scorched3d/data/textures/landscape/snow/texture4.bmp
+games/scorched3d/data/textures/landscape/storm/cloud1.bmp
+games/scorched3d/data/textures/landscape/storm/cubemap.bmp
+games/scorched3d/data/textures/landscape/storm/rockside.bmp
+games/scorched3d/data/textures/landscape/storm/scorch.bmp
+games/scorched3d/data/textures/landscape/storm/shore.bmp
+games/scorched3d/data/textures/landscape/storm/texture0.bmp
+games/scorched3d/data/textures/landscape/storm/texture1.bmp
+games/scorched3d/data/textures/landscape/storm/texture2.bmp
+games/scorched3d/data/textures/landscape/storm/texture3.bmp
+games/scorched3d/data/textures/landscape/storm/texture4.bmp
games/scorched3d/data/textures/landscape/textures.txt
-games/scorched3d/data/textures/glow1.bmp
+games/scorched3d/data/textures/landscape/tropical/cloud1.bmp
+games/scorched3d/data/textures/landscape/tropical/cubemap.bmp
+games/scorched3d/data/textures/landscape/tropical/rockside.bmp
+games/scorched3d/data/textures/landscape/tropical/scorch.bmp
+games/scorched3d/data/textures/landscape/tropical/shore.bmp
+games/scorched3d/data/textures/landscape/tropical/texture0.bmp
+games/scorched3d/data/textures/landscape/tropical/texture1.bmp
+games/scorched3d/data/textures/landscape/tropical/texture2.bmp
+games/scorched3d/data/textures/landscape/tropical/texture3.bmp
+games/scorched3d/data/textures/landscape/tropical/texture4.bmp
+games/scorched3d/data/textures/landscape/vulcano/cloud1.bmp
+games/scorched3d/data/textures/landscape/vulcano/cubemap.bmp
+games/scorched3d/data/textures/landscape/vulcano/rockside.bmp
+games/scorched3d/data/textures/landscape/vulcano/scorch.bmp
+games/scorched3d/data/textures/landscape/vulcano/shore.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture0.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture1.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture2.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture3.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture4.bmp
+games/scorched3d/data/textures/lensflare/flare0.bw
+games/scorched3d/data/textures/lensflare/flare1.bw
+games/scorched3d/data/textures/lensflare/flare2.bw
+games/scorched3d/data/textures/lensflare/flare3.bw
+games/scorched3d/data/textures/lensflare/flare4.bw
+games/scorched3d/data/textures/lensflare/flare5.bw
+games/scorched3d/data/textures/lensflare/shine0.bw
+games/scorched3d/data/textures/lensflare/shine1.bw
+games/scorched3d/data/textures/lensflare/shine2.bw
+games/scorched3d/data/textures/lensflare/shine3.bw
+games/scorched3d/data/textures/lensflare/shine4.bw
+games/scorched3d/data/textures/lensflare/shine5.bw
+games/scorched3d/data/textures/lensflare/shine6.bw
+games/scorched3d/data/textures/lensflare/shine7.bw
+games/scorched3d/data/textures/lensflare/shine8.bw
+games/scorched3d/data/textures/lensflare/shine9.bw
games/scorched3d/data/textures/smoke01.bmp
+games/scorched3d/data/textures/smoke02.bmp
games/scorched3d/data/textures/talk.bmp
+games/scorched3d/data/textures/wicons/Thumbs.db
+games/scorched3d/data/textures/wicons/autod.bmp
+games/scorched3d/data/textures/wicons/battery.bmp
+games/scorched3d/data/textures/wicons/bdigger.bmp
+games/scorched3d/data/textures/wicons/bmissile.bmp
+games/scorched3d/data/textures/wicons/bnuke.bmp
+games/scorched3d/data/textures/wicons/bshog.bmp
+games/scorched3d/data/textures/wicons/dball.bmp
+games/scorched3d/data/textures/wicons/dclod.bmp
+games/scorched3d/data/textures/wicons/dhead.bmp
+games/scorched3d/data/textures/wicons/digger.bmp
+games/scorched3d/data/textures/wicons/fbomb.bmp
+games/scorched3d/data/textures/wicons/fshield.bmp
+games/scorched3d/data/textures/wicons/fuel.bmp
+games/scorched3d/data/textures/wicons/hdigger.bmp
+games/scorched3d/data/textures/wicons/hnapalm.bmp
+games/scorched3d/data/textures/wicons/hrbomb.bmp
+games/scorched3d/data/textures/wicons/hshield.bmp
+games/scorched3d/data/textures/wicons/hshog.bmp
+games/scorched3d/data/textures/wicons/lfrog.bmp
+games/scorched3d/data/textures/wicons/mag.bmp
+games/scorched3d/data/textures/wicons/mirv.bmp
+games/scorched3d/data/textures/wicons/missile.bmp
+games/scorched3d/data/textures/wicons/napalm.bmp
+games/scorched3d/data/textures/wicons/nuke.bmp
+games/scorched3d/data/textures/wicons/para.bmp
+games/scorched3d/data/textures/wicons/rbomb.bmp
+games/scorched3d/data/textures/wicons/shield.bmp
+games/scorched3d/data/textures/wicons/shog.bmp
+games/scorched3d/data/textures/wicons/smag.bmp
+games/scorched3d/data/textures/wicons/stracer.bmp
+games/scorched3d/data/textures/wicons/tdirt.bmp
+games/scorched3d/data/textures/wicons/tracer.bmp
games/scorched3d/data/wav/battery/battery.wav
-games/scorched3d/data/wav/explosions/medium.wav
+games/scorched3d/data/wav/explosions/crunch.wav
games/scorched3d/data/wav/explosions/gloop.wav
games/scorched3d/data/wav/explosions/large.wav
-games/scorched3d/data/wav/explosions/crunch.wav
+games/scorched3d/data/wav/explosions/medium.wav
+games/scorched3d/data/wav/explosions/napalm.wav
games/scorched3d/data/wav/explosions/small.wav
games/scorched3d/data/wav/explosions/tank.wav
games/scorched3d/data/wav/explosions/xlarge.wav
@@ -213,6 +483,7 @@ games/scorched3d/data/wav/misc/camera.wav
games/scorched3d/data/wav/misc/para.wav
games/scorched3d/data/wav/misc/play.wav
games/scorched3d/data/wav/misc/splash.wav
+games/scorched3d/data/wav/misc/text.wav
games/scorched3d/data/wav/movement/elevate.wav
games/scorched3d/data/wav/movement/movement.wav
games/scorched3d/data/wav/movement/turn.wav
@@ -220,16 +491,16 @@ games/scorched3d/data/wav/shield/activate.wav
games/scorched3d/data/wav/shield/activateforce.wav
games/scorched3d/data/wav/shield/hit.wav
games/scorched3d/data/wav/shield/hit2.wav
-games/scorched3d/data/wav/shoot/medium.wav
+games/scorched3d/data/wav/shoot/flare.wav
games/scorched3d/data/wav/shoot/large.wav
games/scorched3d/data/wav/shoot/laser.wav
-games/scorched3d/data/wav/shoot/flare.wav
+games/scorched3d/data/wav/shoot/launch.wav
+games/scorched3d/data/wav/shoot/medium.wav
games/scorched3d/data/wav/shoot/small.wav
games/scorched3d/data/wav/shoot/tracer.wav
games/scorched3d/data/wav/shoot/xlarge.wav
-games/scorched3d/data/windows/tank2.ico
+games/scorched3d/data/windows/client.bmp
games/scorched3d/data/windows/display.bmp
-games/scorched3d/data/windows/eye1.bmp
games/scorched3d/data/windows/island.bmp
games/scorched3d/data/windows/island.ico
games/scorched3d/data/windows/logotiled.bmp
@@ -240,24 +511,9 @@ games/scorched3d/data/windows/tank-easy.bmp
games/scorched3d/data/windows/tank-hard.bmp
games/scorched3d/data/windows/tank-med.bmp
games/scorched3d/data/windows/tank2.bmp
-games/scorched3d/data/windows/client.bmp
-games/scorched3d/data/server.xml
-games/scorched3d/data/ainames.txt
-games/scorched3d/data/singleeasy.xml
-games/scorched3d/data/singlehard.xml
-games/scorched3d/data/singlenormal.xml
-games/scorched3d/data/tanks.xml
-games/scorched3d/data/singlecustom.xml
-games/scorched3d/data/autoexec.xml
-games/scorched3d/data/display.xml
-games/scorched3d/data/motd.txt
-games/scorched3d/data/playernames.txt
-games/scorched3d/data/random.no
-games/scorched3d/data/resource.xml
-games/scorched3d/README
-games/scorched3d/documentation/Scorched3D.hlp
-games/scorched3d/documentation/mehrspieler.txt
-games/scorched3d/documentation/multiplayer.txt
+games/scorched3d/data/windows/tank2.ico
+games/scorched3d/data/windows/wait.bmp
+games/scorched3d/data/windows/waita.bmp
games/scorched3d/documentation/README-EXPAT.txt
games/scorched3d/documentation/README-ODE.txt
games/scorched3d/documentation/README-SDL.txt
@@ -265,30 +521,76 @@ games/scorched3d/documentation/README-SDLMIXER.txt
games/scorched3d/documentation/README-SDLNET.txt
games/scorched3d/documentation/README-wxwindows.txt
games/scorched3d/documentation/README-zlib.txt
+games/scorched3d/documentation/Scorched3D.hlp
games/scorched3d/documentation/liesmich.txt
-@dirrm games/scorched3d/data/meshes
-@dirrm games/scorched3d/data/talk/polish
-@dirrm games/scorched3d/data/talk
-@dirrm games/scorched3d/data/tanks
-@dirrm games/scorched3d/data/fonts
-@dirrm games/scorched3d/data/textures/bordershield
-@dirrm games/scorched3d/data/textures/explode
-@dirrm games/scorched3d/data/textures/flame
+games/scorched3d/documentation/multiplayer.txt
+games/scorched3d/documentation/readme.txt
+games/scorched3d/logs/Log_Dir
+games/scorched3d/scorched3d
+@dirrm games/scorched3d/logs
+@dirrm games/scorched3d/documentation
+@dirrm games/scorched3d/data/windows
+@dirrm games/scorched3d/data/wav/shoot
+@dirrm games/scorched3d/data/wav/shield
+@dirrm games/scorched3d/data/wav/movement
+@dirrm games/scorched3d/data/wav/misc
+@dirrm games/scorched3d/data/wav/explosions
+@dirrm games/scorched3d/data/wav/battery
+@dirrm games/scorched3d/data/wav
+@dirrm games/scorched3d/data/textures/wicons
@dirrm games/scorched3d/data/textures/lensflare
-@dirrm games/scorched3d/data/textures/landscape/default
-@dirrm games/scorched3d/data/textures/landscape/hell
-@dirrm games/scorched3d/data/textures/landscape/sand
+@dirrm games/scorched3d/data/textures/landscape/vulcano
+@dirrm games/scorched3d/data/textures/landscape/tropical
+@dirrm games/scorched3d/data/textures/landscape/storm
@dirrm games/scorched3d/data/textures/landscape/snow
+@dirrm games/scorched3d/data/textures/landscape/sand
+@dirrm games/scorched3d/data/textures/landscape/hell
+@dirrm games/scorched3d/data/textures/landscape/default
@dirrm games/scorched3d/data/textures/landscape
+@dirrm games/scorched3d/data/textures/flame
+@dirrm games/scorched3d/data/textures/explode
+@dirrm games/scorched3d/data/textures/bordershield
@dirrm games/scorched3d/data/textures
-@dirrm games/scorched3d/data/wav/battery
-@dirrm games/scorched3d/data/wav/explosions
-@dirrm games/scorched3d/data/wav/misc
-@dirrm games/scorched3d/data/wav/movement
-@dirrm games/scorched3d/data/wav/shield
-@dirrm games/scorched3d/data/wav/shoot
-@dirrm games/scorched3d/data/windows
-@dirrm games/scorched3d/data/wav
+@dirrm games/scorched3d/data/tanks/zsu57
+@dirrm games/scorched3d/data/tanks/zsu23
+@dirrm games/scorched3d/data/tanks/towedartillery2
+@dirrm games/scorched3d/data/tanks/thel
+@dirrm games/scorched3d/data/tanks/t90
+@dirrm games/scorched3d/data/tanks/sa6
+@dirrm games/scorched3d/data/tanks/patriot
+@dirrm games/scorched3d/data/tanks/mlrs
+@dirrm games/scorched3d/data/tanks/m48
+@dirrm games/scorched3d/data/tanks/m1a1
+@dirrm games/scorched3d/data/tanks/lav-25
+@dirrm games/scorched3d/data/tanks/helder
+@dirrm games/scorched3d/data/tanks/hawk
+@dirrm games/scorched3d/data/tanks/guntower
+@dirrm games/scorched3d/data/tanks/bradley2
+@dirrm games/scorched3d/data/tanks/bm13
+@dirrm games/scorched3d/data/tanks/battleship
+@dirrm games/scorched3d/data/tanks
+@dirrm games/scorched3d/data/talk/polish
+@dirrm games/scorched3d/data/talk/german
+@dirrm games/scorched3d/data/talk
+@dirrm games/scorched3d/data/meshes
+@dirrm games/scorched3d/data/fonts
+@dirrm games/scorched3d/data/accessories/v2missile
+@dirrm games/scorched3d/data/accessories/smallpine
+@dirrm games/scorched3d/data/accessories/shell
+@dirrm games/scorched3d/data/accessories/sa6
+@dirrm games/scorched3d/data/accessories/patriot
+@dirrm games/scorched3d/data/accessories/palmtree
+@dirrm games/scorched3d/data/accessories/mirvwarhead
+@dirrm games/scorched3d/data/accessories/m48
+@dirrm games/scorched3d/data/accessories/littleboy
+@dirrm games/scorched3d/data/accessories/icbm
+@dirrm games/scorched3d/data/accessories/hawkmissile
+@dirrm games/scorched3d/data/accessories/fatman
+@dirrm games/scorched3d/data/accessories/digger
+@dirrm games/scorched3d/data/accessories/bouncingbetty
+@dirrm games/scorched3d/data/accessories/bomblet
+@dirrm games/scorched3d/data/accessories/bomb
+@dirrm games/scorched3d/data/accessories/barrage
+@dirrm games/scorched3d/data/accessories
@dirrm games/scorched3d/data
-@dirrm games/scorched3d/documentation
@dirrm games/scorched3d
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index f36d151af474..48b20956aa62 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -7,7 +7,6 @@
PORTNAME= scorched3d
PORTVERSION= 0.${SCORCH_VERSION}
-PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scorched3d
@@ -18,14 +17,18 @@ COMMENT= Scorched is a game based loosely on the classic DOS game
LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
+.if defined(WITH_MYSQL)
+USE_MYSQL= yes
+.endif
+
USE_SDL= mixer net sdl
-SCORCH_VERSION= 35
+SCORCH_VERSION= 36.2
WRKSRC= ${WRKDIR}/scorched
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
USE_GL= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER= 15
-USE_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 257
AUTOMAKE_ARGS= --foreign
CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
@@ -33,6 +36,10 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \
AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}"
+.if defined(WITH_MYSQL)
+CONFIGURE_ARGS+= --with-mysql
+.endif
+
.include <bsd.port.pre.mk>
.if ${ARCH} != "i386"
@@ -48,5 +55,10 @@ pre-install:
post-install:
@ln -fs ${PREFIX}/games/scorched3d/scorched3d ${PREFIX}/bin/scorched3d
+ @chmod ugo+rw ${PREFIX}/games/scorched3d/data/display.xml
+ @chmod ugo+rw ${PREFIX}/games/scorched3d/data/server.xml
+.if defined(WITH_MYSQL)
+ @chmod ugo+rw ${PREFIX}/games/scorched3d/data/mysql.xml
+.endif
.include <bsd.port.post.mk>
diff --git a/games/scorched3d/distinfo b/games/scorched3d/distinfo
index 7ea5d150f000..77dbad786101 100644
--- a/games/scorched3d/distinfo
+++ b/games/scorched3d/distinfo
@@ -1,2 +1,2 @@
-MD5 (Scorched3D-35-src.tar.gz) = c43507e805b482cc0a37b8cd37a3a26b
+MD5 (Scorched3D-36.2-src.tar.gz) = 7388dfaadd7bc568d2c341539fb27184
SIZE (Scorched3D-35-src.tar.gz) = 10798751
diff --git a/games/scorched3d/files/patch-Makefile.am b/games/scorched3d/files/patch-Makefile.am
index c86896f703dd..a0a0e983d1da 100644
--- a/games/scorched3d/files/patch-Makefile.am
+++ b/games/scorched3d/files/patch-Makefile.am
@@ -1,5 +1,5 @@
---- Makefile.am.orig Sun Aug 3 20:12:01 2003
-+++ Makefile.am Sun Aug 3 20:11:43 2003
+--- 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
diff --git a/games/scorched3d/files/patch-configure.ac b/games/scorched3d/files/patch-configure.ac
index d0204c5943f0..f4a5f2b71c69 100644
--- a/games/scorched3d/files/patch-configure.ac
+++ b/games/scorched3d/files/patch-configure.ac
@@ -1,47 +1,28 @@
---- configure.ac.orig Wed Jul 30 17:44:18 2003
-+++ configure.ac Sun Aug 3 10:15:54 2003
-@@ -13,6 +13,9 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-
-+CFLAGS="$CFLAGS -I/usr/X11R6/include"
-+LIBS="$LIBS -L/usr/X11R6/lib"
-+
- dnl Check for SDL
- SDL_VERSION=1.0.1
- AM_PATH_SDL($SDL_VERSION,
-@@ -28,8 +31,8 @@
+--- 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
- have_opengl=no
AC_TRY_COMPILE([
- #include <SDL/SDL.h>
- #include <SDL/SDL_mixer.h>
+ #include <SDL11/SDL.h>
+ #include <SDL11/SDL_mixer.h>
- ],[
- ],[
- have_SDLmixer=yes
-@@ -44,8 +47,8 @@
+
+ int main(int argc, char *argv[])
+ { return 0; }
+@@ -54,8 +54,8 @@
+ dnl Check for SDL_net lib
have_SDLnet=no
- have_opengl=no
AC_TRY_COMPILE([
- #include <SDL/SDL.h>
- #include <SDL/SDL_net.h>
+ #include <SDL11/SDL.h>
+ #include <SDL11/SDL_net.h>
- ],[
- ],[
- have_SDLnet=yes
-@@ -72,7 +75,7 @@
- AC_MSG_ERROR([*** Can't find the OpenGL library Try: http://www.opengl.org])
- fi
-
--OPENGL_LIBS="-lGL -lGLU -lpthread"
-+OPENGL_LIBS="-lGL -lGLU"
- LIBS="$LIBS $OPENGL_LIBS"
- dnl Check for wxwindows
-@@ -97,9 +100,9 @@
+ int main(int argc, char *argv[])
+ { return 0; }
+@@ -144,9 +144,9 @@
dnl Define install prefix
if test x$prefix = xNONE; then
@@ -52,4 +33,4 @@
+AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/games/$PACKAGE/", [install directory])
# extra fixed flags
- CFLAGS="$CFLAGS -DdDOUBLE -D_NO_SERVER_ASE_"
+ CFLAGS="$CFLAGS -DdDOUBLE"
diff --git a/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp b/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp
index a14e1375cd5f..505201c9d88b 100644
--- a/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp
+++ b/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp
@@ -1,11 +1,15 @@
---- src/3dsparse/aseFile.tab.cpp.orig Mon Nov 3 20:54:39 2003
-+++ src/3dsparse/aseFile.tab.cpp Mon Nov 3 20:55:14 2003
-@@ -5,7 +5,7 @@
-
- #define YYBISON 1 /* Identify Bison output. */
-
--#define alloca
-+/* #define alloca */
-
- #define yyparse aseparse
- #define yylex aselex
+--- ./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 5a5f63d292c1..1e21ac6d0306 100644
--- a/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
+++ b/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
@@ -1,11 +1,6 @@
---- src/GLEXT/GLBitmap.cpp.orig Wed Jul 30 17:41:26 2003
-+++ src/GLEXT/GLBitmap.cpp Sun Aug 3 09:07:12 2003
-@@ -24,11 +24,11 @@
- //////////////////////////////////////////////////////////////////////
-
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
+--- ./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 @@
#include <math.h>
#include <GLEXT/GLState.h>
#include <GLEXT/GLBitmap.h>
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLLuminance.cpp b/games/scorched3d/files/patch-src-GLEXT-GLLuminance.cpp
deleted file mode 100644
index c6ae73b18cae..000000000000
--- a/games/scorched3d/files/patch-src-GLEXT-GLLuminance.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/GLEXT/GLLuminance.cpp.orig Wed Jul 30 17:41:26 2003
-+++ src/GLEXT/GLLuminance.cpp Sun Aug 3 09:07:13 2003
-@@ -24,7 +24,7 @@
- //////////////////////////////////////////////////////////////////////
-
- #include <GLEXT/GLLuminance.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- //////////////////////////////////////////////////////////////////////
- // Construction/Destruction
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLState.h b/games/scorched3d/files/patch-src-GLEXT-GLState.h
index b78a8d5c817a..22a58e459adc 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 Wed Jul 30 17:41:29 2003
-+++ src/GLEXT/GLState.h Sun Aug 3 09:07:13 2003
+--- ./src/GLEXT/GLState.h.orig Fri Jan 23 17:59:00 2004
++++ ./src/GLEXT/GLState.h Fri Jan 23 18:01:27 2004
@@ -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 7b7a970748a4..46a88aed015a 100644
--- a/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp
+++ b/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp
@@ -1,11 +1,11 @@
---- src/GLEXT/GLStateExtension.cpp.orig Wed Jul 30 17:41:26 2003
-+++ src/GLEXT/GLStateExtension.cpp Sun Aug 3 09:07:13 2003
-@@ -20,7 +20,7 @@
-
-
+--- ./src/GLEXT/GLStateExtension.cpp.orig Fri Jan 23 17:59:00 2004
++++ ./src/GLEXT/GLStateExtension.cpp Fri Jan 23 18:01:28 2004
+@@ -21,7 +21,7 @@
#include <GLEXT/GLStateExtension.h>
+ #include <GLEXT/GLConsole.h>
+ #include <common/OptionsDisplay.h> // Hmm library code pollution
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
#include <string.h>
+ #include <string>
- bool GLStateExtension::noExtensions_ = false;
diff --git a/games/scorched3d/files/patch-src-client-ClientMain.cpp b/games/scorched3d/files/patch-src-client-ClientMain.cpp
index 152cfc2296ec..b29271564a0c 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 Wed Jul 30 17:41:23 2003
-+++ src/client/ClientMain.cpp Sun Aug 3 09:07:11 2003
-@@ -35,7 +35,7 @@
- #include <coms/NetClient.h>
- #include <engine/MainLoop.h>
- #include <engine/GameState.h>
+--- ./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>
+ #include <common/Gamma.h>
+ #include <common/Sound.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
- void clientCleanup()
+ void startClient()
{
diff --git a/games/scorched3d/files/patch-src-client-GLSetup.cpp b/games/scorched3d/files/patch-src-client-GLSetup.cpp
deleted file mode 100644
index bafac21645a5..000000000000
--- a/games/scorched3d/files/patch-src-client-GLSetup.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/client/GLSetup.cpp.orig Wed Jul 30 17:41:24 2003
-+++ src/client/GLSetup.cpp Sun Aug 3 09:07:11 2003
-@@ -25,7 +25,7 @@
-
- #include <client/GLSetup.h>
- #include <GLEXT/GLStateExtension.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- void GLSetup::setup()
- {
diff --git a/games/scorched3d/files/patch-src-common-Clock.cpp b/games/scorched3d/files/patch-src-common-Clock.cpp
new file mode 100644
index 000000000000..f422ce5488ec
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-Clock.cpp
@@ -0,0 +1,11 @@
+--- ./src/common/Clock.cpp.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/Clock.cpp Fri Jan 23 18:01:54 2004
+@@ -20,7 +20,7 @@
+
+ #include <common/Defines.h>
+ #include <common/Clock.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+
+ Clock::Clock() : isPaused_(false)
+ {
diff --git a/games/scorched3d/files/patch-src-common-Display.h b/games/scorched3d/files/patch-src-common-Display.h
index 46e62eef2bab..1331d574df9d 100644
--- a/games/scorched3d/files/patch-src-common-Display.h
+++ b/games/scorched3d/files/patch-src-common-Display.h
@@ -1,7 +1,7 @@
---- src/common/Display.h.orig Wed Jul 30 17:41:28 2003
-+++ src/common/Display.h Sun Aug 3 09:07:11 2003
-@@ -27,7 +27,7 @@
- //////////////////////////////////////////////////////////////////////
+--- ./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 @@
+ #define _DISPLAY_H_
#include <stdlib.h>
-#include <SDL/SDL.h>
diff --git a/games/scorched3d/files/patch-src-common-Gamma.cpp b/games/scorched3d/files/patch-src-common-Gamma.cpp
index 72258e753748..0f02eb0c886b 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 Wed Jul 30 17:41:24 2003
-+++ src/common/Gamma.cpp Sun Aug 3 09:07:11 2003
+--- ./src/common/Gamma.cpp.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/Gamma.cpp Fri Jan 23 18:01:56 2004
@@ -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 2342ab615b77..4e4432cf864b 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 Wed Jul 30 17:41:28 2003
-+++ src/common/Gamma.h Sun Aug 3 09:07:12 2003
+--- ./src/common/Gamma.h.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/Gamma.h Fri Jan 23 18:01:56 2004
@@ -26,7 +26,7 @@
//
//////////////////////////////////////////////////////////////////////
diff --git a/games/scorched3d/files/patch-src-common-KeyStateTranslate.h b/games/scorched3d/files/patch-src-common-KeyStateTranslate.h
new file mode 100644
index 000000000000..b79016223c1f
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-KeyStateTranslate.h
@@ -0,0 +1,11 @@
+--- ./src/common/KeyStateTranslate.h.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/KeyStateTranslate.h Fri Jan 23 18:01:56 2004
+@@ -19,7 +19,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+
+
+-#include <SDL/SDL_keysym.h>
++#include <SDL11/SDL_keysym.h>
+
+ struct KeyStateTranslation
+ {
diff --git a/games/scorched3d/files/patch-src-common-KeyTranslate.h b/games/scorched3d/files/patch-src-common-KeyTranslate.h
new file mode 100644
index 000000000000..797e7af136cc
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-KeyTranslate.h
@@ -0,0 +1,11 @@
+--- ./src/common/KeyTranslate.h.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/KeyTranslate.h Fri Jan 23 18:01:57 2004
+@@ -19,7 +19,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+
+
+-#include <SDL/SDL_keysym.h>
++#include <SDL11/SDL_keysym.h>
+
+ struct KeyTranslation
+ {
diff --git a/games/scorched3d/files/patch-src-common-KeyboardHistory.h b/games/scorched3d/files/patch-src-common-KeyboardHistory.h
index c6724cc127c5..582fd94e5d7a 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 Wed Jul 30 17:41:28 2003
-+++ src/common/KeyboardHistory.h Sun Aug 3 09:07:12 2003
+--- ./src/common/KeyboardHistory.h.orig Fri Jan 23 17:59:03 2004
++++ ./src/common/KeyboardHistory.h Fri Jan 23 18:01:57 2004
@@ -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-commonLogger.cpp b/games/scorched3d/files/patch-src-common-Logger.cpp
index d2df36ffecc7..5ba301a2ceca 100644
--- a/games/scorched3d/files/patch-src-commonLogger.cpp
+++ b/games/scorched3d/files/patch-src-common-Logger.cpp
@@ -1,5 +1,5 @@
---- src/common/Logger.cpp.orig Wed Jul 30 17:41:24 2003
-+++ src/common/Logger.cpp Sun Aug 3 09:07:12 2003
+--- ./src/common/Logger.cpp.orig Fri Jan 23 17:59:04 2004
++++ ./src/common/Logger.cpp Fri Jan 23 18:01:58 2004
@@ -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 c37d4faefa3a..442a39c0757b 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 Wed Jul 30 17:41:28 2003
-+++ src/common/Mouse.h Sun Aug 3 09:07:12 2003
+--- ./src/common/Mouse.h.orig Fri Jan 23 17:59:04 2004
++++ ./src/common/Mouse.h Fri Jan 23 18:01:59 2004
@@ -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 8ea2dc8b8022..101bc62413c7 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 Wed Jul 30 17:41:24 2003
-+++ src/common/RandomGenerator.cpp Sun Aug 3 09:07:12 2003
+--- ./src/common/RandomGenerator.cpp.orig Fri Jan 23 17:59:04 2004
++++ ./src/common/RandomGenerator.cpp Fri Jan 23 18:02:00 2004
@@ -20,7 +20,7 @@
#include <common/RandomGenerator.h>
diff --git a/games/scorched3d/files/patch-src-common-Sound.h b/games/scorched3d/files/patch-src-common-Sound.h
index dd61fac1ab78..69f9eb6dc9ba 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 Wed Jul 30 17:41:28 2003
-+++ src/common/Sound.h Sun Aug 3 09:07:12 2003
+--- ./src/common/Sound.h.orig Fri Jan 23 17:59:04 2004
++++ ./src/common/Sound.h Fri Jan 23 18:02:01 2004
@@ -26,7 +26,7 @@
//////////////////////////////////////////////////////////////////////
diff --git a/games/scorched3d/files/patch-src-common-SoundStore.h b/games/scorched3d/files/patch-src-common-SoundStore.h
deleted file mode 100644
index 148c097f7839..000000000000
--- a/games/scorched3d/files/patch-src-common-SoundStore.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/SoundStore.h.orig Wed Jul 30 17:41:28 2003
-+++ src/common/SoundStore.h Sun Aug 3 09:07:12 2003
-@@ -29,7 +29,7 @@
- #include <string>
-
- #define CACHE_SOUND(var, filename) \
-- static SoundBuffer* ##var = SoundStore::instance()->fetchOrCreateBuffer(##filename);
-+ static SoundBuffer* var = SoundStore::instance()->fetchOrCreateBuffer(filename);
-
- class SoundStore
- {
diff --git a/games/scorched3d/files/patch-src-common-Timer.cpp b/games/scorched3d/files/patch-src-common-Timer.cpp
deleted file mode 100644
index 4f145ba31045..000000000000
--- a/games/scorched3d/files/patch-src-common-Timer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/Timer.cpp.orig Wed Jul 30 17:41:24 2003
-+++ src/common/Timer.cpp Sun Aug 3 09:07:12 2003
-@@ -25,7 +25,7 @@
-
- #include <common/Defines.h>
- #include <common/Timer.h>
--#include <SDL/SDL.h>
-+#include <SDL11/SDL.h>
-
- //////////////////////////////////////////////////////////////////////
- // Construction/Destruction
diff --git a/games/scorched3d/files/patch-src-coms-NetBuffer.cpp b/games/scorched3d/files/patch-src-coms-NetBuffer.cpp
index a2fab8cfd972..93d0ef1e1195 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 Wed Jul 30 17:41:25 2003
-+++ src/coms/NetBuffer.cpp Sun Aug 3 09:07:12 2003
+--- ./src/coms/NetBuffer.cpp.orig Fri Jan 23 17:59:07 2004
++++ ./src/coms/NetBuffer.cpp Fri Jan 23 18:02:08 2004
@@ -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 5689ad84e008..1e24a2e647dc 100644
--- a/games/scorched3d/files/patch-src-coms-NetBuffer.h
+++ b/games/scorched3d/files/patch-src-coms-NetBuffer.h
@@ -1,6 +1,6 @@
---- src/coms/NetBuffer.h.orig Wed Jul 30 17:41:28 2003
-+++ src/coms/NetBuffer.h Sun Aug 3 09:07:12 2003
-@@ -23,8 +23,8 @@
+--- ./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_
#include <string>
@@ -9,5 +9,5 @@
+#include <SDL11/SDL.h>
+#include <SDL11/SDL_net.h>
- typedef TCPsocket NetPlayerID;
-
+ class NetBuffer
+ {
diff --git a/games/scorched3d/files/patch-src-coms-NetClient.cpp b/games/scorched3d/files/patch-src-coms-NetClient.cpp
deleted file mode 100644
index 0b27e2f40e73..000000000000
--- a/games/scorched3d/files/patch-src-coms-NetClient.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/coms/NetClient.cpp.orig Wed Jul 30 17:41:25 2003
-+++ src/coms/NetClient.cpp Sun Aug 3 09:07:12 2003
-@@ -24,7 +24,7 @@
- #include <coms/NetMessageHandler.h>
- #include <coms/NetMessagePool.h>
- #include <common/Logger.h>
--#include <SDL/SDL_thread.h>
-+#include <SDL11/SDL_thread.h>
-
- NetClient *NetClient::instance_ = 0;
-
diff --git a/games/scorched3d/files/patch-src-coms-NetMessageHandler.h b/games/scorched3d/files/patch-src-coms-NetMessageHandler.h
index 6187b25974e0..3a4b71e65752 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 Wed Jul 30 17:41:28 2003
-+++ src/coms/NetMessageHandler.h Sun Aug 3 09:07:12 2003
+--- ./src/coms/NetMessageHandler.h.orig Fri Jan 23 17:59:08 2004
++++ ./src/coms/NetMessageHandler.h Fri Jan 23 18:02:10 2004
@@ -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 65ef15fc471c..0545a88c76eb 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 Wed Jul 30 17:41:28 2003
-+++ src/coms/NetMessagePool.h Sun Aug 3 09:07:12 2003
+--- ./src/coms/NetMessagePool.h.orig Fri Jan 23 17:59:08 2004
++++ ./src/coms/NetMessagePool.h Fri Jan 23 18:02:11 2004
@@ -24,7 +24,7 @@
#include <coms/NetMessage.h>
diff --git a/games/scorched3d/files/patch-src-engine-ActionMeta.h b/games/scorched3d/files/patch-src-engine-ActionMeta.h
deleted file mode 100644
index 5b3ef2fe98e6..000000000000
--- a/games/scorched3d/files/patch-src-engine-ActionMeta.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/engine/ActionMeta.h.orig Wed Jul 30 17:41:29 2003
-+++ src/engine/ActionMeta.h Sun Aug 3 09:07:12 2003
-@@ -29,7 +29,7 @@
-
- #define REGISTER_ACTION_HEADER(x) \
- virtual const char *getActionName() { return #x ; } \
-- ##x *getActionCopy() { return new x ; } \
-+ x *getActionCopy() { return new x ; } \
- virtual bool getReferenced() { return true; }
- #define REGISTER_ACTION_SOURCE(x) \
- struct META_##x { META_##x() { ActionMetaRegistration::addMap(#x , new x ); } }; \
diff --git a/games/scorched3d/files/patch-src-engine-MainLoop.cpp b/games/scorched3d/files/patch-src-engine-MainLoop.cpp
index 279c87435635..ff095e62045b 100644
--- a/games/scorched3d/files/patch-src-engine-MainLoop.cpp
+++ b/games/scorched3d/files/patch-src-engine-MainLoop.cpp
@@ -1,11 +1,11 @@
---- src/engine/MainLoop.cpp.orig Wed Jul 30 17:41:26 2003
-+++ src/engine/MainLoop.cpp Sun Aug 3 09:07:12 2003
-@@ -28,7 +28,7 @@
+--- ./src/engine/MainLoop.cpp.orig Fri Jan 23 17:59:09 2004
++++ ./src/engine/MainLoop.cpp Fri Jan 23 18:02:17 2004
+@@ -22,7 +22,7 @@
+ #include <common/OptionsDisplay.h>
#include <common/Defines.h>
- #include <common/Timer.h>
#include <GLEXT/GLState.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
- //////////////////////////////////////////////////////////////////////
- // Construction/Destruction
+ MainLoop::MainLoop() : exitLoop_(false), lastDrawTime_(0.0f)
+ {
diff --git a/games/scorched3d/files/patch-src-irc-GameInfoEntry.h b/games/scorched3d/files/patch-src-irc-GameInfoEntry.h
new file mode 100644
index 000000000000..c070faecfdb1
--- /dev/null
+++ b/games/scorched3d/files/patch-src-irc-GameInfoEntry.h
@@ -0,0 +1,13 @@
+--- ./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
new file mode 100644
index 000000000000..831b1e198f0d
--- /dev/null
+++ b/games/scorched3d/files/patch-src-irc-GameInfoList.h
@@ -0,0 +1,11 @@
+--- ./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
new file mode 100644
index 000000000000..9a817d7f459a
--- /dev/null
+++ b/games/scorched3d/files/patch-src-irc-GameInfoMessage.h
@@ -0,0 +1,15 @@
+--- ./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
new file mode 100644
index 000000000000..ee45c4cf025c
--- /dev/null
+++ b/games/scorched3d/files/patch-src-irc-IrcConnection.h
@@ -0,0 +1,15 @@
+--- ./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
new file mode 100644
index 000000000000..05048c1b5224
--- /dev/null
+++ b/games/scorched3d/files/patch-src-irc-UdpHandler.h
@@ -0,0 +1,15 @@
+--- ./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-common.h b/games/scorched3d/files/patch-src-ode-common.h
deleted file mode 100644
index 7f17caf18bf4..000000000000
--- a/games/scorched3d/files/patch-src-ode-common.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ode/common.h.orig Wed Jul 30 17:41:29 2003
-+++ src/ode/common.h Sun Aug 3 09:07:13 2003
-@@ -25,7 +25,7 @@
-
- #include <ode/config.h>
- #include <ode/error.h>
--#ifndef WIN32
-+#if !defined(WIN32) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <stdlib.h>
diff --git a/games/scorched3d/files/patch-src-ode-config.h b/games/scorched3d/files/patch-src-ode-config.h
index c30d3ec4e9e0..7df954c181de 100644
--- a/games/scorched3d/files/patch-src-ode-config.h
+++ b/games/scorched3d/files/patch-src-ode-config.h
@@ -1,11 +1,11 @@
---- src/ode/config.h.orig Wed Jul 30 17:41:29 2003
-+++ src/ode/config.h Sun Aug 3 09:07:13 2003
-@@ -31,7 +31,7 @@
+--- ./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 @@
+ #if defined(__DARWIN__)
+ #include <sys/malloc.h>
+ #else
+-#include <malloc.h> // for alloca under windows
++#include <stdlib.h> // for alloca under windows
+ #endif
- #include <stdio.h>
- #include <stdarg.h>
--#include <malloc.h> // for alloca under windows
-+#include <stdlib.h> // for alloca under windows
#include <string.h>
- #include <math.h>
-
diff --git a/games/scorched3d/files/patch-src-scorched-main.cpp b/games/scorched3d/files/patch-src-scorched-main.cpp
index f786738cf0c8..2735b09fe57c 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 Wed Jul 30 17:41:27 2003
-+++ src/scorched/main.cpp Sun Aug 3 09:07:13 2003
+--- ./src/scorched/main.cpp.orig Fri Jan 23 17:59:15 2004
++++ ./src/scorched/main.cpp Fri Jan 23 18:03:16 2004
@@ -20,7 +20,7 @@
diff --git a/games/scorched3d/files/patch-src-server-ServerMain.cpp b/games/scorched3d/files/patch-src-server-ServerMain.cpp
index 1e1884d5f7d0..a8572fbd5a56 100644
--- a/games/scorched3d/files/patch-src-server-ServerMain.cpp
+++ b/games/scorched3d/files/patch-src-server-ServerMain.cpp
@@ -1,11 +1,11 @@
---- src/server/ServerMain.cpp.orig Wed Jul 30 17:41:27 2003
-+++ src/server/ServerMain.cpp Sun Aug 3 09:07:13 2003
-@@ -46,7 +46,7 @@
- #include <server/ServerBuyAccessoryHandler.h>
- #include <server/ServerConnectHandler.h>
+--- ./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>
#include <server/ServerState.h>
+ #include <server/ScorchedServer.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
- Timer serverTimer;
+ Clock serverTimer;
diff --git a/games/scorched3d/pkg-descr b/games/scorched3d/pkg-descr
index cade5199432e..f284483c1d18 100644
--- a/games/scorched3d/pkg-descr
+++ b/games/scorched3d/pkg-descr
@@ -12,6 +12,9 @@ to recreate the simple yet addictive game play of the original game,
adding amongst other new features a 3D island environment and LAN and
internet play.
-You must run X11 in 16bpp mode in order for the game to run.
+
+You must run X in 24bpp mode or higher to be able to run the game.
+You should have 3D hardware accelleration enabled to enjoy a playable
+ FPS rate.
WWW: http://www.scorched3d.co.uk/
diff --git a/games/scorched3d/pkg-plist b/games/scorched3d/pkg-plist
index b0c78a48803a..d9ef0c4bf26c 100644
--- a/games/scorched3d/pkg-plist
+++ b/games/scorched3d/pkg-plist
@@ -1,25 +1,157 @@
bin/scorched3d
-games/scorched3d/scorched3d
+games/scorched3d/README
+games/scorched3d/data/accessories.xml
+games/scorched3d/data/accessories/barrage/barrage.txt
+games/scorched3d/data/accessories/barrage/gradient.bmp
+games/scorched3d/data/accessories/barrage/white.bmp
+games/scorched3d/data/accessories/barrage/yellow.bmp
+games/scorched3d/data/accessories/bomb/black.bmp
+games/scorched3d/data/accessories/bomb/bomb.txt
+games/scorched3d/data/accessories/bomb/white.bmp
+games/scorched3d/data/accessories/bomblet/bomblet.txt
+games/scorched3d/data/accessories/bomblet/yellow.bmp
+games/scorched3d/data/accessories/bouncingbetty/black.bmp
+games/scorched3d/data/accessories/bouncingbetty/bouncingbetty.txt
+games/scorched3d/data/accessories/clusterbomb.ase
+games/scorched3d/data/accessories/clusterbomb2.ase
+games/scorched3d/data/accessories/default.ase
+games/scorched3d/data/accessories/default.bmp
+games/scorched3d/data/accessories/digger/black.bmp
+games/scorched3d/data/accessories/digger/digger.txt
+games/scorched3d/data/accessories/digger/swirl.bmp
+games/scorched3d/data/accessories/fatman/black.bmp
+games/scorched3d/data/accessories/fatman/fatman.txt
+games/scorched3d/data/accessories/flare.txt
+games/scorched3d/data/accessories/hawkmissile/gradient.bmp
+games/scorched3d/data/accessories/hawkmissile/hawk.txt
+games/scorched3d/data/accessories/hawkmissile/white.bmp
+games/scorched3d/data/accessories/hawkmissile/yellow.bmp
+games/scorched3d/data/accessories/icbm/black.bmp
+games/scorched3d/data/accessories/icbm/gradient.bmp
+games/scorched3d/data/accessories/icbm/icbm.txt
+games/scorched3d/data/accessories/icbm/white.bmp
+games/scorched3d/data/accessories/icbm/yellow.bmp
+games/scorched3d/data/accessories/littleboy/black.bmp
+games/scorched3d/data/accessories/littleboy/littleboy.txt
+games/scorched3d/data/accessories/m48/gradient.bmp
+games/scorched3d/data/accessories/m48/m48.txt
+games/scorched3d/data/accessories/m48/white.bmp
+games/scorched3d/data/accessories/m48/yellow.bmp
+games/scorched3d/data/accessories/mirvwarhead/black.bmp
+games/scorched3d/data/accessories/mirvwarhead/mirvwarhead.txt
+games/scorched3d/data/accessories/palmtree/black.bmp
+games/scorched3d/data/accessories/palmtree/burntpalm.txt
+games/scorched3d/data/accessories/palmtree/burntpalm2.txt
+games/scorched3d/data/accessories/palmtree/green.bmp
+games/scorched3d/data/accessories/palmtree/palm.txt
+games/scorched3d/data/accessories/palmtree/palm2.txt
+games/scorched3d/data/accessories/palmtree/tan.bmp
+games/scorched3d/data/accessories/patriot/gradient.bmp
+games/scorched3d/data/accessories/patriot/patriot.txt
+games/scorched3d/data/accessories/patriot/white.bmp
+games/scorched3d/data/accessories/patriot/yellow.bmp
+games/scorched3d/data/accessories/sa6/gradient.bmp
+games/scorched3d/data/accessories/sa6/sa6.txt
+games/scorched3d/data/accessories/sa6/white.bmp
+games/scorched3d/data/accessories/sa6/yellow.bmp
+games/scorched3d/data/accessories/shell/black.bmp
+games/scorched3d/data/accessories/shell/shell.txt
+games/scorched3d/data/accessories/smallpine/black.bmp
+games/scorched3d/data/accessories/smallpine/burntsmallpine.txt
+games/scorched3d/data/accessories/smallpine/green.bmp
+games/scorched3d/data/accessories/smallpine/smallpine.txt
+games/scorched3d/data/accessories/smallpine/smallpine2.txt
+games/scorched3d/data/accessories/smallpine/smallpine3.txt
+games/scorched3d/data/accessories/smallpine/tan.bmp
+games/scorched3d/data/accessories/smallpine/wintergreen.bmp
+games/scorched3d/data/accessories/smallpine/wintersmallpine.txt
+games/scorched3d/data/accessories/smallpine/wintersmallpine2.txt
+games/scorched3d/data/accessories/smallpine/wintersmallpine3.txt
+games/scorched3d/data/accessories/v2missile/black.bmp
+games/scorched3d/data/accessories/v2missile/checker.bmp
+games/scorched3d/data/accessories/v2missile/gradient.bmp
+games/scorched3d/data/accessories/v2missile/v2missile.txt
+games/scorched3d/data/accessories/v2missile/yellow.bmp
+games/scorched3d/data/accessories/white.bmp
+games/scorched3d/data/ainames.txt
+games/scorched3d/data/autoexec.xml
+games/scorched3d/data/display.xml
+games/scorched3d/data/fonts/data.bmp
+games/scorched3d/data/fonts/datainv.bmp
+games/scorched3d/data/keys.xml
+games/scorched3d/data/meshes/autoaim.ase
games/scorched3d/data/meshes/rock1.ase
games/scorched3d/data/meshes/rock2.ase
+games/scorched3d/data/meshes/survivalraft.txt
games/scorched3d/data/meshes/wind.ase
+games/scorched3d/data/motd.txt
+games/scorched3d/data/mysql.xml
+games/scorched3d/data/playernames.txt
+games/scorched3d/data/random.no
+games/scorched3d/data/resource.xml
+games/scorched3d/data/server.xml
+games/scorched3d/data/singlecustom.xml
+games/scorched3d/data/singleeasy.xml
+games/scorched3d/data/singlehard.xml
+games/scorched3d/data/singlenormal.xml
+games/scorched3d/data/statstables.sql
+games/scorched3d/data/talk/german/talk1.txt
+games/scorched3d/data/talk/german/talk2.txt
games/scorched3d/data/talk/polish/talk1.txt
games/scorched3d/data/talk/polish/talk2.txt
games/scorched3d/data/talk/talk1.txt
games/scorched3d/data/talk/talk2.txt
-games/scorched3d/data/tanks/wespe.bmp
+games/scorched3d/data/tankais.xml
+games/scorched3d/data/tanks.xml
+games/scorched3d/data/tanks/a7v.ase
+games/scorched3d/data/tanks/a7v.bmp
+games/scorched3d/data/tanks/aat.ase
+games/scorched3d/data/tanks/aat.bmp
+games/scorched3d/data/tanks/apache-long.ase
games/scorched3d/data/tanks/apache-long.bmp
games/scorched3d/data/tanks/apache.ase
games/scorched3d/data/tanks/apache.bmp
+games/scorched3d/data/tanks/atst.ase
+games/scorched3d/data/tanks/atst.bmp
+games/scorched3d/data/tanks/battleship/battleship.txt
+games/scorched3d/data/tanks/battleship/grey.bmp
games/scorched3d/data/tanks/bm13.ase
games/scorched3d/data/tanks/bm13.bmp
+games/scorched3d/data/tanks/bm13/bigtire.bmp
+games/scorched3d/data/tanks/bm13/bm13-2.txt
+games/scorched3d/data/tanks/bm13/cab.bmp
+games/scorched3d/data/tanks/bm13/dot.bmp
+games/scorched3d/data/tanks/bm13/tan.bmp
+games/scorched3d/data/tanks/bm13/white.bmp
games/scorched3d/data/tanks/bradley.ase
games/scorched3d/data/tanks/bradley.bmp
+games/scorched3d/data/tanks/bradley2/bradley.bmp
+games/scorched3d/data/tanks/bradley2/bradley2.txt
games/scorched3d/data/tanks/bradleyb.bmp
+games/scorched3d/data/tanks/flakpanzerwirbelwind.ase
+games/scorched3d/data/tanks/flakpanzerwirbelwind.bmp
+games/scorched3d/data/tanks/guntower/guntower.bmp
+games/scorched3d/data/tanks/guntower/guntower.txt
+games/scorched3d/data/tanks/guntower/guntower2.bmp
+games/scorched3d/data/tanks/harpoon.ase
+games/scorched3d/data/tanks/harpoon.bmp
games/scorched3d/data/tanks/hawk.ase
games/scorched3d/data/tanks/hawk.bmp
+games/scorched3d/data/tanks/hawk/bigtire.bmp
+games/scorched3d/data/tanks/hawk/chrome.bmp
+games/scorched3d/data/tanks/hawk/hawk.txt
+games/scorched3d/data/tanks/hawk/tan.bmp
+games/scorched3d/data/tanks/hawk/white.bmp
+games/scorched3d/data/tanks/helder/helder.txt
+games/scorched3d/data/tanks/helder/helder2.txt
+games/scorched3d/data/tanks/helder/redspace.bmp
+games/scorched3d/data/tanks/helder/whitespace.bmp
games/scorched3d/data/tanks/hind.ase
games/scorched3d/data/tanks/hind.bmp
+games/scorched3d/data/tanks/hothgun.ase
+games/scorched3d/data/tanks/hothgun.bmp
+games/scorched3d/data/tanks/hothgun2.ase
+games/scorched3d/data/tanks/hothgun2.bmp
games/scorched3d/data/tanks/howitzer.ase
games/scorched3d/data/tanks/howitzer.bmp
games/scorched3d/data/tanks/hummermlrs.ase
@@ -28,30 +160,83 @@ games/scorched3d/data/tanks/hummersam.ase
games/scorched3d/data/tanks/hummersam.bmp
games/scorched3d/data/tanks/hummertow.ase
games/scorched3d/data/tanks/hummertow.bmp
+games/scorched3d/data/tanks/kenny02.bmp
+games/scorched3d/data/tanks/kenny2.txt
+games/scorched3d/data/tanks/lav-25/bigtire.bmp
+games/scorched3d/data/tanks/lav-25/camo.bmp
+games/scorched3d/data/tanks/lav-25/lav-25.txt
games/scorched3d/data/tanks/m110.ase
games/scorched3d/data/tanks/m110.bmp
games/scorched3d/data/tanks/m198.ase
games/scorched3d/data/tanks/m198.bmp
games/scorched3d/data/tanks/m1a1.ase
games/scorched3d/data/tanks/m1a1.bmp
+games/scorched3d/data/tanks/m1a1/black.bmp
+games/scorched3d/data/tanks/m1a1/camo.bmp
+games/scorched3d/data/tanks/m1a1/m1a1.txt
+games/scorched3d/data/tanks/m1a1/tread.bmp
+games/scorched3d/data/tanks/m48/camo.bmp
+games/scorched3d/data/tanks/m48/chrome.bmp
+games/scorched3d/data/tanks/m48/m48.txt
+games/scorched3d/data/tanks/m48/tread.bmp
+games/scorched3d/data/tanks/m48/white.bmp
games/scorched3d/data/tanks/m7priest.ase
games/scorched3d/data/tanks/m7priest.bmp
+games/scorched3d/data/tanks/mark1.ase
+games/scorched3d/data/tanks/mark1.bmp
+games/scorched3d/data/tanks/mlrs/camo.bmp
+games/scorched3d/data/tanks/mlrs/chrome.bmp
+games/scorched3d/data/tanks/mlrs/mlrs.txt
+games/scorched3d/data/tanks/mlrs/tread.bmp
games/scorched3d/data/tanks/paladin.ase
games/scorched3d/data/tanks/paladin.bmp
+games/scorched3d/data/tanks/panzer3.ase
+games/scorched3d/data/tanks/panzer3.bmp
games/scorched3d/data/tanks/patriot.ase
games/scorched3d/data/tanks/patriot.bmp
+games/scorched3d/data/tanks/patriot/bigtire.bmp
+games/scorched3d/data/tanks/patriot/camo.bmp
+games/scorched3d/data/tanks/patriot/chrome.bmp
+games/scorched3d/data/tanks/patriot/kaki.bmp
+games/scorched3d/data/tanks/patriot/patriot.txt
+games/scorched3d/data/tanks/phalanx.ase
+games/scorched3d/data/tanks/phalanx.bmp
games/scorched3d/data/tanks/question.ase
games/scorched3d/data/tanks/question.bmp
+games/scorched3d/data/tanks/railgun.ase
+games/scorched3d/data/tanks/railgun.bmp
+games/scorched3d/data/tanks/ram.ase
+games/scorched3d/data/tanks/ram.bmp
+games/scorched3d/data/tanks/rapier.ase
+games/scorched3d/data/tanks/rapier.bmp
+games/scorched3d/data/tanks/sa-19.ase
+games/scorched3d/data/tanks/sa-19.bmp
games/scorched3d/data/tanks/sa6.ase
games/scorched3d/data/tanks/sa6.bmp
+games/scorched3d/data/tanks/sa6/black.bmp
+games/scorched3d/data/tanks/sa6/chrome.bmp
+games/scorched3d/data/tanks/sa6/guncover.bmp
+games/scorched3d/data/tanks/sa6/guncoveralpha.bmp
+games/scorched3d/data/tanks/sa6/sa6.txt
+games/scorched3d/data/tanks/sa6/white.bmp
+games/scorched3d/data/tanks/sa6/zsu23.bmp
games/scorched3d/data/tanks/scud.ase
games/scorched3d/data/tanks/scud.bmp
+games/scorched3d/data/tanks/seasparrow.ase
+games/scorched3d/data/tanks/seasparrow.bmp
+games/scorched3d/data/tanks/siegetank.ase
+games/scorched3d/data/tanks/siegetank.bmp
+games/scorched3d/data/tanks/siegetank2.ase
+games/scorched3d/data/tanks/siegetank2.bmp
games/scorched3d/data/tanks/t55.ase
games/scorched3d/data/tanks/t55.bmp
games/scorched3d/data/tanks/t55b.bmp
games/scorched3d/data/tanks/t74.ase
games/scorched3d/data/tanks/t74.bmp
games/scorched3d/data/tanks/t74b.bmp
+games/scorched3d/data/tanks/t90/black.bmp
+games/scorched3d/data/tanks/t90/t90.bmp
+games/scorched3d/data/tanks/t90/t90.txt
games/scorched3d/data/tanks/tank2.ase
games/scorched3d/data/tanks/tank2.bmp
games/scorched3d/data/tanks/tank3.ase
@@ -65,20 +250,38 @@ games/scorched3d/data/tanks/tank6.ase
games/scorched3d/data/tanks/tank6.bmp
games/scorched3d/data/tanks/tank6a.bmp
games/scorched3d/data/tanks/tank6b.bmp
+games/scorched3d/data/tanks/thel/black.bmp
+games/scorched3d/data/tanks/thel/chrome.bmp
+games/scorched3d/data/tanks/thel/green.bmp
+games/scorched3d/data/tanks/thel/kaki.bmp
+games/scorched3d/data/tanks/thel/thel.txt
games/scorched3d/data/tanks/tos1.ase
games/scorched3d/data/tanks/tos1.bmp
games/scorched3d/data/tanks/towedartillery.ase
games/scorched3d/data/tanks/towedartillery.bmp
+games/scorched3d/data/tanks/towedartillery2/bigtire.bmp
+games/scorched3d/data/tanks/towedartillery2/chrome.bmp
+games/scorched3d/data/tanks/towedartillery2/tan.bmp
+games/scorched3d/data/tanks/towedartillery2/towedartillery2.txt
games/scorched3d/data/tanks/towedartilleryb.bmp
+games/scorched3d/data/tanks/v2.ase
+games/scorched3d/data/tanks/v2.bmp
games/scorched3d/data/tanks/wespe.ase
-games/scorched3d/data/tanks/apache-long.ase
-games/scorched3d/data/fonts/data.bmp
-games/scorched3d/data/fonts/datainv.bmp
+games/scorched3d/data/tanks/wespe.bmp
+games/scorched3d/data/tanks/zsu-24-1.ase
+games/scorched3d/data/tanks/zsu-24-1.bmp
+games/scorched3d/data/tanks/zsu23/black.bmp
+games/scorched3d/data/tanks/zsu23/white.bmp
+games/scorched3d/data/tanks/zsu23/zsu23.bmp
+games/scorched3d/data/tanks/zsu23/zsu23.txt
+games/scorched3d/data/tanks/zsu57/black.bmp
+games/scorched3d/data/tanks/zsu57/zsu57.bmp
+games/scorched3d/data/tanks/zsu57/zsu57.txt
games/scorched3d/data/textures/bordershield/grid.bmp
games/scorched3d/data/textures/bordershield/grid2.bmp
games/scorched3d/data/textures/bordershield/grid22.bmp
games/scorched3d/data/textures/bordershield/hit.bmp
-games/scorched3d/data/textures/explode/exp05_7.bmp
+games/scorched3d/data/textures/explode/exp00_1.bmp
games/scorched3d/data/textures/explode/exp00_10.bmp
games/scorched3d/data/textures/explode/exp00_2.bmp
games/scorched3d/data/textures/explode/exp00_3.bmp
@@ -106,8 +309,8 @@ games/scorched3d/data/textures/explode/exp05_3.bmp
games/scorched3d/data/textures/explode/exp05_4.bmp
games/scorched3d/data/textures/explode/exp05_5.bmp
games/scorched3d/data/textures/explode/exp05_6.bmp
-games/scorched3d/data/textures/explode/exp00_1.bmp
-games/scorched3d/data/textures/flame/flame33.bmp
+games/scorched3d/data/textures/explode/exp05_7.bmp
+games/scorched3d/data/textures/flame/flame01.bmp
games/scorched3d/data/textures/flame/flame02.bmp
games/scorched3d/data/textures/flame/flame03.bmp
games/scorched3d/data/textures/flame/flame04.bmp
@@ -139,25 +342,11 @@ games/scorched3d/data/textures/flame/flame29.bmp
games/scorched3d/data/textures/flame/flame30.bmp
games/scorched3d/data/textures/flame/flame31.bmp
games/scorched3d/data/textures/flame/flame32.bmp
-games/scorched3d/data/textures/flame/flame01.bmp
-games/scorched3d/data/textures/lensflare/shine9.bw
-games/scorched3d/data/textures/lensflare/flare1.bw
-games/scorched3d/data/textures/lensflare/flare2.bw
-games/scorched3d/data/textures/lensflare/flare3.bw
-games/scorched3d/data/textures/lensflare/flare4.bw
-games/scorched3d/data/textures/lensflare/flare5.bw
-games/scorched3d/data/textures/lensflare/shine0.bw
-games/scorched3d/data/textures/lensflare/shine1.bw
-games/scorched3d/data/textures/lensflare/shine2.bw
-games/scorched3d/data/textures/lensflare/shine3.bw
-games/scorched3d/data/textures/lensflare/shine4.bw
-games/scorched3d/data/textures/lensflare/shine5.bw
-games/scorched3d/data/textures/lensflare/shine6.bw
-games/scorched3d/data/textures/lensflare/shine7.bw
-games/scorched3d/data/textures/lensflare/shine8.bw
-games/scorched3d/data/textures/lensflare/flare0.bw
-games/scorched3d/data/textures/landscape/default/texture4.bmp
+games/scorched3d/data/textures/flame/flame33.bmp
+games/scorched3d/data/textures/glow1.bmp
+games/scorched3d/data/textures/landscape/default/cloud1.bmp
games/scorched3d/data/textures/landscape/default/cubemap.bmp
+games/scorched3d/data/textures/landscape/default/detail.bmp
games/scorched3d/data/textures/landscape/default/magma-small.bmp
games/scorched3d/data/textures/landscape/default/rockside.bmp
games/scorched3d/data/textures/landscape/default/scorch.bmp
@@ -166,8 +355,9 @@ games/scorched3d/data/textures/landscape/default/texture0.bmp
games/scorched3d/data/textures/landscape/default/texture1.bmp
games/scorched3d/data/textures/landscape/default/texture2.bmp
games/scorched3d/data/textures/landscape/default/texture3.bmp
-games/scorched3d/data/textures/landscape/default/cloud1.bmp
-games/scorched3d/data/textures/landscape/hell/texture4.bmp
+games/scorched3d/data/textures/landscape/default/texture4.bmp
+games/scorched3d/data/textures/landscape/default/water.bmp
+games/scorched3d/data/textures/landscape/hell/cloud1.bmp
games/scorched3d/data/textures/landscape/hell/cubemap.bmp
games/scorched3d/data/textures/landscape/hell/rockside.bmp
games/scorched3d/data/textures/landscape/hell/scorch.bmp
@@ -176,8 +366,8 @@ games/scorched3d/data/textures/landscape/hell/texture0.bmp
games/scorched3d/data/textures/landscape/hell/texture1.bmp
games/scorched3d/data/textures/landscape/hell/texture2.bmp
games/scorched3d/data/textures/landscape/hell/texture3.bmp
-games/scorched3d/data/textures/landscape/hell/cloud1.bmp
-games/scorched3d/data/textures/landscape/sand/texture4.bmp
+games/scorched3d/data/textures/landscape/hell/texture4.bmp
+games/scorched3d/data/textures/landscape/sand/cloud1.bmp
games/scorched3d/data/textures/landscape/sand/cubemap.bmp
games/scorched3d/data/textures/landscape/sand/rockside.bmp
games/scorched3d/data/textures/landscape/sand/scorch.bmp
@@ -186,8 +376,8 @@ games/scorched3d/data/textures/landscape/sand/texture0.bmp
games/scorched3d/data/textures/landscape/sand/texture1.bmp
games/scorched3d/data/textures/landscape/sand/texture2.bmp
games/scorched3d/data/textures/landscape/sand/texture3.bmp
-games/scorched3d/data/textures/landscape/sand/cloud1.bmp
-games/scorched3d/data/textures/landscape/snow/texture4.bmp
+games/scorched3d/data/textures/landscape/sand/texture4.bmp
+games/scorched3d/data/textures/landscape/snow/cloud1.bmp
games/scorched3d/data/textures/landscape/snow/cubemap.bmp
games/scorched3d/data/textures/landscape/snow/rockside.bmp
games/scorched3d/data/textures/landscape/snow/scorch.bmp
@@ -196,16 +386,96 @@ games/scorched3d/data/textures/landscape/snow/texture0.bmp
games/scorched3d/data/textures/landscape/snow/texture1.bmp
games/scorched3d/data/textures/landscape/snow/texture2.bmp
games/scorched3d/data/textures/landscape/snow/texture3.bmp
-games/scorched3d/data/textures/landscape/snow/cloud1.bmp
+games/scorched3d/data/textures/landscape/snow/texture4.bmp
+games/scorched3d/data/textures/landscape/storm/cloud1.bmp
+games/scorched3d/data/textures/landscape/storm/cubemap.bmp
+games/scorched3d/data/textures/landscape/storm/rockside.bmp
+games/scorched3d/data/textures/landscape/storm/scorch.bmp
+games/scorched3d/data/textures/landscape/storm/shore.bmp
+games/scorched3d/data/textures/landscape/storm/texture0.bmp
+games/scorched3d/data/textures/landscape/storm/texture1.bmp
+games/scorched3d/data/textures/landscape/storm/texture2.bmp
+games/scorched3d/data/textures/landscape/storm/texture3.bmp
+games/scorched3d/data/textures/landscape/storm/texture4.bmp
games/scorched3d/data/textures/landscape/textures.txt
-games/scorched3d/data/textures/glow1.bmp
+games/scorched3d/data/textures/landscape/tropical/cloud1.bmp
+games/scorched3d/data/textures/landscape/tropical/cubemap.bmp
+games/scorched3d/data/textures/landscape/tropical/rockside.bmp
+games/scorched3d/data/textures/landscape/tropical/scorch.bmp
+games/scorched3d/data/textures/landscape/tropical/shore.bmp
+games/scorched3d/data/textures/landscape/tropical/texture0.bmp
+games/scorched3d/data/textures/landscape/tropical/texture1.bmp
+games/scorched3d/data/textures/landscape/tropical/texture2.bmp
+games/scorched3d/data/textures/landscape/tropical/texture3.bmp
+games/scorched3d/data/textures/landscape/tropical/texture4.bmp
+games/scorched3d/data/textures/landscape/vulcano/cloud1.bmp
+games/scorched3d/data/textures/landscape/vulcano/cubemap.bmp
+games/scorched3d/data/textures/landscape/vulcano/rockside.bmp
+games/scorched3d/data/textures/landscape/vulcano/scorch.bmp
+games/scorched3d/data/textures/landscape/vulcano/shore.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture0.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture1.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture2.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture3.bmp
+games/scorched3d/data/textures/landscape/vulcano/texture4.bmp
+games/scorched3d/data/textures/lensflare/flare0.bw
+games/scorched3d/data/textures/lensflare/flare1.bw
+games/scorched3d/data/textures/lensflare/flare2.bw
+games/scorched3d/data/textures/lensflare/flare3.bw
+games/scorched3d/data/textures/lensflare/flare4.bw
+games/scorched3d/data/textures/lensflare/flare5.bw
+games/scorched3d/data/textures/lensflare/shine0.bw
+games/scorched3d/data/textures/lensflare/shine1.bw
+games/scorched3d/data/textures/lensflare/shine2.bw
+games/scorched3d/data/textures/lensflare/shine3.bw
+games/scorched3d/data/textures/lensflare/shine4.bw
+games/scorched3d/data/textures/lensflare/shine5.bw
+games/scorched3d/data/textures/lensflare/shine6.bw
+games/scorched3d/data/textures/lensflare/shine7.bw
+games/scorched3d/data/textures/lensflare/shine8.bw
+games/scorched3d/data/textures/lensflare/shine9.bw
games/scorched3d/data/textures/smoke01.bmp
+games/scorched3d/data/textures/smoke02.bmp
games/scorched3d/data/textures/talk.bmp
+games/scorched3d/data/textures/wicons/Thumbs.db
+games/scorched3d/data/textures/wicons/autod.bmp
+games/scorched3d/data/textures/wicons/battery.bmp
+games/scorched3d/data/textures/wicons/bdigger.bmp
+games/scorched3d/data/textures/wicons/bmissile.bmp
+games/scorched3d/data/textures/wicons/bnuke.bmp
+games/scorched3d/data/textures/wicons/bshog.bmp
+games/scorched3d/data/textures/wicons/dball.bmp
+games/scorched3d/data/textures/wicons/dclod.bmp
+games/scorched3d/data/textures/wicons/dhead.bmp
+games/scorched3d/data/textures/wicons/digger.bmp
+games/scorched3d/data/textures/wicons/fbomb.bmp
+games/scorched3d/data/textures/wicons/fshield.bmp
+games/scorched3d/data/textures/wicons/fuel.bmp
+games/scorched3d/data/textures/wicons/hdigger.bmp
+games/scorched3d/data/textures/wicons/hnapalm.bmp
+games/scorched3d/data/textures/wicons/hrbomb.bmp
+games/scorched3d/data/textures/wicons/hshield.bmp
+games/scorched3d/data/textures/wicons/hshog.bmp
+games/scorched3d/data/textures/wicons/lfrog.bmp
+games/scorched3d/data/textures/wicons/mag.bmp
+games/scorched3d/data/textures/wicons/mirv.bmp
+games/scorched3d/data/textures/wicons/missile.bmp
+games/scorched3d/data/textures/wicons/napalm.bmp
+games/scorched3d/data/textures/wicons/nuke.bmp
+games/scorched3d/data/textures/wicons/para.bmp
+games/scorched3d/data/textures/wicons/rbomb.bmp
+games/scorched3d/data/textures/wicons/shield.bmp
+games/scorched3d/data/textures/wicons/shog.bmp
+games/scorched3d/data/textures/wicons/smag.bmp
+games/scorched3d/data/textures/wicons/stracer.bmp
+games/scorched3d/data/textures/wicons/tdirt.bmp
+games/scorched3d/data/textures/wicons/tracer.bmp
games/scorched3d/data/wav/battery/battery.wav
-games/scorched3d/data/wav/explosions/medium.wav
+games/scorched3d/data/wav/explosions/crunch.wav
games/scorched3d/data/wav/explosions/gloop.wav
games/scorched3d/data/wav/explosions/large.wav
-games/scorched3d/data/wav/explosions/crunch.wav
+games/scorched3d/data/wav/explosions/medium.wav
+games/scorched3d/data/wav/explosions/napalm.wav
games/scorched3d/data/wav/explosions/small.wav
games/scorched3d/data/wav/explosions/tank.wav
games/scorched3d/data/wav/explosions/xlarge.wav
@@ -213,6 +483,7 @@ games/scorched3d/data/wav/misc/camera.wav
games/scorched3d/data/wav/misc/para.wav
games/scorched3d/data/wav/misc/play.wav
games/scorched3d/data/wav/misc/splash.wav
+games/scorched3d/data/wav/misc/text.wav
games/scorched3d/data/wav/movement/elevate.wav
games/scorched3d/data/wav/movement/movement.wav
games/scorched3d/data/wav/movement/turn.wav
@@ -220,16 +491,16 @@ games/scorched3d/data/wav/shield/activate.wav
games/scorched3d/data/wav/shield/activateforce.wav
games/scorched3d/data/wav/shield/hit.wav
games/scorched3d/data/wav/shield/hit2.wav
-games/scorched3d/data/wav/shoot/medium.wav
+games/scorched3d/data/wav/shoot/flare.wav
games/scorched3d/data/wav/shoot/large.wav
games/scorched3d/data/wav/shoot/laser.wav
-games/scorched3d/data/wav/shoot/flare.wav
+games/scorched3d/data/wav/shoot/launch.wav
+games/scorched3d/data/wav/shoot/medium.wav
games/scorched3d/data/wav/shoot/small.wav
games/scorched3d/data/wav/shoot/tracer.wav
games/scorched3d/data/wav/shoot/xlarge.wav
-games/scorched3d/data/windows/tank2.ico
+games/scorched3d/data/windows/client.bmp
games/scorched3d/data/windows/display.bmp
-games/scorched3d/data/windows/eye1.bmp
games/scorched3d/data/windows/island.bmp
games/scorched3d/data/windows/island.ico
games/scorched3d/data/windows/logotiled.bmp
@@ -240,24 +511,9 @@ games/scorched3d/data/windows/tank-easy.bmp
games/scorched3d/data/windows/tank-hard.bmp
games/scorched3d/data/windows/tank-med.bmp
games/scorched3d/data/windows/tank2.bmp
-games/scorched3d/data/windows/client.bmp
-games/scorched3d/data/server.xml
-games/scorched3d/data/ainames.txt
-games/scorched3d/data/singleeasy.xml
-games/scorched3d/data/singlehard.xml
-games/scorched3d/data/singlenormal.xml
-games/scorched3d/data/tanks.xml
-games/scorched3d/data/singlecustom.xml
-games/scorched3d/data/autoexec.xml
-games/scorched3d/data/display.xml
-games/scorched3d/data/motd.txt
-games/scorched3d/data/playernames.txt
-games/scorched3d/data/random.no
-games/scorched3d/data/resource.xml
-games/scorched3d/README
-games/scorched3d/documentation/Scorched3D.hlp
-games/scorched3d/documentation/mehrspieler.txt
-games/scorched3d/documentation/multiplayer.txt
+games/scorched3d/data/windows/tank2.ico
+games/scorched3d/data/windows/wait.bmp
+games/scorched3d/data/windows/waita.bmp
games/scorched3d/documentation/README-EXPAT.txt
games/scorched3d/documentation/README-ODE.txt
games/scorched3d/documentation/README-SDL.txt
@@ -265,30 +521,76 @@ games/scorched3d/documentation/README-SDLMIXER.txt
games/scorched3d/documentation/README-SDLNET.txt
games/scorched3d/documentation/README-wxwindows.txt
games/scorched3d/documentation/README-zlib.txt
+games/scorched3d/documentation/Scorched3D.hlp
games/scorched3d/documentation/liesmich.txt
-@dirrm games/scorched3d/data/meshes
-@dirrm games/scorched3d/data/talk/polish
-@dirrm games/scorched3d/data/talk
-@dirrm games/scorched3d/data/tanks
-@dirrm games/scorched3d/data/fonts
-@dirrm games/scorched3d/data/textures/bordershield
-@dirrm games/scorched3d/data/textures/explode
-@dirrm games/scorched3d/data/textures/flame
+games/scorched3d/documentation/multiplayer.txt
+games/scorched3d/documentation/readme.txt
+games/scorched3d/logs/Log_Dir
+games/scorched3d/scorched3d
+@dirrm games/scorched3d/logs
+@dirrm games/scorched3d/documentation
+@dirrm games/scorched3d/data/windows
+@dirrm games/scorched3d/data/wav/shoot
+@dirrm games/scorched3d/data/wav/shield
+@dirrm games/scorched3d/data/wav/movement
+@dirrm games/scorched3d/data/wav/misc
+@dirrm games/scorched3d/data/wav/explosions
+@dirrm games/scorched3d/data/wav/battery
+@dirrm games/scorched3d/data/wav
+@dirrm games/scorched3d/data/textures/wicons
@dirrm games/scorched3d/data/textures/lensflare
-@dirrm games/scorched3d/data/textures/landscape/default
-@dirrm games/scorched3d/data/textures/landscape/hell
-@dirrm games/scorched3d/data/textures/landscape/sand
+@dirrm games/scorched3d/data/textures/landscape/vulcano
+@dirrm games/scorched3d/data/textures/landscape/tropical
+@dirrm games/scorched3d/data/textures/landscape/storm
@dirrm games/scorched3d/data/textures/landscape/snow
+@dirrm games/scorched3d/data/textures/landscape/sand
+@dirrm games/scorched3d/data/textures/landscape/hell
+@dirrm games/scorched3d/data/textures/landscape/default
@dirrm games/scorched3d/data/textures/landscape
+@dirrm games/scorched3d/data/textures/flame
+@dirrm games/scorched3d/data/textures/explode
+@dirrm games/scorched3d/data/textures/bordershield
@dirrm games/scorched3d/data/textures
-@dirrm games/scorched3d/data/wav/battery
-@dirrm games/scorched3d/data/wav/explosions
-@dirrm games/scorched3d/data/wav/misc
-@dirrm games/scorched3d/data/wav/movement
-@dirrm games/scorched3d/data/wav/shield
-@dirrm games/scorched3d/data/wav/shoot
-@dirrm games/scorched3d/data/windows
-@dirrm games/scorched3d/data/wav
+@dirrm games/scorched3d/data/tanks/zsu57
+@dirrm games/scorched3d/data/tanks/zsu23
+@dirrm games/scorched3d/data/tanks/towedartillery2
+@dirrm games/scorched3d/data/tanks/thel
+@dirrm games/scorched3d/data/tanks/t90
+@dirrm games/scorched3d/data/tanks/sa6
+@dirrm games/scorched3d/data/tanks/patriot
+@dirrm games/scorched3d/data/tanks/mlrs
+@dirrm games/scorched3d/data/tanks/m48
+@dirrm games/scorched3d/data/tanks/m1a1
+@dirrm games/scorched3d/data/tanks/lav-25
+@dirrm games/scorched3d/data/tanks/helder
+@dirrm games/scorched3d/data/tanks/hawk
+@dirrm games/scorched3d/data/tanks/guntower
+@dirrm games/scorched3d/data/tanks/bradley2
+@dirrm games/scorched3d/data/tanks/bm13
+@dirrm games/scorched3d/data/tanks/battleship
+@dirrm games/scorched3d/data/tanks
+@dirrm games/scorched3d/data/talk/polish
+@dirrm games/scorched3d/data/talk/german
+@dirrm games/scorched3d/data/talk
+@dirrm games/scorched3d/data/meshes
+@dirrm games/scorched3d/data/fonts
+@dirrm games/scorched3d/data/accessories/v2missile
+@dirrm games/scorched3d/data/accessories/smallpine
+@dirrm games/scorched3d/data/accessories/shell
+@dirrm games/scorched3d/data/accessories/sa6
+@dirrm games/scorched3d/data/accessories/patriot
+@dirrm games/scorched3d/data/accessories/palmtree
+@dirrm games/scorched3d/data/accessories/mirvwarhead
+@dirrm games/scorched3d/data/accessories/m48
+@dirrm games/scorched3d/data/accessories/littleboy
+@dirrm games/scorched3d/data/accessories/icbm
+@dirrm games/scorched3d/data/accessories/hawkmissile
+@dirrm games/scorched3d/data/accessories/fatman
+@dirrm games/scorched3d/data/accessories/digger
+@dirrm games/scorched3d/data/accessories/bouncingbetty
+@dirrm games/scorched3d/data/accessories/bomblet
+@dirrm games/scorched3d/data/accessories/bomb
+@dirrm games/scorched3d/data/accessories/barrage
+@dirrm games/scorched3d/data/accessories
@dirrm games/scorched3d/data
-@dirrm games/scorched3d/documentation
@dirrm games/scorched3d