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

Merge pull request #1087 from Azaezel/weirdtsbug

Browse source 
conflict resolution for #1086
This commit is contained in:
Brian Roberts 2023-09-13 09:28:11 -05:00 committed by GitHub
parent ec8a8290b4 a746957cd9
commit bf200a511e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -152,6 +152,12 @@ S32 FuncVars::assign(StringTableEntry var, TypeReq currentType, S32 lineNumber,
std::unordered_map<StringTableEntry, Var>::iterator found = vars.find(var);
if (found != vars.end())
{
// if we are calling assign more than once AND it changes type, we don't know what the variable type is as this is a
// dynamically typed language. So we will assign to None and bail. None will be taken care of by the code to always
// load what the default type is (What Globals and arrays use, type None).
if (currentType != found->second.currentType && found->second.currentType != TypeReqNone)
found->second.currentType = TypeReqNone;
if (found->second.isConstant)
{
const char* str = avar("Script Warning: Reassigning variable %s when it is a constant. File: %s Line : %d", var, CodeBlock::smCurrentParser->getCurrentFile(), lineNumber);