fix MSVC2008 compilation again

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index a31e822cc5fead2764828b0b3765956eac34701b..1e17fab81ffe9c55e2b3eb35e6e8c619c9c3b8be 100644 (file)
--- a/common.h
+++ b/common.h
@@ -134,7 +134,7 @@ typedef enum protocolversion_e
        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
+       PROTOCOL_NEHAHRABJP3 ///< same as NEHAHRABJP2 but with some changes
 }
 protocolversion_t;
 
@@ -204,6 +204,7 @@ int COM_ParseToken_Console(const char **datapointer);
 
 extern int com_argc;
 extern const char **com_argv;
+extern int com_selffd;
 
 int COM_CheckParm (const char *parm);
 void COM_Init (void);
@@ -251,6 +252,7 @@ typedef enum gamemode_e
        GAME_ROGUE,
        GAME_NEHAHRA,
        GAME_NEXUIZ,
+       GAME_XONOTIC,
        GAME_TRANSFUSION,
        GAME_GOODVSBAD2,
        GAME_TEU,
@@ -268,9 +270,11 @@ typedef enum gamemode_e
        GAME_DARSANA,
        GAME_CONTAGIONTHEORY,
        GAME_EDU2P,
-       GAME_BLADEMASTER,
        GAME_PROPHECY,
        GAME_BLOODOMNICIDE,
+       GAME_STEELSTORM, // added by motorsep
+       GAME_STRAPBOMB, // added by motorsep for Urre
+       GAME_MOONHELM,
        GAME_COUNT
 }
 gamemode_t;
@@ -346,5 +350,8 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 
 void FindFraction(double val, int *num, int *denom, int denomMax);
 
+// decodes XPM file to XPM array (as if #include'd)
+char **XPM_DecodeString(const char *in);
+
 #endif