mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-10 14:42:13 +00:00
change alot of sprintfs
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3884 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
d309c3338a
commit
fb073f3507
33 changed files with 98 additions and 98 deletions
|
@ -337,9 +337,9 @@ void BGMVolume_Callback(struct cvar_s *var, char *oldvalue)
|
||||||
|
|
||||||
cdvolume = atof(oldvalue);
|
cdvolume = atof(oldvalue);
|
||||||
|
|
||||||
if (cdvolume && !var->value)
|
if (cdvolume && !var->ival)
|
||||||
CDAudio_Pause ();
|
CDAudio_Pause ();
|
||||||
else if (!cdvolume && var->value)
|
else if (!cdvolume && var->ival)
|
||||||
CDAudio_Resume ();
|
CDAudio_Resume ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -313,9 +313,9 @@ void BGMVolume_Callback(struct cvar_s *var, char *oldvalue)
|
||||||
|
|
||||||
cdvolume = atof(oldvalue);
|
cdvolume = atof(oldvalue);
|
||||||
|
|
||||||
if (cdvolume && !var->value)
|
if (cdvolume && !var->ival)
|
||||||
CDAudio_Pause ();
|
CDAudio_Pause ();
|
||||||
else if (!cdvolume && var->value)
|
else if (!cdvolume && var->ival)
|
||||||
CDAudio_Resume ();
|
CDAudio_Resume ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -441,9 +441,9 @@ void BGMVolume_Callback(struct cvar_s *var, char *oldvalue)
|
||||||
|
|
||||||
cdvolume = atof(oldvalue);
|
cdvolume = atof(oldvalue);
|
||||||
|
|
||||||
if (cdvolume && !var->value)
|
if (cdvolume && !var->ival)
|
||||||
CDAudio_Pause ();
|
CDAudio_Pause ();
|
||||||
else if (!cdvolume && var->value)
|
else if (!cdvolume && var->ival)
|
||||||
CDAudio_Resume ();
|
CDAudio_Resume ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1355,7 +1355,7 @@ void CL_ReRecord_f (void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf (name, "%s", s);
|
Q_snprintfz (name, sizeof(name), "%s", s);
|
||||||
|
|
||||||
//
|
//
|
||||||
// open the demo file
|
// open the demo file
|
||||||
|
|
|
@ -305,7 +305,7 @@ void CL_ConnectToDarkPlaces(char *challenge, netadr_t adr)
|
||||||
|
|
||||||
connect_time = realtime; // for retransmit requests
|
connect_time = realtime; // for retransmit requests
|
||||||
|
|
||||||
sprintf(data, "%c%c%c%cconnect\\protocol\\darkplaces 3\\challenge\\%s", 255, 255, 255, 255, challenge);
|
Q_snprintfz(data, sizeof(data), "%c%c%c%cconnect\\protocol\\darkplaces 3\\challenge\\%s", 255, 255, 255, 255, challenge);
|
||||||
|
|
||||||
NET_SendPacket (NS_CLIENT, strlen(data), data, adr);
|
NET_SendPacket (NS_CLIENT, strlen(data), data, adr);
|
||||||
|
|
||||||
|
@ -523,7 +523,7 @@ void CL_SendConnectPacket (
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
sprintf(data, "%c%c%c%cconnect", 255, 255, 255, 255);
|
Q_snprintfz(data, sizeof(data), "%c%c%c%cconnect", 255, 255, 255, 255);
|
||||||
|
|
||||||
if (clients>1) //splitscreen 'connect' command specifies the number of userinfos sent.
|
if (clients>1) //splitscreen 'connect' command specifies the number of userinfos sent.
|
||||||
Q_strncatz(data, va("%i", clients), sizeof(data));
|
Q_strncatz(data, va("%i", clients), sizeof(data));
|
||||||
|
@ -749,7 +749,7 @@ void CL_CheckForResend (void)
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
sprintf (data, "%c%c%c%cgetchallenge\n", 255, 255, 255, 255);
|
Q_snprintfz (data, sizeof(data), "%c%c%c%cgetchallenge\n", 255, 255, 255, 255);
|
||||||
NET_SendPacket (NS_CLIENT, strlen(data), data, adr);
|
NET_SendPacket (NS_CLIENT, strlen(data), data, adr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1382,7 +1382,7 @@ void CL_Color_f (void)
|
||||||
if (bottom > 13)
|
if (bottom > 13)
|
||||||
bottom = 13;
|
bottom = 13;
|
||||||
|
|
||||||
sprintf (num, "%i", top);
|
Q_snprintfz (num, sizeof(num), "%i", top);
|
||||||
if (top == 0)
|
if (top == 0)
|
||||||
*num = '\0';
|
*num = '\0';
|
||||||
if (Cmd_ExecLevel>RESTRICT_SERVER) //colour command came from server for a split client
|
if (Cmd_ExecLevel>RESTRICT_SERVER) //colour command came from server for a split client
|
||||||
|
@ -1391,7 +1391,7 @@ void CL_Color_f (void)
|
||||||
// Cvar_LockFromServer(&topcolor, num);
|
// Cvar_LockFromServer(&topcolor, num);
|
||||||
else
|
else
|
||||||
Cvar_Set (&topcolor, num);
|
Cvar_Set (&topcolor, num);
|
||||||
sprintf (num, "%i", bottom);
|
Q_snprintfz (num, sizeof(num), "%i", bottom);
|
||||||
if (bottom == 0)
|
if (bottom == 0)
|
||||||
*num = '\0';
|
*num = '\0';
|
||||||
if (Cmd_ExecLevel>RESTRICT_SERVER) //colour command came from server for a split client
|
if (Cmd_ExecLevel>RESTRICT_SERVER) //colour command came from server for a split client
|
||||||
|
@ -1892,9 +1892,9 @@ void CL_NextDemo (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcmp(cls.demos[cls.demonum], "quit"))
|
if (!strcmp(cls.demos[cls.demonum], "quit"))
|
||||||
sprintf (str,"quit\n");
|
Q_snprintfz (str, sizeof(str), "quit\n");
|
||||||
else
|
else
|
||||||
sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]);
|
Q_snprintfz (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]);
|
||||||
Cbuf_InsertText (str, RESTRICT_LOCAL, false);
|
Cbuf_InsertText (str, RESTRICT_LOCAL, false);
|
||||||
cls.demonum++;
|
cls.demonum++;
|
||||||
}
|
}
|
||||||
|
@ -2099,7 +2099,7 @@ void CL_ConnectionlessPacket (void)
|
||||||
//firstly it needs an auth message, so it can't be spoofed.
|
//firstly it needs an auth message, so it can't be spoofed.
|
||||||
//secondly, it needs a copy of the realip ident, so you can't report a different player's client (you would need access to their ip).
|
//secondly, it needs a copy of the realip ident, so you can't report a different player's client (you would need access to their ip).
|
||||||
data[5] = ' ';
|
data[5] = ' ';
|
||||||
sprintf(data+6, "%i %i", atoi(MSG_ReadString()), cls.realip_ident);
|
Q_snprintfz(data+6, sizeof(data)-6, "%i %i", atoi(MSG_ReadString()), cls.realip_ident);
|
||||||
len = strlen(data);
|
len = strlen(data);
|
||||||
|
|
||||||
NET_SendPacket (NS_CLIENT, len, &data, net_from);
|
NET_SendPacket (NS_CLIENT, len, &data, net_from);
|
||||||
|
|
|
@ -840,7 +840,7 @@ void Model_CheckDownloads (void)
|
||||||
char picname[256];
|
char picname[256];
|
||||||
if (!*cl.image_name[i])
|
if (!*cl.image_name[i])
|
||||||
continue;
|
continue;
|
||||||
sprintf(picname, "pics/%s.pcx", cl.image_name[i]);
|
Q_snprintfz(picname, sizeof(picname), "pics/%s.pcx", cl.image_name[i]);
|
||||||
CL_CheckOrEnqueDownloadFile(picname, picname, 0);
|
CL_CheckOrEnqueDownloadFile(picname, picname, 0);
|
||||||
}
|
}
|
||||||
if (!CLQ2_RegisterTEntModels())
|
if (!CLQ2_RegisterTEntModels())
|
||||||
|
@ -1704,13 +1704,13 @@ void CL_ParseDownload (void)
|
||||||
{
|
{
|
||||||
if (strncmp(cls.downloadtempname,"skins/",6))
|
if (strncmp(cls.downloadtempname,"skins/",6))
|
||||||
{
|
{
|
||||||
sprintf (name, "%s", cls.downloadtempname);
|
Q_snprintfz(name, sizeof(name), "%s", cls.downloadtempname);
|
||||||
FS_CreatePath (name, FS_GAME);
|
FS_CreatePath (name, FS_GAME);
|
||||||
cls.downloadqw = FS_OpenVFS (name, "wb", FS_GAME);
|
cls.downloadqw = FS_OpenVFS (name, "wb", FS_GAME);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf (name, "%s", cls.downloadtempname+6);
|
Q_snprintfz(name, sizeof(name)-6, "%s", cls.downloadtempname+6);
|
||||||
FS_CreatePath (name, FS_SKINS);
|
FS_CreatePath (name, FS_SKINS);
|
||||||
cls.downloadqw = FS_OpenVFS (name, "wb", FS_SKINS);
|
cls.downloadqw = FS_OpenVFS (name, "wb", FS_SKINS);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1883,7 +1883,7 @@ void SCR_ScreenShot_f (void)
|
||||||
//
|
//
|
||||||
// find a file name to save it to
|
// find a file name to save it to
|
||||||
//
|
//
|
||||||
sprintf(pcxname,"screenshots/fte00000.%s", scr_sshot_type.string);
|
Q_snprintfz(pcxname, sizeof(pcxname), "screenshots/fte00000.%s", scr_sshot_type.string);
|
||||||
|
|
||||||
for (i=0 ; i<=100000 ; i++)
|
for (i=0 ; i<=100000 ; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -853,7 +853,7 @@ void VARGS CLQ3_SendClientCommand(const char *fmt, ...)
|
||||||
char command[MAX_STRING_CHARS];
|
char command[MAX_STRING_CHARS];
|
||||||
|
|
||||||
va_start( argptr, fmt );
|
va_start( argptr, fmt );
|
||||||
vsprintf( command, fmt, argptr );
|
vsnprintf( command, sizeof(command), fmt, argptr );
|
||||||
va_end( argptr );
|
va_end( argptr );
|
||||||
|
|
||||||
// create new clientCommand
|
// create new clientCommand
|
||||||
|
|
|
@ -1379,7 +1379,7 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
kb = keybindings[k][oldstate];
|
kb = keybindings[k][oldstate];
|
||||||
if (kb && kb[0] == '+')
|
if (kb && kb[0] == '+')
|
||||||
{
|
{
|
||||||
sprintf (cmd, "-%s %i\n", kb+1, k+oldstate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "-%s %i\n", kb+1, k+oldstate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[k][oldstate]);
|
Cbuf_AddText (cmd, bindcmdlevel[k][oldstate]);
|
||||||
}
|
}
|
||||||
if (keyshift[k] != k)
|
if (keyshift[k] != k)
|
||||||
|
@ -1387,7 +1387,7 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
kb = keybindings[keyshift[k]][oldstate];
|
kb = keybindings[keyshift[k]][oldstate];
|
||||||
if (kb && kb[0] == '+')
|
if (kb && kb[0] == '+')
|
||||||
{
|
{
|
||||||
sprintf (cmd, "-%s %i\n", kb+1, k+oldstate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "-%s %i\n", kb+1, k+oldstate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[k][oldstate]);
|
Cbuf_AddText (cmd, bindcmdlevel[k][oldstate]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1403,7 +1403,7 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
{
|
{
|
||||||
if (kb[0] == '+')
|
if (kb[0] == '+')
|
||||||
{ // button commands add keynum as a parm
|
{ // button commands add keynum as a parm
|
||||||
sprintf (cmd, "%s %i\n", kb, k+keystate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "%s %i\n", kb, k+keystate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[k][keystate]);
|
Cbuf_AddText (cmd, bindcmdlevel[k][keystate]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1560,7 +1560,7 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
{
|
{
|
||||||
if (kb && kb[0] == '+')
|
if (kb && kb[0] == '+')
|
||||||
{
|
{
|
||||||
sprintf (cmd, "-p%i %s %i\n", pnum+1, kb+1, key+oldstate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "-p%i %s %i\n", pnum+1, kb+1, key+oldstate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
||||||
}
|
}
|
||||||
if (keyshift[key] != key)
|
if (keyshift[key] != key)
|
||||||
|
@ -1568,7 +1568,7 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
kb = keybindings[keyshift[key]][keystate];
|
kb = keybindings[keyshift[key]][keystate];
|
||||||
if (kb && kb[0] == '+')
|
if (kb && kb[0] == '+')
|
||||||
{
|
{
|
||||||
sprintf (cmd, "-p%i %s %i\n", pnum+1, kb+1, key+oldstate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "-p%i %s %i\n", pnum+1, kb+1, key+oldstate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1577,7 +1577,7 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
{
|
{
|
||||||
if (kb && kb[0] == '+')
|
if (kb && kb[0] == '+')
|
||||||
{
|
{
|
||||||
sprintf (cmd, "-%s %i\n", kb+1, key+oldstate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "-%s %i\n", kb+1, key+oldstate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
||||||
}
|
}
|
||||||
if (keyshift[key] != key)
|
if (keyshift[key] != key)
|
||||||
|
@ -1585,7 +1585,7 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
kb = keybindings[keyshift[key]][keystate];
|
kb = keybindings[keyshift[key]][keystate];
|
||||||
if (kb && kb[0] == '+')
|
if (kb && kb[0] == '+')
|
||||||
{
|
{
|
||||||
sprintf (cmd, "-%s %i\n", kb+1, key+oldstate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "-%s %i\n", kb+1, key+oldstate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1630,12 +1630,12 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
{
|
{
|
||||||
if (kb[0] == '+')
|
if (kb[0] == '+')
|
||||||
{ // button commands add keynum as a parm
|
{ // button commands add keynum as a parm
|
||||||
sprintf (cmd, "+p%i %s %i\n", pnum+1, kb+1, key+oldstate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "+p%i %s %i\n", pnum+1, kb+1, key+oldstate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf (cmd, "p%i %s\n", pnum+1, kb);
|
Q_snprintfz (cmd, sizeof(cmd), "p%i %s\n", pnum+1, kb);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1646,7 +1646,7 @@ void Key_Event (int pnum, int key, unsigned int unicode, qboolean down)
|
||||||
{
|
{
|
||||||
if (kb[0] == '+')
|
if (kb[0] == '+')
|
||||||
{ // button commands add keynum as a parm
|
{ // button commands add keynum as a parm
|
||||||
sprintf (cmd, "%s %i\n", kb, key+oldstate*256);
|
Q_snprintfz (cmd, sizeof(cmd), "%s %i\n", kb, key+oldstate*256);
|
||||||
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
Cbuf_AddText (cmd, bindcmdlevel[key][keystate]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -1230,11 +1230,11 @@ cin_t *Media_Static_TryLoad(char *name)
|
||||||
char fullname[MAX_QPATH];
|
char fullname[MAX_QPATH];
|
||||||
qbyte *file;
|
qbyte *file;
|
||||||
|
|
||||||
sprintf(fullname, "%s", name);
|
Q_snprintfz(fullname, sizeof(fullname), "%s", name);
|
||||||
fsize = FS_LoadFile(fullname, (void **)&file);
|
fsize = FS_LoadFile(fullname, (void **)&file);
|
||||||
if (!file)
|
if (!file)
|
||||||
{
|
{
|
||||||
sprintf(fullname, "pics/%s", name);
|
Q_snprintfz(fullname, sizeof(fullname), "pics/%s", name);
|
||||||
fsize = FS_LoadFile(fullname, (void **)&file);
|
fsize = FS_LoadFile(fullname, (void **)&file);
|
||||||
if (!file)
|
if (!file)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -1995,7 +1995,7 @@ void Media_RecordFrame (void)
|
||||||
case CT_SCREENSHOT:
|
case CT_SCREENSHOT:
|
||||||
{
|
{
|
||||||
char filename[MAX_OSPATH];
|
char filename[MAX_OSPATH];
|
||||||
sprintf(filename, "%s/%8.8i.%s", capturefilenameprefix, captureframe++, capturecodec.string);
|
Q_snprintfz(filename, sizeof(filename), "%s/%8.8i.%s", capturefilenameprefix, captureframe++, capturecodec.string);
|
||||||
SCR_ScreenShot(filename);
|
SCR_ScreenShot(filename);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -2244,7 +2244,7 @@ void Media_RecordFilm_f (void)
|
||||||
sbits = 16;
|
sbits = 16;
|
||||||
if (chans > 6)
|
if (chans > 6)
|
||||||
chans = 6;
|
chans = 6;
|
||||||
sprintf(filename, "%s/audio_%ichan_%ikhz_%ib.raw", capturefilenameprefix, chans, snd_speed/1000, sbits);
|
Q_snprintfz(filename, sizeof(filename), "%s/audio_%ichan_%ikhz_%ib.raw", capturefilenameprefix, chans, snd_speed/1000, sbits);
|
||||||
captureaudiorawfile = FS_OpenVFS(filename, "wb", FS_GAMEONLY);
|
captureaudiorawfile = FS_OpenVFS(filename, "wb", FS_GAMEONLY);
|
||||||
|
|
||||||
if (captureaudiorawfile)
|
if (captureaudiorawfile)
|
||||||
|
|
|
@ -275,7 +275,7 @@ void M_MenuS_Comboi_f (void)
|
||||||
for (opt = 0; opt < sizeof(opts)/sizeof(opts[0])-2 && *(line=Cmd_Argv(5+opt)); opt++)
|
for (opt = 0; opt < sizeof(opts)/sizeof(opts[0])-2 && *(line=Cmd_Argv(5+opt)); opt++)
|
||||||
{
|
{
|
||||||
opts[opt] = line;
|
opts[opt] = line;
|
||||||
sprintf(valuesb[opt], "%i", opt);
|
Q_snprintfz(valuesb[opt], sizeof(valuesb[opt]), "%i", opt);
|
||||||
values[opt] = valuesb[opt];
|
values[opt] = valuesb[opt];
|
||||||
}
|
}
|
||||||
opts[opt] = NULL;
|
opts[opt] = NULL;
|
||||||
|
|
|
@ -666,10 +666,10 @@ static void ShowDemoMenu (menu_t *menu, char *path)
|
||||||
M_Demo_Flush(menu->data);
|
M_Demo_Flush(menu->data);
|
||||||
if (*path)
|
if (*path)
|
||||||
{
|
{
|
||||||
sprintf(match, "%s../", path);
|
Q_snprintfz(match, sizeof(match), "%s../", path);
|
||||||
DemoAddItem(match, 0, menu->data);
|
DemoAddItem(match, 0, menu->data);
|
||||||
}
|
}
|
||||||
sprintf(match, "%s*", path);
|
Q_snprintfz(match, sizeof(match), "%s*", path);
|
||||||
|
|
||||||
COM_EnumerateFiles(match, DemoAddItem, menu->data);
|
COM_EnumerateFiles(match, DemoAddItem, menu->data);
|
||||||
M_Demo_Flatten(menu->data);
|
M_Demo_Flatten(menu->data);
|
||||||
|
|
|
@ -1437,9 +1437,9 @@ void Master_QueryServer(serverinfo_t *server)
|
||||||
server->sends--;
|
server->sends--;
|
||||||
server->refreshtime = Sys_DoubleTime();
|
server->refreshtime = Sys_DoubleTime();
|
||||||
if (server->special & SS_QUAKE3)
|
if (server->special & SS_QUAKE3)
|
||||||
sprintf(data, "%c%c%c%cgetstatus", 255, 255, 255, 255);
|
Q_snprintfz(data, sizeof(data), "%c%c%c%cgetstatus", 255, 255, 255, 255);
|
||||||
else if (server->special & SS_DARKPLACES)
|
else if (server->special & SS_DARKPLACES)
|
||||||
sprintf(data, "%c%c%c%cgetinfo", 255, 255, 255, 255);
|
Q_snprintfz(data, sizeof(data), "%c%c%c%cgetinfo", 255, 255, 255, 255);
|
||||||
else if (server->special & SS_NETQUAKE)
|
else if (server->special & SS_NETQUAKE)
|
||||||
{
|
{
|
||||||
#ifdef NQPROT
|
#ifdef NQPROT
|
||||||
|
@ -1457,7 +1457,7 @@ void Master_QueryServer(serverinfo_t *server)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
sprintf(data, "%c%c%c%cstatus", 255, 255, 255, 255);
|
Q_snprintfz(data, sizeof(data), "%c%c%c%cstatus", 255, 255, 255, 255);
|
||||||
NET_SendPollPacket (strlen(data), data, server->adr);
|
NET_SendPollPacket (strlen(data), data, server->adr);
|
||||||
}
|
}
|
||||||
//send a packet to each server in sequence.
|
//send a packet to each server in sequence.
|
||||||
|
|
|
@ -2471,7 +2471,7 @@ void Sbar_Draw (void)
|
||||||
|
|
||||||
if (hud_tracking_show.ival)
|
if (hud_tracking_show.ival)
|
||||||
{
|
{
|
||||||
sprintf(st, "Tracking %-.64s",
|
Q_snprintfz(st, sizeof(st), "Tracking %-.64s",
|
||||||
cl.players[spec_track[pnum]].name);
|
cl.players[spec_track[pnum]].name);
|
||||||
Sbar_DrawString(0, -8, st);
|
Sbar_DrawString(0, -8, st);
|
||||||
}
|
}
|
||||||
|
|
|
@ -267,10 +267,10 @@ qbyte *Skin_Cache8 (skin_t *skin)
|
||||||
|
|
||||||
#ifdef Q2CLIENT
|
#ifdef Q2CLIENT
|
||||||
if (cls.protocol == CP_QUAKE2)
|
if (cls.protocol == CP_QUAKE2)
|
||||||
sprintf (name, "players/%s.pcx", skin->name);
|
Q_snprintfz (name, sizeof(name), "players/%s.pcx", skin->name);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
sprintf (name, "skins/%s.pcx", skin->name);
|
Q_snprintfz (name, sizeof(name), "skins/%s.pcx", skin->name);
|
||||||
raw = COM_LoadTempFile (name);
|
raw = COM_LoadTempFile (name);
|
||||||
if (!raw)
|
if (!raw)
|
||||||
{
|
{
|
||||||
|
@ -282,9 +282,9 @@ qbyte *Skin_Cache8 (skin_t *skin)
|
||||||
skin->tex_base = R_LoadReplacementTexture(skin->name, "skins", IF_NOALPHA);
|
skin->tex_base = R_LoadReplacementTexture(skin->name, "skins", IF_NOALPHA);
|
||||||
if (TEXVALID(skin->tex_base))
|
if (TEXVALID(skin->tex_base))
|
||||||
{
|
{
|
||||||
sprintf (name, "%s_shirt", skin->name);
|
Q_snprintfz (name, sizeof(name), "%s_shirt", skin->name);
|
||||||
skin->tex_upper = R_LoadReplacementTexture(name, "skins", 0);
|
skin->tex_upper = R_LoadReplacementTexture(name, "skins", 0);
|
||||||
sprintf (name, "%s_pants", skin->name);
|
Q_snprintfz (name, sizeof(name), "%s_pants", skin->name);
|
||||||
skin->tex_lower = R_LoadReplacementTexture(name, "skins", 0);
|
skin->tex_lower = R_LoadReplacementTexture(name, "skins", 0);
|
||||||
|
|
||||||
skin->failedload = true;
|
skin->failedload = true;
|
||||||
|
@ -294,7 +294,7 @@ qbyte *Skin_Cache8 (skin_t *skin)
|
||||||
#endif
|
#endif
|
||||||
//if its not already the base skin, try the base (and warn if anything not base couldn't load).
|
//if its not already the base skin, try the base (and warn if anything not base couldn't load).
|
||||||
Con_Printf ("Couldn't load skin %s\n", name);
|
Con_Printf ("Couldn't load skin %s\n", name);
|
||||||
sprintf (name, "skins/%s.pcx", baseskin.string);
|
Q_snprintfz (name, sizeof(name), "skins/%s.pcx", baseskin.string);
|
||||||
raw = COM_LoadTempFile (name);
|
raw = COM_LoadTempFile (name);
|
||||||
}
|
}
|
||||||
if (!raw)
|
if (!raw)
|
||||||
|
@ -437,7 +437,7 @@ qbyte *Skin_Cache32 (skin_t *skin)
|
||||||
//
|
//
|
||||||
// load the pic from disk
|
// load the pic from disk
|
||||||
//
|
//
|
||||||
sprintf (name, "%s%s.tga", path, skin->name);
|
Q_snprintfz (name, sizeof(name), "%s%s.tga", path, skin->name);
|
||||||
raw = COM_LoadTempFile (name);
|
raw = COM_LoadTempFile (name);
|
||||||
if (raw)
|
if (raw)
|
||||||
{
|
{
|
||||||
|
@ -450,7 +450,7 @@ qbyte *Skin_Cache32 (skin_t *skin)
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sprintf (name, "%s%s.pcx", path, skin->name);
|
Q_snprintfz (name, sizeof(name), "%s%s.pcx", path, skin->name);
|
||||||
raw = COM_LoadTempFile (name);
|
raw = COM_LoadTempFile (name);
|
||||||
if (raw)
|
if (raw)
|
||||||
{
|
{
|
||||||
|
@ -464,7 +464,7 @@ qbyte *Skin_Cache32 (skin_t *skin)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef AVAIL_PNGLIB
|
#ifdef AVAIL_PNGLIB
|
||||||
sprintf (name, "%s%s.png", path, skin->name);
|
Q_snprintfz (name, sizeof(name), "%s%s.png", path, skin->name);
|
||||||
raw = COM_LoadTempFile (name);
|
raw = COM_LoadTempFile (name);
|
||||||
if (raw)
|
if (raw)
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ qbyte *Skin_Cache32 (skin_t *skin)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef AVAIL_JPEGLIB
|
#ifdef AVAIL_JPEGLIB
|
||||||
sprintf (name, "%s%s.jpeg", path, skin->name);
|
Q_snprintfz (name, sizeof(name), "%s%s.jpeg", path, skin->name);
|
||||||
raw = COM_LoadTempFile (name);
|
raw = COM_LoadTempFile (name);
|
||||||
if (raw)
|
if (raw)
|
||||||
{
|
{
|
||||||
|
@ -492,7 +492,7 @@ qbyte *Skin_Cache32 (skin_t *skin)
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sprintf (name, "%s%s.jpg", path, skin->name); //jpegs are gready with 2 extensions...
|
Q_snprintfz (name, sizeof(name), "%s%s.jpg", path, skin->name); //jpegs are gready with 2 extensions...
|
||||||
raw = COM_LoadTempFile (name);
|
raw = COM_LoadTempFile (name);
|
||||||
if (raw)
|
if (raw)
|
||||||
{
|
{
|
||||||
|
|
|
@ -791,7 +791,7 @@ sfxcache_t *S_LoadSound (sfx_t *s)
|
||||||
FILE *f;
|
FILE *f;
|
||||||
#ifndef _WIN32 //convert from windows to a suitable alternative.
|
#ifndef _WIN32 //convert from windows to a suitable alternative.
|
||||||
char unixname[128];
|
char unixname[128];
|
||||||
sprintf(unixname, "/mnt/%c/%s", name[0]-'A'+'a', name+3);
|
snprintf(unixname, sizeof(unixname), "/mnt/%c/%s", name[0]-'A'+'a', name+3);
|
||||||
name = unixname;
|
name = unixname;
|
||||||
while (*name)
|
while (*name)
|
||||||
{
|
{
|
||||||
|
|
|
@ -109,7 +109,7 @@ sfxcache_t *S_LoadMP3Sound (sfx_t *s)
|
||||||
if (name[0] == '#')
|
if (name[0] == '#')
|
||||||
strcpy(namebuffer, &name[1]);
|
strcpy(namebuffer, &name[1]);
|
||||||
else
|
else
|
||||||
sprintf (namebuffer, "sound/%s", name);
|
Q_snprintfz (namebuffer, sizeof(namebuffer), "sound/%s", name);
|
||||||
|
|
||||||
len = strlen(namebuffer);
|
len = strlen(namebuffer);
|
||||||
telluser = strcmp(namebuffer+len-4, ".wav");
|
telluser = strcmp(namebuffer+len-4, ".wav");
|
||||||
|
@ -128,7 +128,7 @@ sfxcache_t *S_LoadMP3Sound (sfx_t *s)
|
||||||
char unixname[128];
|
char unixname[128];
|
||||||
if (name[1] == ':' && name[2] == '\\') //convert from windows to a suitable alternative.
|
if (name[1] == ':' && name[2] == '\\') //convert from windows to a suitable alternative.
|
||||||
{
|
{
|
||||||
sprintf(unixname, "/mnt/%c/%s", name[0]-'A'+'a', name+3);
|
snprintf(unixname, sizeof(unixname), "/mnt/%c/%s", name[0]-'A'+'a', name+3);
|
||||||
name = unixname;
|
name = unixname;
|
||||||
while (*name)
|
while (*name)
|
||||||
{
|
{
|
||||||
|
|
|
@ -266,7 +266,7 @@ static void EditorOpenFile(char *name)
|
||||||
|
|
||||||
if (!(F = FS_OpenVFS(OpenEditorFile, "rb", FS_GAME)))
|
if (!(F = FS_OpenVFS(OpenEditorFile, "rb", FS_GAME)))
|
||||||
{
|
{
|
||||||
sprintf(OpenEditorFile, "src/%s", name);
|
Q_snprintfz(OpenEditorFile, sizeof(OpenEditorFile), "src/%s", name);
|
||||||
if (!(F = FS_OpenVFS(OpenEditorFile, "rb", FS_GAME)))
|
if (!(F = FS_OpenVFS(OpenEditorFile, "rb", FS_GAME)))
|
||||||
{
|
{
|
||||||
Con_Printf("Couldn't open file \"%s\"\nA new file will be created\n", name);
|
Con_Printf("Couldn't open file \"%s\"\nA new file will be created\n", name);
|
||||||
|
|
|
@ -497,7 +497,7 @@ static char *Macro_BestAmmo (void)
|
||||||
static char *Macro_BestWeaponAndAmmo (void)
|
static char *Macro_BestWeaponAndAmmo (void)
|
||||||
{
|
{
|
||||||
char buf[MAX_MACRO_VALUE];
|
char buf[MAX_MACRO_VALUE];
|
||||||
sprintf (buf, "%s:%s", Macro_BestWeapon(), Macro_BestAmmo());
|
Q_snprintfz (buf, sizeof(buf), "%s:%s", Macro_BestWeapon(), Macro_BestAmmo());
|
||||||
strcpy (macro_buf, buf);
|
strcpy (macro_buf, buf);
|
||||||
return macro_buf;
|
return macro_buf;
|
||||||
}
|
}
|
||||||
|
@ -1217,17 +1217,17 @@ static char *TP_ParseMacroString (char *s)
|
||||||
if (!macro_string[0])
|
if (!macro_string[0])
|
||||||
macro_string = "a";
|
macro_string = "a";
|
||||||
if (cl.stats[SP][STAT_ARMOR] < 30)
|
if (cl.stats[SP][STAT_ARMOR] < 30)
|
||||||
sprintf (mbuf, "\x10%s:%i\x11", macro_string, cl.stats[SP][STAT_ARMOR]);
|
Q_snprintfz (mbuf, sizeof(mbuf), "\x10%s:%i\x11", macro_string, cl.stats[SP][STAT_ARMOR]);
|
||||||
else
|
else
|
||||||
sprintf (mbuf, "%s:%i", macro_string, cl.stats[SP][STAT_ARMOR]);
|
Q_snprintfz (mbuf, sizeof(mbuf), "%s:%i", macro_string, cl.stats[SP][STAT_ARMOR]);
|
||||||
macro_string = mbuf;
|
macro_string = mbuf;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'h':
|
case 'h':
|
||||||
if (cl.stats[SP][STAT_HEALTH] >= 50)
|
if (cl.stats[SP][STAT_HEALTH] >= 50)
|
||||||
sprintf (macro_buf, "%i", cl.stats[SP][STAT_HEALTH]);
|
Q_snprintfz (macro_buf, sizeof(macro_buf), "%i", cl.stats[SP][STAT_HEALTH]);
|
||||||
else
|
else
|
||||||
sprintf (macro_buf, "\x10%i\x11", cl.stats[SP][STAT_HEALTH]);
|
Q_snprintfz (macro_buf, sizeof(macro_buf), "\x10%i\x11", cl.stats[SP][STAT_HEALTH]);
|
||||||
macro_string = macro_buf;
|
macro_string = macro_buf;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1235,7 +1235,7 @@ static char *TP_ParseMacroString (char *s)
|
||||||
case 'P':
|
case 'P':
|
||||||
macro_string = Macro_Powerups();
|
macro_string = Macro_Powerups();
|
||||||
if (macro_string[0])
|
if (macro_string[0])
|
||||||
sprintf (mbuf, "\x10%s\x11", macro_string);
|
Q_snprintfz (mbuf, sizeof(mbuf), "\x10%s\x11", macro_string);
|
||||||
else
|
else
|
||||||
mbuf[0] = 0;
|
mbuf[0] = 0;
|
||||||
macro_string = mbuf;
|
macro_string = mbuf;
|
||||||
|
|
|
@ -2205,7 +2205,7 @@ static void *Q1_LoadSkins_GL (daliasskintype_t *pskintype, unsigned int skintran
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
sprintf(skinname, "%s_%i", loadname, i);
|
Q_snprintfz(skinname, sizeof(skinname), "%s_%i", loadname, i);
|
||||||
if (skintranstype == 4)
|
if (skintranstype == 4)
|
||||||
texnums->shader = R_RegisterShader(skinname,
|
texnums->shader = R_RegisterShader(skinname,
|
||||||
"{\n"
|
"{\n"
|
||||||
|
@ -2284,24 +2284,24 @@ static void *Q1_LoadSkins_GL (daliasskintype_t *pskintype, unsigned int skintran
|
||||||
//LH naming scheme
|
//LH naming scheme
|
||||||
if (!TEXVALID(texture))
|
if (!TEXVALID(texture))
|
||||||
{
|
{
|
||||||
sprintf(skinname, "%s_%i_%i", loadmodel->name, i, t);
|
Q_snprintfz(skinname, sizeof(skinname), "%s_%i_%i", loadmodel->name, i, t);
|
||||||
texture = R_LoadReplacementTexture(skinname, "models", IF_NOALPHA);
|
texture = R_LoadReplacementTexture(skinname, "models", IF_NOALPHA);
|
||||||
}
|
}
|
||||||
if (!TEXVALID(fbtexture) && r_fb_models.ival)
|
if (!TEXVALID(fbtexture) && r_fb_models.ival)
|
||||||
{
|
{
|
||||||
sprintf(skinname, "%s_%i_%i_luma", loadmodel->name, i, t);
|
Q_snprintfz(skinname, sizeof(skinname), "%s_%i_%i_luma", loadmodel->name, i, t);
|
||||||
fbtexture = R_LoadReplacementTexture(skinname, "models", 0);
|
fbtexture = R_LoadReplacementTexture(skinname, "models", 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Fuhquake naming scheme
|
//Fuhquake naming scheme
|
||||||
if (!TEXVALID(texture))
|
if (!TEXVALID(texture))
|
||||||
{
|
{
|
||||||
sprintf(skinname, "%s_%i_%i", loadname, i, t);
|
Q_snprintfz(skinname, sizeof(skinname), "%s_%i_%i", loadname, i, t);
|
||||||
texture = R_LoadReplacementTexture(skinname, "models", IF_NOALPHA);
|
texture = R_LoadReplacementTexture(skinname, "models", IF_NOALPHA);
|
||||||
}
|
}
|
||||||
if (!TEXVALID(fbtexture) && r_fb_models.ival)
|
if (!TEXVALID(fbtexture) && r_fb_models.ival)
|
||||||
{
|
{
|
||||||
sprintf(skinname, "%s_%i_%i_luma", loadname, i, t);
|
Q_snprintfz(skinname, sizeof(skinname), "%s_%i_%i_luma", loadname, i, t);
|
||||||
fbtexture = R_LoadReplacementTexture(skinname, "models", 0);
|
fbtexture = R_LoadReplacementTexture(skinname, "models", 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2318,14 +2318,14 @@ static void *Q1_LoadSkins_GL (daliasskintype_t *pskintype, unsigned int skintran
|
||||||
Mod_FloodFillSkin(saved, outskin->skinwidth, outskin->skinheight);
|
Mod_FloodFillSkin(saved, outskin->skinwidth, outskin->skinheight);
|
||||||
if (!TEXVALID(texture))
|
if (!TEXVALID(texture))
|
||||||
{
|
{
|
||||||
sprintf(skinname, "%s_%i_%i", loadname, i, t);
|
Q_snprintfz(skinname, sizeof(skinname), "%s_%i_%i", loadname, i, t);
|
||||||
texture = R_LoadTexture8(skinname, outskin->skinwidth, outskin->skinheight, saved, (skintranstype?0:IF_NOALPHA)|IF_NOGAMMA, skintranstype);
|
texture = R_LoadTexture8(skinname, outskin->skinwidth, outskin->skinheight, saved, (skintranstype?0:IF_NOALPHA)|IF_NOGAMMA, skintranstype);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!TEXVALID(fbtexture) && r_fb_models.value)
|
if (!TEXVALID(fbtexture) && r_fb_models.value)
|
||||||
{
|
{
|
||||||
sprintf(skinname, "%s_%i_%i_luma", loadname, i, t);
|
Q_snprintfz(skinname, sizeof(skinname), "%s_%i_%i_luma", loadname, i, t);
|
||||||
fbtexture = R_LoadTextureFB(skinname, outskin->skinwidth, outskin->skinheight, saved, IF_NOGAMMA);
|
fbtexture = R_LoadTextureFB(skinname, outskin->skinwidth, outskin->skinheight, saved, IF_NOGAMMA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2333,7 +2333,7 @@ static void *Q1_LoadSkins_GL (daliasskintype_t *pskintype, unsigned int skintran
|
||||||
BZ_Free(saved);
|
BZ_Free(saved);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(skinname, "%s_%i_%i", loadname, i, t);
|
Q_snprintfz(skinname, sizeof(skinname), "%s_%i_%i", loadname, i, t);
|
||||||
texnums->shader = R_RegisterSkin(skinname);
|
texnums->shader = R_RegisterSkin(skinname);
|
||||||
|
|
||||||
texnums->base = texture;
|
texnums->base = texture;
|
||||||
|
|
|
@ -1252,7 +1252,7 @@ static int FS_AddWildDataFiles (const char *descriptor, int size, void *vparam)
|
||||||
char purefile[MAX_OSPATH];
|
char purefile[MAX_OSPATH];
|
||||||
flocation_t loc;
|
flocation_t loc;
|
||||||
|
|
||||||
sprintf (pakfile, "%s%s", param->parentdesc, descriptor);
|
Q_snprintfz (pakfile, sizeof(pakfile), "%s%s", param->parentdesc, descriptor);
|
||||||
|
|
||||||
for (search = com_searchpaths; search; search = search->next)
|
for (search = com_searchpaths; search; search = search->next)
|
||||||
{
|
{
|
||||||
|
@ -1271,7 +1271,7 @@ static int FS_AddWildDataFiles (const char *descriptor, int size, void *vparam)
|
||||||
if (!pak)
|
if (!pak)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
sprintf (pakfile, "%s%s/", param->parentdesc, descriptor);
|
Q_snprintfz (pakfile, sizeof(pakfile), "%s%s/", param->parentdesc, descriptor);
|
||||||
if (*param->puredesc)
|
if (*param->puredesc)
|
||||||
snprintf (purefile, sizeof(purefile), "%s/%s", param->puredesc, descriptor);
|
snprintf (purefile, sizeof(purefile), "%s/%s", param->puredesc, descriptor);
|
||||||
else
|
else
|
||||||
|
@ -1312,7 +1312,7 @@ static void FS_AddDataFiles(const char *purepath, const char *pathto, searchpath
|
||||||
}
|
}
|
||||||
|
|
||||||
//now load the random ones
|
//now load the random ones
|
||||||
sprintf (pakfile, "*.%s", extension);
|
Q_snprintfz (pakfile, sizeof(pakfile), "*.%s", extension);
|
||||||
wp.funcs = funcs;
|
wp.funcs = funcs;
|
||||||
wp.parentdesc = pathto;
|
wp.parentdesc = pathto;
|
||||||
wp.parentpath = search;
|
wp.parentpath = search;
|
||||||
|
|
|
@ -151,7 +151,7 @@ static int FSSTDIO_RebuildFSHash(const char *filename, int filesize, void *data)
|
||||||
{ //this is actually a directory
|
{ //this is actually a directory
|
||||||
|
|
||||||
char childpath[256];
|
char childpath[256];
|
||||||
sprintf(childpath, "%s*", filename);
|
Q_snprintfz(childpath, sizeof(childpath), "%s*", filename);
|
||||||
Sys_EnumerateFiles((char*)data, childpath, FSSTDIO_RebuildFSHash, data);
|
Sys_EnumerateFiles((char*)data, childpath, FSSTDIO_RebuildFSHash, data);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -191,7 +191,7 @@ static int VFSW32_RebuildFSHash(const char *filename, int filesize, void *data)
|
||||||
{ //this is actually a directory
|
{ //this is actually a directory
|
||||||
|
|
||||||
char childpath[256];
|
char childpath[256];
|
||||||
sprintf(childpath, "%s*", filename);
|
Q_snprintfz(childpath, sizeof(childpath), "%s*", filename);
|
||||||
Sys_EnumerateFiles((char*)data, childpath, VFSW32_RebuildFSHash, data);
|
Sys_EnumerateFiles((char*)data, childpath, VFSW32_RebuildFSHash, data);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,7 +161,7 @@ void VARGS PR_BIError(progfuncs_t *progfuncs, char *format, ...)
|
||||||
pbool QC_WriteFile(const char *name, void *data, int len)
|
pbool QC_WriteFile(const char *name, void *data, int len)
|
||||||
{
|
{
|
||||||
char buffer[256];
|
char buffer[256];
|
||||||
sprintf(buffer, "%s", name);
|
Q_snprintfz(buffer, sizeof(buffer), "%s", name);
|
||||||
COM_WriteFile(buffer, data, len);
|
COM_WriteFile(buffer, data, len);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -339,7 +339,7 @@ qvm_t *QVM_LoadVM(const char *name, sys_callqvm_t syscall)
|
||||||
int n;
|
int n;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
sprintf(path, "%s.qvm", name);
|
Q_snprintfz(path, sizeof(path), "%s.qvm", name);
|
||||||
FS_LoadFile(path, (void **)&raw);
|
FS_LoadFile(path, (void **)&raw);
|
||||||
// file not found
|
// file not found
|
||||||
if(!raw) return NULL;
|
if(!raw) return NULL;
|
||||||
|
|
|
@ -1063,7 +1063,7 @@ void GL_Upload32_Int (char *name, unsigned *data, int width, int height, unsigne
|
||||||
qglGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_COMPRESSED_ARB, &compressed);
|
qglGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_COMPRESSED_ARB, &compressed);
|
||||||
if (compressed == GL_TRUE && !strstr(name, "..")) //is there any point in bothering with the whole endian thing?
|
if (compressed == GL_TRUE && !strstr(name, "..")) //is there any point in bothering with the whole endian thing?
|
||||||
{
|
{
|
||||||
sprintf(outname, "tex/%s.tex", name);
|
Q_snprintfz(outname, sizeof(outname), "tex/%s.tex", name);
|
||||||
FS_CreatePath(outname, FS_GAME);
|
FS_CreatePath(outname, FS_GAME);
|
||||||
out = FS_OpenVFS(outname, "wb", FS_GAME);
|
out = FS_OpenVFS(outname, "wb", FS_GAME);
|
||||||
if (out)
|
if (out)
|
||||||
|
|
|
@ -543,9 +543,9 @@ qboolean SV_LoadLevelCache(char *savename, char *level, char *startspot, qboolea
|
||||||
gametype = cache->gametype;
|
gametype = cache->gametype;
|
||||||
|
|
||||||
if (savename)
|
if (savename)
|
||||||
sprintf (name, "saves/%s/%s", savename, level);
|
Q_snprintfz (name, sizeof(name), "saves/%s/%s", savename, level);
|
||||||
else
|
else
|
||||||
sprintf (name, "saves/%s", level);
|
Q_snprintfz (name, sizeof(name), "saves/%s", level);
|
||||||
COM_DefaultExtension (name, ".lvc", sizeof(name));
|
COM_DefaultExtension (name, ".lvc", sizeof(name));
|
||||||
|
|
||||||
// Con_TPrintf (STL_LOADGAMEFROM, name);
|
// Con_TPrintf (STL_LOADGAMEFROM, name);
|
||||||
|
@ -783,9 +783,9 @@ void SV_SaveLevelCache(char *savedir, qboolean dontharmgame)
|
||||||
|
|
||||||
|
|
||||||
if (savedir)
|
if (savedir)
|
||||||
sprintf (name, "saves/%s/%s", savedir, cache->mapname);
|
Q_snprintfz (name, sizeof(name), "saves/%s/%s", savedir, cache->mapname);
|
||||||
else
|
else
|
||||||
sprintf (name, "saves/%s", cache->mapname);
|
Q_snprintfz (name, sizeof(name), "saves/%s", cache->mapname);
|
||||||
COM_DefaultExtension (name, ".lvc", sizeof(name));
|
COM_DefaultExtension (name, ".lvc", sizeof(name));
|
||||||
|
|
||||||
FS_CreatePath(name, FS_GAMEONLY);
|
FS_CreatePath(name, FS_GAMEONLY);
|
||||||
|
@ -1040,7 +1040,7 @@ void SV_Loadgame_f (void)
|
||||||
if (!*savename || strstr(savename, ".."))
|
if (!*savename || strstr(savename, ".."))
|
||||||
strcpy(savename, "quicksav");
|
strcpy(savename, "quicksav");
|
||||||
|
|
||||||
sprintf (filename, "saves/%s/info.fsv", savename);
|
Q_snprintfz (filename, sizeof(filename), "saves/%s/info.fsv", savename);
|
||||||
f = FS_OpenVFS (filename, "rb", FS_GAME);
|
f = FS_OpenVFS (filename, "rb", FS_GAME);
|
||||||
if (!f)
|
if (!f)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1945,7 +1945,7 @@ void SV_Snap (int uid)
|
||||||
{
|
{
|
||||||
pcxname[strlen(pcxname) - 6] = i/10 + '0';
|
pcxname[strlen(pcxname) - 6] = i/10 + '0';
|
||||||
pcxname[strlen(pcxname) - 5] = i%10 + '0';
|
pcxname[strlen(pcxname) - 5] = i%10 + '0';
|
||||||
sprintf (checkname, "%s/snap/%s", gamedirfile, pcxname);
|
Q_snprintfz (checkname, sizeof(checkname), "%s/snap/%s", gamedirfile, pcxname);
|
||||||
if (!COM_FCheckExists(checkname))
|
if (!COM_FCheckExists(checkname))
|
||||||
break; // file doesn't exist
|
break; // file doesn't exist
|
||||||
}
|
}
|
||||||
|
|
|
@ -846,13 +846,13 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
|
||||||
{
|
{
|
||||||
char *exts[] = {"maps/%s.bsp", "maps/%s.cm", "maps/%s.hmp", NULL};
|
char *exts[] = {"maps/%s.bsp", "maps/%s.cm", "maps/%s.hmp", NULL};
|
||||||
strcpy (sv.name, server);
|
strcpy (sv.name, server);
|
||||||
sprintf (sv.modelname, exts[0], server);
|
Q_snprintfz (sv.modelname, sizeof(sv.modelname), exts[0], server);
|
||||||
if (!COM_FCheckExists(sv.modelname))
|
if (!COM_FCheckExists(sv.modelname))
|
||||||
{
|
{
|
||||||
if (COM_FCheckExists(va(exts[1], server)))
|
if (COM_FCheckExists(va(exts[1], server)))
|
||||||
sprintf (sv.modelname,exts[1], server);
|
Q_snprintfz (sv.modelname, sizeof(sv.modelname), exts[1], server);
|
||||||
else if (COM_FCheckExists(va(exts[2], server)))
|
else if (COM_FCheckExists(va(exts[2], server)))
|
||||||
sprintf (sv.modelname,exts[2], server);
|
Q_snprintfz (sv.modelname, sizeof(sv.modelname), exts[2], server);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sv.state = ss_loading;
|
sv.state = ss_loading;
|
||||||
|
|
|
@ -884,7 +884,7 @@ void *Sys_GetGameAPI(void *parms)
|
||||||
searchpath = 0;
|
searchpath = 0;
|
||||||
while((searchpath = COM_NextPath(searchpath)))
|
while((searchpath = COM_NextPath(searchpath)))
|
||||||
{
|
{
|
||||||
sprintf (name, "%s/%s/%s", curpath, searchpath, gamename);
|
snprintf (name, sizeof(name), "%s/%s/%s", curpath, searchpath, gamename);
|
||||||
game_library = dlopen (name, RTLD_LAZY );
|
game_library = dlopen (name, RTLD_LAZY );
|
||||||
if (game_library)
|
if (game_library)
|
||||||
{
|
{
|
||||||
|
|
|
@ -414,7 +414,7 @@ void SVNQ_New_f (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MSG_WriteByte (&host_client->netchan.message, svc_print);
|
MSG_WriteByte (&host_client->netchan.message, svc_print);
|
||||||
sprintf (message, "%c\n%s server\n", 2, version_string());
|
Q_snprintfz (message, sizeof(message), "%c\n%s server\n", 2, version_string());
|
||||||
MSG_WriteString (&host_client->netchan.message,message);
|
MSG_WriteString (&host_client->netchan.message,message);
|
||||||
|
|
||||||
if (host_client->protocol == SCP_DARKPLACES6 || host_client->protocol == SCP_DARKPLACES7)
|
if (host_client->protocol == SCP_DARKPLACES6 || host_client->protocol == SCP_DARKPLACES7)
|
||||||
|
@ -2046,7 +2046,7 @@ void VARGS OutofBandPrintf(netadr_t where, char *fmt, ...)
|
||||||
send[3] = 0xff;
|
send[3] = 0xff;
|
||||||
send[4] = A2C_PRINT;
|
send[4] = A2C_PRINT;
|
||||||
va_start (argptr, fmt);
|
va_start (argptr, fmt);
|
||||||
vsprintf (send+5, fmt, argptr);
|
vsnprintf (send+5, sizeof(send)-5, fmt, argptr);
|
||||||
va_end (argptr);
|
va_end (argptr);
|
||||||
|
|
||||||
NET_SendPacket (NS_SERVER, strlen(send)+1, send, where);
|
NET_SendPacket (NS_SERVER, strlen(send)+1, send, where);
|
||||||
|
@ -2792,12 +2792,12 @@ void SV_SayOne_f (void)
|
||||||
if (host_client->spectator)
|
if (host_client->spectator)
|
||||||
{
|
{
|
||||||
if (!sv_spectalk.value || to->spectator)
|
if (!sv_spectalk.value || to->spectator)
|
||||||
sprintf (text, "[SPEC] {%s}:", host_client->name);
|
Q_snprintfz (text, sizeof(text), "[SPEC] {%s}:", host_client->name);
|
||||||
else
|
else
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
sprintf (text, "{%s}:", host_client->name);
|
Q_snprintfz (text, sizeof(text), "{%s}:", host_client->name);
|
||||||
|
|
||||||
if (host_client->ismuted)
|
if (host_client->ismuted)
|
||||||
{
|
{
|
||||||
|
@ -2927,11 +2927,11 @@ void SV_Say (qboolean team)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (host_client->spectator && (!sv_spectalk.value || team))
|
if (host_client->spectator && (!sv_spectalk.value || team))
|
||||||
sprintf (text, "[SPEC] %s: ", host_client->name);
|
Q_snprintfz (text, sizeof(text), "[SPEC] %s: ", host_client->name);
|
||||||
else if (team)
|
else if (team)
|
||||||
sprintf (text, "(%s): ", host_client->name);
|
Q_snprintfz (text, sizeof(text), "(%s): ", host_client->name);
|
||||||
else
|
else
|
||||||
sprintf (text, "%s: ", host_client->name);
|
Q_snprintfz (text, sizeof(text), "%s: ", host_client->name);
|
||||||
|
|
||||||
if (host_client->ismuted)
|
if (host_client->ismuted)
|
||||||
{
|
{
|
||||||
|
|
|
@ -61,7 +61,7 @@ static void VARGS PFQ2_dprintf (char *fmt, ...)
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
|
|
||||||
va_start (argptr,fmt);
|
va_start (argptr,fmt);
|
||||||
vsprintf (msg, fmt, argptr);
|
vsnprintf (msg, sizeof(msg), fmt, argptr);
|
||||||
va_end (argptr);
|
va_end (argptr);
|
||||||
|
|
||||||
Con_Printf ("%s", msg);
|
Con_Printf ("%s", msg);
|
||||||
|
@ -98,7 +98,7 @@ static void VARGS PFQ2_cprintf (q2edict_t *ent, int level, char *fmt, ...)
|
||||||
}
|
}
|
||||||
|
|
||||||
va_start (argptr,fmt);
|
va_start (argptr,fmt);
|
||||||
vsprintf (msg, fmt, argptr);
|
vsnprintf (msg, sizeof(msg), fmt, argptr);
|
||||||
va_end (argptr);
|
va_end (argptr);
|
||||||
|
|
||||||
if (ent)
|
if (ent)
|
||||||
|
@ -151,7 +151,7 @@ static void VARGS PFQ2_error (char *fmt, ...)
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
|
|
||||||
va_start (argptr,fmt);
|
va_start (argptr,fmt);
|
||||||
vsprintf (msg, fmt, argptr);
|
vsnprintf (msg, sizeof(msg), fmt, argptr);
|
||||||
va_end (argptr);
|
va_end (argptr);
|
||||||
|
|
||||||
SV_Error("Game Error: %s", msg);
|
SV_Error("Game Error: %s", msg);
|
||||||
|
|
|
@ -1476,7 +1476,7 @@ static void VARGS BL_Print(int l, char *fmt, ...)
|
||||||
char text[1024];
|
char text[1024];
|
||||||
|
|
||||||
va_start (argptr, fmt);
|
va_start (argptr, fmt);
|
||||||
vsprintf (text, fmt, argptr);
|
vsnprintf (text, sizeof(text), fmt, argptr);
|
||||||
va_end (argptr);
|
va_end (argptr);
|
||||||
|
|
||||||
Con_Printf("%s", text);
|
Con_Printf("%s", text);
|
||||||
|
|
Loading…
Reference in a new issue