TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' into console-func-refactor

Browse source 
Conflicts:
	Engine/source/console/compiledEval.cpp
This commit is contained in:
Daniel Buckmaster 2014-10-20 09:29:44 +11:00
commit 4c07c55121
4 changed files with 19 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/console/compiledEval.cpp
View file

@ -1747,6 +1747,7 @@ breakContinue:
Con::warnf(ConsoleLogEntry::General,"%s: Unable to find object: '%s' attempting to call function '%s'", getFileLine(ip-4), (const char*)callArgv[1], fnName);
STR.popFrame();
CSTK.popFrame();
STR.setStringValue("");
break;
}

2
Engine/source/console/simManager.cpp
View file

@ -372,6 +372,8 @@ SimObject* findObject(const char* name)
return NULL;
return obj->findObject(temp);
}
else if (c < '0' || c > '9')
return NULL;
}
}
S32 len;