X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=common.h;h=f3516c5da03ce7d4241892f1bb40a71a9b096984;hb=65c1200fa869c82dc83f04c5bb43d91742669c6a;hp=220e5caaa64b019506c9dd8a044ba9edfe1b78ba;hpb=0f80ff51ff9f369233d17b3377d3a0d34b4c8e5a;p=xonotic%2Fdarkplaces.git

diff --git a/common.h b/common.h
index 220e5caa..f3516c5d 100644
--- a/common.h
+++ b/common.h
@@ -216,7 +216,13 @@ char	*va(const char *format, ...) DP_FUNC_PRINTF(1);
 
 
 // snprintf and vsnprintf are NOT portable. Use their DP counterparts instead
+#ifdef snprintf
+# undef snprintf
+#endif
 #define snprintf DO_NOT_USE_SNPRINTF__USE_DPSNPRINTF
+#ifdef vsnprintf
+# undef vsnprintf
+#endif
 #define vsnprintf DO_NOT_USE_VSNPRINTF__USE_DPVSNPRINTF
 
 // dpsnprintf and dpvsnprintf
@@ -252,6 +258,7 @@ typedef enum gamemode_e
 	GAME_ROGUE,
 	GAME_NEHAHRA,
 	GAME_NEXUIZ,
+	GAME_XONOTIC,
 	GAME_TRANSFUSION,
 	GAME_GOODVSBAD2,
 	GAME_TEU,
@@ -273,6 +280,7 @@ typedef enum gamemode_e
 	GAME_BLOODOMNICIDE,
 	GAME_STEELSTORM, // added by motorsep
 	GAME_STRAPBOMB, // added by motorsep for Urre
+	GAME_MOONHELM,
 	GAME_COUNT
 }
 gamemode_t;
@@ -351,5 +359,7 @@ 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);
 
+size_t base64_encode(unsigned char *buf, size_t buflen, size_t outbuflen);
+
 #endif