Merge remote branch 'origin/master' into qt-trunk

Conflicts:
	.hgignore
	configure.ac
	lib/framework/SDL_framerate.h
	lib/framework/cursors.h
	lib/framework/endian_hack.h
	lib/framework/frame.c
	lib/framework/input.c
	lib/framework/input.h
	lib/framework/opengl.h
	lib/framework/wzapp_c.h
	lib/gamelib/gtime.c
	lib/gamelib/gtime.h
	lib/ivis_common/Makefile.am
	lib/ivis_common/ivispatch.h
	lib/ivis_common/png_util.h
	lib/ivis_opengl/screen.c
	lib/ivis_opengl/screen.h
	lib/netplay/netlog.c
	lib/netplay/netlog.h
	lib/netplay/netplay.c
	lib/netplay/netplay.vcproj
	lib/netplay/netsocket.cpp
	lib/netplay/nettypes.c
	lib/sequence/sequence.c
	lib/sound/oggvorbis.c
	lib/widget/scrap.c
	macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Bison-Debug.xcconfig
	macosx/configs/Bison-Release.xcconfig
	macosx/configs/FetchPrebuilt.sh
	macosx/configs/FetchSource.sh
	macosx/configs/Project-All.xcconfig
	macosx/configs/SDLmain-All.xcconfig
	macosx/configs/SDLmain-Debug.xcconfig
	macosx/configs/SDLmain-Release.xcconfig
	macosx/configs/Warzone-All.xcconfig
	macosx/configs/Warzone-Debug.xcconfig
	po/cs.po
	po/da.po
	po/de.po
	po/en_GB.po
	po/es.po
	po/et_EE.po
	po/fi.po
	po/fr.po
	po/fy.po
	po/ga.po
	po/hr.po
	po/it.po
	po/ko.po
	po/la.po
	po/lt.po
	po/nb.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/sk.po
	po/sl.po
	po/uk_UA.po
	po/zh_CN.po
	po/zh_TW.po
	src/astar.c
	src/data.c
	src/fpath.c
	src/frontend.c
	src/hci.c
	src/main.cpp
	src/move.c
	src/move.h
	src/multibot.c
	src/multiint.c
	src/multijoin.c
	src/multiplay.c
	src/multisync.c
	src/terrain.c

.gitattributes

@@ -0,0 +1 @@
+*.pbxproj -crlf -diff -merge

.gitignore

@@ -5,7 +5,9 @@
 
 # Generated binary files:
 *.o
+*.lo
 *.a
+*.la
 *.gmo
 *.pyc
 *.wz
@@ -85,6 +87,7 @@ win32/libs/zlib/zlib-*/
 
 # Autotool files:
 .deps
+.libs
 Makefile
 Makefile.in
 /aclocal.m4
@@ -101,11 +104,13 @@ Makefile.in
 /po/stamp-po
 /po/warzone2100.pot
 
+# Include this one Makefile
+!/pkg/dpkg/videos/Makefile
+
 # Betawidget autotools and libtool files:
 /lib/betawidget/.libs/
 /lib/betawidget/aclocal.m4
 /lib/betawidget/autom4te.cache/
-/lib/betawidget/betawidget_wrap_lua.cpp
 /lib/betawidget/config.*
 /lib/betawidget/configure
 /lib/betawidget/depcomp
@@ -117,6 +122,8 @@ Makefile.in
 /lib/betawidget/lua-5.1.3/
 /lib/betawidget/m4/
 /lib/betawidget/missing
+/lib/betawidget/src/*_wrap_lua.cpp
+/lib/betawidget/src/betawidget.pc
 /lib/betawidget/stamp-h1
 /lib/betawidget/tools/.dirstamp
 
@@ -131,7 +138,7 @@ cscope.out
 
 # KDevelop4
 /.kdev4/
-/warzone.kdev4
+/warzone*.kdev4
 /.kdev_include_paths
 
 # Qt
@@ -145,5 +152,35 @@ tools/qwzm/ui_animationview.h
 tools/qwzm/ui_connectorview.h
 tools/qwzm/ui_qwzm.h
 
-# patches
+# Patches
 *.patch
+*.diff
+*.rej
+*.orig
+
+# Debian stuff
+/debian
+/pkg/dpkg/files
+/pkg/dpkg/tmp/
+/pkg/dpkg/warzone2100-data.debhelper.log
+/pkg/dpkg/warzone2100-data.substvars
+/pkg/dpkg/warzone2100-data/
+/pkg/dpkg/warzone2100-music.debhelper.log
+/pkg/dpkg/warzone2100-music.substvars
+/pkg/dpkg/warzone2100-music/
+/pkg/dpkg/warzone2100.debhelper.log
+/pkg/dpkg/warzone2100.postinst.debhelper
+/pkg/dpkg/warzone2100.postrm.debhelper
+/pkg/dpkg/warzone2100.substvars
+/pkg/dpkg/warzone2100/
+
+# build folders
+/macosx/build/
+/macosx/external/
+/macosx/prebuilt/
+/build
+/build_*/
+/2.3
+/trunk
+/newnet
+/qt-trunk

build_tools/autorevision/autorevision.cpp

@@ -210,6 +210,23 @@ class RevGitSVNQuery : public RevisionExtractor
         const std::string _workingDir;
 };
 
+class RevGitQuery : public RevisionExtractor
+{
+    public:
+        RevGitQuery(const std::string& workingDir, RevisionExtractor* s = NULL) :
+            RevisionExtractor(s),
+            _workingDir(workingDir)
+        {}
+
+        virtual bool extractRevision(RevisionInformation& rev_info);
+
+    private:
+        std::string runCommand(char const *cmd) const;
+
+    private:
+        const std::string _workingDir;
+};
+
 class RevConfigFile : public RevisionExtractor
 {
     public:
@@ -270,7 +287,7 @@ int main(int argc, char** argv)
              << "         +int  assign const unsigned int\n"
              << "         +std  assign const std::string\n"
              << "         +cstr assign const char[]\n"
-             << "         +wx  assing const wxString\n"
+             << "         +wx   assign const wxString\n"
              << "         +t    add Unicode translation macros to strings\n"
              << "         -v    be verbose\n";
 
@@ -283,7 +300,8 @@ int main(int argc, char** argv)
     RevConfigFile revRetr4(workingDir + "/autorevision.conf");
     RevFileParse revRetr3(workingDir + "/_svn/entries", &revRetr4);
     RevFileParse revRetr2(workingDir + "/.svn/entries", &revRetr3);
-    RevGitSVNQuery revRetr2_1(workingDir, &revRetr2);
+    RevGitSVNQuery revRetr2_2(workingDir, &revRetr2);
+    RevGitQuery revRetr2_1(workingDir, &revRetr2_2);
     RevSVNQuery  revRetr1(workingDir, &revRetr2_1);
 
     RevSVNVersionQuery revRetr(workingDir, &revRetr1);
@@ -581,7 +599,7 @@ bool RevGitSVNQuery::extractRevision(RevisionInformation& rev_info)
         if (system(NULL))
         {
             // This command will return without success if the working copy is
-            // changed, wether checked into index or not.
+            // changed, whether checked into index or not.
             rev_info.wc_modified = system("git diff --quiet HEAD");
         }
     }
@@ -589,6 +607,62 @@ bool RevGitSVNQuery::extractRevision(RevisionInformation& rev_info)
     return RevisionExtractor::extractRevision(rev_info);
 }
 
+std::string RevGitQuery::runCommand(char const *cmd) const
+{
+    std::string result;
+
+    const string cwd(GetWorkingDir());
+    if (!ChangeDir(_workingDir))
+        return false;
+
+    set_env("LANG", "C");
+    set_env("LC_ALL", "C");
+    FILE* process = popen(cmd, "r");
+
+    // Change directories back
+    ChangeDir(cwd);
+
+    if (!process)
+        return false;
+
+    char buf[1024];
+    if (fgets(buf, sizeof(buf), process))
+    {
+        result.assign(buf);
+        removeAfterNewLine(result);
+    }
+
+    pclose(process);
+
+    return result;
+}
+
+bool RevGitQuery::extractRevision(RevisionInformation& rev_info)
+{
+    std::string revision = runCommand("git rev-parse HEAD");
+    if (!revision.empty())
+    {
+        rev_info.low_revision = revision;
+        rev_info.revision = revision;
+        if (system(NULL))
+        {
+            // This command will return without success if the working copy is
+            // changed, whether checked into index or not.
+            rev_info.wc_modified = system("git diff --quiet HEAD");
+        }
+    }
+    std::string branch = runCommand("git symbolic-ref HEAD");
+    if (!branch.empty())
+    {
+        rev_info.wc_uri = branch;
+    }
+
+    // The working copy URI still needs to be extracted. "svnversion" cannot
+    // help us with that task, so delegate that task to another link in the
+    // chain of responsibility.
+    return RevisionExtractor::extractRevision(rev_info);
+}
+
 bool RevConfigFile::extractRevision(RevisionInformation& rev_info)
 {
     ifstream inFile(_configFile.c_str());
@@ -657,6 +731,14 @@ bool RevConfigFile::extractRevision(RevisionInformation& rev_info)
         return RevisionExtractor::extractRevision(rev_info);
 }
 
+static std::string integerOnly(std::string const &str)
+{
+    std::string ret = "-1";
+    if (!str.empty() && str.find_first_not_of("0123456789") == std::string::npos)
+        ret = str;
+    return ret;
+}
+
 bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info)
 {
     std::stringstream comment_str;
@@ -722,9 +804,9 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info)
     if(do_wx)
         header << "#include <wx/string.h>\n";
 
