diff options
Diffstat (limited to 'games')
46 files changed, 524 insertions, 370 deletions
diff --git a/games/scorched3d-devel/Makefile b/games/scorched3d-devel/Makefile index 0e6aa71a804f..ee1f2d4a6b7e 100644 --- a/games/scorched3d-devel/Makefile +++ b/games/scorched3d-devel/Makefile @@ -13,33 +13,35 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= scorched3d DISTNAME= Scorched3D-${SCORCH_VERSION}-src -MAINTAINER= mdodd@FreeBSD.org +MAINTAINER= guy@device.dyndns.org COMMENT= Scorched is a game based loosely on the classic DOS game LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +SCORCH_VERSION= 37.2 + .if defined(WITH_MYSQL) USE_MYSQL= yes .endif - USE_SDL= mixer net sdl -SCORCH_VERSION= 36.2 -WRKSRC= ${WRKDIR}/scorched GNU_CONFIGURE= yes USE_GL= yes USE_GMAKE= yes USE_AUTOMAKE_VER= 15 USE_AUTOCONF_VER= 259 +WRKSRC= ${WRKDIR}/scorched AUTOMAKE_ARGS= --foreign -CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \ - AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}" - +CONFIGURE_ARGS= --program-prefix='' \ + --prefix=${PREFIX}/games/scorched3d \ + --datadir=${PREFIX}/games/scorched3d \ + --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config .if defined(WITH_MYSQL) CONFIGURE_ARGS+= --with-mysql .endif +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \ + AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}" .include <bsd.port.pre.mk> @@ -52,14 +54,6 @@ pre-configure: @cd ${WRKSRC} && ${ACLOCAL} pre-install: - @mkdir -p ${PREFIX}/games/scorched3d - -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 + @${MKDIR} ${PREFIX}/games/scorched3d .include <bsd.port.post.mk> diff --git a/games/scorched3d-devel/distinfo b/games/scorched3d-devel/distinfo index 77dbad786101..d83ae1a0a567 100644 --- a/games/scorched3d-devel/distinfo +++ b/games/scorched3d-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (Scorched3D-36.2-src.tar.gz) = 7388dfaadd7bc568d2c341539fb27184 -SIZE (Scorched3D-35-src.tar.gz) = 10798751 +MD5 (Scorched3D-37.2-src.tar.gz) = 08ba1a2252446b539dcd2067836e7ad3 +SIZE (Scorched3D-35-src.tar.gz) = 19295008 diff --git a/games/scorched3d-devel/files/patch-Makefile.am b/games/scorched3d-devel/files/patch-Makefile.am deleted file mode 100644 index a0a0e983d1da..000000000000 --- a/games/scorched3d-devel/files/patch-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.am.orig Sat Jan 31 00:53:31 2004 -+++ Makefile.am Sat Jan 31 00:53:58 2004 -@@ -1,6 +1,6 @@ - ## Process with automake to produce Makefile.in - --pkgdir = $(prefix)/@PACKAGE@ -+pkgdir = $(prefix)/games/@PACKAGE@ - - SUBDIRS = src - diff --git a/games/scorched3d-devel/files/patch-configure.ac b/games/scorched3d-devel/files/patch-configure.ac index f4a5f2b71c69..e25bb76ccf30 100644 --- a/games/scorched3d-devel/files/patch-configure.ac +++ b/games/scorched3d-devel/files/patch-configure.ac @@ -1,36 +1,24 @@ ---- configure.ac.orig Wed Jan 14 12:08:10 2004 -+++ configure.ac Sat Jan 31 18:10:28 2004 -@@ -34,8 +34,8 @@ - dnl Check for SDL_mixer lib - have_SDLmixer=no - AC_TRY_COMPILE([ -- #include <SDL/SDL.h> -- #include <SDL/SDL_mixer.h> -+ #include <SDL11/SDL.h> -+ #include <SDL11/SDL_mixer.h> +--- ./configure.ac.orig Wed May 26 14:01:15 2004 ++++ ./configure.ac Sun May 30 22:43:42 2004 +@@ -37,8 +37,8 @@ + have_SDLmixer=yes + if test "x$enable_sdltest" = "xyes" ; then + AC_TRY_COMPILE([ +- #include <SDL/SDL.h> +- #include <SDL/SDL_mixer.h> ++ #include <SDL11/SDL.h> ++ #include <SDL11/SDL_mixer.h> - int main(int argc, char *argv[]) - { return 0; } -@@ -54,8 +54,8 @@ - dnl Check for SDL_net lib - have_SDLnet=no - AC_TRY_COMPILE([ -- #include <SDL/SDL.h> -- #include <SDL/SDL_net.h> -+ #include <SDL11/SDL.h> -+ #include <SDL11/SDL_net.h> + int main(int argc, char *argv[]) + { return 0; } +@@ -64,8 +64,8 @@ + have_SDLnet=yes + if test "x$enable_sdltest" = "xyes" ; then + AC_TRY_COMPILE([ +- #include <SDL/SDL.h> +- #include <SDL/SDL_net.h> ++ #include <SDL11/SDL.h> ++ #include <SDL11/SDL_net.h> - int main(int argc, char *argv[]) - { return 0; } -@@ -144,9 +144,9 @@ - - dnl Define install prefix - if test x$prefix = xNONE; then -- prefix=/usr/local/games -+ prefix=/usr/local - fi --AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/$PACKAGE/", [install directory]) -+AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/games/$PACKAGE/", [install directory]) - - # extra fixed flags - CFLAGS="$CFLAGS -DdDOUBLE" + int main(int argc, char *argv[]) + { return 0; } diff --git a/games/scorched3d-devel/files/patch-scripts-createAMMakefile.pl b/games/scorched3d-devel/files/patch-scripts-createAMMakefile.pl new file mode 100644 index 000000000000..acc189f65b2a --- /dev/null +++ b/games/scorched3d-devel/files/patch-scripts-createAMMakefile.pl @@ -0,0 +1,18 @@ +--- scripts/createAMMakefile.pl.orig Sun May 30 14:41:40 2004 ++++ scripts/createAMMakefile.pl Sun May 30 14:42:35 2004 +@@ -56,6 +56,7 @@ + } + } + ++chmod 0644, "../Makefile.am"; + open (CLIENT, ">../Makefile.am") || die "ERROR: Failed to write to ../Makefile.am"; + print CLIENT "SUBDIRS = src\n\n"; + print CLIENT "docdir = \@docdir\@\n\n"; +@@ -65,6 +66,7 @@ + + my @clientfiles = getFiles("../src/scorched/scorched.vcproj"); + ++chmod 0644, "../src/scorched/Makefile.am"; + open (CLIENT, ">../src/scorched/Makefile.am") || die "../src/scorched/Makefile.am"; + + print CLIENT << "EOF"; diff --git a/games/scorched3d-devel/files/patch-src-3dsparse-aseFile.tab.cpp b/games/scorched3d-devel/files/patch-src-3dsparse-aseFile.tab.cpp deleted file mode 100644 index 505201c9d88b..000000000000 --- a/games/scorched3d-devel/files/patch-src-3dsparse-aseFile.tab.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/3dsparse/aseFile.tab.cpp.orig Fri Jan 23 17:58:58 2004 -+++ ./src/3dsparse/aseFile.tab.cpp Fri Jan 23 18:01:17 2004 -@@ -330,10 +330,10 @@ - #include <alloca.h> - #else /* not sparc */ - #if defined (MSDOS) && !defined (__TURBOC__) --#include <malloc.h> -+#include <stdlib.h> - #else /* not MSDOS, or __TURBOC__ */ - #if defined(_AIX) --#include <malloc.h> -+#include <stdlib.h> - #pragma alloca - #else /* not MSDOS, __TURBOC__, or _AIX */ - #ifdef __hpux diff --git a/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp b/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp index 1e21ac6d0306..4489ed1811ba 100644 --- a/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp +++ b/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp @@ -1,11 +1,11 @@ ---- ./src/GLEXT/GLBitmap.cpp.orig Fri Jan 23 17:58:59 2004 -+++ ./src/GLEXT/GLBitmap.cpp Fri Jan 23 18:01:21 2004 -@@ -27,7 +27,7 @@ +--- ./src/GLEXT/GLBitmap.cpp.orig Thu Feb 26 23:00:26 2004 ++++ ./src/GLEXT/GLBitmap.cpp Sun May 30 22:43:45 2004 +@@ -22,7 +22,7 @@ #include <math.h> #include <GLEXT/GLState.h> #include <GLEXT/GLBitmap.h> -#include <SDL/SDL.h> +#include <SDL11/SDL.h> - ////////////////////////////////////////////////////////////////////// - // Construction/Destruction + GLBitmap::GLBitmap() : + width_(0), height_(0), alpha_(false), newbits_(0) diff --git a/games/scorched3d-devel/files/patch-src-XML-XMLParser.cpp b/games/scorched3d-devel/files/patch-src-XML-XMLParser.cpp new file mode 100644 index 000000000000..3b410df25ab4 --- /dev/null +++ b/games/scorched3d-devel/files/patch-src-XML-XMLParser.cpp @@ -0,0 +1,11 @@ +--- src/XML/XMLParser.cpp.orig Sun May 30 21:18:51 2004 ++++ src/XML/XMLParser.cpp Sun May 30 21:19:29 2004 +@@ -28,7 +28,7 @@ + static const char *getSpacer(int space) + { + static std::string spacestr; +- spacestr.clear(); ++ spacestr.erase(); + for (int i=0; i<space; i++) spacestr+="\t"; + return spacestr.c_str(); + } diff --git a/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp b/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp index b29271564a0c..8ec4282cbcca 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 Fri Jan 23 17:59:02 2004 -+++ ./src/client/ClientMain.cpp Fri Jan 23 18:01:47 2004 -@@ -57,7 +57,7 @@ - #include <common/Display.h> +--- ./src/client/ClientMain.cpp.orig Fri May 28 00:24:45 2004 ++++ ./src/client/ClientMain.cpp Sun May 30 22:43:47 2004 +@@ -66,7 +66,7 @@ #include <common/Gamma.h> #include <common/Sound.h> + #include <common/Clock.h> -#include <SDL/SDL.h> +#include <SDL11/SDL.h> - void startClient() + bool initHardware(ProgressCounter *progressCounter) { diff --git a/games/scorched3d-devel/files/patch-src-client-SoftwareMouse.cpp b/games/scorched3d-devel/files/patch-src-client-SoftwareMouse.cpp new file mode 100644 index 000000000000..ca784ee6a41c --- /dev/null +++ b/games/scorched3d-devel/files/patch-src-client-SoftwareMouse.cpp @@ -0,0 +1,11 @@ +--- ./src/client/SoftwareMouse.cpp.orig Mon Apr 5 19:10:34 2004 ++++ ./src/client/SoftwareMouse.cpp Sun May 30 22:43:47 2004 +@@ -25,7 +25,7 @@ + #include <GLEXT/GLState.h> + #include <common/Defines.h> + #include <common/OptionsDisplay.h> +-#include <SDL/SDL.h> ++#include <SDL11/SDL.h> + + SoftwareMouse *SoftwareMouse::instance_ = 0; + diff --git a/games/scorched3d-devel/files/patch-src-common-Sound.cpp b/games/scorched3d-devel/files/patch-src-common-Sound.cpp new file mode 100644 index 000000000000..ffb48d3d872a --- /dev/null +++ b/games/scorched3d-devel/files/patch-src-common-Sound.cpp @@ -0,0 +1,11 @@ +--- src/common/Sound.cpp.orig Sun May 30 23:32:44 2004 ++++ src/common/Sound.cpp Sun May 30 23:07:33 2004 +@@ -73,7 +73,7 @@ + + bool Sound::init() + { +- if ( Mix_OpenAudio(11025, AUDIO_U8, 1, 512) < 0 ) ++ if ( Mix_OpenAudio(11025, AUDIO_U8, 1, 2048) < 0 ) + { + dialogMessage(SDL_GetError(), + "Warning: Couldn't set 11025 Hz 8-bit audio"); diff --git a/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp b/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp index ff095e62045b..79bf54394a75 100644 --- a/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp +++ b/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp @@ -1,5 +1,5 @@ ---- ./src/engine/MainLoop.cpp.orig Fri Jan 23 17:59:09 2004 -+++ ./src/engine/MainLoop.cpp Fri Jan 23 18:02:17 2004 +--- ./src/engine/MainLoop.cpp.orig Mon Feb 23 01:35:25 2004 ++++ ./src/engine/MainLoop.cpp Sun May 30 22:43:49 2004 @@ -22,7 +22,7 @@ #include <common/OptionsDisplay.h> #include <common/Defines.h> @@ -7,5 +7,5 @@ -#include <SDL/SDL.h> +#include <SDL11/SDL.h> - MainLoop::MainLoop() : exitLoop_(false), lastDrawTime_(0.0f) + MainLoop::MainLoop() : exitLoop_(false), lastDrawTime_(0.0f), flip_(false) { diff --git a/games/scorched3d-devel/files/patch-src-irc-GameInfoEntry.h b/games/scorched3d-devel/files/patch-src-irc-GameInfoEntry.h deleted file mode 100644 index c070faecfdb1..000000000000 --- a/games/scorched3d-devel/files/patch-src-irc-GameInfoEntry.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src/irc/GameInfoEntry.h.orig Fri Jan 23 17:59:10 2004 -+++ ./src/irc/GameInfoEntry.h Fri Jan 23 18:02:32 2004 -@@ -1,8 +1,8 @@ - #ifndef _GAMEINFOENTRY_H_ - #define _GAMEINFOENTRY_H_ - --#include <SDL/SDL.h> --#include <SDL/SDL_net.h> -+#include <SDL11/SDL.h> -+#include <SDL11/SDL_net.h> - - #include <string> - diff --git a/games/scorched3d-devel/files/patch-src-irc-GameInfoList.h b/games/scorched3d-devel/files/patch-src-irc-GameInfoList.h deleted file mode 100644 index 831b1e198f0d..000000000000 --- a/games/scorched3d-devel/files/patch-src-irc-GameInfoList.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/irc/GameInfoList.h.orig Fri Jan 23 17:59:10 2004 -+++ ./src/irc/GameInfoList.h Fri Jan 23 18:02:32 2004 -@@ -1,7 +1,7 @@ - #ifndef _GAMEINFOLIST_H_ - #define _GAMEINFOLIST_H_ - --#include <SDL/SDL_mutex.h> -+#include <SDL11/SDL_mutex.h> - - #include <list> - #include "irc/GameInfoEntry.h" diff --git a/games/scorched3d-devel/files/patch-src-irc-GameInfoMessage.h b/games/scorched3d-devel/files/patch-src-irc-GameInfoMessage.h deleted file mode 100644 index 9a817d7f459a..000000000000 --- a/games/scorched3d-devel/files/patch-src-irc-GameInfoMessage.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/irc/GameInfoMessage.h.orig Fri Jan 23 17:59:10 2004 -+++ ./src/irc/GameInfoMessage.h Fri Jan 23 18:02:33 2004 -@@ -1,9 +1,9 @@ - #ifndef _GAMEINFOMESSAGE_H_ - #define _GAMEINFOMESSAGE_H_ - --#include <SDL/SDL.h> --#include <SDL/SDL_net.h> --#include <SDL/SDL_thread.h> -+#include <SDL11/SDL.h> -+#include <SDL11/SDL_net.h> -+#include <SDL11/SDL_thread.h> - #include "irc/GameInfoEntry.h" - #include <string> - diff --git a/games/scorched3d-devel/files/patch-src-irc-IrcConnection.h b/games/scorched3d-devel/files/patch-src-irc-IrcConnection.h deleted file mode 100644 index ee45c4cf025c..000000000000 --- a/games/scorched3d-devel/files/patch-src-irc-IrcConnection.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/irc/IrcConnection.h.orig Fri Jan 23 17:59:10 2004 -+++ ./src/irc/IrcConnection.h Fri Jan 23 18:02:33 2004 -@@ -1,9 +1,9 @@ - #ifndef _IRC_CLIENT_H_ - #define _IRC_CLIENT_H_ - --#include <SDL/SDL.h> --#include <SDL/SDL_thread.h> --#include <SDL/SDL_net.h> -+#include <SDL11/SDL.h> -+#include <SDL11/SDL_thread.h> -+#include <SDL11/SDL_net.h> - - #include "irc/IrcDefines.h" - diff --git a/games/scorched3d-devel/files/patch-src-irc-UdpHandler.h b/games/scorched3d-devel/files/patch-src-irc-UdpHandler.h deleted file mode 100644 index 05048c1b5224..000000000000 --- a/games/scorched3d-devel/files/patch-src-irc-UdpHandler.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/irc/UdpHandler.h.orig Fri Jan 23 17:59:11 2004 -+++ ./src/irc/UdpHandler.h Fri Jan 23 18:02:35 2004 -@@ -1,9 +1,9 @@ - #ifndef _UDPHANDLER_H_ - #define _UDPHANDLER_H_ - --#include <SDL/SDL.h> --#include <SDL/SDL_net.h> --#include <SDL/SDL_thread.h> -+#include <SDL11/SDL.h> -+#include <SDL11/SDL_net.h> -+#include <SDL11/SDL_thread.h> - #include "irc/GameInfoEntry.h" - - diff --git a/games/scorched3d-devel/files/patch-src-ode-config.h b/games/scorched3d-devel/files/patch-src-ode-config.h index 7df954c181de..d8880cbd8da9 100644 --- a/games/scorched3d-devel/files/patch-src-ode-config.h +++ b/games/scorched3d-devel/files/patch-src-ode-config.h @@ -1,6 +1,6 @@ ---- ./src/ode/config.h.orig Fri Jan 23 17:59:18 2004 -+++ ./src/ode/config.h Fri Jan 23 18:03:31 2004 -@@ -35,7 +35,7 @@ +--- ./src/ode/config.h.orig Mon May 24 21:02:31 2004 ++++ ./src/ode/config.h Sun May 30 14:38:24 2004 +@@ -36,7 +36,7 @@ #if defined(__DARWIN__) #include <sys/malloc.h> #else diff --git a/games/scorched3d-devel/files/patch-src-scorched-MainDialog.cpp b/games/scorched3d-devel/files/patch-src-scorched-MainDialog.cpp new file mode 100644 index 000000000000..db73b41c92ae --- /dev/null +++ b/games/scorched3d-devel/files/patch-src-scorched-MainDialog.cpp @@ -0,0 +1,13 @@ +--- ./src/scorched/MainDialog.cpp.orig Tue May 18 00:45:23 2004 ++++ ./src/scorched/MainDialog.cpp Sun May 30 22:43:49 2004 +@@ -25,8 +25,8 @@ + #include <wx/msgdlg.h> + #define WIN32_LEAN_AND_MEAN + #include <windows.h> +-#include <SDL/SDL.h> +-#include <SDL/SDL_net.h> ++#include <SDL11/SDL.h> ++#include <SDL11/SDL_net.h> + #include <scorched/MainDialog.h> + #include <scorched/HtmlHelpDialog.h> + #include <scorched/NetDialog.h> diff --git a/games/scorched3d-devel/files/patch-src-scorched-main.cpp b/games/scorched3d-devel/files/patch-src-scorched-main.cpp index 2735b09fe57c..a9d185fe3f4e 100644 --- a/games/scorched3d-devel/files/patch-src-scorched-main.cpp +++ b/games/scorched3d-devel/files/patch-src-scorched-main.cpp @@ -1,11 +1,11 @@ ---- ./src/scorched/main.cpp.orig Fri Jan 23 17:59:15 2004 -+++ ./src/scorched/main.cpp Fri Jan 23 18:03:16 2004 +--- ./src/scorched/main.cpp.orig Fri May 28 00:24:45 2004 ++++ ./src/scorched/main.cpp Sun May 30 22:43:49 2004 @@ -20,7 +20,7 @@ - #include <wx/wx.h> + #include <wx/utils.h> -#include <SDL/SDL.h> +#include <SDL11/SDL.h> #include <client/ClientMain.h> - #include <common/OptionsDisplay.h> - #include <common/OptionsParam.h> + #include <client/ClientSave.h> + #include <client/ScorchedClient.h> diff --git a/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp b/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp index a8572fbd5a56..98a3d3657325 100644 --- a/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp +++ b/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp @@ -1,8 +1,8 @@ ---- ./src/server/ServerMain.cpp.orig Fri Jan 23 17:59:16 2004 -+++ ./src/server/ServerMain.cpp Fri Jan 23 18:03:17 2004 -@@ -48,7 +48,7 @@ - #include <server/ServerBrowserInfo.h> +--- ./src/server/ServerMain.cpp.orig Thu May 27 22:11:23 2004 ++++ ./src/server/ServerMain.cpp Sun May 30 22:43:52 2004 +@@ -53,7 +53,7 @@ #include <server/ServerState.h> + #include <server/ServerCommon.h> #include <server/ScorchedServer.h> -#include <SDL/SDL.h> +#include <SDL11/SDL.h> diff --git a/games/scorched3d-devel/pkg-descr b/games/scorched3d-devel/pkg-descr index f284483c1d18..1c7a0cb9167c 100644 --- a/games/scorched3d-devel/pkg-descr +++ b/games/scorched3d-devel/pkg-descr @@ -13,8 +13,10 @@ adding amongst other new features a 3D island environment and LAN and internet play. -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/ + +- Guy P. +guy@device.dyndns.org diff --git a/games/scorched3d-devel/pkg-plist b/games/scorched3d-devel/pkg-plist index d9ef0c4bf26c..515041c0d51b 100644 --- a/games/scorched3d-devel/pkg-plist +++ b/games/scorched3d-devel/pkg-plist @@ -1,6 +1,7 @@ bin/scorched3d -games/scorched3d/README games/scorched3d/data/accessories.xml +games/scorched3d/data/accessories/banana/banana.txt +games/scorched3d/data/accessories/banana/bantex.bmp games/scorched3d/data/accessories/barrage/barrage.txt games/scorched3d/data/accessories/barrage/gradient.bmp games/scorched3d/data/accessories/barrage/white.bmp @@ -50,6 +51,7 @@ 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/roller.ase games/scorched3d/data/accessories/sa6/gradient.bmp games/scorched3d/data/accessories/sa6/sa6.txt games/scorched3d/data/accessories/sa6/white.bmp @@ -75,25 +77,46 @@ 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/fonts/test.ttf games/scorched3d/data/keys.xml +games/scorched3d/data/landscapes.xml +games/scorched3d/data/landscapes/half-mask.bmp +games/scorched3d/data/landscapes/halved.bmp +games/scorched3d/data/landscapes/hilly.bmp +games/scorched3d/data/landscapes/hmap3.bmp +games/scorched3d/data/landscapes/hole-mask.bmp +games/scorched3d/data/landscapes/hole.bmp +games/scorched3d/data/landscapes/islands.bmp +games/scorched3d/data/landscapes/lowlands.bmp +games/scorched3d/data/landscapes/oldstyle.bmp +games/scorched3d/data/landscapes/picture-none.bmp +games/scorched3d/data/landscapes/ridge-mask.bmp +games/scorched3d/data/landscapes/ridge.bmp +games/scorched3d/data/landscapes/valley-mask.bmp +games/scorched3d/data/landscapes/valley.bmp games/scorched3d/data/meshes/autoaim.ase +games/scorched3d/data/meshes/bounce.ase +games/scorched3d/data/meshes/concrete.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/meshes/wrap.ase games/scorched3d/data/motd.txt games/scorched3d/data/mysql.xml games/scorched3d/data/playernames.txt +games/scorched3d/data/prunetables.sql games/scorched3d/data/random.no games/scorched3d/data/resource.xml +games/scorched3d/data/safedisplay.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/singletarget.xml +games/scorched3d/data/ssdisplay.xml +games/scorched3d/data/ssgame.xml games/scorched3d/data/statstables.sql games/scorched3d/data/talk/german/talk1.txt games/scorched3d/data/talk/german/talk2.txt @@ -128,8 +151,16 @@ 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/death/black.bmp +games/scorched3d/data/tanks/death/chrome.bmp +games/scorched3d/data/tanks/death/death.txt +games/scorched3d/data/tanks/death/tan.bmp +games/scorched3d/data/tanks/death/white.bmp games/scorched3d/data/tanks/flakpanzerwirbelwind.ase games/scorched3d/data/tanks/flakpanzerwirbelwind.bmp +games/scorched3d/data/tanks/gorilla/gorilla.bmp +games/scorched3d/data/tanks/gorilla/gorilla.txt +games/scorched3d/data/tanks/gorilla/gun.bmp games/scorched3d/data/tanks/guntower/guntower.bmp games/scorched3d/data/tanks/guntower/guntower.txt games/scorched3d/data/tanks/guntower/guntower2.bmp @@ -201,6 +232,11 @@ 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/photoncannon/basetexture.bmp +games/scorched3d/data/tanks/photoncannon/blue.bmp +games/scorched3d/data/tanks/photoncannon/gradient.bmp +games/scorched3d/data/tanks/photoncannon/photoncannon.txt +games/scorched3d/data/tanks/photoncannon/yellow.bmp games/scorched3d/data/tanks/question.ase games/scorched3d/data/tanks/question.bmp games/scorched3d/data/tanks/railgun.ase @@ -434,15 +470,20 @@ 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/pine.bmp +games/scorched3d/data/textures/pinea.bmp games/scorched3d/data/textures/smoke01.bmp games/scorched3d/data/textures/smoke02.bmp games/scorched3d/data/textures/talk.bmp +games/scorched3d/data/textures/waves.bmp +games/scorched3d/data/textures/waves2.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/broller.bmp games/scorched3d/data/textures/wicons/bshog.bmp games/scorched3d/data/textures/wicons/dball.bmp games/scorched3d/data/textures/wicons/dclod.bmp @@ -454,6 +495,7 @@ 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/hroller.bmp games/scorched3d/data/textures/wicons/hshield.bmp games/scorched3d/data/textures/wicons/hshog.bmp games/scorched3d/data/textures/wicons/lfrog.bmp @@ -464,6 +506,7 @@ 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/roller.bmp games/scorched3d/data/textures/wicons/shield.bmp games/scorched3d/data/textures/wicons/shog.bmp games/scorched3d/data/textures/wicons/smag.bmp @@ -480,6 +523,7 @@ games/scorched3d/data/wav/explosions/small.wav games/scorched3d/data/wav/explosions/tank.wav games/scorched3d/data/wav/explosions/xlarge.wav games/scorched3d/data/wav/misc/camera.wav +games/scorched3d/data/wav/misc/laserdeath.wav games/scorched3d/data/wav/misc/para.wav games/scorched3d/data/wav/misc/play.wav games/scorched3d/data/wav/misc/splash.wav @@ -499,21 +543,51 @@ 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.xml +games/scorched3d/data/windows/aim.bmp +games/scorched3d/data/windows/aima.bmp +games/scorched3d/data/windows/arrow.bmp +games/scorched3d/data/windows/arrowi.bmp games/scorched3d/data/windows/client.bmp +games/scorched3d/data/windows/diff.bmp +games/scorched3d/data/windows/diffa.bmp games/scorched3d/data/windows/display.bmp +games/scorched3d/data/windows/exclaim.gif +games/scorched3d/data/windows/help.bmp +games/scorched3d/data/windows/helpa.bmp games/scorched3d/data/windows/island.bmp games/scorched3d/data/windows/island.ico games/scorched3d/data/windows/logotiled.bmp +games/scorched3d/data/windows/mask.bmp +games/scorched3d/data/windows/move.bmp +games/scorched3d/data/windows/ok.gif +games/scorched3d/data/windows/plan.bmp +games/scorched3d/data/windows/plana.bmp +games/scorched3d/data/windows/player.bmp +games/scorched3d/data/windows/playera.bmp +games/scorched3d/data/windows/playera2.bmp +games/scorched3d/data/windows/pointer.bmp +games/scorched3d/data/windows/pointera.bmp +games/scorched3d/data/windows/question.gif +games/scorched3d/data/windows/save.bmp games/scorched3d/data/windows/scorched.bmp -games/scorched3d/data/windows/scorcheds.bmp games/scorched3d/data/windows/server.bmp +games/scorched3d/data/windows/tank-cus.bmp 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/tank2.ico +games/scorched3d/data/windows/target.bmp games/scorched3d/data/windows/wait.bmp games/scorched3d/data/windows/waita.bmp +games/scorched3d/data/windows/warn.gif +games/scorched3d/data/windows/weapon.bmp +games/scorched3d/data/windows/weapona.bmp +games/scorched3d/data/windows/weapona2.bmp +games/scorched3d/data/windows/wind.bmp +games/scorched3d/data/windows/winda.bmp +games/scorched3d/data/windows/winda2.bmp games/scorched3d/documentation/README-EXPAT.txt games/scorched3d/documentation/README-ODE.txt games/scorched3d/documentation/README-SDL.txt @@ -521,13 +595,57 @@ 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 -games/scorched3d/documentation/multiplayer.txt +games/scorched3d/documentation/html/accessories.html +games/scorched3d/documentation/html/aiming.html +games/scorched3d/documentation/html/buttons/donate.gif +games/scorched3d/documentation/html/buttons/scorchedlarge2.gif +games/scorched3d/documentation/html/camera.html +games/scorched3d/documentation/html/index.html +games/scorched3d/documentation/html/keys.html +games/scorched3d/documentation/html/modelling.html +games/scorched3d/documentation/html/numbers/number-1.gif +games/scorched3d/documentation/html/numbers/number-2.gif +games/scorched3d/documentation/html/numbers/number-3.gif +games/scorched3d/documentation/html/numbers/number-4.gif +games/scorched3d/documentation/html/numbers/number-5.gif +games/scorched3d/documentation/html/numbers/number-6.gif +games/scorched3d/documentation/html/numbers/number-7.gif +games/scorched3d/documentation/html/numbers/number-8.gif +games/scorched3d/documentation/html/numbers/number-9.gif +games/scorched3d/documentation/html/online.html +games/scorched3d/documentation/html/options.html +games/scorched3d/documentation/html/players.html +games/scorched3d/documentation/html/ports.html +games/scorched3d/documentation/html/quickstart.html +games/scorched3d/documentation/html/screen.html +games/scorched3d/documentation/html/screenshots/3ds.gif +games/scorched3d/documentation/html/screenshots/aiming.gif +games/scorched3d/documentation/html/screenshots/indicators.gif +games/scorched3d/documentation/html/screenshots/milkshape1.gif +games/scorched3d/documentation/html/screenshots/milkshape2.gif +games/scorched3d/documentation/html/screenshots/online1.gif +games/scorched3d/documentation/html/screenshots/online2.gif +games/scorched3d/documentation/html/screenshots/plan.gif +games/scorched3d/documentation/html/screenshots/player.gif +games/scorched3d/documentation/html/screenshots/quickstart1.gif +games/scorched3d/documentation/html/screenshots/quickstart2.gif +games/scorched3d/documentation/html/screenshots/quickstart3.gif +games/scorched3d/documentation/html/screenshots/quickstart4.gif +games/scorched3d/documentation/html/screenshots/quickstart5.gif +games/scorched3d/documentation/html/screenshots/quickstart6.gif +games/scorched3d/documentation/html/screenshots/quickstart7.gif +games/scorched3d/documentation/html/screenshots/scorched37-3-small.gif +games/scorched3d/documentation/html/screenshots/scorched37-4-small.gif +games/scorched3d/documentation/html/screenshots/server1.gif +games/scorched3d/documentation/html/screenshots/server2.gif +games/scorched3d/documentation/html/screenshots/tooltip1.gif +games/scorched3d/documentation/html/screenshots/weapon.gif +games/scorched3d/documentation/html/screenshots/wind.gif games/scorched3d/documentation/readme.txt -games/scorched3d/logs/Log_Dir -games/scorched3d/scorched3d -@dirrm games/scorched3d/logs +@dirrm games/scorched3d/documentation/html/screenshots +@dirrm games/scorched3d/documentation/html/numbers +@dirrm games/scorched3d/documentation/html/buttons +@dirrm games/scorched3d/documentation/html @dirrm games/scorched3d/documentation @dirrm games/scorched3d/data/windows @dirrm games/scorched3d/data/wav/shoot @@ -557,6 +675,7 @@ games/scorched3d/scorched3d @dirrm games/scorched3d/data/tanks/thel @dirrm games/scorched3d/data/tanks/t90 @dirrm games/scorched3d/data/tanks/sa6 +@dirrm games/scorched3d/data/tanks/photoncannon @dirrm games/scorched3d/data/tanks/patriot @dirrm games/scorched3d/data/tanks/mlrs @dirrm games/scorched3d/data/tanks/m48 @@ -565,6 +684,8 @@ games/scorched3d/scorched3d @dirrm games/scorched3d/data/tanks/helder @dirrm games/scorched3d/data/tanks/hawk @dirrm games/scorched3d/data/tanks/guntower +@dirrm games/scorched3d/data/tanks/gorilla +@dirrm games/scorched3d/data/tanks/death @dirrm games/scorched3d/data/tanks/bradley2 @dirrm games/scorched3d/data/tanks/bm13 @dirrm games/scorched3d/data/tanks/battleship @@ -573,6 +694,7 @@ games/scorched3d/scorched3d @dirrm games/scorched3d/data/talk/german @dirrm games/scorched3d/data/talk @dirrm games/scorched3d/data/meshes +@dirrm games/scorched3d/data/landscapes @dirrm games/scorched3d/data/fonts @dirrm games/scorched3d/data/accessories/v2missile @dirrm games/scorched3d/data/accessories/smallpine @@ -591,6 +713,7 @@ games/scorched3d/scorched3d @dirrm games/scorched3d/data/accessories/bomblet @dirrm games/scorched3d/data/accessories/bomb @dirrm games/scorched3d/data/accessories/barrage +@dirrm games/scorched3d/data/accessories/banana @dirrm games/scorched3d/data/accessories @dirrm games/scorched3d/data @dirrm games/scorched3d diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index 0e6aa71a804f..ee1f2d4a6b7e 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -13,33 +13,35 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= scorched3d DISTNAME= Scorched3D-${SCORCH_VERSION}-src -MAINTAINER= mdodd@FreeBSD.org +MAINTAINER= guy@device.dyndns.org COMMENT= Scorched is a game based loosely on the classic DOS game LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +SCORCH_VERSION= 37.2 + .if defined(WITH_MYSQL) USE_MYSQL= yes .endif - USE_SDL= mixer net sdl -SCORCH_VERSION= 36.2 -WRKSRC= ${WRKDIR}/scorched GNU_CONFIGURE= yes USE_GL= yes USE_GMAKE= yes USE_AUTOMAKE_VER= 15 USE_AUTOCONF_VER= 259 +WRKSRC= ${WRKDIR}/scorched AUTOMAKE_ARGS= --foreign -CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \ - AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}" - +CONFIGURE_ARGS= --program-prefix='' \ + --prefix=${PREFIX}/games/scorched3d \ + --datadir=${PREFIX}/games/scorched3d \ + --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config .if defined(WITH_MYSQL) CONFIGURE_ARGS+= --with-mysql .endif +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \ + AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}" .include <bsd.port.pre.mk> @@ -52,14 +54,6 @@ pre-configure: @cd ${WRKSRC} && ${ACLOCAL} pre-install: - @mkdir -p ${PREFIX}/games/scorched3d - -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 + @${MKDIR} ${PREFIX}/games/scorched3d .include <bsd.port.post.mk> diff --git a/games/scorched3d/distinfo b/games/scorched3d/distinfo index 77dbad786101..d83ae1a0a567 100644 --- a/games/scorched3d/distinfo +++ b/games/scorched3d/distinfo @@ -1,2 +1,2 @@ -MD5 (Scorched3D-36.2-src.tar.gz) = 7388dfaadd7bc568d2c341539fb27184 -SIZE (Scorched3D-35-src.tar.gz) = 10798751 +MD5 (Scorched3D-37.2-src.tar.gz) = 08ba1a2252446b539dcd2067836e7ad3 +SIZE (Scorched3D-35-src.tar.gz) = 19295008 diff --git a/games/scorched3d/files/patch-Makefile.am b/games/scorched3d/files/patch-Makefile.am deleted file mode 100644 index a0a0e983d1da..000000000000 --- a/games/scorched3d/files/patch-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.am.orig Sat Jan 31 00:53:31 2004 -+++ Makefile.am Sat Jan 31 00:53:58 2004 -@@ -1,6 +1,6 @@ - ## Process with automake to produce Makefile.in - --pkgdir = $(prefix)/@PACKAGE@ -+pkgdir = $(prefix)/games/@PACKAGE@ - - SUBDIRS = src - diff --git a/games/scorched3d/files/patch-configure.ac b/games/scorched3d/files/patch-configure.ac index f4a5f2b71c69..e25bb76ccf30 100644 --- a/games/scorched3d/files/patch-configure.ac +++ b/games/scorched3d/files/patch-configure.ac @@ -1,36 +1,24 @@ ---- configure.ac.orig Wed Jan 14 12:08:10 2004 -+++ configure.ac Sat Jan 31 18:10:28 2004 -@@ -34,8 +34,8 @@ - dnl Check for SDL_mixer lib - have_SDLmixer=no - AC_TRY_COMPILE([ -- #include <SDL/SDL.h> -- #include <SDL/SDL_mixer.h> -+ #include <SDL11/SDL.h> -+ #include <SDL11/SDL_mixer.h> +--- ./configure.ac.orig Wed May 26 14:01:15 2004 ++++ ./configure.ac Sun May 30 22:43:42 2004 +@@ -37,8 +37,8 @@ + have_SDLmixer=yes + if test "x$enable_sdltest" = "xyes" ; then + AC_TRY_COMPILE([ +- #include <SDL/SDL.h> +- #include <SDL/SDL_mixer.h> ++ #include <SDL11/SDL.h> ++ #include <SDL11/SDL_mixer.h> - int main(int argc, char *argv[]) - { return 0; } -@@ -54,8 +54,8 @@ - dnl Check for SDL_net lib - have_SDLnet=no - AC_TRY_COMPILE([ -- #include <SDL/SDL.h> -- #include <SDL/SDL_net.h> -+ #include <SDL11/SDL.h> -+ #include <SDL11/SDL_net.h> + int main(int argc, char *argv[]) + { return 0; } +@@ -64,8 +64,8 @@ + have_SDLnet=yes + if test "x$enable_sdltest" = "xyes" ; then + AC_TRY_COMPILE([ +- #include <SDL/SDL.h> +- #include <SDL/SDL_net.h> ++ #include <SDL11/SDL.h> ++ #include <SDL11/SDL_net.h> - int main(int argc, char *argv[]) - { return 0; } -@@ -144,9 +144,9 @@ - - dnl Define install prefix - if test x$prefix = xNONE; then -- prefix=/usr/local/games -+ prefix=/usr/local - fi --AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/$PACKAGE/", [install directory]) -+AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/games/$PACKAGE/", [install directory]) - - # extra fixed flags - CFLAGS="$CFLAGS -DdDOUBLE" + int main(int argc, char *argv[]) + { return 0; } diff --git a/games/scorched3d/files/patch-scripts-createAMMakefile.pl b/games/scorched3d/files/patch-scripts-createAMMakefile.pl new file mode 100644 index 000000000000..acc189f65b2a --- /dev/null +++ b/games/scorched3d/files/patch-scripts-createAMMakefile.pl @@ -0,0 +1,18 @@ +--- scripts/createAMMakefile.pl.orig Sun May 30 14:41:40 2004 ++++ scripts/createAMMakefile.pl Sun May 30 14:42:35 2004 +@@ -56,6 +56,7 @@ + } + } + ++chmod 0644, "../Makefile.am"; + open (CLIENT, ">../Makefile.am") || die "ERROR: Failed to write to ../Makefile.am"; + print CLIENT "SUBDIRS = src\n\n"; + print CLIENT "docdir = \@docdir\@\n\n"; +@@ -65,6 +66,7 @@ + + my @clientfiles = getFiles("../src/scorched/scorched.vcproj"); + ++chmod 0644, "../src/scorched/Makefile.am"; + open (CLIENT, ">../src/scorched/Makefile.am") || die "../src/scorched/Makefile.am"; + + print CLIENT << "EOF"; diff --git a/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp b/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp deleted file mode 100644 index 505201c9d88b..000000000000 --- a/games/scorched3d/files/patch-src-3dsparse-aseFile.tab.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/3dsparse/aseFile.tab.cpp.orig Fri Jan 23 17:58:58 2004 -+++ ./src/3dsparse/aseFile.tab.cpp Fri Jan 23 18:01:17 2004 -@@ -330,10 +330,10 @@ - #include <alloca.h> - #else /* not sparc */ - #if defined (MSDOS) && !defined (__TURBOC__) --#include <malloc.h> -+#include <stdlib.h> - #else /* not MSDOS, or __TURBOC__ */ - #if defined(_AIX) --#include <malloc.h> -+#include <stdlib.h> - #pragma alloca - #else /* not MSDOS, __TURBOC__, or _AIX */ - #ifdef __hpux diff --git a/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp b/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp index 1e21ac6d0306..4489ed1811ba 100644 --- a/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp +++ b/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp @@ -1,11 +1,11 @@ ---- ./src/GLEXT/GLBitmap.cpp.orig Fri Jan 23 17:58:59 2004 -+++ ./src/GLEXT/GLBitmap.cpp Fri Jan 23 18:01:21 2004 -@@ -27,7 +27,7 @@ +--- ./src/GLEXT/GLBitmap.cpp.orig Thu Feb 26 23:00:26 2004 ++++ ./src/GLEXT/GLBitmap.cpp Sun May 30 22:43:45 2004 +@@ -22,7 +22,7 @@ #include <math.h> #include <GLEXT/GLState.h> #include <GLEXT/GLBitmap.h> -#include <SDL/SDL.h> +#include <SDL11/SDL.h> - ////////////////////////////////////////////////////////////////////// - // Construction/Destruction + GLBitmap::GLBitmap() : + width_(0), height_(0), alpha_(false), newbits_(0) diff --git a/games/scorched3d/files/patch-src-XML-XMLParser.cpp b/games/scorched3d/files/patch-src-XML-XMLParser.cpp new file mode 100644 index 000000000000..3b410df25ab4 --- /dev/null +++ b/games/scorched3d/files/patch-src-XML-XMLParser.cpp @@ -0,0 +1,11 @@ +--- src/XML/XMLParser.cpp.orig Sun May 30 21:18:51 2004 ++++ src/XML/XMLParser.cpp Sun May 30 21:19:29 2004 +@@ -28,7 +28,7 @@ + static const char *getSpacer(int space) + { + static std::string spacestr; +- spacestr.clear(); ++ spacestr.erase(); + for (int i=0; i<space; i++) spacestr+="\t"; + return spacestr.c_str(); + } diff --git a/games/scorched3d/files/patch-src-client-ClientMain.cpp b/games/scorched3d/files/patch-src-client-ClientMain.cpp index b29271564a0c..8ec4282cbcca 100644 --- a/games/scorched3d/files/patch-src-client-ClientMain.cpp +++ b/games/scorched3d/files/patch-src-client-ClientMain.cpp @@ -1,11 +1,11 @@ ---- ./src/client/ClientMain.cpp.orig Fri Jan 23 17:59:02 2004 -+++ ./src/client/ClientMain.cpp Fri Jan 23 18:01:47 2004 -@@ -57,7 +57,7 @@ - #include <common/Display.h> +--- ./src/client/ClientMain.cpp.orig Fri May 28 00:24:45 2004 ++++ ./src/client/ClientMain.cpp Sun May 30 22:43:47 2004 +@@ -66,7 +66,7 @@ #include <common/Gamma.h> #include <common/Sound.h> + #include <common/Clock.h> -#include <SDL/SDL.h> +#include <SDL11/SDL.h> - void startClient() + bool initHardware(ProgressCounter *progressCounter) { diff --git a/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp b/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp new file mode 100644 index 000000000000..ca784ee6a41c --- /dev/null +++ b/games/scorched3d/files/patch-src-client-SoftwareMouse.cpp @@ -0,0 +1,11 @@ +--- ./src/client/SoftwareMouse.cpp.orig Mon Apr 5 19:10:34 2004 ++++ ./src/client/SoftwareMouse.cpp Sun May 30 22:43:47 2004 +@@ -25,7 +25,7 @@ + #include <GLEXT/GLState.h> + #include <common/Defines.h> + #include <common/OptionsDisplay.h> +-#include <SDL/SDL.h> ++#include <SDL11/SDL.h> + + SoftwareMouse *SoftwareMouse::instance_ = 0; + diff --git a/games/scorched3d/files/patch-src-common-Sound.cpp b/games/scorched3d/files/patch-src-common-Sound.cpp new file mode 100644 index 000000000000..ffb48d3d872a --- /dev/null +++ b/games/scorched3d/files/patch-src-common-Sound.cpp @@ -0,0 +1,11 @@ +--- src/common/Sound.cpp.orig Sun May 30 23:32:44 2004 ++++ src/common/Sound.cpp Sun May 30 23:07:33 2004 +@@ -73,7 +73,7 @@ + + bool Sound::init() + { +- if ( Mix_OpenAudio(11025, AUDIO_U8, 1, 512) < 0 ) ++ if ( Mix_OpenAudio(11025, AUDIO_U8, 1, 2048) < 0 ) + { + dialogMessage(SDL_GetError(), + "Warning: Couldn't set 11025 Hz 8-bit audio"); diff --git a/games/scorched3d/files/patch-src-engine-MainLoop.cpp b/games/scorched3d/files/patch-src-engine-MainLoop.cpp index ff095e62045b..79bf54394a75 100644 --- a/games/scorched3d/files/patch-src-engine-MainLoop.cpp +++ b/games/scorched3d/files/patch-src-engine-MainLoop.cpp @@ -1,5 +1,5 @@ ---- ./src/engine/MainLoop.cpp.orig Fri Jan 23 17:59:09 2004 -+++ ./src/engine/MainLoop.cpp Fri Jan 23 18:02:17 2004 +--- ./src/engine/MainLoop.cpp.orig Mon Feb 23 01:35:25 2004 ++++ ./src/engine/MainLoop.cpp Sun May 30 22:43:49 2004 @@ -22,7 +22,7 @@ #include <common/OptionsDisplay.h> #include <common/Defines.h> @@ -7,5 +7,5 @@ -#include <SDL/SDL.h> +#include <SDL11/SDL.h> - MainLoop::MainLoop() : exitLoop_(false), lastDrawTime_(0.0f) + MainLoop::MainLoop() : exitLoop_(false), lastDrawTime_(0.0f), flip_(false) { diff --git a/games/scorched3d/files/patch-src-irc-GameInfoEntry.h b/games/scorched3d/files/patch-src-irc-GameInfoEntry.h deleted file mode 100644 index c070faecfdb1..000000000000 --- a/games/scorched3d/files/patch-src-irc-GameInfoEntry.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src/irc/GameInfoEntry.h.orig Fri Jan 23 17:59:10 2004 -+++ ./src/irc/GameInfoEntry.h Fri Jan 23 18:02:32 2004 -@@ -1,8 +1,8 @@ - #ifndef _GAMEINFOENTRY_H_ - #define _GAMEINFOENTRY_H_ - --#include <SDL/SDL.h> --#include <SDL/SDL_net.h> -+#include <SDL11/SDL.h> -+#include <SDL11/SDL_net.h> - - #include <string> - diff --git a/games/scorched3d/files/patch-src-irc-GameInfoList.h b/games/scorched3d/files/patch-src-irc-GameInfoList.h deleted file mode 100644 index 831b1e198f0d..000000000000 --- a/games/scorched3d/files/patch-src-irc-GameInfoList.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/irc/GameInfoList.h.orig Fri Jan 23 17:59:10 2004 -+++ ./src/irc/GameInfoList.h Fri Jan 23 18:02:32 2004 -@@ -1,7 +1,7 @@ - #ifndef _GAMEINFOLIST_H_ - #define _GAMEINFOLIST_H_ - --#include <SDL/SDL_mutex.h> -+#include <SDL11/SDL_mutex.h> - - #include <list> - #include "irc/GameInfoEntry.h" diff --git a/games/scorched3d/files/patch-src-irc-GameInfoMessage.h b/games/scorched3d/files/patch-src-irc-GameInfoMessage.h deleted file mode 100644 index 9a817d7f459a..000000000000 --- a/games/scorched3d/files/patch-src-irc-GameInfoMessage.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/irc/GameInfoMessage.h.orig Fri Jan 23 17:59:10 2004 -+++ ./src/irc/GameInfoMessage.h Fri Jan 23 18:02:33 2004 -@@ -1,9 +1,9 @@ - #ifndef _GAMEINFOMESSAGE_H_ - #define _GAMEINFOMESSAGE_H_ - --#include <SDL/SDL.h> --#include <SDL/SDL_net.h> --#include <SDL/SDL_thread.h> -+#include <SDL11/SDL.h> -+#include <SDL11/SDL_net.h> -+#include <SDL11/SDL_thread.h> - #include "irc/GameInfoEntry.h" - #include <string> - diff --git a/games/scorched3d/files/patch-src-irc-IrcConnection.h b/games/scorched3d/files/patch-src-irc-IrcConnection.h deleted file mode 100644 index ee45c4cf025c..000000000000 --- a/games/scorched3d/files/patch-src-irc-IrcConnection.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/irc/IrcConnection.h.orig Fri Jan 23 17:59:10 2004 -+++ ./src/irc/IrcConnection.h Fri Jan 23 18:02:33 2004 -@@ -1,9 +1,9 @@ - #ifndef _IRC_CLIENT_H_ - #define _IRC_CLIENT_H_ - --#include <SDL/SDL.h> --#include <SDL/SDL_thread.h> --#include <SDL/SDL_net.h> -+#include <SDL11/SDL.h> -+#include <SDL11/SDL_thread.h> -+#include <SDL11/SDL_net.h> - - #include "irc/IrcDefines.h" - diff --git a/games/scorched3d/files/patch-src-irc-UdpHandler.h b/games/scorched3d/files/patch-src-irc-UdpHandler.h deleted file mode 100644 index 05048c1b5224..000000000000 --- a/games/scorched3d/files/patch-src-irc-UdpHandler.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/irc/UdpHandler.h.orig Fri Jan 23 17:59:11 2004 -+++ ./src/irc/UdpHandler.h Fri Jan 23 18:02:35 2004 -@@ -1,9 +1,9 @@ - #ifndef _UDPHANDLER_H_ - #define _UDPHANDLER_H_ - --#include <SDL/SDL.h> --#include <SDL/SDL_net.h> --#include <SDL/SDL_thread.h> -+#include <SDL11/SDL.h> -+#include <SDL11/SDL_net.h> -+#include <SDL11/SDL_thread.h> - #include "irc/GameInfoEntry.h" - - diff --git a/games/scorched3d/files/patch-src-ode-config.h b/games/scorched3d/files/patch-src-ode-config.h index 7df954c181de..d8880cbd8da9 100644 --- a/games/scorched3d/files/patch-src-ode-config.h +++ b/games/scorched3d/files/patch-src-ode-config.h @@ -1,6 +1,6 @@ ---- ./src/ode/config.h.orig Fri Jan 23 17:59:18 2004 -+++ ./src/ode/config.h Fri Jan 23 18:03:31 2004 -@@ -35,7 +35,7 @@ +--- ./src/ode/config.h.orig Mon May 24 21:02:31 2004 ++++ ./src/ode/config.h Sun May 30 14:38:24 2004 +@@ -36,7 +36,7 @@ #if defined(__DARWIN__) #include <sys/malloc.h> #else diff --git a/games/scorched3d/files/patch-src-scorched-MainDialog.cpp b/games/scorched3d/files/patch-src-scorched-MainDialog.cpp new file mode 100644 index 000000000000..db73b41c92ae --- /dev/null +++ b/games/scorched3d/files/patch-src-scorched-MainDialog.cpp @@ -0,0 +1,13 @@ +--- ./src/scorched/MainDialog.cpp.orig Tue May 18 00:45:23 2004 ++++ ./src/scorched/MainDialog.cpp Sun May 30 22:43:49 2004 +@@ -25,8 +25,8 @@ + #include <wx/msgdlg.h> + #define WIN32_LEAN_AND_MEAN + #include <windows.h> +-#include <SDL/SDL.h> +-#include <SDL/SDL_net.h> ++#include <SDL11/SDL.h> ++#include <SDL11/SDL_net.h> + #include <scorched/MainDialog.h> + #include <scorched/HtmlHelpDialog.h> + #include <scorched/NetDialog.h> diff --git a/games/scorched3d/files/patch-src-scorched-main.cpp b/games/scorched3d/files/patch-src-scorched-main.cpp index 2735b09fe57c..a9d185fe3f4e 100644 --- a/games/scorched3d/files/patch-src-scorched-main.cpp +++ b/games/scorched3d/files/patch-src-scorched-main.cpp @@ -1,11 +1,11 @@ ---- ./src/scorched/main.cpp.orig Fri Jan 23 17:59:15 2004 -+++ ./src/scorched/main.cpp Fri Jan 23 18:03:16 2004 +--- ./src/scorched/main.cpp.orig Fri May 28 00:24:45 2004 ++++ ./src/scorched/main.cpp Sun May 30 22:43:49 2004 @@ -20,7 +20,7 @@ - #include <wx/wx.h> + #include <wx/utils.h> -#include <SDL/SDL.h> +#include <SDL11/SDL.h> #include <client/ClientMain.h> - #include <common/OptionsDisplay.h> - #include <common/OptionsParam.h> + #include <client/ClientSave.h> + #include <client/ScorchedClient.h> diff --git a/games/scorched3d/files/patch-src-server-ServerMain.cpp b/games/scorched3d/files/patch-src-server-ServerMain.cpp index a8572fbd5a56..98a3d3657325 100644 --- a/games/scorched3d/files/patch-src-server-ServerMain.cpp +++ b/games/scorched3d/files/patch-src-server-ServerMain.cpp @@ -1,8 +1,8 @@ ---- ./src/server/ServerMain.cpp.orig Fri Jan 23 17:59:16 2004 -+++ ./src/server/ServerMain.cpp Fri Jan 23 18:03:17 2004 -@@ -48,7 +48,7 @@ - #include <server/ServerBrowserInfo.h> +--- ./src/server/ServerMain.cpp.orig Thu May 27 22:11:23 2004 ++++ ./src/server/ServerMain.cpp Sun May 30 22:43:52 2004 +@@ -53,7 +53,7 @@ #include <server/ServerState.h> + #include <server/ServerCommon.h> #include <server/ScorchedServer.h> -#include <SDL/SDL.h> +#include <SDL11/SDL.h> diff --git a/games/scorched3d/pkg-descr b/games/scorched3d/pkg-descr index f284483c1d18..1c7a0cb9167c 100644 --- a/games/scorched3d/pkg-descr +++ b/games/scorched3d/pkg-descr @@ -13,8 +13,10 @@ adding amongst other new features a 3D island environment and LAN and internet play. -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/ + +- Guy P. +guy@device.dyndns.org diff --git a/games/scorched3d/pkg-plist b/games/scorched3d/pkg-plist index d9ef0c4bf26c..515041c0d51b 100644 --- a/games/scorched3d/pkg-plist +++ b/games/scorched3d/pkg-plist @@ -1,6 +1,7 @@ bin/scorched3d -games/scorched3d/README games/scorched3d/data/accessories.xml +games/scorched3d/data/accessories/banana/banana.txt +games/scorched3d/data/accessories/banana/bantex.bmp games/scorched3d/data/accessories/barrage/barrage.txt games/scorched3d/data/accessories/barrage/gradient.bmp games/scorched3d/data/accessories/barrage/white.bmp @@ -50,6 +51,7 @@ 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/roller.ase games/scorched3d/data/accessories/sa6/gradient.bmp games/scorched3d/data/accessories/sa6/sa6.txt games/scorched3d/data/accessories/sa6/white.bmp @@ -75,25 +77,46 @@ 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/fonts/test.ttf games/scorched3d/data/keys.xml +games/scorched3d/data/landscapes.xml +games/scorched3d/data/landscapes/half-mask.bmp +games/scorched3d/data/landscapes/halved.bmp +games/scorched3d/data/landscapes/hilly.bmp +games/scorched3d/data/landscapes/hmap3.bmp +games/scorched3d/data/landscapes/hole-mask.bmp +games/scorched3d/data/landscapes/hole.bmp +games/scorched3d/data/landscapes/islands.bmp +games/scorched3d/data/landscapes/lowlands.bmp +games/scorched3d/data/landscapes/oldstyle.bmp +games/scorched3d/data/landscapes/picture-none.bmp +games/scorched3d/data/landscapes/ridge-mask.bmp +games/scorched3d/data/landscapes/ridge.bmp +games/scorched3d/data/landscapes/valley-mask.bmp +games/scorched3d/data/landscapes/valley.bmp games/scorched3d/data/meshes/autoaim.ase +games/scorched3d/data/meshes/bounce.ase +games/scorched3d/data/meshes/concrete.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/meshes/wrap.ase games/scorched3d/data/motd.txt games/scorched3d/data/mysql.xml games/scorched3d/data/playernames.txt +games/scorched3d/data/prunetables.sql games/scorched3d/data/random.no games/scorched3d/data/resource.xml +games/scorched3d/data/safedisplay.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/singletarget.xml +games/scorched3d/data/ssdisplay.xml +games/scorched3d/data/ssgame.xml games/scorched3d/data/statstables.sql games/scorched3d/data/talk/german/talk1.txt games/scorched3d/data/talk/german/talk2.txt @@ -128,8 +151,16 @@ 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/death/black.bmp +games/scorched3d/data/tanks/death/chrome.bmp +games/scorched3d/data/tanks/death/death.txt +games/scorched3d/data/tanks/death/tan.bmp +games/scorched3d/data/tanks/death/white.bmp games/scorched3d/data/tanks/flakpanzerwirbelwind.ase games/scorched3d/data/tanks/flakpanzerwirbelwind.bmp +games/scorched3d/data/tanks/gorilla/gorilla.bmp +games/scorched3d/data/tanks/gorilla/gorilla.txt +games/scorched3d/data/tanks/gorilla/gun.bmp games/scorched3d/data/tanks/guntower/guntower.bmp games/scorched3d/data/tanks/guntower/guntower.txt games/scorched3d/data/tanks/guntower/guntower2.bmp @@ -201,6 +232,11 @@ 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/photoncannon/basetexture.bmp +games/scorched3d/data/tanks/photoncannon/blue.bmp +games/scorched3d/data/tanks/photoncannon/gradient.bmp +games/scorched3d/data/tanks/photoncannon/photoncannon.txt +games/scorched3d/data/tanks/photoncannon/yellow.bmp games/scorched3d/data/tanks/question.ase games/scorched3d/data/tanks/question.bmp games/scorched3d/data/tanks/railgun.ase @@ -434,15 +470,20 @@ 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/pine.bmp +games/scorched3d/data/textures/pinea.bmp games/scorched3d/data/textures/smoke01.bmp games/scorched3d/data/textures/smoke02.bmp games/scorched3d/data/textures/talk.bmp +games/scorched3d/data/textures/waves.bmp +games/scorched3d/data/textures/waves2.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/broller.bmp games/scorched3d/data/textures/wicons/bshog.bmp games/scorched3d/data/textures/wicons/dball.bmp games/scorched3d/data/textures/wicons/dclod.bmp @@ -454,6 +495,7 @@ 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/hroller.bmp games/scorched3d/data/textures/wicons/hshield.bmp games/scorched3d/data/textures/wicons/hshog.bmp games/scorched3d/data/textures/wicons/lfrog.bmp @@ -464,6 +506,7 @@ 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/roller.bmp games/scorched3d/data/textures/wicons/shield.bmp games/scorched3d/data/textures/wicons/shog.bmp games/scorched3d/data/textures/wicons/smag.bmp @@ -480,6 +523,7 @@ games/scorched3d/data/wav/explosions/small.wav games/scorched3d/data/wav/explosions/tank.wav games/scorched3d/data/wav/explosions/xlarge.wav games/scorched3d/data/wav/misc/camera.wav +games/scorched3d/data/wav/misc/laserdeath.wav games/scorched3d/data/wav/misc/para.wav games/scorched3d/data/wav/misc/play.wav games/scorched3d/data/wav/misc/splash.wav @@ -499,21 +543,51 @@ 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.xml +games/scorched3d/data/windows/aim.bmp +games/scorched3d/data/windows/aima.bmp +games/scorched3d/data/windows/arrow.bmp +games/scorched3d/data/windows/arrowi.bmp games/scorched3d/data/windows/client.bmp +games/scorched3d/data/windows/diff.bmp +games/scorched3d/data/windows/diffa.bmp games/scorched3d/data/windows/display.bmp +games/scorched3d/data/windows/exclaim.gif +games/scorched3d/data/windows/help.bmp +games/scorched3d/data/windows/helpa.bmp games/scorched3d/data/windows/island.bmp games/scorched3d/data/windows/island.ico games/scorched3d/data/windows/logotiled.bmp +games/scorched3d/data/windows/mask.bmp +games/scorched3d/data/windows/move.bmp +games/scorched3d/data/windows/ok.gif +games/scorched3d/data/windows/plan.bmp +games/scorched3d/data/windows/plana.bmp +games/scorched3d/data/windows/player.bmp +games/scorched3d/data/windows/playera.bmp +games/scorched3d/data/windows/playera2.bmp +games/scorched3d/data/windows/pointer.bmp +games/scorched3d/data/windows/pointera.bmp +games/scorched3d/data/windows/question.gif +games/scorched3d/data/windows/save.bmp games/scorched3d/data/windows/scorched.bmp -games/scorched3d/data/windows/scorcheds.bmp games/scorched3d/data/windows/server.bmp +games/scorched3d/data/windows/tank-cus.bmp 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/tank2.ico +games/scorched3d/data/windows/target.bmp games/scorched3d/data/windows/wait.bmp games/scorched3d/data/windows/waita.bmp +games/scorched3d/data/windows/warn.gif +games/scorched3d/data/windows/weapon.bmp +games/scorched3d/data/windows/weapona.bmp +games/scorched3d/data/windows/weapona2.bmp +games/scorched3d/data/windows/wind.bmp +games/scorched3d/data/windows/winda.bmp +games/scorched3d/data/windows/winda2.bmp games/scorched3d/documentation/README-EXPAT.txt games/scorched3d/documentation/README-ODE.txt games/scorched3d/documentation/README-SDL.txt @@ -521,13 +595,57 @@ 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 -games/scorched3d/documentation/multiplayer.txt +games/scorched3d/documentation/html/accessories.html +games/scorched3d/documentation/html/aiming.html +games/scorched3d/documentation/html/buttons/donate.gif +games/scorched3d/documentation/html/buttons/scorchedlarge2.gif +games/scorched3d/documentation/html/camera.html +games/scorched3d/documentation/html/index.html +games/scorched3d/documentation/html/keys.html +games/scorched3d/documentation/html/modelling.html +games/scorched3d/documentation/html/numbers/number-1.gif +games/scorched3d/documentation/html/numbers/number-2.gif +games/scorched3d/documentation/html/numbers/number-3.gif +games/scorched3d/documentation/html/numbers/number-4.gif +games/scorched3d/documentation/html/numbers/number-5.gif +games/scorched3d/documentation/html/numbers/number-6.gif +games/scorched3d/documentation/html/numbers/number-7.gif +games/scorched3d/documentation/html/numbers/number-8.gif +games/scorched3d/documentation/html/numbers/number-9.gif +games/scorched3d/documentation/html/online.html +games/scorched3d/documentation/html/options.html +games/scorched3d/documentation/html/players.html +games/scorched3d/documentation/html/ports.html +games/scorched3d/documentation/html/quickstart.html +games/scorched3d/documentation/html/screen.html +games/scorched3d/documentation/html/screenshots/3ds.gif +games/scorched3d/documentation/html/screenshots/aiming.gif +games/scorched3d/documentation/html/screenshots/indicators.gif +games/scorched3d/documentation/html/screenshots/milkshape1.gif +games/scorched3d/documentation/html/screenshots/milkshape2.gif +games/scorched3d/documentation/html/screenshots/online1.gif +games/scorched3d/documentation/html/screenshots/online2.gif +games/scorched3d/documentation/html/screenshots/plan.gif +games/scorched3d/documentation/html/screenshots/player.gif +games/scorched3d/documentation/html/screenshots/quickstart1.gif +games/scorched3d/documentation/html/screenshots/quickstart2.gif +games/scorched3d/documentation/html/screenshots/quickstart3.gif +games/scorched3d/documentation/html/screenshots/quickstart4.gif +games/scorched3d/documentation/html/screenshots/quickstart5.gif +games/scorched3d/documentation/html/screenshots/quickstart6.gif +games/scorched3d/documentation/html/screenshots/quickstart7.gif +games/scorched3d/documentation/html/screenshots/scorched37-3-small.gif +games/scorched3d/documentation/html/screenshots/scorched37-4-small.gif +games/scorched3d/documentation/html/screenshots/server1.gif +games/scorched3d/documentation/html/screenshots/server2.gif +games/scorched3d/documentation/html/screenshots/tooltip1.gif +games/scorched3d/documentation/html/screenshots/weapon.gif +games/scorched3d/documentation/html/screenshots/wind.gif games/scorched3d/documentation/readme.txt -games/scorched3d/logs/Log_Dir -games/scorched3d/scorched3d -@dirrm games/scorched3d/logs +@dirrm games/scorched3d/documentation/html/screenshots +@dirrm games/scorched3d/documentation/html/numbers +@dirrm games/scorched3d/documentation/html/buttons +@dirrm games/scorched3d/documentation/html @dirrm games/scorched3d/documentation @dirrm games/scorched3d/data/windows @dirrm games/scorched3d/data/wav/shoot @@ -557,6 +675,7 @@ games/scorched3d/scorched3d @dirrm games/scorched3d/data/tanks/thel @dirrm games/scorched3d/data/tanks/t90 @dirrm games/scorched3d/data/tanks/sa6 +@dirrm games/scorched3d/data/tanks/photoncannon @dirrm games/scorched3d/data/tanks/patriot @dirrm games/scorched3d/data/tanks/mlrs @dirrm games/scorched3d/data/tanks/m48 @@ -565,6 +684,8 @@ games/scorched3d/scorched3d @dirrm games/scorched3d/data/tanks/helder @dirrm games/scorched3d/data/tanks/hawk @dirrm games/scorched3d/data/tanks/guntower +@dirrm games/scorched3d/data/tanks/gorilla +@dirrm games/scorched3d/data/tanks/death @dirrm games/scorched3d/data/tanks/bradley2 @dirrm games/scorched3d/data/tanks/bm13 @dirrm games/scorched3d/data/tanks/battleship @@ -573,6 +694,7 @@ games/scorched3d/scorched3d @dirrm games/scorched3d/data/talk/german @dirrm games/scorched3d/data/talk @dirrm games/scorched3d/data/meshes +@dirrm games/scorched3d/data/landscapes @dirrm games/scorched3d/data/fonts @dirrm games/scorched3d/data/accessories/v2missile @dirrm games/scorched3d/data/accessories/smallpine @@ -591,6 +713,7 @@ games/scorched3d/scorched3d @dirrm games/scorched3d/data/accessories/bomblet @dirrm games/scorched3d/data/accessories/bomb @dirrm games/scorched3d/data/accessories/barrage +@dirrm games/scorched3d/data/accessories/banana @dirrm games/scorched3d/data/accessories @dirrm games/scorched3d/data @dirrm games/scorched3d |