yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change atoi() to strtol()

Browse source
This commit is contained in:
Yamagi Burmeister 2012-06-02 09:31:27 +02:00
parent fc679896f5
commit 67dbe816c9
22 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/cl_download.c
View file

@ -49,7 +49,7 @@ static const char *env_suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
void CL_RequestNextDownload (void)
{
unsigned map_checksum; /* for detecting cheater maps */
unsigned int map_checksum; /* for detecting cheater maps */
char fn[MAX_OSPATH];
dmdl_t *pheader;
@ -313,7 +313,7 @@ void CL_RequestNextDownload (void)
CM_LoadMap (cl.configstrings[CS_MODELS+1], true, &map_checksum);
if (map_checksum != atoi(cl.configstrings[CS_MAPCHECKSUM]))
if (map_checksum != (int)strtol(cl.configstrings[CS_MAPCHECKSUM], (char **)NULL, 10))
{
Com_Error (ERR_DROP, "Local map version differs from server: %i != '%s'\n",
map_checksum, cl.configstrings[CS_MAPCHECKSUM]);

10
src/client/cl_input.c
View file

@ -70,7 +70,7 @@ void KeyDown (kbutton_t *b) {
c = Cmd_Argv(1);
if (c[0])
k = atoi(c);
k = (int)strtol(c, (char **)NULL, 10);
else
k = -1; /* typed manually at the console for continuous down */
@ -94,7 +94,7 @@ void KeyDown (kbutton_t *b) {
/* save timestamp */
c = Cmd_Argv(2);
b->downtime = atoi(c);
b->downtime = (int)strtol(c, (char **)NULL, 10);
if (!b->downtime)
b->downtime = sys_frame_time - 100;
@ -110,7 +110,7 @@ void KeyUp (kbutton_t *b) {
c = Cmd_Argv(1);
if (c[0])
k = atoi(c);
k = (int)strtol(c, (char **)NULL, 10);
else {
/* typed manually at the console, assume for unsticking, so clear all */
@ -136,7 +136,7 @@ void KeyUp (kbutton_t *b) {
/* save timestamp */
c = Cmd_Argv(2);
uptime = atoi(c);
uptime = (int)strtol(c, (char **)NULL, 10);
if (uptime)
b->msec += uptime - b->downtime;
@ -243,7 +243,7 @@ void IN_UseUp (void) {
}
void IN_Impulse (void) {
in_impulse=atoi(Cmd_Argv(1));
in_impulse=(int)strtol(Cmd_Argv(1), (char **)NULL, 10);
}
/*

2
src/client/cl_main.c
View file

@ -438,7 +438,7 @@ void CL_Precache_f (void)
precache_check = CS_MODELS;
precache_spawncount = atoi(Cmd_Argv(1));
precache_spawncount = (int)strtol(Cmd_Argv(1), (char **)NULL, 10);
precache_model = 0;
precache_model_skin = 0;

2
src/client/cl_network.c
View file

@ -576,7 +576,7 @@ void CL_ConnectionlessPacket (void)
/* challenge from the server we are connecting to */
if (!strcmp(c, "challenge"))
{
cls.challenge = atoi(Cmd_Argv(1));
cls.challenge = (int)strtol(Cmd_Argv(1), (char **)NULL, 10);
CL_SendConnectPacket ();
return;
}

4
src/client/cl_parse.c
View file

@ -838,12 +838,12 @@ void CL_ParseConfigString (void) {
else if (i == CS_CDTRACK) {
if (cl.refresh_prepped) {
#ifdef CDA
CDAudio_Play (atoi(cl.configstrings[CS_CDTRACK]), true);
CDAudio_Play ((int)strtol(cl.configstrings[CS_CDTRACK], (char **)NULL, 10), true);
#endif
#ifdef OGG
/* OGG/Vorbis */
if (atoi(cl.configstrings[CS_CDTRACK]) < 10) {
if ((int)strtol(cl.configstrings[CS_CDTRACK], (char **)NULL, 10) < 10) {
char tmp[3] = "0";
OGG_ParseCmd(strcat(tmp, cl.configstrings[CS_CDTRACK]));

44
src/client/cl_screen.c
View file

@ -810,44 +810,44 @@ void SCR_ExecuteLayoutString (char *s) {
if (!strcmp(token, "xl")) {
token = COM_Parse (&s);
x = atoi(token);
x = (int)strtol(token, (char **)NULL, 10);
continue;
}
if (!strcmp(token, "xr")) {
token = COM_Parse (&s);
x = viddef.width + atoi(token);
x = viddef.width + (int)strtol(token, (char **)NULL, 10);
continue;
}
if (!strcmp(token, "xv")) {
token = COM_Parse (&s);
x = viddef.width/2 - 160 + atoi(token);
x = viddef.width/2 - 160 + (int)strtol(token, (char **)NULL, 10);
continue;
}
if (!strcmp(token, "yt")) {
token = COM_Parse (&s);
y = atoi(token);
y = (int)strtol(token, (char **)NULL, 10);
continue;
}
if (!strcmp(token, "yb")) {
token = COM_Parse (&s);
y = viddef.height + atoi(token);
y = viddef.height + (int)strtol(token, (char **)NULL, 10);
continue;
}
if (!strcmp(token, "yv")) {
token = COM_Parse (&s);
y = viddef.height/2 - 120 + atoi(token);
y = viddef.height/2 - 120 + (int)strtol(token, (char **)NULL, 10);
continue;
}
if (!strcmp(token, "pic")) {
/* draw a pic from a stat number */
token = COM_Parse (&s);
index = atoi(token);
index = (int)strtol(token, (char **)NULL, 10);
if (index < 0 || index >= sizeof(cl.frame.playerstate.stats))
Com_Error (ERR_DROP, "bad stats index %d (0x%x)", index, index);
@ -871,14 +871,14 @@ void SCR_ExecuteLayoutString (char *s) {
int score, ping, time;
token = COM_Parse (&s);
x = viddef.width/2 - 160 + atoi(token);
x = viddef.width/2 - 160 + (int)strtol(token, (char **)NULL, 10);
token = COM_Parse (&s);
y = viddef.height/2 - 120 + atoi(token);
y = viddef.height/2 - 120 + (int)strtol(token, (char **)NULL, 10);
SCR_AddDirtyPoint (x, y);
SCR_AddDirtyPoint (x+159, y+31);
token = COM_Parse (&s);
value = atoi(token);
value = (int)strtol(token, (char **)NULL, 10);
if (value >= MAX_CLIENTS || value < 0)
Com_Error (ERR_DROP, "client >= MAX_CLIENTS");
@ -886,13 +886,13 @@ void SCR_ExecuteLayoutString (char *s) {
ci = &cl.clientinfo[value];
token = COM_Parse (&s);
score = atoi(token);
score = (int)strtol(token, (char **)NULL, 10);
token = COM_Parse (&s);
ping = atoi(token);
ping = (int)strtol(token, (char **)NULL, 10);
token = COM_Parse (&s);
time = atoi(token);
time = (int)strtol(token, (char **)NULL, 10);
DrawAltString (x+32, y, ci->name);
DrawString (x+32, y+8, "Score: ");
@ -913,14 +913,14 @@ void SCR_ExecuteLayoutString (char *s) {
char block[80];
token = COM_Parse (&s);
x = viddef.width/2 - 160 + atoi(token);
x = viddef.width/2 - 160 + (int)strtol(token, (char **)NULL, 10);
token = COM_Parse (&s);
y = viddef.height/2 - 120 + atoi(token);
y = viddef.height/2 - 120 + (int)strtol(token, (char **)NULL, 10);
SCR_AddDirtyPoint (x, y);
SCR_AddDirtyPoint (x+159, y+31);
token = COM_Parse (&s);
value = atoi(token);
value = (int)strtol(token, (char **)NULL, 10);
if (value >= MAX_CLIENTS || value < 0)
Com_Error (ERR_DROP, "client >= MAX_CLIENTS");
@ -928,10 +928,10 @@ void SCR_ExecuteLayoutString (char *s) {
ci = &cl.clientinfo[value];
token = COM_Parse (&s);
score = atoi(token);
score = (int)strtol(token, (char **)NULL, 10);
token = COM_Parse (&s);
ping = atoi(token);
ping = (int)strtol(token, (char **)NULL, 10);
if (ping > 999)
ping = 999;
@ -959,9 +959,9 @@ void SCR_ExecuteLayoutString (char *s) {
if (!strcmp(token, "num")) {
/* draw a number */
token = COM_Parse (&s);
width = atoi(token);
width = (int)strtol(token, (char **)NULL, 10);
token = COM_Parse (&s);
value = cl.frame.playerstate.stats[atoi(token)];
value = cl.frame.playerstate.stats[(int)strtol(token, (char **)NULL, 10)];
SCR_DrawField (x, y, 0, width, value);
continue;
}
@ -1033,7 +1033,7 @@ void SCR_ExecuteLayoutString (char *s) {
if (!strcmp(token, "stat_string")) {
token = COM_Parse (&s);
index = atoi(token);
index = (int)strtol(token, (char **)NULL, 10);
if (index < 0 || index >= MAX_CONFIGSTRINGS)
Com_Error (ERR_DROP, "Bad stat_string index");
@ -1074,7 +1074,7 @@ void SCR_ExecuteLayoutString (char *s) {
if (!strcmp(token, "if")) {
/* draw a number */
token = COM_Parse (&s);
value = cl.frame.playerstate.stats[atoi(token)];
value = cl.frame.playerstate.stats[(int)strtol(token, (char **)NULL, 10)];
if (!value) {
/* skip to endif */

4
src/client/cl_view.c
View file

@ -310,12 +310,12 @@ void CL_PrepRefresh (void) {
#endif
} else {
#ifdef CDA
CDAudio_Play (atoi(cl.configstrings[CS_CDTRACK]), true);
CDAudio_Play ((int)strtol(cl.configstrings[CS_CDTRACK], (char **)NULL, 10), true);
#endif
#ifdef OGG
/* OGG/Vorbis */
if (atoi(cl.configstrings[CS_CDTRACK]) < 10) {
if ((int)strtol(cl.configstrings[CS_CDTRACK], (char **)NULL, 10) < 10) {
char tmp[3] = "0";
OGG_ParseCmd(strcat(tmp, cl.configstrings[CS_CDTRACK]));

6
src/client/menu/menu.c
View file

@ -1121,7 +1121,7 @@ static void CDShuffleFunc(void *unused) {
Cvar_Set("ogg_sequence", "loop");
if(ogg->value) {
if (atoi(cl.configstrings[CS_CDTRACK]) < 10) {
if ((int)strtol(cl.configstrings[CS_CDTRACK], (char **)NULL, 10) < 10) {
char tmp[2] = "0";
OGG_ParseCmd(strcat(tmp, cl.configstrings[CS_CDTRACK]));
@ -1151,7 +1151,7 @@ static void UpdateCDVolumeFunc( void *unused ) {
CDAudio_RandomPlay();
} else {
CDAudio_Play(atoi(cl.configstrings[CS_CDTRACK]), true);
CDAudio_Play((int)strtol(cl.configstrings[CS_CDTRACK], (char **)NULL, 10), true);
}
} else {
@ -1174,7 +1174,7 @@ static void UpdateOGGVolumeFunc( void *unused ) {
OGG_Init();
OGG_Stop();
if (atoi(cl.configstrings[CS_CDTRACK]) < 10) {
if ((int)strtol(cl.configstrings[CS_CDTRACK], (char **)NULL, 10) < 10) {
char tmp[3] = "0";
OGG_ParseCmd(strcat(tmp, cl.configstrings[CS_CDTRACK]));

6
src/client/sound/snd_vorbis.c
View file

@ -690,7 +690,7 @@ OGG_ParseCmd ( char *arg )
switch ( arg [ 0 ] )
{
case '#':
n = atoi( arg + 1 ) - 1;
n = (int)strtol( arg + 1, (char **)NULL, 10) - 1;
OGG_Open( ABS, n );
break;
case '?':
@ -700,7 +700,7 @@ OGG_ParseCmd ( char *arg )
if ( strlen( arg ) > 1 )
{
OGG_Open( REL, atoi( arg + 1 ) );
OGG_Open( REL, (int)strtol( arg + 1, (char **)NULL, 10 ) );
}
else
@ -713,7 +713,7 @@ OGG_ParseCmd ( char *arg )
if ( strlen( arg ) > 1 )
{
OGG_Open( REL, -atoi( arg + 1 ) );
OGG_Open( REL, -(int)strtol( arg + 1, (char **)NULL, 10 ) );
}
else

2
src/common/model/cm_bsp.c
View file

@ -501,7 +501,7 @@ cmodel_t *CM_InlineModel (char *name)
if (!name || name[0] != '*')
Com_Error (ERR_DROP, "CM_InlineModel: bad name");
num = atoi (name+1);
num = (int)strtol(name+1, (char **)NULL, 10);
if (num < 1 || num >= numcmodels)
Com_Error (ERR_DROP, "CM_InlineModel: bad number");

6
src/game/g_cmds.c
View file

@ -249,7 +249,7 @@ Cmd_Give_f(edict_t *ent)
{
if (gi.argc() == 3)
{
ent->health = atoi(gi.argv(2));
ent->health = (int)strtol(gi.argv(2), (char **)NULL, 10);
}
else
{
@ -399,7 +399,7 @@ Cmd_Give_f(edict_t *ent)
{
if (gi.argc() == 3)
{
ent->client->pers.inventory[index] = atoi(gi.argv(2));
ent->client->pers.inventory[index] = (int)strtol(gi.argv(2), (char **)NULL, 10);
}
else
{
@ -965,7 +965,7 @@ Cmd_Wave_f(edict_t *ent)
return;
}
i = atoi(gi.argv(1));
i = (int)strtol(gi.argv(1), (char **)NULL, 10);
/* can't wave when ducked */
if (ent->client->ps.pmove.pm_flags & PMF_DUCKED)

2
src/game/g_spawn.c
View file

@ -400,7 +400,7 @@ ED_ParseField(const char *key, const char *value, edict_t *ent)
((float *)(b + f->ofs))[2] = vec[2];
break;
case F_INT:
*(int *)(b + f->ofs) = atoi(value);
*(int *)(b + f->ofs) = (int)strtol(value, (char **)NULL, 10);
break;
case F_FLOAT:
*(float *)(b + f->ofs) = atof(value);

2
src/game/g_svcmds.c
View file

@ -115,7 +115,7 @@ StringToFilter(char *s, ipfilter_t *f)
}
num[j] = 0;
b[i] = atoi(num);
b[i] = (int)strtol(num, (char **)NULL, 10);
if (b[i] != 0)
{

2
src/game/g_trigger.c
View file

@ -785,7 +785,7 @@ SP_trigger_gravity(edict_t *self)
}
InitTrigger(self);
self->gravity = atoi(st.gravity);
self->gravity = (int)strtol(st.gravity, (char **)NULL, 10);
self->touch = trigger_gravity_touch;
}

6
src/game/player/client.c
View file

@ -1742,7 +1742,7 @@ PutClientInServer(edict_t *ent)
}
else
{
client->ps.fov = atoi(Info_ValueForKey(client->pers.userinfo, "fov"));
client->ps.fov = (int)strtol(Info_ValueForKey(client->pers.userinfo, "fov"), (char **)NULL, 10);
if (client->ps.fov < 1)
{
@ -1978,7 +1978,7 @@ ClientUserinfoChanged(edict_t *ent, char *userinfo)
}
else
{
ent->client->ps.fov = atoi(Info_ValueForKey(userinfo, "fov"));
ent->client->ps.fov = (int)strtol(Info_ValueForKey(userinfo, "fov"), (char **)NULL, 10);
if (ent->client->ps.fov < 1)
{
@ -1995,7 +1995,7 @@ ClientUserinfoChanged(edict_t *ent, char *userinfo)
if (strlen(s))
{
ent->client->pers.hand = atoi(s);
ent->client->pers.hand = (int)strtol(s, (char **)NULL, 10);
}
/* save off the userinfo in case we want to check something later */

2
src/refresh/r_model.c
View file

@ -190,7 +190,7 @@ Mod_ForName ( char *name, qboolean crash )
/* inline models are grabbed only from worldmodel */
if ( name [ 0 ] == '*' )
{
i = atoi( name + 1 );
i = (int)strtol( name + 1, (char **)NULL, 10 );
if ( ( i < 1 ) || !r_worldmodel || ( i >= r_worldmodel->numsubmodels ) )
{

4
src/sdl/cd.c
View file

@ -441,13 +441,13 @@ CD_f ()
if ( !Q_strcasecmp( command, "play" ) )
{
CDAudio_Play( (byte) atoi( Cmd_Argv( 2 ) ), false );
CDAudio_Play( (byte) (int)strtol( Cmd_Argv( 2 ), (char **)NULL, 10 ), false );
return;
}
if ( !Q_strcasecmp( command, "loop" ) )
{
CDAudio_Play( (byte) atoi( Cmd_Argv( 2 ) ), true );
CDAudio_Play( (byte) (int)strtol( Cmd_Argv( 2 ), (char **)NULL, 10 ), true );
return;
}

2
src/server/sv_cmd.c
View file

@ -104,7 +104,7 @@ SV_SetPlayer ( void )
/* numeric values are just slot numbers */
if ( ( s [ 0 ] >= '0' ) && ( s [ 0 ] <= '9' ) )
{
idnum = atoi( Cmd_Argv( 1 ) );
idnum = (int)strtol( Cmd_Argv( 1 ), (char **)NULL, 10 );
if ( ( idnum < 0 ) || ( idnum >= maxclients->value ) )
{

8
src/server/sv_conless.c
View file

@ -64,7 +64,7 @@ SVC_Info ( void )
return; /* ignore in single player */
}
version = atoi( Cmd_Argv( 1 ) );
version = (int)strtol( Cmd_Argv( 1 ), (char **)NULL, 10 );
if ( version != PROTOCOL_VERSION )
{
@ -163,7 +163,7 @@ SVC_DirectConnect ( void )
Com_DPrintf( "SVC_DirectConnect ()\n" );
version = atoi( Cmd_Argv( 1 ) );
version = (int)strtol( Cmd_Argv( 1 ), (char **)NULL, 10 );
if ( version != PROTOCOL_VERSION )
{
@ -172,9 +172,9 @@ SVC_DirectConnect ( void )
return;
}
qport = atoi( Cmd_Argv( 2 ) );
qport = (int)strtol( Cmd_Argv( 2 ), (char **)NULL, 10 );
challenge = atoi( Cmd_Argv( 3 ) );
challenge = (int)strtol( Cmd_Argv( 3 ), (char **)NULL, 10 );
strncpy( userinfo, Cmd_Argv( 4 ), sizeof ( userinfo ) - 1 );
userinfo [ sizeof ( userinfo ) - 1 ] = 0;

2
src/server/sv_init.c
View file

@ -278,7 +278,7 @@ SV_SpawnServer ( char *server, char *spawnpoint, server_state_t serverstate, qbo
ge->RunFrame();
/* verify game didn't clobber important stuff */
if ( (int) checksum != atoi( sv.configstrings [ CS_MAPCHECKSUM ] ) )
if ( (int) checksum != (int)strtol( sv.configstrings [ CS_MAPCHECKSUM ], (char **)NULL, 10 ) )
{
Com_Error( ERR_DROP, "Game DLL corrupted server configstrings" );
}

4
src/server/sv_main.c
View file

@ -546,7 +546,7 @@ SV_UserinfoChanged ( client_t *cl )
if ( strlen( val ) )
{
i = atoi( val );
i = (int)strtol( val, (char **)NULL, 10 );
cl->rate = i;
if ( cl->rate < 100 )
@ -569,7 +569,7 @@ SV_UserinfoChanged ( client_t *cl )
if ( strlen( val ) )
{
cl->messagelevel = atoi( val );
cl->messagelevel = (int)strtol( val, (char **)NULL, 10 );
}
}

14
src/server/sv_user.c
View file

@ -124,14 +124,14 @@ SV_Configstrings_f ( void )
}
/* handle the case of a level changing while a client was connecting */
if ( atoi( Cmd_Argv( 1 ) ) != svs.spawncount )
if ( (int)strtol( Cmd_Argv( 1 ), (char **)NULL, 10 ) != svs.spawncount )
{
Com_Printf( "SV_Configstrings_f from different level\n" );
SV_New_f();
return;
}
start = atoi( Cmd_Argv( 2 ) );
start = (int)strtol( Cmd_Argv( 2 ), (char **)NULL, 10 );
/* write a packet full of data */
while ( sv_client->netchan.message.cursize < MAX_MSGLEN / 2 && start < MAX_CONFIGSTRINGS )
@ -175,14 +175,14 @@ SV_Baselines_f ( void )
}
/* handle the case of a level changing while a client was connecting */
if ( atoi( Cmd_Argv( 1 ) ) != svs.spawncount )
if ( (int)strtol( Cmd_Argv( 1 ), (char **)NULL, 10 ) != svs.spawncount )
{
Com_Printf( "SV_Baselines_f from different level\n" );
SV_New_f();
return;
}
start = atoi( Cmd_Argv( 2 ) );
start = (int)strtol( Cmd_Argv( 2 ), (char **)NULL, 10 );
memset( &nullstate, 0, sizeof ( nullstate ) );
@ -220,7 +220,7 @@ SV_Begin_f ( void )
Com_DPrintf( "Begin() from %s\n", sv_client->name );
/* handle the case of a level changing while a client was connecting */
if ( atoi( Cmd_Argv( 1 ) ) != svs.spawncount )
if ( (int)strtol( Cmd_Argv( 1 ), (char **)NULL, 10 ) != svs.spawncount )
{
Com_Printf( "SV_Begin_f from different level\n" );
SV_New_f();
@ -295,7 +295,7 @@ SV_BeginDownload_f ( void )
if ( Cmd_Argc() > 2 )
{
offset = atoi( Cmd_Argv( 2 ) ); /* downloaded offset */
offset = (int)strtol( Cmd_Argv( 2 ), (char **)NULL, 10 ); /* downloaded offset */
}
/* hacked by zoid to allow more conrol over download
@ -407,7 +407,7 @@ SV_Nextserver ( void )
void
SV_Nextserver_f ( void )
{
if ( atoi( Cmd_Argv( 1 ) ) != svs.spawncount )
if ( (int)strtol( Cmd_Argv( 1 ), (char **)NULL, 10 ) != svs.spawncount )
{
Com_DPrintf( "Nextserver() from wrong level, from %s\n", sv_client->name );
return; /* leftover from last server */