-    header << "\n#define SVN_LOW_REV      " << (rev_info.low_revision.empty() ? rev_info.revision : rev_info.low_revision)
+    header << "\n#define SVN_LOW_REV      " << integerOnly(rev_info.low_revision.empty() ? rev_info.revision : rev_info.low_revision)
            << "\n#define SVN_LOW_REV_STR \"" << (rev_info.low_revision.empty() ? rev_info.revision : rev_info.low_revision) << "\""
-           << "\n#define SVN_REV          " << rev_info.revision
+           << "\n#define SVN_REV          " << integerOnly(rev_info.revision)
            << "\n#define SVN_REV_STR     \"" << rev_info.revision << "\""
            << "\n#define SVN_DATE        \"" << rev_info.date << "\""
            << "\n#define SVN_URI         \"" << rev_info.wc_uri << "\"\n";

build_tools/changelog2bbcode.sh

@@ -1,2 +1,6 @@
 #!/bin/sh
-sed -e 's/r\([0-9]\+\)/[rev]\1[\/rev]/g' -e 's/ticket:\([0-9]\+\)/[ticket]\1[\/ticket]/g' -e 's/\ \ \*/\ */g' -e 's/^\ \*\ \(.*\):/\n[b]\1[\/b]/g'
+sed -e 's/r\([0-9]\+\)/[rev]\1[\/rev]/g' \
+    -e 's/ticket:\([0-9]\+\)/[ticket]\1[\/ticket]/g'\
+    -e 's/\ \ \*/\ */g' \
+    -e 's/^\ \*\ \(.*\):/\n[\/list][b]\1[\/b][list]/g' \
+    -e 's/^\ \ \*/\ [*]/'

configure.ac

@@ -41,6 +41,12 @@ AC_CHECK_PROG(ZIP, zip, zip)
 test -z "${ZIP}" && AC_MSG_ERROR(Zip not found!)
 AC_CHECK_PROG(UNZIP, unzip, unzip)
 test -z "${UNZIP}" && AC_MSG_ERROR(Unzip not found!)
+# --filesync was added in zip 3.0, older versions need -u
+ZIP_UPDATE="-u"
+zip -q --filesync filesynctest.zip $srcdir/ChangeLog 2> /dev/null && export ZIP_UPDATE="--filesync"
+echo $srcdir
+rm -f filesynctest.zip
+AC_SUBST([ZIP_UPDATE], [${ZIP_UPDATE}])
 
 # Enable Compiler/LibC GNU extensions
 AC_GNU_SOURCE
@@ -213,7 +219,7 @@ AS_IF([test "x$enable_sound" != "xyes"],[
 # -Wno-unused-label is necessary because flex produces unused labels that we cannot fix
 # Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
 AC_ARG_ENABLE([debug],
-	AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/no]],[Compile debug version [[yes]]]),
+	AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
 	[ enable_debug=${enableval} ], [ enable_debug=yes ])
 AC_MSG_CHECKING([whether to compile in debug mode])
 AC_MSG_RESULT([${enable_debug}])
@@ -227,34 +233,59 @@ AX_C_CHECK_FLAG([-Werror -Wno-enum-compare], , , CFLAGS_IGNORE_WARNINGS="${CFLAG
 # Only needed for CXX, actually.
 WZ_CPPFLAGS="${WZ_CPPFLAGS} -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
 
+# zlib
+LDFLAGS="-lz ${LDFLAGS}"
+
+if test "x$enable_warnings" = "xyes" ; then
+	# Only disable -Werror for the warning.
+	WZ_Wno_="-Wno-error="
+else
+	# Disable warning completely.
+	WZ_Wno_="-Wno-"
+fi
+
+WZ_WARNINGS_GCC="-Wall -Wextra ${WZ_Wno_}unused-parameter ${WZ_Wno_}sign-compare -Wcast-align -Wwrite-strings -Wpointer-arith ${WZ_Wno_}format-security"
+WZ_WARNINGS_GCC_C="${WZ_WARNINGS_GCC} ${WZ_Wno_}pointer-to-int-cast ${WZ_Wno_}strict-aliasing -Wstrict-prototypes -Wdeclaration-after-statement -Wc++-compat ${WZ_Wno_}c++-compat ${CFLAGS_IGNORE_WARNINGS}"
+WZ_WARNINGS_GCC_CXX="${WZ_WARNINGS_GCC}"
 if test "x$enable_debug" = "xyes" ; then
 	if test "x$cc_icc" = "xyes" ; then
+		# "-fp-model precise -fp-model source -ftz -no-fma" was here
 		WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Wcheck -Werror"
+		WZ_CXXFLAGS="${WZ_CXXFLAGS} -O0 -g -Wcheck -Werror"
 		WZ_CPPFLAGS="${WZ_CPPFLAGS} -DDEBUG"
 	else
-		WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Wall -Werror -Wno-unused-label -Wno-pointer-to-int-cast -Wmissing-field-initializers -Wcast-align -Wwrite-strings"
-		WZ_CFLAGS="${WZ_CFLAGS} -Wmissing-declarations -Wstrict-prototypes -Wpointer-arith -Wno-format-security -Wdeclaration-after-statement"
-		WZ_CFLAGS="${WZ_CFLAGS} ${CFLAGS_IGNORE_WARNINGS}"
+		WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Werror ${WZ_WARNINGS_GCC_C}"
+		WZ_CXXFLAGS="${WZ_CXXFLAGS} -O0 -g -Werror ${WZ_WARNINGS_GCC_CXX}"
 		WZ_C99FLAGS="${WZ_C99FLAGS} -Wno-declaration-after-statement"
 		WZ_CPPFLAGS="${WZ_CPPFLAGS} -DDEBUG"
 	fi
+elif test "x$enable_debug" = "xoptimised" ; then
+	WZ_CFLAGS="${WZ_CFLAGS} -O2 -g -Werror ${WZ_WARNINGS_GCC_C}"
+	WZ_CXXFLAGS="${WZ_CXXFLAGS} -O2 -g -Werror ${WZ_WARNINGS_GCC_CXX}"
+	WZ_C99FLAGS="${WZ_C99FLAGS} -Wno-declaration-after-statement"
+	WZ_CPPFLAGS="${WZ_CPPFLAGS} -DDEBUG"
 elif test "x$enable_debug" = "xrelaxed" ; then
-	WZ_CFLAGS="${WZ_CFLAGS} -g -O0 -Wall -Wextra -Wwrite-strings"
+	WZ_CFLAGS="${WZ_CFLAGS} -g -O0 ${WZ_WARNINGS_GCC_C}"
+	WZ_CXXFLAGS="${WZ_CXXFLAGS} -g -O0 ${WZ_WARNINGS_GCC_CXX}"
 	WZ_CPPFLAGS="${WZ_CPPFLAGS} -DDEBUG"
 elif test "x$enable_debug" = "xdebugprofile" ; then
-	WZ_CFLAGS="${WZ_CFLAGS} -g -O0 -pg -Wall -Wwrite-strings"
+	WZ_CFLAGS="${WZ_CFLAGS} -g -O0 -pg ${WZ_WARNINGS_GCC_C}"
+	WZ_CXXFLAGS="${WZ_CXXFLAGS} -g -O0 -pg ${WZ_WARNINGS_GCC_CXX}"
 	WZ_CPPFLAGS="${WZ_CPPFLAGS} -DDEBUG"
 	LDFLAGS="-pg ${LDFLAGS}"
 elif test "x$enable_debug" = "xprofile" ; then
-	WZ_CFLAGS="${WZ_CFLAGS} -g -Os -pg -Wall -Wwrite-strings"
+	WZ_CFLAGS="${WZ_CFLAGS} -g -Os -pg ${WZ_WARNINGS_GCC_C}"
+	WZ_CXXFLAGS="${WZ_CXXFLAGS} -g -Os -pg ${WZ_WARNINGS_GCC_CXX}"
 	WZ_CPPFLAGS="${WZ_CPPFLAGS} -DNDEBUG"
 	LDFLAGS="-pg ${LDFLAGS}"
 elif test "x$enable_debug" = "xg++" ; then
-	WZ_CFLAGS="${WZ_CFLAGS} -g -O2 -Wall -fpermissive"
+	WZ_CFLAGS="${WZ_CFLAGS} -g -O2 ${WZ_WARNINGS_GCC_C} -fpermissive"
+	WZ_CXXFLAGS="${WZ_CXXFLAGS} -g -O2 ${WZ_WARNINGS_GCC_CXX}"
 	WZ_CPPFLAGS="${WZ_CPPFLAGS} -DDEBUG"
 	CC="g++"
 else
-	WZ_CFLAGS="${WZ_CFLAGS} -g -Wall -Wwrite-strings"
+	WZ_CFLAGS="${WZ_CFLAGS} -g ${WZ_WARNINGS_GCC_C}"
+	WZ_CXXFLAGS="${WZ_CXXFLAGS} -g ${WZ_WARNINGS_GCC_CXX}"
 	WZ_CPPFLAGS="${WZ_CPPFLAGS} -DNDEBUG"
 fi
 
@@ -413,6 +444,7 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)"
 
 AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}])
 AC_SUBST([WZ_CFLAGS], [${WZ_CFLAGS}])
