Added a lot of builtin commands to prvm_cmds.c (mostly from pr_cmds).

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 743b499ae1026c405bd565e74a8482a111829819..a10242a6e7097382be8489d96c96c7849c24cf8c 100644 (file)
--- a/common.h
+++ b/common.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -114,13 +114,20 @@ extern    int                     msg_readcount;
 extern qboolean        msg_badread;            // set if a read goes beyond end of message
 
 void MSG_BeginReading (void);
-int MSG_ReadShort (void);
-int MSG_ReadLong (void);
-float MSG_ReadFloat (void);
+int MSG_ReadLittleShort (void);
+int MSG_ReadBigShort (void);
+int MSG_ReadLittleLong (void);
+int MSG_ReadBigLong (void);
+float MSG_ReadLittleFloat (void);
+float MSG_ReadBigFloat (void);
 char *MSG_ReadString (void);
+int MSG_ReadBytes (int numbytes, unsigned char *out);
 
 #define MSG_ReadChar() (msg_readcount >= net_message.cursize ? (msg_badread = true, -1) : (signed char)net_message.data[msg_readcount++])
 #define MSG_ReadByte() (msg_readcount >= net_message.cursize ? (msg_badread = true, -1) : (unsigned char)net_message.data[msg_readcount++])
+#define MSG_ReadShort MSG_ReadLittleShort
+#define MSG_ReadLong MSG_ReadLittleLong
+#define MSG_ReadFloat MSG_ReadLittleFloat
 
 float MSG_ReadCoord (void);
 
@@ -131,13 +138,11 @@ float MSG_ReadDPCoord (void);
 
 #define MSG_ReadVector(v) {(v)[0] = MSG_ReadCoord();(v)[1] = MSG_ReadCoord();(v)[2] = MSG_ReadCoord();}
 
-extern int dpprotocol;
-
 //============================================================================
 
 extern char com_token[1024];
 
-int COM_ParseToken (const char **data);
+int COM_ParseToken(const char **datapointer, int returnnewline);
 
 extern int com_argc;
 extern const char **com_argv;
@@ -159,19 +164,24 @@ extern    struct cvar_s   registered;
 #define GAME_HIPNOTIC 1
 #define GAME_ROGUE 2
 #define GAME_NEHAHRA 3
-#define GAME_NEXIUZ 4
+#define GAME_NEXUIZ 4
 #define GAME_TRANSFUSION 5
+#define GAME_GOODVSBAD2 6
+#define GAME_TEU 7
+#define GAME_BATTLEMECH 8
+#define GAME_ZYMOTIC 9
 
 extern int gamemode;
 extern char *gamename;
 extern char *gamedirname;
 extern char com_modname[MAX_OSPATH];
 
-// LordHavoc: useful...
-void COM_ToLowerString(const char *in, char *out);
-void COM_ToUpperString(const char *in, char *out);
+void COM_ToLowerString (const char *in, char *out, size_t size_out);
+void COM_ToUpperString (const char *in, char *out, size_t size_out);
 int COM_StringBeginsWith(const char *s, const char *match);
 
+int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize);
+
 typedef struct stringlist_s
 {
        struct stringlist_s *next;
@@ -182,5 +192,30 @@ int matchpattern(char *in, char *pattern, int caseinsensitive);
 stringlist_t *listdirectory(char *path);
 void freedirectory(stringlist_t *list);
 
+char *SearchInfostring(const char *infostring, const char *key);
+
+
+// strlcat and strlcpy, from OpenBSD
+// Most (all?) BSDs already have them
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t strlcat(char *dst, const char *src, size_t siz);
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t strlcpy(char *dst, const char *src, size_t siz);
+
+#endif  // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+
 #endif