fixed a mistake regarding clusterlist

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 9d0ee53d44bdecf6b068b65fa72e26848d7c9537..891f6783680a40b26829bd1340832461d4f4651a 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,6 +180,18 @@ 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;
@@ -208,8 +218,10 @@ extern     struct cvar_s   cmdline;
 
 extern int gamemode;
 extern const char *gamename;
-extern const char *gamedirname;
+extern const char *gamedirname1;
+extern const char *gamedirname2;
 extern const char *gamescreenshotname;
+extern const char *gameuserdirname;
 extern char com_modname[MAX_OSPATH];
 
 void COM_ToLowerString (const char *in, char *out, size_t size_out);