OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- eliminated the two global FraggleScript variables by moving them into DFraggleThinker.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-29 01:18:21 +01:00
commit f31b1b92c9
9 changed files with 27 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/fragglescript/t_spec.cpp
View file

@ -467,7 +467,7 @@ void FParser::EvaluateFunction(svalue_t &result, int start, int stop)
}
// all the functions are stored in the global script
else if( !(func = global_script->VariableForName (Tokens[start])) )
else if( !(func = DFraggleThinker::ActiveThinker->GlobalScript->VariableForName (Tokens[start])) )
{
script_error("no such function: '%s'\n",Tokens[start]);
}
@ -551,7 +551,7 @@ void FParser::OPstructure(svalue_t &result, int start, int n, int stop)
svalue_t argv[MAXARGS];
// all the functions are stored in the global script
if( !(func = global_script->VariableForName (Tokens[n+1])) )
if( !(func = DFraggleThinker::ActiveThinker->GlobalScript->VariableForName (Tokens[n+1])) )
{
script_error("no such function: '%s'\n",Tokens[n+1]);
}