TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #630 from JeffProgrammer/ts-nexttoken

Browse source 
This one slipped through - nextToken can't use local variable for its…
This commit is contained in:
Brian Roberts 2021-10-19 19:44:04 -05:00 committed by GitHub
parent 84be0a369f 4af4d90f4a
commit 77ac78493a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/console/console.cpp
View file

@ -861,12 +861,6 @@ void setVariable(const char *name, const char *value)
}
}
void setLocalVariable(const char *name, const char *value)
{
name = prependPercent(name);
gEvalState.getCurrentFrame().setVariable(StringTable->insert(name), value);
}
void setBoolVariable(const char *varName, bool value)
{
SimObject *obj = NULL;

9
Engine/source/console/console.h
View file

@ -720,15 +720,6 @@ namespace Con
///
void removeVariableNotify(const char *name, const NotifyDelegate &callback);
/// Assign a string value to a locally scoped console variable
///
/// @note The context of the variable is determined by gEvalState; that is,
/// by the currently executing code.
///
/// @param name Local console variable name to set
/// @param value String value to assign to name
void setLocalVariable(const char *name, const char *value);
/// Retrieve the string value to a locally scoped console variable
///
/// @note The context of the variable is determined by gEvalState; that is,

7
Engine/source/console/consoleFunctions.cpp
View file

@ -1703,12 +1703,7 @@ DefineEngineFunction( nextToken, const char*, ( const char* str1, const char* to
if (*str)
*str++ = 0;
// set local variable if inside a function
if (gEvalState.getStackDepth() > 0 &&
gEvalState.getCurrentFrame().scopeName)
Con::setLocalVariable(token,tmp);
else
Con::setVariable(token,tmp);
Con::setVariable(token,tmp);
// advance str past the 'delim space'
while (isInSet(*str, delim))