Skip to content

Fix #3439 - onClientDebugMessage/onDebugMessage recognize level 4 as 0 #3440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 9, 2024
Merged

Fix #3439 - onClientDebugMessage/onDebugMessage recognize level 4 as 0 #3440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d8282
Fixed #3439
TracerDS Jun 8, 2024
b29fd58
Merge branch 'master' into 080624_Fix-#3439
TracerDS Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,25 +127,23 @@ int CLuaFunctionDefs::OutputClientDebugString(lua_State* luaVM)
CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
if (pLuaMain)
{
if (uiLevel == 1)
switch (uiLevel)
{
m_pScriptDebugging->LogError(luaVM, "%s", strText.c_str());
}
else if (uiLevel == 2)
{
m_pScriptDebugging->LogWarning(luaVM, "%s", strText.c_str());
}
else if (uiLevel == 3)
{
m_pScriptDebugging->LogInformation(luaVM, "%s", strText.c_str());
}
else if (uiLevel == 4)
{
m_pScriptDebugging->LogCustom(luaVM, ucRed, ucGreen, ucBlue, "%s", strText.c_str());
}
else if (uiLevel == 0)
{
m_pScriptDebugging->LogDebug(luaVM, ucRed, ucGreen, ucBlue, "%s", strText.c_str());
case 0:
m_pScriptDebugging->LogDebug(luaVM, ucRed, ucGreen, ucBlue, "%s", strText.c_str());
break;
case 1:
m_pScriptDebugging->LogError(luaVM, "%s", strText.c_str());
break;
case 2:
m_pScriptDebugging->LogWarning(luaVM, "%s", strText.c_str());
break;
case 3:
m_pScriptDebugging->LogInformation(luaVM, "%s", strText.c_str());
break;
case 4:
m_pScriptDebugging->LogCustom(luaVM, ucRed, ucGreen, ucBlue, "%s", strText.c_str());
break;
}

// Success
Expand Down
3 changes: 1 addition & 2 deletions Shared/mods/deathmatch/logic/CScriptDebugging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ void CScriptDebugging::LogCustom(lua_State* luaVM, unsigned char ucRed, unsigned
VSNPRINTF(szBuffer, MAX_STRING_LENGTH, szFormat, marker);
va_end(marker);

SLuaDebugInfo luaDebugInfo;
LogString("", luaDebugInfo, szBuffer, 0, ucRed, ucGreen, ucBlue);
LogString("", GetLuaDebugInfo(luaVM), szBuffer, 4, ucRed, ucGreen, ucBlue);
}

void CScriptDebugging::LogDebug(lua_State* luaVM, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue, const char* szFormat, ...)
Expand Down