From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 2 May 2010 16:38:41 +0000 (+0200)
Subject: actually activate -game xonotic in q3map2 :(
X-Git-Tag: xonotic-v0.5.0~265
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0e905ce5de51958ba2faeec4bfae7b599ca79d3;p=xonotic%2Fnetradiant.git

actually activate -game xonotic in q3map2 :(
---

diff --git a/tools/quake3/q3map2/game_xonotic.h b/tools/quake3/q3map2/game_xonotic.h
index 4c5a3e3e..ac857778 100644
--- a/tools/quake3/q3map2/game_xonotic.h
+++ b/tools/quake3/q3map2/game_xonotic.h
@@ -29,8 +29,8 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2."
 
 
 /* marker */
-#ifndef GAME_NEXUIZ_H
-#define GAME_NEXUIZ_H
+#ifndef GAME_XONOTIC_H
+#define GAME_XONOTIC_H
 
 
 
@@ -53,7 +53,7 @@ game_t struct
 	"xonotic", /* -game x */
 	"data", /* default base game data dir */
 	".xonotic", /* unix home sub-dir */
-	"nexuiz", /* magic path word */
+	"xonotic", /* magic path word */
 	"scripts", /* shader directory */
 	1048575, /* max lightmapped surface verts */
 	1048575, /* max surface verts */
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 5db3b8cd..303ff66e 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -1905,6 +1905,8 @@ Q_EXTERN game_t				games[]
 								,
 								#include "game_nexuiz.h"/* most be after game_quake3.h as they share defines! */
 								,
+								#include "game_xonotic.h"/* most be after game_quake3.h as they share defines! */
+								,
 								#include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
 								,
 								#include "game_tenebrae.h"