+AC_SUBST([WZ_CXXFLAGS], [${WZ_CXXFLAGS}])
 AC_SUBST([WZ_C99FLAGS], [${WZ_C99FLAGS}])
 
 

data/Makefile.am

@@ -4,7 +4,7 @@ stamp:
 	touch stamp
 
 %.wz: $(abs_srcdir)/% stamp
-	(cd $(srcdir)/$(notdir $<) && $(ZIP) -ru0 $(abs_builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' -x '*Makefile*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
+	(cd $(srcdir)/$(notdir $<) && $(ZIP) -r0 $(ZIP_UPDATE) $(abs_builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' -x '*Makefile*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
 	$(ZIP) -T $@
 	rm -f stamp
 

data/base/challenges/b2basics.ini

@@ -6,6 +6,7 @@ MaxPlayers = 2
 Scavengers = true
 Bases = 3
 Power = 700
+Description = "A level that players should be able to beat before playing online. The AI starts with a good defense."
 
 [player_1]
 team = 1

data/base/challenges/hidebehind.ini

@@ -6,6 +6,7 @@ MaxPlayers = 8
 Scavengers = false
 Bases = 2
 Power = 700
+Description = "Stay behind your AI allies and beat the enemy in close quarters, man-to-man combat."
 
 [player_1]
 team = 1

data/base/challenges/noplace.ini

@@ -7,6 +7,7 @@ Scavengers = false
 Bases = 2
 Power = 700
 AllowPositionChange = true
+Description = "You've got seven AI players on your tail. There's nowhere to run, nowhere to hide."
 
 [player_1]
 team = 1

data/base/components/weapons/gnmair2.pie

@@ -0,0 +1,64 @@
+PIE 2
+TYPE 200
+TEXTURE 0 page-17-droid-weapons.png 256 256
+LEVELS 1
+LEVEL 1
+POINTS 24
+	-9 3 0
+	-9 3 -6
+	9 11 7
+	9 12 -6
+	7 8 -6
+	4 4 -6
+	4 11 -6
+	1 8 -6
+	1 8 -44
+	7 8 -44
+	-7 8 -6
+	-4 11 -6
+	-4 4 -6
+	-1 8 -6
+	-1 8 -44
+	-4 11 -44
+	-4 6 -44
+	9 3 0
+	9 3 -6
+	-9 11 7
+	-9 12 -6
+	4 6 -44
+	4 11 -44
+	-7 8 -44
+POLYGONS 30
+	200 3 19 0 20 142 65 142 56 134 57
+	200 3 0 1 20 142 56 138 53 134 57
+	200 3 0 17 1 9 191 9 177 14 191
+	200 3 17 18 1 9 177 14 177 14 191
+	200 3 2 3 17 142 65 134 57 142 56
+	200 3 3 18 17 134 57 138 53 142 56
+	200 3 2 19 3 1 177 1 191 9 177
+	200 3 19 20 3 1 191 9 191 9 177
+	200 3 20 1 3 9 191 14 191 9 177
+	200 3 1 18 3 14 191 14 177 9 177
+	200 3 7 8 6 191 0 191 17 193 0
+	200 3 8 22 6 191 17 193 17 193 0
+	200 3 5 21 7 193 0 193 17 191 0
+	200 3 21 8 7 193 17 191 17 191 0
+	200 3 4 6 9 194 0 193 0 194 17
+	200 3 6 22 9 193 0 193 17 194 17
+	200 3 5 4 21 193 0 194 0 193 17
+	200 3 4 9 21 194 0 194 17 193 17
+	200 3 8 21 22 144 39 144 43 148 39
+	200 3 21 9 22 144 43 148 43 148 39
+	200 3 13 11 14 194 0 193 0 194 17
+	200 3 11 15 14 193 0 193 17 194 17
+	200 3 12 13 16 193 0 194 0 193 17
+	200 3 13 14 16 194 0 194 17 193 17
+	200 3 10 23 11 191 0 191 17 193 0
+	200 3 23 15 11 191 17 193 17 193 0
+	200 3 12 16 10 193 0 193 17 191 0
+	200 3 16 23 10 193 17 191 17 191 0
+	200 3 14 15 16 148 43 148 39 144 43
+	200 3 15 23 16 148 39 144 39 144 43
+CONNECTORS 2
+	3 -43 8
+	-3 -43 8

data/base/components/weapons/gnmair3.pie

@@ -0,0 +1,56 @@
+PIE 2
+TYPE 200
+TEXTURE 0 page-17-droid-weapons.png 256 256
+LEVELS 1
+LEVEL 1
+POINTS 16
+	29 11 12
+	-29 11 -12
+	-10 5 -12
+	10 11 -12
+	29 11 -12
+	29 5 -12
+	29 5 12
+	10 11 12
+	10 5 12
+	10 5 -12
+	-29 5 -12
+	-10 11 12
+	-10 5 12
+	-10 11 -12
+	-29 11 12
+	-29 5 12
+POLYGONS 24
+	200 3 7 3 8 24 102 2 102 24 107
+	200 3 8 3 9 24 107 2 102 2 107
+	200 3 3 4 9 0 152 21 152 0 159
+	200 3 9 4 5 0 159 21 152 21 159
+	200 3 4 0 5 2 102 24 102 2 107
+	200 3 5 0 6 2 107 24 102 24 107
+	200 3 0 7 6 0 164 21 164 0 170
+	200 3 6 7 8 0 170 21 164 21 170
+	200 3 3 7 4 0 78 0 101 22 78
+	200 3 7 0 4 0 101 22 101 22 78
+	200 3 8 9 6 0 101 0 78 22 101
+	200 3 6 9 5 22 101 0 78 22 78
+	200 3 14 1 15 24 102 2 102 24 107
+	200 3 15 1 10 24 107 2 102 2 107
+	200 3 1 13 10 0 152 21 152 0 159
+	200 3 10 13 2 0 159 21 152 21 159
+	200 3 13 11 2 2 102 24 102 2 107
+	200 3 2 11 12 2 107 24 102 24 107
+	200 3 11 14 12 0 164 21 164 0 170
+	200 3 12 14 15 0 170 21 164 21 170
+	200 3 1 14 13 0 78 0 101 22 78
+	200 3 13 14 11 22 78 0 101 22 101
+	200 3 15 10 12 0 101 0 78 22 101
+	200 3 12 10 2 22 101 0 78 22 78
+CONNECTORS 8
+	13 -12 8
+	-13 -12 8
+	18 -12 8
+	-17 -12 8
+	22 -12 8
+	-21 -12 8
+	27 -12 8
+	-26 -12 8

data/base/components/weapons/trmair2.pie

@@ -0,0 +1,88 @@
+PIE 2
+TYPE 200
+TEXTURE 0 page-17-droid-weapons.png 256 256
+LEVELS 1
+LEVEL 1
+POINTS 32
+	-12 1 -7
+	-12 12 -3
+	11 12 1
+	11 0 -19
+	14 0 15
+	13 2 2
+	12 9 18
+	16 30 23
+	17 5 15
+	16 4 17
+	11 6 -3
+	-12 6 -3
+	11 1 -7
+	11 3 -14
+	-12 3 -14
+	-12 12 1
+	-12 12 10
+	11 12 -3
+	-15 0 18
+	-15 0 -1
+	14 0 -1
+	-12 0 -19
+	14 0 18
+	-12 12 20
+	12 12 20
+	12 12 5
+	22 11 3
+	19 9 16
+	21 1 14
+	24 4 2
+	14 4 16
+	12 12 10
+POLYGONS 49
+	4200 3 12 10 13 8 1 8 1 174 217 171 218 175 221
+	4200 3 13 10 17 8 1 8 1 175 221 171 218 170 221
+	4200 3 0 14 11 8 1 8 1 174 217 175 221 171 218
+	4200 3 11 14 1 8 1 8 1 171 218 175 221 170 221
+	200 3 2 10 15 35 176 42 176 35 191
+	200 3 15 10 11 35 191 42 176 42 191
+	200 3 0 11 12 45 191 42 191 45 176
+	200 3 12 11 10 45 176 42 191 42 176
+	4200 3 13 0 12 8 1 16 1 129 204 143 201 129 201
+	4200 3 0 13 14 8 1 16 1 143 201 129 204 143 204
+	4200 3 1 14 19 8 1 25 1 9 20 3 24 10 27
+	4200 3 19 14 21 8 1 25 1 10 27 3 24 0 27
+	4200 3 1 19 15 8 1 25 1 9 20 10 27 13 20
+	4200 3 15 19 16 8 1 25 1 13 20 10 27 19 20
+	4200 3 13 3 14 8 1 16 1 129 204 129 207 143 204
+	4200 3 14 3 21 8 1 16 1 143 204 129 207 143 207
+	4200 3 10 2 17 8 1 8 1 171 218 168 218 170 221
+	4200 3 1 15 11 8 1 8 1 170 221 168 218 171 218
+	200 3 15 16 2 35 191 30 191 35 176
+	200 3 2 16 31 35 176 30 191 30 176
+	4200 3 17 20 13 8 1 25 1 9 20 10 27 3 24
+	4200 3 13 20 3 8 1 25 1 3 24 10 27 0 27
+	4200 3 17 2 20 8 1 25 1 9 20 13 20 10 27
+	4200 3 20 2 31 8 1 25 1 10 27 13 20 19 20
+	4200 3 18 23 19 8 1 25 1 23 27 24 20 10 27
+	4200 3 3 20 21 8 1 16 1 26 174 24 168 35 174
+	4200 3 18 19 22 8 1 16 1 37 160 37 168 24 160
+	4200 3 22 19 20 8 1 16 1 24 160 37 168 24 168
+	4200 3 19 21 20 8 1 16 1 37 168 35 174 24 168
+	4200 3 20 24 22 8 1 25 1 10 27 24 20 23 27
+	4200 3 22 24 18 8 1 18 1 0 47 2 38 17 47
+	4200 3 18 24 23 8 1 18 1 17 47 2 38 16 38
+	4200 3 4 5 28 8 1 16 1 10 131 0 131 9 137
+	4200 3 28 5 29 8 1 16 1 9 137 0 131 0 139
+	4200 3 25 26 5 8 1 18 1 4 28 13 30 4 37
+	4200 3 5 26 29 8 1 18 1 4 37 13 30 13 36
+	4200 3 6 27 25 8 1 16 1 10 131 9 137 0 131
+	4200 3 25 27 26 8 1 16 1 0 131 9 137 0 139
+	4200 3 6 4 27 8 1 16 1 4 14 4 3 11 12
+	4200 3 27 4 28 8 1 16 1 11 12 4 3 11 3
+	4200 3 28 29 27 8 1 15 1 6 120 5 126 0 120
+	4200 3 27 29 26 8 1 15 1 0 120 5 126 0 126
+	200 3 7 8 30 97 72 96 61 101 61
+	200 3 7 30 9 97 72 96 61 99 61
+	200 3 7 9 8 97 72 99 61 101 61
+	4200 3 31 23 24 8 1 13 1 12 211 8 223 8 211
+	4200 3 20 31 24 8 1 25 1 10 27 19 20 24 20
+	4200 3 16 23 31 8 1 13 1 12 223 8 223 12 211
+	4200 3 16 19 23 8 1 25 1 19 20 10 27 24 20

data/base/components/weapons/trmair3.pie

@@ -0,0 +1,39 @@
+PIE 2
+TYPE 200
+TEXTURE 0 page-17-droid-weapons.png 256 256
+LEVELS 1
+LEVEL 1
+POINTS 12
+	-10 13 6
+	-10 0 6
+	-10 13 -6
+	0 0 12
+	10 0 6
+	10 0 -6
+	10 13 6
+	10 13 -6
+	-10 0 -6
+	0 0 -12
+	0 13 -12
+	0 13 12
+POLYGONS 20
+	4200 3 0 2 1 8 1 16 1 129 192 143 192 129 207
+	4200 3 1 2 8 8 1 16 1 129 207 143 192 143 207
+	4200 3 11 0 3 8 1 13 1 6 241 12 241 6 254
+	4200 3 3 0 1 8 1 13 1 6 254 12 241 12 254
+	4200 3 6 11 4 8 1 13 1 0 241 6 241 0 254
+	4200 3 4 11 3 8 1 13 1 0 254 6 241 6 254
+	4200 3 7 6 5 8 1 16 1 129 192 143 192 129 207
+	4200 3 5 6 4 8 1 16 1 129 207 143 192 143 207
+	4200 3 10 7 9 8 1 16 1 8 0 15 0 8 18
+	4200 3 9 7 5 8 1 16 1 8 18 15 0 15 18
+	4200 3 2 10 8 8 1 16 1 0 0 8 0 0 18
+	4200 3 8 10 9 8 1 16 1 0 18 8 0 8 18
+	4200 3 8 9 3 8 1 11 1 34 104 36 108 26 108
+	4200 3 8 3 1 8 1 11 1 34 104 26 108 28 104
+	4200 3 3 9 4 8 1 11 1 26 108 36 108 28 112
+	4200 3 4 9 5 8 1 11 1 28 112 36 108 34 112
+	4200 3 2 0 10 8 1 11 1 34 104 28 104 36 108
+	4200 3 0 11 10 8 1 11 1 28 104 26 108 36 108
+	4200 3 6 7 11 8 1 11 1 28 112 34 112 26 108
+	4200 3 7 10 11 8 1 11 1 34 112 36 108 26 108

data/base/images/frontend.img

@@ -235,3 +235,11 @@
 4,36,156,35,24,0,0,"IMAGE DARK NOSCAV"
 4,144,156,35,24,0,0,"IMAGE HI SCAV"
 4,180,156,35,24,0,0,"IMAGE HI NOSCAV"
+4,0,206,35,24,0,0,"IMAGE_KICK"
+4,36,206,35,24,0,0,"IMAGE_VTOL"
+4,72,206,35,24,0,0,"IMAGE_CYBORG"
+4,108,206,35,24,0,0,"IMAGE_TANK"
+4,0,232,35,24,0,0,"IMAGE_KICK_TRANS"
+4,36,232,35,24,0,0,"IMAGE_NO_VTOL"
+4,72,232,35,24,0,0,"IMAGE_NO_CYBORG"
+4,108,232,35,24,0,0,"IMAGE_NO_TANK"

data/base/images/intfac.img

@@ -498,6 +498,10 @@
 2,70,114,10,10,0,0,"IMAGE ORIGIN SENSOR CB"
 2,81,114,12,11,-2,-1,"IMAGE ORIGIN SENSOR AIRDEF"
 2,110,114,10,10,0,0,"IMAGE ORIGIN RADAR DETECTOR"
+5,109,232,36,24,0,0,"IMAGE WAITING LO"
+5,146,232,36,24,0,0,"IMAGE WAITING HI"
+5,183,232,36,24,0,0,"IMAGE DESYNC LO"
+5,220,232,36,24,0,0,"IMAGE DESYNC HI"
 5,0,128,32,32,-15,-15,"IMAGE CURSOR EMBARK"
 5,32,128,32,32,-15,-15,"IMAGE CURSOR DEST"
 5,64,128,32,32,-15,-15,"IMAGE CURSOR DEFAULT"
@@ -518,3 +522,10 @@
 5,32,192,32,32,-15,-15,"IMAGE CURSOR BRIDGE"
 5,64,192,32,32,-15,-15,"IMAGE CURSOR BOMB"
 5,20,86,179,18,0,0,"IMAGE SLIDER AI"
+1,39,98,3,3,-1,-1,"IMAGE RAD BURNRESREAD"
+1,79,133,6,9,-3,-6,"IMAGE RAD BURNRES1"
+1,86,133,6,9,-3,-6,"IMAGE RAD BURNRES2"
+1,94,134,5,8,-2,-5,"IMAGE RAD BURNRES3"
+1,101,133,5,9,-2,-6,"IMAGE RAD BURNRES4"
+1,108,132,5,10,-2,-7,"IMAGE RAD BURNRES5"
+1,114,131,6,11,-3,-8,"IMAGE RAD BURNRES6"

data/base/images/intfac_differentOil.img

@@ -0,0 +1,6 @@
+1,37,102,6,9,-3,-6,"IMAGE RAD BURNRES1"
+1,44,102,7,10,-3,-6,"IMAGE RAD BURNRES2"
+1,52,103,9,10,-4,-5,"IMAGE RAD BURNRES3"
+1,62,102,5,9,-2,-6,"IMAGE RAD BURNRES4"
+1,68,101,7,11,-3,-7,"IMAGE RAD BURNRES5"
+1,76,100,9,13,-4,-8,"IMAGE RAD BURNRES6"

data/base/messages/strings/names.txt

@@ -204,7 +204,7 @@ BarbarianRKBuggy			_("Rocket Buggy")
 BabaRKJeep				_("Rocket Jeep")
 BabaFireTruck				_("Fire Truck")
 BabaPickUp				_("Pick-Up Truck")
-BabaFireCan				_("Fire Cannon")
+BabaFireCan				_("Cannon Fire Truck")
 BabaBusCan				_("School Bus")
 BaBaCivilian				_("Civilian")
 

data/base/multiplay/skirmish/ai.slo

@@ -391,6 +391,23 @@ event checkResearch(checkResearchTr)
 	setEventTrigger(doResearch, chainloadTr);
 }
 
+function void dbgPlr(string message)
+{
+	setEventTrigger(doResearch, chainloadTr);
+	if (me == selectedPlayer)
+	{
+		console(message);
+	}
+}
+
+function void dbgObj(DROID obj, string message)
+{
+	if (obj.selected)
+	{
+		console(message);
+	}
+}
+
 function bool conCanHelp(DROID mydroid, int bx, int by)
 {
 	return (mydroid.order != DORDER_HELPBUILD and mydroid.order != DORDER_BUILD and mydroid.order != DORDER_LINEBUILD and droidCanReach(mydroid, bx, by));
@@ -446,6 +463,8 @@ event arrived(reachedTr)
 
 	if (droid.droidType == DROID_CONSTRUCT or droid.droidType == DROID_CYBORG_CONSTRUCT)
 	{
+		dbgObj(droid, "Failed to build where we should - attempt to screw up enemy oil derrick");
+
 		// Check if at oil well, and it was taken by enemy
 		structure = structureBuiltInRange(derrick, droid.x, droid.y, (5 * 128), -1);
 		if (structure != NULLOBJECT)
@@ -475,12 +494,22 @@ event arrived(reachedTr)
 					{
 						orderDroidStatsLoc(droid, DORDER_BUILD, defStructs[count], buildX, buildY);
 					}
+					else
+					{
+						dbgObj(droid, "Wanted to be nasty, but found nowhere to build defense");
+						orderDroid(droid, DORDER_RTB);		// nothing more to do here.
+					}
+				}
+				else
+				{
+					dbgObj(droid, "Wanted to be nasty, but had nothing nasty to build - returning to base");
+					orderDroid(droid, DORDER_RTB);		// oh, well. nothing more to do here.
 				}
 				exit;
 			}
 			else if (droid.health < 100 and !insideBase(droid.x, droid.y))
 			{
-				orderDroid(droid, DORDER_RTB);		// bolt back to base now!
+				orderDroid(droid, DORDER_RTR);		// bolt back to base now!
 				exit;
 			}
 		}
@@ -707,7 +736,6 @@ event buildOilDefenseOrRetreat(buildOilDefenseOrRetreatTr)
 {
 	local	int		_numBuilders,_maxBuilders;
 
-
 	_maxBuilders = 1;
 
 	// check idle.
@@ -743,20 +771,8 @@ event buildOilDefenseOrRetreat(buildOilDefenseOrRetreatTr)
 					{
 						if( isStructureAvailable(defStructs[count],me))
 						{
-
-							// don't build multiple sensors together.
-							if(count == 5)
-							{
-								structure = structureBuiltInRange(defStructs[count], buildX, buildY,(6*128), me);
-								if(structure != NULLOBJECT)
-								{
-									count = 8;
-								}
-							}
-
 							structChoice[count2] = defStructs[count];
 							count2 = count2 + 1;
-
 						}
 						count = count - 1;
 					}
@@ -973,7 +989,10 @@ event incendry(incendryTr)
 // build a power gen for every 4 derricks. VITAL!
 event buildPowerGenerators(buildPowerGeneratorsTr)
 {
-
+	if (!isStructureAvailable(powGen, me))
+	{
+		exit;
+	}
 	initEnumStruct(FALSE,derrick,me,me);					// count = numderricks
 	structure= enumStruct();
 	count	 = 0;
@@ -2126,28 +2145,24 @@ event doAllOutAttack(allOutAttackTr)
 // defend attacked objects.
 event defendWatch(defendWatchTr)
 {
-	if(baseobj != NULLOBJECT)
+	if (baseobj != NULLOBJECT)
 	{
 		if(!friendlyPlayer(baseobj.player))
 		{
-			if(not isHumanPlayer(baseobj.player) )	// new in wdg1 dont allout attack a pc player	//TODO:is this check needed?
+			if(distBetweenTwoPoints(baseobj.x, baseobj.y, baseX, baseY) <= MAX_DEFENDERS_RADIUS)	//don't go too far away from the base
 			{
-				if(distBetweenTwoPoints(baseobj.x, baseobj.y, baseX, baseY) <= MAX_DEFENDERS_RADIUS)	//don't go too far away from the base
+				defendObj = baseobj;
+				defendbusy = TRUE;
+				// if not too busy, attack.
+				if (idleGroup(defendGroup) >= (defendGroup.members / 2))
 				{
-					defendObj = baseobj;
-					defendbusy = TRUE;
-					// if not too busy, attack.
-					if( idleGroup(defendGroup) >= (defendGroup.members / 2) )
-					{
-						orderGroupLoc(defendGroup, DORDER_MOVE,defendObj.x,defendObj.y);	//cyborg mechanics can't attack (won't move)
-					}
-
-					if( idleGroup(scoutGroup) >= (scoutGroup.members / 2) )
-					{
-						orderGroupLoc(scoutGroup, DORDER_MOVE,scoutX,scoutY);
-					}
+					orderGroupLoc(defendGroup, DORDER_MOVE,defendObj.x,defendObj.y);	//cyborg mechanics can't attack (won't move)
 				}
 
+				if (idleGroup(scoutGroup) >= (scoutGroup.members / 2))
+				{
+					orderGroupLoc(scoutGroup, DORDER_MOVE,scoutX,scoutY);
+				}
 			}
 		}
 	}
@@ -2590,10 +2605,7 @@ event vtolAttack(inactive)
 		{
 			if(defendObj != NULLOBJECT)
 			{
-				if(not isHumanPlayer(defendObj.player) )	// new in wdg1 	//TODO:is this check needed?
-				{
-					orderGroupObj(vtolDefendGr, DORDER_ATTACK,defendObj);		// get the defend target
-				}
+				orderGroupObj(vtolDefendGr, DORDER_ATTACK,defendObj);		// get the defend target
 			}
 		}
 	}
@@ -2929,8 +2941,8 @@ event vtolDefend(vtolDefendTr)
 						}
 						if(count2 != (-1) )
 						{
-							boolResult = pickStructLocation(vtolDefStruct[count2], ref buildX, ref buildY,me);
-							if((boolResult == TRUE) and (_numBuilders < _maxBuilders) and droidCanReach(droid, buildX, buildY))	// build a vtol defense near the attacked struct...
+							boolResult = pickDroidStructLocation(droid, vtolDefStruct[count2], ref buildX, ref buildY, me, 1);
+							if (boolResult == TRUE and (_numBuilders < _maxBuilders))	// build a vtol defense near the attacked struct...
 							{
 								orderDroidStatsLoc(droid, DORDER_BUILD,vtolDefStruct[count2],buildX,buildY);
 								_numBuilders++;

data/base/script/demo/demo_global.slo

@@ -47,7 +47,6 @@ event startup(CALL_GAMEINIT)
 
 	centreViewPos(3392, 10944);		//centre on P0 base
 
-	randomiseSeed();
 	playnum=0;
 	while (playnum < 8)
 	{
@@ -204,4 +203,4 @@ event weatherStop(inactive)
 		setEventTrigger(weatherStart, startTrig);
 		setEventTrigger(weatherStop, inactive);
 	}
-}
+}

data/base/script/text/cam1a-c.slo

@@ -172,7 +172,6 @@ event startEvnt(CALL_GAMEINIT)
 
 
 	LZMess = numLZ+1;					//force to recalc
-	randomiseSeed();
 /*
 //also don't allow building on 1CA's enemy LZs!
 	count = 0;

data/base/script/text/cam1c.slo

@@ -631,7 +631,6 @@ event startup(CALL_GAMEINIT)	//(init)
 	setAssemblyPoint (enm2c, 9920, 3136);
 	//setAssemblyPoint (enm2d, 14528, 3776);
 
-	randomiseSeed();
 	//make scavengers allies with NP
 	createAlliance(enemy1, enemy2);
 //set attack level for scavs

data/base/script/text/cam1ca.slo

@@ -123,7 +123,6 @@ event startEvnt(CALL_GAMEINIT)
 	//targetChoice = 1000;
 	targetChoice=random(numTargets);	//choose target now so can check for waypoints
 
-	randomiseSeed();
 //allow to build stuff
 	setStructureLimits (powerGen,numPow,0);
 	setStructureLimits (oilDerrick,numExt,0);

data/base/script/text/cam1end.slo

@@ -59,7 +59,6 @@ event briefings;
 /* Initialisation */
 event	start(CALL_GAMEINIT)
 {
-	randomiseSeed();
 //centre view
 	centreViewPos(centreX, centreY);
 

data/base/script/text/cam2endx.slo

@@ -138,7 +138,6 @@ event	start(CALL_GAMEINIT)
 {
 	//set up so that when Transporter gets to the edge of the map, it will empty and return
 	setDroidsToSafetyFlag(true);
-	randomiseSeed();
 //centre view
 	centreViewPos(centreX, centreY);
 

data/base/script/text/genbet.slo

@@ -55,7 +55,6 @@ event briefings;
 /* Initialisation */
 event	start(CALL_GAMEINIT)
 {
-	randomiseSeed();
 //centre view
 	centreViewPos(centreX, centreY);
 

data/base/script/text/genexp.slo

@@ -246,8 +246,6 @@ event	periodicRTLZ;
 /* Initialisation */
 event	start(CALL_GAMEINIT)
 {
-	randomiseSeed();
-
 //set scroll limits
 //	setScrollParams(scrollX1, scrollY1, scrollX2, scrollY2);
 //centre view

data/base/shaders/tcmask.frag

@@ -1,30 +1,30 @@
-#pragma debug(on)
-
-#ifdef FOG_ENABLED
-varying float vertexDistance;
-#endif
-
-uniform sampler2D Texture0;
-uniform sampler2D Texture1;
-uniform vec4 teamcolour;
-
-void main(void)
-{
-	vec4 colour, mask;
-
-	// Get color and tcmask information from TIUs 0-1
-	colour = texture2D(Texture0, gl_TexCoord[0].st);
-	mask  = texture2D(Texture1, gl_TexCoord[0].st);
-	
-	// Apply color using "Merge grain" within tcmask
-	gl_FragColor = (colour + (teamcolour - 0.5) * mask.a) * gl_Color;
-	
-#ifdef FOG_ENABLED
-	// Calculate linear fog
-	float fogFactor = (gl_Fog.end - vertexDistance) / (gl_Fog.end - gl_Fog.start);
-	fogFactor = clamp(fogFactor, 0.0, 1.0);
-	
-	// Return fragment color
-	gl_FragColor = mix(gl_Fog.color, gl_FragColor, fogFactor);
-#endif
+#pragma debug(on)
+
+#ifdef FOG_ENABLED
+varying float vertexDistance;
+#endif
+
+uniform sampler2D Texture0;
+uniform sampler2D Texture1;
+uniform vec4 teamcolour;
+
+void main(void)
+{
+	vec4 colour, mask;
+
+	// Get color and tcmask information from TIUs 0-1
+	colour = texture2D(Texture0, gl_TexCoord[0].st);
+	mask  = texture2D(Texture1, gl_TexCoord[0].st);
+	
+	// Apply color using "Merge grain" within tcmask
+	gl_FragColor = (colour + (teamcolour - 0.5) * mask.a) * gl_Color;
+	
+#ifdef FOG_ENABLED
+	// Calculate linear fog
+	float fogFactor = (gl_Fog.end - vertexDistance) / (gl_Fog.end - gl_Fog.start);
+	fogFactor = clamp(fogFactor, 0.0, 1.0);
+	
+	// Return fragment color
+	gl_FragColor = mix(gl_Fog.color, gl_FragColor, fogFactor);
+#endif
 }

data/base/shaders/tcmask.vert

@@ -1,24 +1,21 @@
-#pragma debug(on)
-
-#ifdef FOG_ENABLED
-varying float vertexDistance;
-#endif
-
-void main(void)
-{
-	// Pass vertex color information to fragment shader
-	gl_FrontColor = gl_Color;
-	
-	// Pass texture coordinates to fragment shader
-	gl_TexCoord[0] = gl_TextureMatrix [0] * gl_MultiTexCoord0;
-
-	// Translate every vertex according to the Model View and Projection Matrix
-	//gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * gl_Vertex;
-	// Use "magic" fixed routine while using GLSL < 1.30
-	gl_Position = ftransform();
-	
-#ifdef FOG_ENABLED
-	// Remember vertex distance
-	vertexDistance = gl_Position.z;
-#endif
-}
+#pragma debug(on)
+#ifdef FOG_ENABLED
+varying float vertexDistance;
+#endif
+
+void main(void)
+{
+	// Pass vertex color information to fragment shader
+	gl_FrontColor = gl_Color;
+	
+	// Pass texture coordinates to fragment shader
+	gl_TexCoord[0] = gl_TextureMatrix [0] * gl_MultiTexCoord0;
+
+	// Translate every vertex according to the Model View and Projection Matrix
+	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+	
+#ifdef FOG_ENABLED
+	// Remember vertex distance
+	vertexDistance = gl_Position.z;
+#endif
+}

data/base/stats/features.txt

@@ -4,7 +4,7 @@ OilResource,1,1,0,0,0,mislick.pie,OIL RESOURCE,1,1,0
 Boulder1,1,1,0,0,0,mibould1.pie,BOULDER,1,0,1
 Boulder2,1,1,0,0,0,mibould2.pie,BOULDER,1,0,1
 Boulder3,1,1,0,5,25,mibould3.pie,BOULDER,1,0,1
-WreckedDroidHub,1,1,1,0,0,drwreck.pie,VEHICLE,1,1,0
+WreckedDroidHub,1,1,1,7,60,drwreck.pie,VEHICLE,1,1,0
 WreckedVertCampVan,1,1,1,5,50,micamper.pie,VEHICLE,1,0,0
 WreckedSuzukiJeep,1,1,1,2,40,mijeep.pie,VEHICLE,1,0,0
 WreckedTankerV,1,2,1,2,75,mitanker.pie,TANK WRECK,1,0,0

data/base/wrf/piestats.wrf

@@ -272,6 +272,10 @@ file		IMD	"gnhrepar.pie"
 file		IMD	"cy_las.pie"
 file		IMD	"cy_rail.pie"
 file		IMD	"cy_miss.pie"
+file		IMD	"gnmair2.pie"
+file		IMD	"gnmair3.pie"
+file		IMD	"trmair2.pie"
+file		IMD	"trmair3.pie"
 directory	"components/bodies"
 file		IMD	"drhbod09.pie"
 file		IMD	"drhbod10.pie"

data/mods/multiplay/Makefile.am

@@ -2,7 +2,7 @@ stamp:
 	touch stamp
 
 %.wz: $(srcdir)/% stamp
-	(cd $(srcdir)/$(notdir $<) && $(ZIP) -ru0 $(abs_builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
+	(cd $(srcdir)/$(notdir $<) && $(ZIP) -r0 $(ZIP_UPDATE) $(abs_builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
 	$(ZIP) -T $@
 	rm -f stamp
 
@@ -18,42 +18,23 @@ OLD110LIST = \
 	messages \
 	stats \
 	wrf
-	
+
 OLD110ARCHIVE = old-1.10-balance.wz
 
 
-NTWLIST = \
-	addon.lev \
-	audio \
-	components \
-	COPYING \
-	doc \
-	effects \
-	images \
-	messages \
-	multiplay \
-	stats \
-	structs \
-	texpages \
-	wrf
-
-NTWARCHIVE = ntw.wz
-
 SEMPERFILIST = multiplay
 SEMPERFIARCHIVE = semperfi.wz
 
-CLEANFILES = $(DYDOAIARCHIVE) $(OLD110ARCHIVE) $(NTWARCHIVE) $(SEMPERFIARCHIVE)
+CLEANFILES = $(DYDOAIARCHIVE) $(OLD110ARCHIVE) $(SEMPERFIARCHIVE)
 
 $(DYDOAIARCHIVE): $(DYDOAILIST:%=$(basename $(DYDOAIARCHIVE))/%)
 $(OLD110ARCHIVE): $(OLD110LIST:%=$(basename $(OLD110ARCHIVE))/%)
-$(NTWARCHIVE): $(NTWLIST:%=$(basename $(NTWARCHIVE))/%)
 $(SEMPERFIARCHIVE): $(SEMPERFILIST:%=$(basename $(SEMPERFIARCHIVE))/%)
 
 multiplaymodsdir = $(pkgdatadir)/mods/multiplay
-nodist_multiplaymods_DATA =  $(DYDOAIARCHIVE) $(OLD110ARCHIVE) $(NTWARCHIVE) $(SEMPERFIARCHIVE)
+nodist_multiplaymods_DATA =  $(DYDOAIARCHIVE) $(OLD110ARCHIVE) $(SEMPERFIARCHIVE)
 
-dist-hook: $(DYDOAIARCHIVE) $(OLD110ARCHIVE) $(NTWARCHIVE) $(SEMPERFIARCHIVE)
+dist-hook: $(DYDOAIARCHIVE) $(OLD110ARCHIVE) $(SEMPERFIARCHIVE)
 	$(UNZIP) -u $(DYDOAIARCHIVE) -d $(DESTDIR)$(distdir)/$(basename $(DYDOAIARCHIVE))
 	$(UNZIP) -u $(OLD110ARCHIVE) -d $(DESTDIR)$(distdir)/$(basename $(OLD110ARCHIVE))
-	$(UNZIP) -u $(NTWARCHIVE) -d $(DESTDIR)$(distdir)/$(basename $(NTWARCHIVE))
 	$(UNZIP) -u $(SEMPERFIARCHIVE) -d $(DESTDIR)$(distdir)/$(basename $(SEMPERFIARCHIVE))

data/mods/multiplay/ntw/components/bodies/cybdstdi.pie

@@ -1,73 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-14-droid-hubs.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 49 
-	18 6 8 
-	-18 6 8 
-	-18 38 4 
-	18 38 4 
-	-18 6 -2 
-	18 6 -2 
-	18 38 -6 
-	-18 38 -6 
-	10 10 -8 
-	10 10 8 
-	6 38 8 
-	6 38 -8 
-	-8 36 -8 
-	8 36 -8 
-	8 36 6 
-	-8 36 6 
-	14 9 -12 
-	14 6 5 
-	14 25 8 
-	14 28 -9 
-	-10 10 8 
-	-10 10 -8 
-	-6 38 -8 
-	-6 38 8 
-	12 -16 8 
-	4 -16 8 
-	2 10 2 
-	10 10 2 
-	4 -16 0 
-	12 -16 0 
-	10 10 -6 
-	2 10 -6 
-	4 -16 -6 
-	2 10 8 
-	12 -16 -6 
-	-4 -14 12 
-	-12 -14 12 
-	-10 10 2 
-	-2 10 2 
-	-12 -14 0 
-	-4 -14 0 
-	-2 10 -4 
-	-10 10 -4 
-	-4 -14 -6 
-	-2 10 12 
-	-2 10 -6 
-	-12 -14 -6 
-	-10 10 -6 
-	-10 10 12
-POLYGONS 15
-	4200 4 3 2 1 0 8 1 19 17 19 246 1 246 1 230 19 230
-	4200 4 7 6 5 4 8 1 19 17 1 215 19 215 19 231 1 231
-	4200 4 11 10 9 8 8 1 9 15 57 200 66 200 66 214 57 214
-	4200 4 15 14 13 12 8 1 9 9 9 246 9 255 0 255 0 246
-	200 4 16 17 18 19 130 210 139 210 139 200 130 200
-	200 4 19 18 17 16 130 200 139 200 139 210 130 210
-	4200 4 23 22 21 20 8 1 9 15 66 200 57 200 57 214 66 214
-	200 4 27 26 25 24 78 186 82 186 82 199 78 199
-	200 4 31 30 29 28 78 186 74 186 74 199 78 199
-	200 4 33 31 32 25 28 201 21 201 21 214 28 214
-	200 4 30 9 24 34 21 187 28 187 28 200 21 200
-	200 4 38 37 36 35 106 186 102 186 102 199 106 199
-	200 4 42 41 40 39 98 186 102 186 102 199 98 199
-	200 4 45 44 35 43 50 201 57 201 57 214 50 214
-	200 4 48 47 46 36 57 187 50 187 50 200 57 200
-CONNECTORS 1
-	0 4 24

data/mods/multiplay/ntw/components/bodies/exbuggy.pie

@@ -1,50 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-7-barbarians-arizona.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 24 
-	-4 29 -3 
-	4 29 -3 
-	4 32 6 
-	-4 32 6 
-	-6 21 -7 
-	6 21 -7 
-	7 22 20 
-	-7 22 20 
-	-13 10 -24 
-	-15 10 26 
-	15 10 26 
-	13 10 -24 
-	-13 20 -24 
-	13 20 -24 
-	15 22 26 
-	-15 22 26 
-	-2 20 -26 
-	-2 25 -26 
-	-2 25 -10 
-	-2 20 -8 
-	2 20 -26 
-	2 20 -8 
-	2 25 -10 
-	2 25 -26
-POLYGONS 16
-	200 4 3 2 1 0 211 125 211 121 207 121 207 125
-	200 4 0 1 5 4 199 113 199 109 202 109 202 113
-	200 4 1 2 6 5 209 137 205 138 200 134 211 134
-	200 4 2 3 7 6 216 109 216 113 213 114 213 108
-	200 4 3 0 4 7 209 138 204 137 201 134 213 134
-	200 4 11 10 9 8 190 130 197 129 197 135 190 135
-	200 4 15 14 13 12 218 129 218 117 199 118 199 128
-	200 4 12 13 11 8 203 116 203 106 207 106 207 116
-	200 4 13 14 10 11 217 133 198 134 198 129 217 129
-	200 4 14 15 9 10 213 105 213 117 208 117 208 105
-	200 4 15 12 8 9 218 134 199 133 199 129 218 129
-	200 4 19 18 17 16 205 133 204 135 198 135 198 133
-	200 4 23 22 21 20 218 135 212 135 211 133 218 133
-	200 4 21 22 18 19 212 110 213 110 213 112 212 112
-	200 4 22 23 17 18 204 122 198 122 198 124 204 124
-	200 4 23 20 16 17 201 110 203 110 203 112 201 112
-CONNECTORS 2
-	0 3 22
-	0 3 9

data/mods/multiplay/ntw/components/bodies/exfire.pie

@@ -1,72 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-7-barbarians-arizona.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 32 
-	17 36 -27 
-	17 17 -23 
-	-17 17 -23 
-	-17 36 -27 
-	17 30 -69 
-	-17 30 -69 
-	17 17 -15 
-	-17 17 -15 
-	17 32 -12 
-	17 32 49 
-	-17 32 49 
-	-17 32 -12 
-	17 0 7 
-	17 5 3 
-	-17 5 3 
-	-17 0 7 
-	17 0 -51 
-	17 5 -53 
-	-17 5 -53 
-	-17 0 -51 
-	17 6 -72 
-	-17 6 -72 
-	17 5 45 
-	17 6 57 
-	17 0 41 
-	17 5 -34 
-	17 0 -37 
-	-17 6 57 
-	-17 5 45 
-	-17 0 41 
-	-17 5 -34 
-	-17 0 -37
-POLYGONS 30
-	200 4 3 2 1 0 254 66 243 66 243 84 254 84
-	200 4 5 3 0 4 70 180 46 180 46 164 70 164
-	200 4 2 7 6 1 44 180 39 180 39 164 44 164
-	200 4 11 10 9 8 37 180 2 180 2 164 37 164
-	200 4 15 14 13 12 219 168 219 164 190 164 190 168
-	200 4 19 18 17 16 219 168 219 163 190 163 190 168
-	200 4 21 5 4 20 219 163 219 143 190 143 190 163
-	200 4 23 22 8 9 2 203 8 203 39 184 6 184
-	200 4 8 22 24 6 39 184 8 203 10 207 40 195
-	200 4 20 4 0 17 70 203 69 185 47 182 61 203
-	200 4 0 1 16 17 47 182 45 195 59 207 61 203
-	200 4 26 16 1 25 52 207 59 207 45 195 50 204
-	200 4 25 1 6 13 50 204 45 195 40 195 31 204
-	200 4 6 24 12 13 40 195 10 207 28 207 31 204
-	200 4 11 28 27 10 39 184 8 203 2 203 6 184
-	200 4 29 28 11 7 10 207 8 203 39 184 40 195
-	200 4 3 5 21 18 47 182 69 185 70 203 61 203
-	200 4 19 2 3 18 59 207 45 195 47 182 61 203
-	200 4 2 19 31 30 45 195 59 207 52 207 50 204
-	200 4 7 2 30 14 40 195 45 195 50 204 31 204
-	200 4 15 29 7 14 28 207 10 207 40 195 31 204
-	200 4 28 29 24 22 183 126 186 126 186 144 183 144
-	200 4 30 31 26 25 183 126 186 126 186 144 183 144
-	200 4 10 27 23 9 166 126 182 126 182 144 166 144
-	200 4 29 15 12 24 72 221 72 204 91 204 91 221
-	200 4 14 30 25 13 72 201 72 182 91 182 91 201
-	200 4 31 19 16 26 72 181 72 174 91 174 91 181
-	200 4 18 21 20 17 72 172 72 163 91 163 91 172
-	200 4 27 28 22 23 72 229 72 223 91 223 91 229
-	200 4 7 11 8 6 125 81 112 81 112 63 125 63
-CONNECTORS 2
-	0 18 32
-	0 7 -1

data/mods/multiplay/ntw/components/bodies/exjeep.pie

@@ -1,63 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-7-barbarians-arizona.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 36 
-	0 38 -7 
-	1 40 -7 
-	0 42 -7 
-	-2 40 -7 
-	0 27 6 
-	0 26 -2 
-	1 36 -2 
-	1 36 6 
-	-2 27 1 
-	9 27 1 
-	9 36 1 
-	-2 36 1 
-	-10 26 -7 
-	9 26 -7 
-	9 32 -3 
-	-10 32 -3 
-	6 26 -2 
-	6 27 6 
-	3 36 6 
-	3 36 -2 
-	0 43 -7 
-	0 36 -7 
-	0 36 16 
-	0 43 16 
-	-3 40 -7 
-	3 40 -7 
-	3 40 16 
-	-3 40 16 
-	-13 10 -22 
-	-15 10 27 
-	14 10 27 
-	12 10 -22 
-	12 24 -22 
-	-13 24 -22 
-	14 29 27 
-	-15 29 27
-POLYGONS 17
-	200 4 3 2 1 0 151 121 149 121 149 119 151 119
-	200 4 7 6 5 4 36 128 42 128 42 135 36 134
-	200 4 8 9 10 11 30 156 40 156 40 146 30 146
-	200 4 11 10 9 8 30 146 40 146 40 156 30 156
-	200 4 12 13 14 15 151 91 141 91 141 95 151 95
-	200 4 15 14 13 12 151 95 141 95 141 91 151 91
-	200 4 19 18 17 16 42 128 36 128 36 135 42 135
-	200 4 20 21 22 23 120 122 113 122 113 140 120 140
-	200 4 23 22 21 20 120 140 113 140 113 122 120 122
-	200 4 24 25 26 27 120 122 113 122 113 140 120 140
-	200 4 27 26 25 24 120 140 113 140 113 122 120 122
-	200 4 31 30 29 28 243 106 255 105 255 119 243 118
-	200 4 33 32 31 28 189 137 189 127 195 127 195 137
-	200 4 32 34 30 31 144 122 123 124 123 115 144 115
-	200 4 34 35 29 30 187 126 187 138 195 138 195 126
-	200 4 35 33 28 29 144 124 123 122 123 115 144 115
-	200 4 35 34 32 33 243 84 255 84 254 105 244 105
-CONNECTORS 2
-	0 2 29
-	0 2 9

data/mods/multiplay/ntw/components/bodies/exschool.pie

@@ -1,63 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-7-barbarians-arizona.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 32 
-	15 21 -66 
-	15 22 -52 
-	-15 22 -52 
-	-15 21 -66 
-	14 37 -49 
-	14 36 47 
-	-15 36 47 
-	-15 37 -49 
-	15 0 -57 
-	15 6 -62 
-	-15 6 -62 
-	-15 0 -57 
-	15 6 -67 
-	-15 6 -67 
-	15 22 -48 
-	21 22 -48 
-	21 32 -48 
-	15 32 -48 
-	-21 22 -48 
-	-15 22 -48 
-	-15 32 -48 
-	-21 32 -48 
-	15 9 50 
-	-15 9 50 
-	15 8 22 
-	15 0 16 
-	-15 0 16 
-	-15 8 22 
-	-12 23 -65 
-	12 23 -65 
-	12 34 -51 
-	-12 34 -51
-POLYGONS 21
-	200 4 3 2 1 0 110 220 110 212 92 212 92 220
-	200 4 7 6 5 4 110 208 110 152 92 152 92 208
-	200 4 11 10 9 8 197 191 197 187 216 187 216 191
-	200 4 13 3 0 12 197 187 197 179 216 179 216 187
-	200 4 2 7 4 1 197 178 197 170 215 170 216 178
-	200 4 17 16 15 14 216 172 219 172 219 178 216 178
-	200 4 21 20 19 18 194 172 197 172 197 178 194 178
-	200 4 6 23 22 5 188 145 188 159 171 159 171 145
-	200 4 27 26 25 24 188 159 188 164 171 164 171 159
-	200 4 23 27 24 22 90 163 90 179 73 179 73 163
-	200 4 26 11 8 25 90 182 90 224 73 224 73 182
-	200 4 10 13 12 9 90 227 90 229 73 229 73 227
-	200 4 22 24 4 5 2 225 18 225 59 209 3 209
-	200 4 24 25 1 4 18 225 21 230 60 217 59 209
-	200 4 25 8 9 1 21 230 63 230 66 226 60 217
-	200 4 1 9 12 0 60 217 66 226 68 226 68 217
-	200 4 7 27 23 6 59 209 18 225 2 225 3 209
-	200 4 2 26 27 7 60 217 21 230 18 225 59 209
-	200 4 10 11 26 2 66 226 63 230 21 230 60 217
-	200 4 13 10 2 3 68 226 66 226 60 217 68 217
-	200 4 31 30 29 28 66 151 81 151 81 161 66 161
-CONNECTORS 2
-	0 -14 38
-	0 7 -1

data/mods/multiplay/ntw/components/bodies/extrike.pie

@@ -1,80 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-7-barbarians-arizona.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 40 
-	2 35 11 
-	2 33 17 
-	-2 33 17 
-	-2 35 11 
-	2 27 15 
-	-2 27 15 
-	2 28 10 
-	-2 28 10 
-	3 10 -14 
-	3 19 -14 
-	3 19 -25 
-	3 10 -25 
-	-3 10 -14 
-	-3 10 -25 
-	-3 19 -25 
-	-3 19 -14 
-	4 15 -14 
-	10 10 21 
-	9 24 25 
-	3 32 -2 
-	-5 15 -14 
-	-3 32 -2 
-	-10 24 25 
-	-10 10 21 
-	-17 10 24 
-	-17 10 9 
-	-17 23 9 
-	-17 23 24 
-	-11 10 9 
-	-11 23 9 
-	-11 23 24 
-	-11 10 24 
-	16 10 24 
-	16 23 24 
-	16 23 9 
-	16 10 9 
-	10 23 9 
-	10 10 9 
-	10 23 24 
-	10 10 24
-POLYGONS 30
-	200 4 3 2 1 0 131 99 135 99 135 99 131 99
-	200 4 2 5 4 1 135 99 135 103 135 103 135 99
-	200 4 6 0 1 4 131 103 131 99 135 99 135 103
-	200 4 2 3 7 5 135 99 131 99 131 103 135 103
-	200 4 7 3 0 6 131 103 131 99 131 99 131 103
-	200 4 11 10 9 8 152 90 152 84 158 84 158 90
-	200 4 15 14 13 12 158 84 152 84 152 90 158 90
-	200 4 13 14 10 11 152 90 152 84 152 84 152 90
-	200 4 14 15 9 10 152 84 158 84 158 84 152 84
-	200 4 15 12 8 9 158 84 158 90 158 90 158 84
-	200 3 18 17 16 160 83 158 90 141 87
-	200 3 16 19 18 141 87 147 79 160 83
-	200 3 22 21 20 160 83 147 79 141 88
-	200 3 20 23 22 141 88 158 90 160 83
-	200 3 19 16 20 205 119 211 117 211 129
-	200 3 20 21 19 211 129 205 127 205 119
-	200 3 17 23 20 243 105 255 105 251 119
-	200 3 20 16 17 251 119 247 119 243 105
-	200 3 22 23 17 230 159 228 168 239 168
-	200 3 17 18 22 239 168 237 159 230 159
-	200 3 18 19 21 218 129 198 126 198 122
-	200 3 21 22 18 198 122 218 118 218 129
-	200 4 27 26 25 24 158 84 152 84 152 90 158 90
-	200 4 25 26 29 28 152 90 152 84 152 84 152 90
-	200 4 26 27 30 29 152 84 158 84 158 84 152 84
-	200 4 27 24 31 30 158 84 158 90 158 90 158 84
-	200 4 35 34 33 32 152 90 152 84 158 84 158 90
-	200 4 37 36 34 35 152 90 152 84 152 84 152 90
-	200 4 36 38 33 34 152 84 158 84 158 84 152 84
-	200 4 38 39 32 33 158 84 158 90 158 90 158 84
-CONNECTORS 2
-	0 6 31
-	0 2 9

data/mods/multiplay/ntw/components/bodies/sabod1.pie

@@ -1,24 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-20-fx.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 8 
-	-15 9 31 
-	-15 22 19 
-	14 22 19 
-	14 9 31 
-	14 9 -35 
-	-15 9 -35 
-	-15 22 -21 
-	14 22 -21
-POLYGONS 6
-	200 4 3 2 1 0 142 190 153 177 167 174 167 188
-	200 4 7 6 1 2 166 179 153 179 152 169 164 169
-	200 4 6 7 4 5 155 165 166 181 154 188 142 176
-	200 4 3 4 7 2 177 184 155 191 151 180 173 170
-	200 4 1 6 5 0 173 170 151 180 155 191 177 184
-	200 4 4 3 0 5 203 162 248 165 246 183 205 179
-CONNECTORS 2
-	0 4 24
-	0 -17 8

data/mods/multiplay/ntw/components/bodies/sabod2.pie

@@ -1,34 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-20-fx.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 14 
-	-22 9 -28 
-	-22 9 31 
-	22 9 31 
-	22 9 -28 
-	-22 26 42 
-	22 26 42 
-	22 26 -38 
-	-22 26 -38 
-	21 43 33 
-	-21 43 33 
-	-22 36 47 
-	22 36 47 
-	-22 26 23 
-	22 26 23
-POLYGONS 10
-	200 4 3 2 1 0 247 175 243 190 222 152 245 161
-	200 4 0 7 6 3 172 102 150 102 144 106 146 109
-	200 4 1 2 11 10 147 141 166 147 160 163 155 163
-	200 4 4 7 0 1 163 106 172 104 183 119 177 144
-	200 4 6 5 2 3 184 124 147 143 161 152 177 144
-	200 4 6 7 12 13 183 119 172 103 163 106 158 148
-	200 4 13 12 9 8 158 148 163 106 148 104 135 129
-	200 4 9 12 4 10 148 104 163 106 172 102 150 102
-	200 4 9 10 11 8 147 142 155 163 160 163 167 147
-	200 4 8 11 5 13 136 129 139 136 157 153 158 148
-CONNECTORS 2
-	0 -4 27
-	0 -18 8

data/mods/multiplay/ntw/components/bodies/sabod3.pie

@@ -1,38 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-20-fx.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 16 
-	-19 9 36 
-	-19 9 -39 
-	-19 22 -44 
-	-19 22 36 
-	19 9 -39 
-	19 9 36 
-	19 22 36 
-	19 22 -44 
-	-34 9 36 
-	34 9 36 
-	34 22 36 
-	-34 22 36 
-	-34 9 50 
-	34 9 50 
-	-34 22 50 
-	34 22 50
-POLYGONS 12
-	200 4 3 2 1 0 141 116 177 120 173 107 148 106
-	200 4 7 6 5 4 175 107 145 110 151 102 171 102
-	200 4 15 14 12 13 75 130 75 118 89 118 89 130
-	200 4 15 10 11 14 75 137 85 140 85 103 79 112
-	200 4 15 13 9 10 143 75 149 75 149 66 143 66
-	200 4 10 9 5 6 161 59 154 67 150 57 155 54
-	200 4 14 11 8 12 143 75 143 66 149 66 149 75
-	200 4 11 3 0 8 161 59 155 54 150 57 154 67
-	200 4 2 7 4 1 147 90 153 59 149 59 141 85
-	200 4 7 2 3 6 153 59 147 90 176 88 173 66
-	200 4 1 4 5 0 221 158 228 193 245 186 237 160
-	200 4 12 8 9 13 218 160 209 156 208 186 219 191
-CONNECTORS 2
-	0 8 23
-	0 -29 8

data/mods/multiplay/ntw/components/bodies/sebod1.pie

@@ -1,36 +0,0 @@
-PIE 2
-TYPE 200
-TEXTURE 0 page-14-droid-hubs.png 256 256
-LEVELS 1
-LEVEL 1
-POINTS 10 
-	0 8 -39 
-	0 24 -55 
-	-15 24 -16 
-	15 24 -16 
-	12 8 -16 
-	-12 8 -16 
-	-12 8 26 
-	12 8 26 
-	12 24 39 
-	-12 24 39
-POLYGONS 16
-	200 3 8 6 7 198 175 218 164 219 193
-	200 3 9 6 8 201 184 201 159 219 163
-	200 3 4 8 7 195 193 195 156 219 156
-	200 3 4 3 8 195 156 219 156 219 193
-	200 3 4 0 3 209 157 195 162 219 193
-	200 3 0 1 3 195 193 220 161 195 161
-	200 3 1 0 2 198 184 216 189 217 156
-	200 3 2 0 5 199 174 210 157 217 178
-	200 3 2 6 9 219 192 196 164 219 156
-	200 3 5 6 2 195 168 219 193 211 157
-	200 3 2 9 8 115 0 80 0 80 16
-	200 3 2 8 3 115 0 80 16 115 16
-	200 3 2 3 1 189 240 213 240 202 256
-	200 3 6 5 7 214 81 214 131 198 81
-	200 3 7 5 4 214 131 201 82 214 82
-	200 3 4 5 0 214 87 214 104 205 87
-CONNECTORS 2
-	0 0 24
-	0 -16 7