aboutsummaryrefslogtreecommitdiffstats
path: root/code/botlib/l_precomp.c
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-10-19 23:29:44 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-10-19 23:29:44 +0000
commit12b36c8a3aa680f65df68c369a2803e83800d40f (patch)
tree0cf4e471203ed0653cb040857044aea2a08249d0 /code/botlib/l_precomp.c
parent05577376d95da42fe8cf3bb465ec4c628edb4ad7 (diff)
downloadioquake3-aero-12b36c8a3aa680f65df68c369a2803e83800d40f.tar.gz
ioquake3-aero-12b36c8a3aa680f65df68c369a2803e83800d40f.zip
Fix botlib parser for negative int/float values, thanks to Makro for reporting (#4227).
git-svn-id: svn://svn.icculus.org/quake3/trunk@1688 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/botlib/l_precomp.c')
-rw-r--r--code/botlib/l_precomp.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c
index 06e7877..06dbae7 100644
--- a/code/botlib/l_precomp.c
+++ b/code/botlib/l_precomp.c
@@ -2561,12 +2561,16 @@ int PC_DollarDirective_evalint(source_t *source)
sprintf(token.string, "%d", abs(value));
token.type = TT_NUMBER;
token.subtype = TT_INTEGER|TT_LONG|TT_DECIMAL;
+
#ifdef NUMBERVALUE
- token.intvalue = value;
- token.floatvalue = value;
+ token.intvalue = abs(value);
+ token.floatvalue = token.intvalue;
#endif //NUMBERVALUE
+
PC_UnreadSourceToken(source, &token);
- if (value < 0) UnreadSignToken(source);
+ if (value < 0)
+ UnreadSignToken(source);
+
return qtrue;
} //end of the function PC_DollarDirective_evalint
//============================================================================
@@ -2588,12 +2592,16 @@ int PC_DollarDirective_evalfloat(source_t *source)
sprintf(token.string, "%1.2f", fabs(value));
token.type = TT_NUMBER;
token.subtype = TT_FLOAT|TT_LONG|TT_DECIMAL;
+
#ifdef NUMBERVALUE
- token.intvalue = (unsigned long) value;
- token.floatvalue = value;
+ token.floatvalue = fabs(value);
+ token.intvalue = (unsigned long) token.floatvalue;
#endif //NUMBERVALUE
+
PC_UnreadSourceToken(source, &token);
- if (value < 0) UnreadSignToken(source);
+ if (value < 0)
+ UnreadSignToken(source);
+
return qtrue;
} //end of the function PC_DollarDirective_evalfloat
//============================================================================