R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'indev' of https://github.com/Mauler125/r5sdk into indev

Browse Source
This commit is contained in:
Amos 2022-05-11 10:30:34 +02:00
commit 187174cda5
6 changed files with 72 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r5dev/engine/sys_utils.cpp
View File

@ -188,7 +188,7 @@ void DevMsg(eDLL_T idx, const char* fmt, ...)
break;
}
g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str().c_str(), color));
g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
g_pLogSystem.AddLog(tLog, g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
@ -265,8 +265,8 @@ void Warning(eDLL_T idx, const char* fmt, ...)
#ifndef DEDICATED
iconsole->info(svOut);
g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
g_pLogSystem.AddLog(LogType_t::WARNING_C, g_spd_sys_w_oss.str());
g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
g_spd_sys_w_oss.str("");
g_spd_sys_w_oss.clear();
@ -342,8 +342,8 @@ void Error(eDLL_T idx, const char* fmt, ...)
#ifndef DEDICATED
iconsole->info(svOut);
g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 0.00f, 0.00f, 1.00f)));
g_pLogSystem.AddLog(LogType_t::ERROR_C, g_spd_sys_w_oss.str());
g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 0.00f, 0.00f, 1.00f)));
g_spd_sys_w_oss.str("");
g_spd_sys_w_oss.clear();

10
r5dev/gameui/IConsole.cpp
View File

@ -520,7 +520,7 @@ void CConsole::FindFromPartial(void)
//-----------------------------------------------------------------------------
void CConsole::ProcessCommand(const char* pszCommand)
{
AddLog(ImVec4(1.00f, 0.80f, 0.60f, 1.00f), "# %s\n", pszCommand);
AddLog(ImVec4(1.00f, 0.80f, 0.60f, 1.00f), "# %s\n", PrintPercentageEscape(pszCommand).c_str());
std::thread t(CEngineClient_CommandExecute, this, pszCommand);
t.detach(); // Detach from render thread.
@ -552,9 +552,9 @@ void CConsole::ProcessCommand(const char* pszCommand)
}
AddLog(ImVec4(0.81f, 0.81f, 0.81f, 1.00f), "Log types:");
AddLog(ImVec4(0.59f, 0.58f, 0.73f, 1.00f), "Script(S): = Server DLL (Script VM)");
AddLog(ImVec4(0.59f, 0.58f, 0.63f, 1.00f), "Script(C): = Client DLL (Script VM)");
AddLog(ImVec4(0.59f, 0.48f, 0.53f, 1.00f), "Script(U): = UI DLL (Script VM)");
AddLog(ImVec4(0.59f, 0.58f, 0.73f, 1.00f), "Script(S): = Server DLL (Script)");
AddLog(ImVec4(0.59f, 0.58f, 0.63f, 1.00f), "Script(C): = Client DLL (Script)");
AddLog(ImVec4(0.59f, 0.48f, 0.53f, 1.00f), "Script(U): = UI DLL (Script)");
AddLog(ImVec4(0.23f, 0.47f, 0.85f, 1.00f), "Native(S): = Server DLL (Code)");
AddLog(ImVec4(0.46f, 0.46f, 0.46f, 1.00f), "Native(C): = Client DLL (Code)");
@ -766,7 +766,7 @@ void CConsole::AddLog(ImVec4 color, const char* fmt, ...) IM_FMTARGS(2)
vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
buf[IM_ARRAYSIZE(buf) - 1] = 0;
va_end(args);
m_ivConLog.push_back(CConLog(Strdup(buf), ImVec4(1.00f, 0.80f, 0.60f, 1.00f)));
m_ivConLog.push_back(CConLog(Strdup(buf), color));
}
//-----------------------------------------------------------------------------

8
r5dev/public/include/utility.h
View File

@ -27,8 +27,16 @@ bool CompareStringLexicographically(const string& svA, const string& svB);
bool StringReplace(string& svInput, const string& svFrom, const string& svTo);
string StringEscape(const string& svInput);
string StringUnescape(const string& svInput);
vector<int> StringToBytes(const string& svInput, bool bNullTerminator);
vector<int> PatternToBytes(const string& svInput);
vector<int> IntToDigits(int value);
void PrintM128i8(__m128i in);
void PrintM128i16(__m128i in);
void PrintM128i32(__m128i in);
void PrintM128i64(__m128i in);
string PrintPercentageEscape(const string& svInput);
/////////////////////////////////////////////////////////////////////////////

57
r5dev/public/utility.cpp
View File

