}
#endif
+
+// Extract integers from buffers
+
+unsigned int BuffBigLong (const qbyte *buffer)
+{
+ return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
+}
+
+unsigned short BuffBigShort (const qbyte *buffer)
+{
+ return (buffer[0] << 8) | buffer[1];
+}
+
+unsigned int BuffLittleLong (const qbyte *buffer)
+{
+ return (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0];
+}
+
+unsigned short BuffLittleShort (const qbyte *buffer)
+{
+ return (buffer[1] << 8) | buffer[0];
+}
+
+
/*
==============================================================================
void MSG_WriteChar (sizebuf_t *sb, int c)
{
qbyte *buf;
-
+
buf = SZ_GetSpace (sb, 1);
buf[0] = c;
}
void MSG_WriteByte (sizebuf_t *sb, int c)
{
qbyte *buf;
-
+
buf = SZ_GetSpace (sb, 1);
buf[0] = c;
}
SZ_Write (sb, s, strlen(s)+1);
}
-// used by server (always latest dpprotocol)
+// used by server (always latest PROTOCOL_DARKPLACES)
void MSG_WriteDPCoord (sizebuf_t *sb, float f)
{
if (f >= 0)
msg_badread = false;
}
-int MSG_ReadShort (void)
+int MSG_ReadLittleShort (void)
{
- int c;
-
if (msg_readcount+2 > net_message.cursize)
{
msg_badread = true;
return -1;
}
-
- c = (short)(net_message.data[msg_readcount]
- + (net_message.data[msg_readcount+1]<<8));
-
msg_readcount += 2;
-
- return c;
+ return (short)(net_message.data[msg_readcount-2] | (net_message.data[msg_readcount-1]<<8));
}
-int MSG_ReadLong (void)
+int MSG_ReadBigShort (void)
{
- int c;
+ if (msg_readcount+2 > net_message.cursize)
+ {
+ msg_badread = true;
+ return -1;
+ }
+ msg_readcount += 2;
+ return (short)((net_message.data[msg_readcount-2]<<8) + net_message.data[msg_readcount-1]);
+}
+int MSG_ReadLittleLong (void)
+{
if (msg_readcount+4 > net_message.cursize)
{
msg_badread = true;
return -1;
}
-
- c = net_message.data[msg_readcount]
- + (net_message.data[msg_readcount+1]<<8)
- + (net_message.data[msg_readcount+2]<<16)
- + (net_message.data[msg_readcount+3]<<24);
-
msg_readcount += 4;
+ return net_message.data[msg_readcount-4] | (net_message.data[msg_readcount-3]<<8) | (net_message.data[msg_readcount-2]<<16) | (net_message.data[msg_readcount-1]<<24);
+}
- return c;
+int MSG_ReadBigLong (void)
+{
+ if (msg_readcount+4 > net_message.cursize)
+ {
+ msg_badread = true;
+ return -1;
+ }
+ msg_readcount += 4;
+ return (net_message.data[msg_readcount-4]<<24) + (net_message.data[msg_readcount-3]<<16) + (net_message.data[msg_readcount-2]<<8) + net_message.data[msg_readcount-1];
}
-float MSG_ReadFloat (void)
+float MSG_ReadLittleFloat (void)
{
union
{
- qbyte b[4];
float f;
int l;
} dat;
-
- dat.b[0] = net_message.data[msg_readcount];
- dat.b[1] = net_message.data[msg_readcount+1];
- dat.b[2] = net_message.data[msg_readcount+2];
- dat.b[3] = net_message.data[msg_readcount+3];
+ if (msg_readcount+4 > net_message.cursize)
+ {
+ msg_badread = true;
+ return -1;
+ }
msg_readcount += 4;
+ dat.l = net_message.data[msg_readcount-4] | (net_message.data[msg_readcount-3]<<8) | (net_message.data[msg_readcount-2]<<16) | (net_message.data[msg_readcount-1]<<24);
+ return dat.f;
+}
- dat.l = LittleLong (dat.l);
-
+float MSG_ReadBigFloat (void)
+{
+ union
+ {
+ float f;
+ int l;
+ } dat;
+ if (msg_readcount+4 > net_message.cursize)
+ {
+ msg_badread = true;
+ return -1;
+ }
+ msg_readcount += 4;
+ dat.l = (net_message.data[msg_readcount-4]<<24) | (net_message.data[msg_readcount-3]<<16) | (net_message.data[msg_readcount-2]<<8) | net_message.data[msg_readcount-1];
return dat.f;
}
{
static char string[2048];
int l,c;
-
- l = 0;
- do
- {
- c = MSG_ReadChar ();
- if (c == -1 || c == 0)
- break;
+ for (l = 0;l < (int) sizeof(string) - 1 && (c = MSG_ReadChar()) != -1 && c != 0;l++)
string[l] = c;
- l++;
- } while (l < (int)sizeof(string)-1);
-
string[l] = 0;
-
return string;
}
-// used by server (always latest dpprotocol)
+int MSG_ReadBytes (int numbytes, unsigned char *out)
+{
+ int l, c;
+ for (l = 0;l < numbytes && (c = MSG_ReadChar()) != -1;l++)
+ out[l] = c;
+ return l;
+}
+
+// used by server (always latest PROTOCOL_DARKPLACES)
float MSG_ReadDPCoord (void)
{
- return (signed short) MSG_ReadShort();
+ return (signed short) MSG_ReadLittleShort();
}
// used by client
float MSG_ReadCoord (void)
{
- if (dpprotocol == DPPROTOCOL_VERSION2 || dpprotocol == DPPROTOCOL_VERSION3)
- return (signed short) MSG_ReadShort();
- else if (dpprotocol == DPPROTOCOL_VERSION1)
- return MSG_ReadFloat();
+ if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+ return (signed short) MSG_ReadLittleShort();
+ else if (cl.protocol == PROTOCOL_DARKPLACES1)
+ return MSG_ReadLittleFloat();
else
- return MSG_ReadShort() * (1.0f/8.0f);
+ return MSG_ReadLittleShort() * (1.0f/8.0f);
}
Parse a token out of a string
==============
*/
-int COM_ParseToken (const char **datapointer)
+int COM_ParseToken(const char **datapointer, int returnnewline)
{
int c;
int len;
// skip whitespace
skipwhite:
- while ((c = *data) <= ' ')
+ while ((c = *data) <= ' ' && (c != '\n' || !returnnewline))
{
if (c == 0)
{
data++;
}
-// skip // comments
- if (c=='/' && data[1] == '/')
+ // check if it's a comment
+ if (c == '/')
{
- while (*data && *data != '\n')
- data++;
- goto skipwhite;
+ // skip // comments
+ if (data[1] == '/')
+ {
+ while (*data && *data != '\n')
+ data++;
+ goto skipwhite;
+ }
+ // skip /* comments
+ if (data[1] == '*')
+ {
+ while (*data && *data != '*' && data[1] != '/')
+ data++;
+ goto skipwhite;
+ }
}
-
// handle quoted strings specially
if (c == '\"')
{
while (1)
{
c = *data++;
- if (c=='\"' || !c)
+ if (c == '\"' || !c)
{
com_token[len] = 0;
*datapointer = data;
}
// parse single characters
- if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':')
+ if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';' || c == '\n')
{
com_token[len] = c;
len++;
data++;
len++;
c = *data;
- if (c=='{' || c=='}'|| c==')'|| c=='(' || c=='\'' || c==':')
+ if (c == '{' || c == '}' || c == ')' || c == '(' || c == ']' || c == '[' || c == '\'' || c == ':' || c == ',' || c == ';')
break;
} while (c>32);
void COM_InitGameType (void)
{
char name[MAX_OSPATH];
- FS_StripExtension(com_argv[0], name);
- COM_ToLowerString(name, name);
+ FS_StripExtension (com_argv[0], name, sizeof (name));
+ COM_ToLowerString (name, name, sizeof (name));
if (strstr(name, "transfusion"))
gamemode = GAME_TRANSFUSION;
- else if (strstr(name, "nexiuz"))
- gamemode = GAME_NEXIUZ;
+ else if (strstr(name, "nexuiz"))
+ gamemode = GAME_NEXUIZ;
else if (strstr(name, "nehahra"))
gamemode = GAME_NEHAHRA;
else if (strstr(name, "hipnotic"))
gamemode = GAME_HIPNOTIC;
else if (strstr(name, "rogue"))
gamemode = GAME_ROGUE;
+ else if (strstr(name, "gvb2"))
+ gamemode = GAME_GOODVSBAD2;
+ else if (strstr(name, "teu"))
+ gamemode = GAME_TEU;
+ else if (strstr(name, "battlemech"))
+ gamemode = GAME_BATTLEMECH;
+ else if (strstr(name, "zymotic"))
+ gamemode = GAME_ZYMOTIC;
else
gamemode = GAME_NORMAL;
if (COM_CheckParm ("-transfusion"))
gamemode = GAME_TRANSFUSION;
- else if (COM_CheckParm ("-nexiuz"))
- gamemode = GAME_NEXIUZ;
+ else if (COM_CheckParm ("-nexuiz"))
+ gamemode = GAME_NEXUIZ;
else if (COM_CheckParm ("-nehahra"))
gamemode = GAME_NEHAHRA;
else if (COM_CheckParm ("-hipnotic"))
gamemode = GAME_ROGUE;
else if (COM_CheckParm ("-quake"))
gamemode = GAME_NORMAL;
+ else if (COM_CheckParm ("-goodvsbad2"))
+ gamemode = GAME_GOODVSBAD2;
+ else if (COM_CheckParm ("-teu"))
+ gamemode = GAME_TEU;
+ else if (COM_CheckParm ("-battlemech"))
+ gamemode = GAME_BATTLEMECH;
+ else if (COM_CheckParm ("-zymotic"))
+ gamemode = GAME_ZYMOTIC;
switch(gamemode)
{
gamename = "DarkPlaces-Nehahra";
gamedirname = "nehahra";
break;
- case GAME_NEXIUZ:
- gamename = "Nexiuz";
+ case GAME_NEXUIZ:
+ gamename = "Nexuiz";
gamedirname = "data";
break;
case GAME_TRANSFUSION:
gamename = "Transfusion";
gamedirname = "transfusion";
break;
+ case GAME_GOODVSBAD2:
+ gamename = "GoodVs.Bad2";
+ gamedirname = "rts";
+ break;
+ case GAME_TEU:
+ gamename = "TheEvilUnleashed";
+ gamedirname = "baseteu";
+ break;
+ case GAME_BATTLEMECH:
+ gamename = "Battlemech";
+ gamedirname = "base";
+ break;
+ case GAME_ZYMOTIC:
+ gamename = "Zymotic";
+ gamedirname = "data";
+ break;
default:
Sys_Error("COM_InitGameType: unknown gamemode %i\n", gamemode);
break;
Mathlib_Init();
FS_Init ();
+ Con_InitLogging();
COM_CheckRegistered ();
COM_InitGameType();
s = string[stringindex];
stringindex = (stringindex + 1) & 7;
va_start (argptr, format);
- vsprintf (s, format,argptr);
+ vsnprintf (s, sizeof (string[0]), format,argptr);
va_end (argptr);
return s;
//======================================
-// LordHavoc: added these because they are useful
-void COM_ToLowerString(const char *in, char *out)
+void COM_ToLowerString (const char *in, char *out, size_t size_out)
{
- while (*in)
+ if (size_out == 0)
+ return;
+
+ while (*in && size_out > 1)
{
if (*in >= 'A' && *in <= 'Z')
*out++ = *in++ + 'a' - 'A';
else
*out++ = *in++;
+ size_out--;
}
+ *out = '\0';
}
-void COM_ToUpperString(const char *in, char *out)
+void COM_ToUpperString (const char *in, char *out, size_t size_out)
{
- while (*in)
+ if (size_out == 0)
+ return;
+
+ while (*in && size_out > 1)
{
if (*in >= 'a' && *in <= 'z')
*out++ = *in++ + 'A' - 'a';
else
*out++ = *in++;
+ size_out--;
}
+ *out = '\0';
}
int COM_StringBeginsWith(const char *s, const char *match)
return false;
return true;
}
+
+int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *tokenbuf, int tokenbufsize)
+{
+ int argc;
+ char *tokenbufend;
+ const char *l;
+ argc = 0;
+ tokenbufend = tokenbuf + tokenbufsize;
+ l = *text;
+ while (*l && *l != '\n')
+ {
+ if (*l > ' ')
+ {
+ if (argc >= maxargc)
+ return -1;
+ argv[argc++] = tokenbuf;
+ if (*l == '"')
+ {
+ l++;
+ while (*l && *l != '"')
+ {
+ if (tokenbuf >= tokenbufend)
+ return -1;
+ *tokenbuf++ = *l++;
+ }
+ if (*l == '"')
+ l++;
+ }
+ else
+ {
+ while (*l > ' ')
+ {
+ if (tokenbuf >= tokenbufend)
+ return -1;
+ *tokenbuf++ = *l++;
+ }
+ }
+ if (tokenbuf >= tokenbufend)
+ return -1;
+ *tokenbuf++ = 0;
+ }
+ else
+ l++;
+ }
+ if (*l == '\n')
+ l++;
+ *text = l;
+ return argc;
+}
+
+// written by Elric, thanks Elric!
+char *SearchInfostring(const char *infostring, const char *key)
+{
+ static char value [256];
+ char crt_key [256];
+ size_t value_ind, key_ind;
+ char c;
+
+ if (*infostring++ != '\\')
+ return NULL;
+
+ value_ind = 0;
+ for (;;)
+ {
+ key_ind = 0;
+
+ // Get the key name
+ for (;;)
+ {
+ c = *infostring++;
+
+ if (c == '\0')
+ return NULL;
+ if (c == '\\' || key_ind == sizeof (crt_key) - 1)
+ {
+ crt_key[key_ind] = '\0';
+ break;
+ }
+
+ crt_key[key_ind++] = c;
+ }
+
+ // If it's the key we are looking for, save it in "value"
+ if (!strcmp(crt_key, key))
+ {
+ for (;;)
+ {
+ c = *infostring++;
+
+ if (c == '\0' || c == '\\' || value_ind == sizeof (value) - 1)
+ {
+ value[value_ind] = '\0';
+ return value;
+ }
+
+ value[value_ind++] = c;
+ }
+ }
+
+ // Else, skip the value
+ for (;;)
+ {
+ c = *infostring++;
+
+ if (c == '\0')
+ return NULL;
+ if (c == '\\')
+ break;
+ }
+ }
+}
+
+
+//========================================================
+// strlcat and strlcpy, from OpenBSD
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $ */
+/* $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $ */
+
+
+// Most (all?) BSDs already have them
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+ register char *d = dst;
+ register const char *s = src;
+ register size_t n = siz;
+ size_t dlen;
+
+ /* Find the end of dst and adjust bytes left but don't go past end */
+ while (n-- != 0 && *d != '\0')
+ d++;
+ dlen = d - dst;
+ n = siz - dlen;
+
+ if (n == 0)
+ return(dlen + strlen(s));
+ while (*s != '\0') {
+ if (n != 1) {
+ *d++ = *s;
+ n--;
+ }
+ s++;
+ }
+ *d = '\0';
+
+ return(dlen + (s - src)); /* count does not include NUL */
+}
+
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+ register char *d = dst;
+ register const char *s = src;
+ register size_t n = siz;
+
+ /* Copy as many bytes as will fit */
+ if (n != 0 && --n != 0) {
+ do {
+ if ((*d++ = *s++) == 0)
+ break;
+ } while (--n != 0);
+ }
+
+ /* Not enough room in dst, add NUL and traverse rest of src */
+ if (n == 0) {
+ if (siz != 0)
+ *d = '\0'; /* NUL-terminate dst */
+ while (*s++)
+ ;
+ }
+
+ return(s - src - 1); /* count does not include NUL */
+}
+
+#endif // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
projects / xonotic / darkplaces.git / blobdiff