rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-01-22 17:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

More robust parsing of negative numbers in uiScript's.

Browse source
This commit is contained in:
Andrei Drexler 2009-06-26 20:11:40 +00:00
parent 78a95492bd
commit 808452afe3
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
reaction/ta_ui/ui_shared.c
View file

@ -491,7 +491,7 @@ qboolean Float_Parse(char **p, float *f)
token && *token;
token = COM_ParseExt(p, qfalse) )
{
if (*token != '-')
if (*token != '-' || token[1] != 0)
break;
negative ^= qtrue;
@ -601,7 +601,7 @@ qboolean Int_Parse(char **p, int *i)
token && *token;
token = COM_ParseExt(p, qfalse) )
{
if (*token != '-')
if (*token != '-' || token[1] != 0)
break;
negative ^= qtrue;
@ -630,18 +630,32 @@ qboolean PC_Int_Parse(int handle, int *i)
if (!trap_PC_ReadToken(handle, &token))
return qfalse;
if (token.string[0] == '-') {
while (token.type == TT_PUNCTUATION)
{
if (token.string[0] != '-')
{
PC_SourceError(handle, "expected integer but found %s\n", token.string);
return qfalse;
}
if (!trap_PC_ReadToken(handle, &token))
return qfalse;
negative = qtrue;
negative ^= qtrue;
}
if (token.type != TT_NUMBER) {
if (token.type != TT_NUMBER)
{
PC_SourceError(handle, "expected integer but found %s\n", token.string);
return qfalse;
}
*i = atoi(token.string);
if (negative)
*i = -*i;
*i = -atoi(token.string);
else
*i = atoi(token.string);
return qtrue;
}