fixed some issues with how D3D=1 worked in the makefile

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 4c7165c1d6d374741f89de074c9f414831c8ed18..220e5caaa64b019506c9dd8a044ba9edfe1b78ba 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;
 
@@ -272,6 +272,7 @@ typedef enum gamemode_e
        GAME_PROPHECY,
        GAME_BLOODOMNICIDE,
        GAME_STEELSTORM, // added by motorsep
+       GAME_STRAPBOMB, // added by motorsep for Urre
        GAME_COUNT
 }
 gamemode_t;
@@ -347,5 +348,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