@ -144,7 +144,7 @@ void PrintLastError(void)
}
///////////////////////////////////////////////////////////////////////////////
// For dumping data from a buffer to a file on the disk
// For dumping data from a buffer to a file on the disk.
void HexDump(const char* szHeader, const char* szLogger, const void* pData, int nSize)
{
static unsigned char szAscii[17] = {};
@ -345,7 +345,7 @@ string Base64Decode(const string& svInput)
}
///////////////////////////////////////////////////////////////////////////////
// For comparing input strings alphabetically
// For comparing input strings alphabetically.
bool CompareStringAlphabetically(const string& svA, const string& svB)
{
int i = 0;
@ -358,7 +358,7 @@ bool CompareStringAlphabetically(const string& svA, const string& svB)
}
///////////////////////////////////////////////////////////////////////////////
// For comparing input strings lexicographically
// For comparing input strings lexicographically.
bool CompareStringLexicographically(const string& svA, const string& svB)
{
return svA < svB;
@ -384,6 +384,7 @@ string StringEscape(const string& svInput)
{
string results;
results.reserve(svInput.size());
for (const char c : svInput)
{
switch (c)
@ -408,6 +409,7 @@ string StringUnescape(const string& svInput)
{
string results;
results.reserve(svInput.size());
for (const char c : svInput)
{
switch (c)
@ -475,7 +477,7 @@ vector<int> PatternToBytes(const string& svInput)
};
///////////////////////////////////////////////////////////////////////////////
// For converting a integer into digits
// For converting a integer into digits.
vector<int> IntToDigits(int value)
{
vector<int> vDigits;
@ -486,3 +488,50 @@ vector<int> IntToDigits(int value)
std::reverse(vDigits.begin(), vDigits.end());
return vDigits;
}
///////////////////////////////////////////////////////////////////////////////
// For printing __m128i datatypes.
void PrintM128i8(__m128i in)
{
alignas(16) uint8_t v[16];
_mm_store_si128(reinterpret_cast<__m128i*>(v), in);
printf("v16_u8: %x %x %x %x | %x %x %x %x | %x %x %x %x | %x %x %x %x\n",
v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7],
v[8], v[9], v[10], v[11], v[12], v[13], v[14], v[15]);
}
void PrintM128i16(__m128i in)
{
alignas(16) uint16_t v[8];
_mm_store_si128(reinterpret_cast<__m128i*>(v), in);
printf("v8_u16: %x %x %x %x, %x %x %x %x\n", v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
}
void PrintM128i32(__m128i in)
{
alignas(16) uint32_t v[4];
_mm_store_si128(reinterpret_cast<__m128i*>(v), in);
printf("v4_u32: %x %x %x %x\n", v[0], v[1], v[2], v[3]);
}
void PrintM128i64(__m128i in)
{
alignas(16) uint64_t v[2]; // uint64_t might give format-string warnings with %llx; it's just long in some ABIs
_mm_store_si128(reinterpret_cast<__m128i*>(v), in);
printf("v2_u64: %llx %llx\n", v[0], v[1]);
}
///////////////////////////////////////////////////////////////////////////////
// For escaping the '%' character for *rintf.
string PrintPercentageEscape(const string& svInput)
{
string results;
results.reserve(svInput.size());
for (const char c : svInput)
{
switch (c)
{
case '%': results += "%%"; break;
default: results += c; break;
}
}
return results;
}

8
r5dev/squirrel/sqtype.h
View File

@ -92,14 +92,6 @@ const static std::string SQVM_LOG_T[4] =
"Script(X):"
};
const static std::string SQVM_WARNING_LOG_T[4] =
{
"Script(S):",
"Script(C):",
"Script(U):",
"Script(X):"
};
const static std::string SQVM_ANSI_LOG_T[4] =
{
"\033[38;2;151;149;187mScript(S):",

6
r5dev/squirrel/sqvm.cpp
View File

@ -147,7 +147,7 @@ SQRESULT HSQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...)
}
}
g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), color));
g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
g_pLogSystem.AddLog(static_cast<LogType_t>(context), g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
@ -189,7 +189,7 @@ SQRESULT HSQVM_WarningFunc(HSQUIRRELVM v, SQInteger a2, SQInteger a3, SQInteger*
static std::shared_ptr<spdlog::logger> wconsole = spdlog::get("win_console");
static std::shared_ptr<spdlog::logger> sqlogger = spdlog::get("sqvm_warn_logger");
std::string vmStr = SQVM_WARNING_LOG_T[static_cast<int>(context)].c_str();
std::string vmStr = SQVM_LOG_T[static_cast<int>(context)].c_str();
std::string svConstructor(*ppString, *nStringSize); // Get string from memory via std::string constructor.
vmStr.append(svConstructor);
@ -216,7 +216,7 @@ SQRESULT HSQVM_WarningFunc(HSQUIRRELVM v, SQInteger a2, SQInteger a3, SQInteger*
#ifndef DEDICATED
iconsole->debug(vmStr); // Emit to in-game console.
g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
g_pLogSystem.AddLog(LogType_t::WARNING_C, g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");