RomanRom2/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-10-25 21:36:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(ui): improve FrameXML debug routines

Browse Source
This commit is contained in:
VDm 2025-08-03 13:07:27 +04:00
parent 679ed1101f
commit eed536042d
5 changed files with 77 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/gameui/GameScriptFunctions.cpp
View File

@ -1,5 +1,7 @@
#include "gameui/GameScriptFunctions.hpp"
#include "ui/FrameXML.hpp"
#include "ui/FrameScript.hpp"
#include "util/Lua.hpp"
#include "util/Unimplemented.hpp"
// External from "ui/ScriptFunctions.hpp"
@ -7,7 +9,13 @@ void RegisterSimpleFrameScriptMethods();
static int32_t Script_FrameXML_Debug(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
int32_t level = FrameXML_GetDebugLevel();
if (lua_isnumber(L, 1)) {
level = static_cast<int32_t>(lua_tonumber(L, 1));
FrameXML_SetDebugLevel(level);
}
lua_pushnumber(L, 1);
return 1;
}
static int32_t Script_GetBuildInfo(lua_State* L) {
@ -115,7 +123,12 @@ static int32_t Script_GetDebugStats(lua_State* L) {
}
static int32_t Script_IsDebugBuild(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
#ifdef WHOA_BUILD_ASSERTIONS
lua_pushboolean(L, 1);
#else
lua_pushboolean(L, 0);
#endif
return 1;
}
static int32_t Script_RegisterCVar(lua_State* L) {
@ -639,15 +652,30 @@ static int32_t Script_InCinematic(lua_State* L) {
}
static int32_t Script_IsWindowsClient(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
#ifdef WHOA_SYSTEM_WIN
lua_pushnumber(L, 1.0);
#else
lua_pushnil(L);
#endif
return 1;
}
static int32_t Script_IsMacClient(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
#ifdef WHOA_SYSTEM_MAC
lua_pushnumber(L, 1.0);
#else
lua_pushnil(L);
#endif
return 1;
}
static int32_t Script_IsLinuxClient(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
#ifdef WHOA_SYSTEM_LINUX
lua_pushnumber(L, 1.0);
#else
lua_pushnil(L);
#endif
return 1;
}
static int32_t Script_AcceptXPLoss(lua_State* L) {

51
src/ui/FrameXML.cpp
View File

@ -272,9 +272,10 @@ int32_t FrameXML_CreateFrames(const char* tocPath, const char* a2, MD5_CTX* md5,
tocData = tocData + 3;
}
CStatus v21;
CStatus frameStatus;
char tocLine[1024];
char tocEntryPath[260];
int32_t v25 = 0;
do {
SStrTokenize(&tocData, tocLine, 1024, "\r\n", 0);
@ -307,7 +308,7 @@ int32_t FrameXML_CreateFrames(const char* tocPath, const char* a2, MD5_CTX* md5,
*v12 = 0;
FrameXML_ProcessFile(tocEntryPath, a2, md5, &v21);
FrameXML_ProcessFile(tocEntryPath, a2, md5, &frameStatus);
// TODO
// if (s_progressCallback && s_progressFiles < s_progressTotal) {
@ -324,13 +325,11 @@ int32_t FrameXML_CreateFrames(const char* tocPath, const char* a2, MD5_CTX* md5,
SFile::Unload(tocBuffer);
// TODO
// if (s_debugLevel > 0 || v25 > 0) {
// v21.Prepend(STATUS_INFO, "** Loading table of contents %s", v5);
// }
if (FrameXML::s_debugLevel > 0 || v25 > 0) {
frameStatus.Prepend(STATUS_INFO, "** Loading table of contents %s", v5);
}
// TODO
// status->Add(v21);
status->Add(frameStatus);
return 1;
}
@ -417,7 +416,7 @@ int32_t FrameXML_ProcessFile(const char* filePath, const char* a2, MD5_CTX* md5,
return 0;
}
CStatus unkStatus;
CStatus fileStatus;
XMLNode* node = XMLTree_GetRoot(tree)->m_child;
@ -428,6 +427,8 @@ int32_t FrameXML_ProcessFile(const char* filePath, const char* a2, MD5_CTX* md5,
// Should come from some kind of Lua headers
const char* lua_tainted = nullptr;
int32_t v34 = 0;
while (node) {
// <Include>
if (!SStrCmpI(node->GetName(), "Include", 0x7FFFFFFFu)) {
@ -448,9 +449,9 @@ int32_t FrameXML_ProcessFile(const char* filePath, const char* a2, MD5_CTX* md5,
SStrCopy(v27, v14, 260);
}
FrameXML_ProcessFile(v27, a2, md5, &unkStatus);
FrameXML_ProcessFile(v27, a2, md5, &fileStatus);
} else {
unkStatus.Add(STATUS_ERROR, "Element 'Include' without file attribute");
fileStatus.Add(STATUS_ERROR, "Element 'Include' without file attribute");
}
// <Script>
} else if (!SStrCmpI(node->GetName(), "Script", 0x7FFFFFFFu)) {
@ -473,7 +474,7 @@ int32_t FrameXML_ProcessFile(const char* filePath, const char* a2, MD5_CTX* md5,
SStrCopy(v27, v16, 260);
}
FrameScript_ExecuteFile(v27, a2, md5, &unkStatus);
FrameScript_ExecuteFile(v27, a2, md5, &fileStatus);
}
char* v19 = node->m_body;
@ -490,22 +491,22 @@ int32_t FrameXML_ProcessFile(const char* filePath, const char* a2, MD5_CTX* md5,
CSimpleFont* font = CSimpleFont::GetFont(fontName, 1);
font->LoadXML(node, status);
} else {
unkStatus.Add(STATUS_WARNING, "Unnamed font node at top level");
fileStatus.Add(STATUS_WARNING, "Unnamed font node at top level");
}
// Everything else (frame nodes)
} else {
const char* v22 = node->GetAttributeByName("virtual");
if (!v22 || SStrCmpI(v22, "true", 0x7FFFFFFFu)) {
FrameXML_CreateFrame(node, nullptr, &unkStatus);
FrameXML_CreateFrame(node, nullptr, &fileStatus);
CLayoutFrame::ResizePending();
} else {
const char* v23 = node->GetAttributeByName("name");
if (v23 && *v23) {
FrameXML_StoreHashNode(node, v23, lua_tainted, &unkStatus);
FrameXML_StoreHashNode(node, v23, lua_tainted, &fileStatus);
} else {
unkStatus.Add(STATUS_WARNING, "Unnamed virtual node at top level");
fileStatus.Add(STATUS_WARNING, "Unnamed virtual node at top level");
}
}
}
@ -515,13 +516,11 @@ int32_t FrameXML_ProcessFile(const char* filePath, const char* a2, MD5_CTX* md5,
XMLTree_Free(tree);
// TODO
// if (s_debugLevel > 0 || v34 > 0) {
// unkStatus.Prepend(STATUS_INFO, "++ Loading file %s", v5);
// }
if (FrameXML::s_debugLevel > 0 || v34 > 0) {
fileStatus.Prepend(STATUS_INFO, "++ Loading file %s", v5);
}
// TODO
// status->Unk8(unkStatus);
status->Add(fileStatus);
return 1;
}
@ -613,3 +612,11 @@ int32_t FrameXML_GuessNumFiles(const char* data) {
}
return result;
}
int32_t FrameXML_GetDebugLevel() {
return FrameXML::s_debugLevel;
}
void FrameXML_SetDebugLevel(int32_t level) {
FrameXML::s_debugLevel = level;
}

4
src/ui/FrameXML.hpp
View File

@ -54,4 +54,8 @@ void FrameXML_StoreHashNode(XMLNode* node, const char* name, const char* a3, CSt
int32_t FrameXML_GuessNumFiles(const char* data);
int32_t FrameXML_GetDebugLevel();
void FrameXML_SetDebugLevel(int32_t level);
#endif

10
src/util/CStatus.cpp
View File

@ -24,6 +24,16 @@ void CStatus::Add(STATUS_TYPE severity, const char* format, ...) {
va_end(args);
}
void CStatus::Prepend(STATUS_TYPE severity, const char* format, ...) {
// TODO
// Remove temporary console debug logging
va_list args;
va_start(args, format);
vprintf(format, args);
printf("\n");
va_end(args);
}
CStatus& GetGlobalStatusObj() {
return CStatus::s_errorList;
}

1
src/util/CStatus.hpp
View File

@ -27,6 +27,7 @@ class CStatus {
// Member functions
void Add(const CStatus&);
void Add(STATUS_TYPE, const char*, ...);
void Prepend(STATUS_TYPE, const char*, ...);
public:
STORM_EXPLICIT_LIST(CStatus::STATUSENTRY, link) statusList;