patch from VorteX which removes special menu behavior for

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 47f62bb9cf52b678c2355d9c01f9c3befd24b290..460d5325dd7107d20bd78dd6353cccb57d1d0f28 100644 (file)
--- a/common.h
+++ b/common.h
@@ -149,6 +149,9 @@ typedef enum protocolversion_e
        PROTOCOL_NEHAHRAMOVIE, // Nehahra movie protocol, a big nasty hack dating back to early days of the Quake Standards Group (but only ever used by neh_gl.exe), this is potentially backwards compatible with quake protocol as long as no extended features are used (but in actuality the neh_gl.exe which wrote this protocol ALWAYS wrote the extended information)
        PROTOCOL_QUAKE, // quake (aka netquake/normalquake/nq) protocol
        PROTOCOL_QUAKEWORLD, // quakeworld protocol
+       PROTOCOL_NEHAHRABJP, // same as QUAKEDP but with 16bit modelindex
+       PROTOCOL_NEHAHRABJP2, // same as NEHAHRABJP but with 16bit soundindex
+       PROTOCOL_NEHAHRABJP3, // same as NEHAHRABJP2 but with some changes
 }
 protocolversion_t;
 
@@ -202,9 +205,9 @@ float MSG_ReadAngle (protocolversion_t protocol);
 
 extern char com_token[MAX_INPUTLINE];
 
-int COM_ParseToken_Simple(const char **datapointer, int returnnewline);
-int COM_ParseToken_QuakeC(const char **datapointer, int returnnewline);
-int COM_ParseToken_VM_Tokenize(const char **datapointer, int returnnewline);
+int COM_ParseToken_Simple(const char **datapointer, qboolean returnnewline, qboolean parsebackslash);
+int COM_ParseToken_QuakeC(const char **datapointer, qboolean returnnewline);
+int COM_ParseToken_VM_Tokenize(const char **datapointer, qboolean returnnewline);
 int COM_ParseToken_Console(const char **datapointer);
 
 extern int com_argc;
@@ -267,7 +270,7 @@ typedef enum gamemode_e
        GAME_NEOTERIC,
        GAME_OPENQUARTZ, //this game sucks
        GAME_PRYDON,
-       GAME_NETHERWORLD,
+       GAME_DELUXEQUAKE,
        GAME_THEHUNTED,
        GAME_DEFEATINDETAIL2,
        GAME_DARSANA,