Convert \ to / when loading texture from Q3 shader

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 6e45808efd5f8fdfbd9dc98294727f7ac0ce62f9..64dba29015cd067415d6d9cc43d0551bb97a4453 100644 (file)
--- a/common.h
+++ b/common.h
@@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef WIN32
 # define strcasecmp _stricmp
 # define strncasecmp _strnicmp
+#else
+#include "strings.h"
 #endif
 
 // Create our own define for Mac OS X
@@ -34,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #ifdef SUNOS
-#include <sys/file.h>          ///< Needed for FNDELAY
+#include <sys/file.h>          ///< Needed for O_NDELAY
 #endif
 
 //============================================================================
@@ -204,10 +206,6 @@ int COM_ParseToken_QuakeC(const char **datapointer, qboolean returnnewline);
 int COM_ParseToken_VM_Tokenize(const char **datapointer, qboolean returnnewline);
 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);
 void COM_Shutdown (void);
@@ -235,7 +233,7 @@ 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);
 
 // A bunch of functions are forbidden for security reasons (and also to please MSVS 2005, for some of them)
-// LordHavoc: added #undef lines here to avoid warnings in Linux
+// LadyHavoc: added #undef lines here to avoid warnings in Linux
 #undef strcat
 #define strcat DO_NOT_USE_STRCAT__USE_STRLCAT_OR_MEMCPY
 #undef strncat
@@ -293,6 +291,7 @@ typedef enum gamemode_e
        GAME_STEELSTORM, // added by motorsep
        GAME_STEELSTORM2, // added by motorsep
        GAME_SSAMMO, // added by motorsep
+       GAME_STEELSTORMREVENANTS, // added by motorsep 07/19/2015
        GAME_TOMESOFMEPHISTOPHELES, // added by motorsep
        GAME_STRAPBOMB, // added by motorsep for Urre
        GAME_MOONHELM,