summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-12-29 21:21:18 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-12-29 21:21:18 +0000
commit49e964aeacd761aa3da03ff542a38ae3966aed43 (patch)
treefc8f5c33635e38a27fdeb10e4d84258fac76c0fb
parentdef4f750bc79d88963567c976813666a4dd706e7 (diff)
downloadmanaserv-49e964aeacd761aa3da03ff542a38ae3966aed43.tar.gz
manaserv-49e964aeacd761aa3da03ff542a38ae3966aed43.tar.bz2
manaserv-49e964aeacd761aa3da03ff542a38ae3966aed43.tar.xz
manaserv-49e964aeacd761aa3da03ff542a38ae3966aed43.zip
Incorporate running without X server in the server executable.
-rwxr-xr-xrunserv.sh1
-rw-r--r--src/main.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/runserv.sh b/runserv.sh
index 63ac1af2..b06ba81f 100755
--- a/runserv.sh
+++ b/runserv.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-export SDL_VIDEODRIVER=dummy
ulimit -c 100000000
while [ true ] ; do
src/tmwserv
diff --git a/src/main.cpp b/src/main.cpp
index 4f31f0c0..d1e26e04 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -130,6 +130,9 @@ void initialize()
gameHandler = new GameHandler();
connectionHandler = new ConnectionHandler();
+ // Make SDL use a dummy videodriver so that it doesn't require an X server
+ putenv("SDL_VIDEODRIVER=dummy");
+
// Initialize SDL
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) == -1) {
LOG_FATAL("SDL_Init: " << SDL_GetError(), 0)