Removed havoc mode also here

diff --git a/Docs/htmlfiles/faq.aft b/Docs/htmlfiles/faq.aft
index fe09a8bb39ca966526d7d55ae39481b74e1ec548..f36fd2cfc406106d1d5c59f4db8e89999255abd5 100644 (file)
--- a/Docs/htmlfiles/faq.aft
+++ b/Docs/htmlfiles/faq.aft
@@ -24,8 +24,6 @@ Nexuiz/
 |-- data/
 |   |-- common-spog.pk3
 |   `-- data*.pk3
-|-- havoc/
-|   `-- data*.pk3
 |-- Nexuiz.app/
 |-- Nexuiz-SDL.app/
 |-- server/

diff --git a/havoc/default.cfg b/havoc/default.cfg
deleted file mode 100644 (file)
index e87c29e..0000000
--- a/havoc/default.cfg
+++ /dev/null
@@ -1 +0,0 @@
-exec defaultHavoc.cfg

diff --git a/server/readme.txt b/server/readme.txt
index 1a0c70b8d576d24273512328bf8d4c0833691360..27ebc1cb2fe0559fb29e1ce1908920a7013ba36d 100644 (file)
--- a/server/readme.txt
+++ b/server/readme.txt
@@ -1,17 +1,14 @@
 This subdirectory contains scripts and a config file that can be used\r
-to start a dedicated Nexuiz (default) or Nexuiz Havoc server (differs\r
-in movement, weapon and other settings) on linux, mac or windows\r
-systems and also some tools that help with maintaining your server.\r
+to start a dedicated Nexuiz on linux, mac or windows systems and also \r
+some tools that help with maintaining your server.\r
 \r
 You will need to copy the right script into your Nexuiz main\r
-directory, where the normal binaries are.  There are two scrips for\r
-each sytems, one to start a normal Nexuiz server and one to start a\r
-Nexuiz 'Havoc' server.  You then need to copy and ADJUST the config\r
-file which is called server.cfg.  You can copy it either into the\r
-Nexuiz/data directory where the big data*.pk3 file is or when running\r
-on linux or mac you can as well copy it into a special directory\r
-called '~/.nexuiz/data'.  After you have setup everything and have\r
-adjusted the config file you can start the server by running the\r
+directory, where the normal binaries are. You then need to copy and \r
+ADJUST the config file which is called server.cfg.  You can copy it \r
+either into the Nexuiz/data directory where the big data*.pk3 file is \r
+or when running on linux or mac you can as well copy it into a special \r
+directory called '~/.nexuiz/data'.  After you have setup everything and \r
+have adjusted the config file you can start the server by running the\r
 server script.\r
 \r
 Please make sure your server is always uptodate!  Just signup the\r

diff --git a/server/server_havoc_linux.sh b/server/server_havoc_linux.sh
deleted file mode 100755 (executable)
index dbd7ed1..0000000
--- a/server/server_havoc_linux.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-case "$(uname -m)" in
-  x86_64)      executable="nexuiz-linux-x86_64-dedicated" ;;
-  *)           executable="nexuiz-linux-686-dedicated" ;;
-esac
-
-cd "`dirname "${0}"`"
-
-if ! [ -x "$executable" ]; then
-       if [ -x "../$executable" ] && { [ -f ~/.nexuiz/data/server.cfg ] || [ -f ../data/server.cfg ] || [ -f ~/.nexuiz/havoc/server.cfg ] || [ -f ../havoc/server.cfg ]; }; then
-               cd ..
-       else
-               echo "This script is not properly set up yet."
-               echo "Please refer to the instructions in readme.txt."
-               echo "In short:"
-               echo "- copy server.cfg to the data directory and adjust its settings"
-               echo "- move this file to the main directory of your Nexuiz installation"
-               exit 1
-       fi
-fi
-
-exec ./${executable} -game havoc +serverconfig server.cfg "${@}"

diff --git a/server/server_havoc_mac.sh b/server/server_havoc_mac.sh
deleted file mode 100755 (executable)
index c3b12f1..0000000
--- a/server/server_havoc_mac.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-executable="nexuiz-osx-dedicated"
-
-cd "`dirname "${0}"`"
-
-if ! [ -x "$executable" ]; then
-       if [ -x "../$executable" ] && { [ -f ~/.nexuiz/data/server.cfg ] || [ -f ../data/server.cfg ] || [ -f ~/.nexuiz/havoc/server.cfg ] || [ -f ../havoc/server.cfg ]; }; then
-               cd ..
-       else
-               echo "This script is not properly set up yet."
-               echo "Please refer to the instructions in readme.txt."
-               echo "In short:"
-               echo "- copy server.cfg to the data directory and adjust its settings"
-               echo "- move this file to the main directory of your Nexuiz installation"
-               exit 1
-       fi
-fi
-
-exec ./${executable} -game havoc +serverconfig server.cfg "${@}"

diff --git a/server/server_havoc_windows.bat b/server/server_havoc_windows.bat
deleted file mode 100644 (file)
index 7441362..0000000
--- a/server/server_havoc_windows.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@echo off\r
-\r
-setlocal\r
-set executable=nexuiz -dedicated\r
-\r
-%~d0\r
-cd "%~p0"\r
-\r
-if exist %executable% goto good\r
-if not exist ..\%executable% goto bad\r
-if exist ..\data\server.cfg goto halfgood\r
-if exist ..\havoc\server.cfg goto halfgood\r
-goto bad\r
-\r
-:bad\r
-echo This script is not properly set up yet.\r
-echo Please refer to the instructions in readme.txt.\r
-echo In short:\r
-echo - copy server.cfg to the data directory and adjust its settings\r
-echo - move this file to the main directory of your Nexuiz installation\r
-pause\r
-exit\r
-\r
-:halfgood\r
-cd ..\r
-\r
-:good\r
-.\%executable% -game havoc +serverconfig server.cfg %*\r