qboolean com_modified; // set true if using non-id files
-qboolean msg_suppress_1 = 0;
-
void COM_InitFilesystem (void);
char com_token[1024];
int gamemode;
char *gamename;
char *gamedirname;
+char com_modname[MAX_OSPATH];
/*
break;
string[l] = c;
l++;
- } while (l < sizeof(string)-1);
+ } while (l < (int)sizeof(string)-1);
string[l] = 0;
}
static char *hexchar = "0123456789ABCDEF";
-void SZ_HexDumpToConsole(const sizebuf_t *buf)
+void Com_HexDumpToConsole(const qbyte *data, int size)
{
- int i;
+ int i, j, n;
char text[1024];
char *cur, *flushpointer;
+ const qbyte *d;
cur = text;
flushpointer = text + 512;
- for (i = 0;i < buf->cursize;i++)
+ for (i = 0;i < size;)
{
- if ((i & 15) == 0)
+ n = 16;
+ if (n > size - i)
+ n = size - i;
+ d = data + i;
+ *cur++ = hexchar[(i >> 12) & 15];
+ *cur++ = hexchar[(i >> 8) & 15];
+ *cur++ = hexchar[(i >> 4) & 15];
+ *cur++ = hexchar[(i >> 0) & 15];
+ *cur++ = ':';
+ for (j = 0;j < n;j++)
{
- *cur++ = hexchar[(i >> 12) & 15];
- *cur++ = hexchar[(i >> 8) & 15];
- *cur++ = hexchar[(i >> 4) & 15];
- *cur++ = hexchar[(i >> 0) & 15];
- *cur++ = ':';
- *cur++ = ' ';
+ if (j & 1)
+ {
+ *cur++ = hexchar[(d[j] >> 4) & 15] | 0x80;
+ *cur++ = hexchar[(d[j] >> 0) & 15] | 0x80;
+ }
+ else
+ {
+ *cur++ = hexchar[(d[j] >> 4) & 15];
+ *cur++ = hexchar[(d[j] >> 0) & 15];
+ }
}
- else if ((i & 15) == 15)
- *cur++ = '\n';
- else
- *cur++ = ' ';
- if (i & 1)
+ for (;j < 16;j++)
{
- *cur++ = hexchar[(buf->data[i] >> 4) & 15] | 0x80;
- *cur++ = hexchar[(buf->data[i] >> 0) & 15] | 0x80;
- }
- else
- {
- *cur++ = hexchar[(buf->data[i] >> 4) & 15];
- *cur++ = hexchar[(buf->data[i] >> 0) & 15];
+ *cur++ = ' ';
+ *cur++ = ' ';
}
- if (cur >= flushpointer)
+ for (j = 0;j < n;j++)
+ *cur++ = (d[j] >= ' ' && d[j] <= 0x7E) ? d[j] : '.';
+ for (;j < 16;j++)
+ *cur++ = ' ';
+ *cur++ = '\n';
+ i += n;
+ if (cur >= flushpointer || i >= size)
{
*cur++ = 0;
Con_Printf("%s", text);
cur = text;
}
}
- if ((i & 15) != 0)
- *cur++ = '\n';
- if (cur > text)
- {
- *cur++ = 0;
- Con_Printf("%s", text);
- }
+}
+
+void SZ_HexDumpToConsole(const sizebuf_t *buf)
+{
+ Com_HexDumpToConsole(buf->data, buf->cursize);
}
if (strstr(name, "transfusion"))
gamemode = GAME_TRANSFUSION;
+ else if (strstr(name, "nexiuz"))
+ gamemode = GAME_NEXIUZ;
else if (strstr(name, "nehahra"))
gamemode = GAME_NEHAHRA;
else if (strstr(name, "hipnotic"))
if (COM_CheckParm ("-transfusion"))
gamemode = GAME_TRANSFUSION;
+ else if (COM_CheckParm ("-nexiuz"))
+ gamemode = GAME_NEXIUZ;
else if (COM_CheckParm ("-nehahra"))
gamemode = GAME_NEHAHRA;
else if (COM_CheckParm ("-hipnotic"))
gamename = "DarkPlaces-Nehahra";
gamedirname = "nehahra";
break;
+ case GAME_NEXIUZ:
+ gamename = "Nexiuz";
+ gamedirname = "data";
+ break;
case GAME_TRANSFUSION:
gamename = "Transfusion";
gamedirname = "transfusion";
while (remaining)
{
- if (remaining < sizeof(buf))
+ if (remaining < (int)sizeof(buf))
count = remaining;
else
count = sizeof(buf);
com_basedir[i-1] = 0;
// start up with GAMENAME by default (id1)
+ strcpy(com_modname, GAMENAME);
COM_AddGameDirectory (va("%s/"GAMENAME, com_basedir));
if (gamedirname[0])
{
com_modified = true;
+ strcpy(com_modname, gamedirname);
COM_AddGameDirectory (va("%s/%s", com_basedir, gamedirname));
}
if (i && i < com_argc-1)
{
com_modified = true;
+ strcpy(com_modname, com_argv[i+1]);
COM_AddGameDirectory (va("%s/%s", com_basedir, com_argv[i+1]));
}