TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Console Refactor

Browse source
This commit is contained in:
Lukas Aldershaab 2023-04-23 10:39:54 +02:00
parent 626de074cc
commit 89b0c7f73b
89 changed files with 1883 additions and 1553 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/console/scriptFilename.cpp
View file

@ -23,12 +23,12 @@
#include "platform/platform.h"
#include "console/scriptFilename.h"
#include "consoleInternal.h"
#include "core/frameAllocator.h"
#include "core/tSimpleHashTable.h"
#include "core/strings/stringFunctions.h"
#include "core/stringTable.h"
#include "console/engineAPI.h"
#include "console/compiler.h"
namespace Con
@ -88,8 +88,8 @@ bool expandToolScriptFilename(char *filename, U32 size, const char *src)
// same way the old code did as it is now possible that something could
// be expanded if the name or mod is NULL. This was previously not the case.
const StringTableEntry cbMod = CodeBlock::getCurrentCodeBlockModName();
const StringTableEntry cbFullPath = CodeBlock::getCurrentCodeBlockFullPath();
const StringTableEntry cbMod = Con::getCurrentScriptModuleName();
const StringTableEntry cbFullPath = Con::getCurrentScriptModulePath();
char varBuf[1024], modBuf[1024];
const char *ptr = src;
@ -216,7 +216,8 @@ bool expandToolScriptFilename(char *filename, U32 size, const char *src)
bool expandOldScriptFilename(char *filename, U32 size, const char *src)
{
const StringTableEntry cbName = CodeBlock::getCurrentCodeBlockName();
const StringTableEntry cbName = Con::getCurrentScriptModuleName();
if (!cbName)
{
dStrcpy(filename, src, size);