optimized surface rendering to surface->groupmesh->data_* array pointers directly...

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 6ce65f463dd39b098e2b6f84a1abde593ec49577..990ab6ded12a252b2197bc2838eeb6bb33bbba74 100644 (file)
--- a/common.h
+++ b/common.h
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // MSVC has a different name for several standard functions
 #ifdef WIN32
-# define snprintf _snprintf
-# define vsnprintf _vsnprintf
 # define strcasecmp stricmp
 # define strncasecmp strnicmp
 #endif
@@ -182,31 +180,48 @@ char      *va(const char *format, ...);
 // does a varargs printf into a temp buffer
 
 
+// snprintf and vsnprintf are NOT portable. Use their DP counterparts instead
+#define snprintf DO_NOT_USE_SNPRINTF__USE_DPSNPRINTF
+#define vsnprintf DO_NOT_USE_VSNPRINTF__USE_DPVSNPRINTF
+
+// dpsnprintf and dpvsnprintf
+// return the number of printed characters, excluding the final '\0'
+// or return -1 if the buffer isn't big enough to contain the entire string.
+// buffer is ALWAYS null-terminated
+extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...);
+extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args);
+
+
 //============================================================================
 
 extern struct cvar_s   registered;
 extern struct cvar_s   cmdline;
 
-#define GAME_NORMAL 0
-#define GAME_HIPNOTIC 1
-#define GAME_ROGUE 2
-#define GAME_NEHAHRA 3
-#define GAME_NEXUIZ 4
-#define GAME_TRANSFUSION 5
-#define GAME_GOODVSBAD2 6
-#define GAME_TEU 7
-#define GAME_BATTLEMECH 8
-#define GAME_ZYMOTIC 9
-#define GAME_FNIGGIUM 10
-#define GAME_SETHERAL 11
-#define GAME_SOM 12
-#define GAME_TENEBRAE 13 // full of evil hackery
-#define GAME_NEOTERIC 14
-#define GAME_OPENQUARTZ 15 //this game sucks
-#define GAME_PRYDON 16
-#define GAME_NETHERWORLD 17
-
-extern int gamemode;
+typedef enum gamemode_e
+{
+       GAME_NORMAL,
+       GAME_HIPNOTIC,
+       GAME_ROGUE,
+       GAME_NEHAHRA,
+       GAME_NEXUIZ,
+       GAME_TRANSFUSION,
+       GAME_GOODVSBAD2,
+       GAME_TEU,
+       GAME_BATTLEMECH,
+       GAME_ZYMOTIC,
+       GAME_FNIGGIUM,
+       GAME_SETHERAL,
+       GAME_SOM,
+       GAME_TENEBRAE, // full of evil hackery
+       GAME_NEOTERIC,
+       GAME_OPENQUARTZ, //this game sucks
+       GAME_PRYDON,
+       GAME_NETHERWORLD,
+       GAME_THEHUNTED,
+}
+gamemode_t;
+
+extern gamemode_t gamemode;
 extern const char *gamename;
 extern const char *gamedirname1;
 extern const char *gamedirname2;