From: mand1nga <saulo_gil@argentina.com>
Date: Sat, 20 Mar 2010 02:58:51 +0000 (-0300)
Subject: Removed havoc mode also here
X-Git-Tag: xonotic-v0.1.0preview~520^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=37578b037035324f40447e45eb8ae2dc7585c837

Removed havoc mode also here
---

diff --git a/Docs/htmlfiles/faq.aft b/Docs/htmlfiles/faq.aft
index fe09a8bb..f36fd2cf 100644
--- 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
index e87c29e4..00000000
--- a/havoc/default.cfg
+++ /dev/null
@@ -1 +0,0 @@
-exec defaultHavoc.cfg
diff --git a/server/readme.txt b/server/readme.txt
index 1a0c70b8..27ebc1cb 100644
--- a/server/readme.txt
+++ b/server/readme.txt
@@ -1,17 +1,14 @@
 This subdirectory contains scripts and a config file that can be used
-to start a dedicated Nexuiz (default) or Nexuiz Havoc server (differs
-in movement, weapon and other settings) on linux, mac or windows
-systems and also some tools that help with maintaining your server.
+to start a dedicated Nexuiz on linux, mac or windows systems and also 
+some tools that help with maintaining your server.
 
 You will need to copy the right script into your Nexuiz main
-directory, where the normal binaries are.  There are two scrips for
-each sytems, one to start a normal Nexuiz server and one to start a
-Nexuiz 'Havoc' server.  You then need to copy and ADJUST the config
-file which is called server.cfg.  You can copy it either into the
-Nexuiz/data directory where the big data*.pk3 file is or when running
-on linux or mac you can as well copy it into a special directory
-called '~/.nexuiz/data'.  After you have setup everything and have
-adjusted the config file you can start the server by running the
+directory, where the normal binaries are. You then need to copy and 
+ADJUST the config file which is called server.cfg.  You can copy it 
+either into the Nexuiz/data directory where the big data*.pk3 file is 
+or when running on linux or mac you can as well copy it into a special 
+directory called '~/.nexuiz/data'.  After you have setup everything and 
+have adjusted the config file you can start the server by running the
 server script.
 
 Please make sure your server is always uptodate!  Just signup the
diff --git a/server/server_havoc_linux.sh b/server/server_havoc_linux.sh
deleted file mode 100755
index dbd7ed11..00000000
--- 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
index c3b12f19..00000000
--- 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
index 74413627..00000000
--- a/server/server_havoc_windows.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@echo off
-
-setlocal
-set executable=nexuiz -dedicated
-
-%~d0
-cd "%~p0"
-
-if exist %executable% goto good
-if not exist ..\%executable% goto bad
-if exist ..\data\server.cfg goto halfgood
-if exist ..\havoc\server.cfg goto halfgood
-goto bad
-
-:bad
-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
-pause
-exit
-
-:halfgood
-cd ..
-
-:good
-.\%executable% -game havoc +serverconfig server.cfg %*