diff options
| -rw-r--r-- | code/botlib/be_ai_weight.c | 13 | ||||
| -rw-r--r-- | code/botlib/l_precomp.c | 20 | ||||
| -rw-r--r-- | code/botlib/l_script.c | 32 |
3 files changed, 48 insertions, 17 deletions
diff --git a/code/botlib/be_ai_weight.c b/code/botlib/be_ai_weight.c index 72ef812..17216ab 100644 --- a/code/botlib/be_ai_weight.c +++ b/code/botlib/be_ai_weight.c @@ -64,13 +64,20 @@ int ReadValue(source_t *source, float *value) if (!strcmp(token.string, "-")) { SourceWarning(source, "negative value set to zero\n"); - if (!PC_ExpectTokenType(source, TT_NUMBER, 0, &token)) return qfalse; - } //end if + + if(!PC_ExpectAnyToken(source, &token)) + { + SourceError(source, "Missing return value\n"); + return qfalse; + } + } + if (token.type != TT_NUMBER) { SourceError(source, "invalid return value %s\n", token.string); return qfalse; - } //end if + } + *value = token.floatvalue; return qtrue; } //end of the function ReadValue 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 //============================================================================ diff --git a/code/botlib/l_script.c b/code/botlib/l_script.c index c92481c..a579f28 100644 --- a/code/botlib/l_script.c +++ b/code/botlib/l_script.c @@ -1156,13 +1156,21 @@ float ReadSignedFloat(script_t *script) PS_ExpectAnyToken(script, &token); if (!strcmp(token.string, "-")) { + if(!PS_ExpectAnyToken(script, &token)) + { + ScriptError(script, "Missing float value\n", token.string); + return 0; + } + sign = -1.0; - PS_ExpectTokenType(script, TT_NUMBER, 0, &token); - } //end if - else if (token.type != TT_NUMBER) + } + + if (token.type != TT_NUMBER) { ScriptError(script, "expected float value, found %s\n", token.string); - } //end else if + return 0; + } + return sign * token.floatvalue; } //end of the function ReadSignedFloat //============================================================================ @@ -1179,13 +1187,21 @@ signed long int ReadSignedInt(script_t *script) PS_ExpectAnyToken(script, &token); if (!strcmp(token.string, "-")) { + if(!PS_ExpectAnyToken(script, &token)) + { + ScriptError(script, "Missing integer value\n", token.string); + return 0; + } + sign = -1; - PS_ExpectTokenType(script, TT_NUMBER, TT_INTEGER, &token); - } //end if - else if (token.type != TT_NUMBER || token.subtype == TT_FLOAT) + } + + if (token.type != TT_NUMBER || token.subtype == TT_FLOAT) { ScriptError(script, "expected integer value, found %s\n", token.string); - } //end else if + return 0; + } + return sign * token.intvalue; } //end of the function ReadSignedInt //============================================================================ |