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

Removed native console logging, logging to file and imgui console now.

Browse Source
This commit is contained in:
IcePixelx 2021-08-30 17:52:10 +02:00
parent 0e1c930805
commit c89c7c9c6b
5 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/include/opcptc.h
View File

@ -53,7 +53,5 @@ namespace
PRINT_ADDRESS("FairFight_Init", FairFight_Init.GetPtr());
PRINT_ADDRESS("Squirrel_CompileError", Squirrel_CompileError.GetPtr());
std::cout << "+--------------------------------------------------------+" << std::endl;
// TODO implement error handling when sigscan fails or result is 0
}
}

7
r5dev/src/hooks/cvengineserver.cpp
View File

@ -21,14 +21,7 @@ bool Hooks::IsPersistenceDataAvailable(__int64 thisptr, int client)
*(char*)(targetPlayerStruct + persistenceVar) = (char)0x5;
if (!isPersistenceVarSet[client])
{
printf("\n");
printf("##################################################\n");
printf("] SETTING PERSISTENCE VAR FOR CLIENT #%d\n", client);
printf("##################################################\n");
printf("\n");
isPersistenceVarSet[client] = true;
}
return originalIsPersistenceDataAvailable(thisptr, client);
}

2
r5dev/src/hooks/msgbox.cpp
View File

@ -8,7 +8,7 @@ namespace Hooks
int Hooks::MSG_EngineError(char* fmt, va_list args)
{
printf("\nENGINE ERROR #####################################\n");
std::cout << "\nENGINE ERROR #####################################\n";
vprintf(fmt, args);
return originalMSG_EngineError(fmt, args);

27
r5dev/src/hooks/net.cpp
View File

@ -8,8 +8,9 @@ namespace Hooks
NET_SendDatagramFn originalNET_SendDatagram = nullptr;
}
static std::ostringstream oss;
static auto ostream_sink = std::make_shared<spdlog::sinks::ostream_sink_st>(oss);
static std::ostringstream oss_print;
static auto ostream_sink_print = std::make_shared<spdlog::sinks::ostream_sink_st>(oss_print);
static auto log_sink_print = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/NET_Print.txt", true);
//-----------------------------------------------------------------------------
// Purpose: log the clients signonstate to the console
@ -19,19 +20,18 @@ void Hooks::NET_PrintFunc(const char* fmt, ...)
static bool initialized = false;
static char buf[1024];
static auto iconsole = spdlog::stdout_logger_mt("net_iconsole"); // in-game console
static auto wconsole = spdlog::stdout_logger_mt("net_wconsole"); // windows console
oss_print.str("");
oss_print.clear();
oss.str("");
oss.clear();
static spdlog::logger logger("sqvm_print", { log_sink_print, ostream_sink_print });
if (!initialized)
{
iconsole = std::make_shared<spdlog::logger>("ostream", ostream_sink);
iconsole->set_pattern("[%S.%e] %v");
iconsole->set_level(spdlog::level::debug);
wconsole->set_pattern("[%S.%e] %v\n");
wconsole->set_level(spdlog::level::debug);
log_sink_print->set_level(spdlog::level::debug);
ostream_sink_print->set_level(spdlog::level::debug);
logger.set_level(spdlog::level::debug);
logger.set_pattern("[%S.%e] %v");
initialized = true;
}
@ -43,10 +43,9 @@ void Hooks::NET_PrintFunc(const char* fmt, ...)
buf[sizeof(buf) - 1] = 0;
va_end(args);
iconsole->debug(buf);
wconsole->debug(buf);
logger.debug(buf);
std::string s = oss.str();
std::string s = oss_print.str();
const char* c = s.c_str();
Items.push_back(Strdup((const char*)c));

48
r5dev/src/hooks/sqvm.cpp
View File

@ -10,33 +10,32 @@ namespace Hooks
static std::ostringstream oss_print;
static auto ostream_sink_print = std::make_shared<spdlog::sinks::ostream_sink_st>(oss_print);
static auto log_sink_print = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/SQVM_Print.txt", true);
//---------------------------------------------------------------------------------
// Purpose: prints the output of each VM to the console
//---------------------------------------------------------------------------------
void* Hooks::SQVM_Print(void* sqvm, char* fmt, ...)
{
int vmIdx = *(int*)((std::uintptr_t)sqvm + 0x18);
static bool initialized = false;
static char buf[1024];
static std::string vmType[3] = { "Script(S):", "Script(C):", "Script(U):" };
static auto iconsole = spdlog::stdout_logger_mt("sqvm_print_iconsole"); // in-game console
static auto wconsole = spdlog::stdout_logger_mt("sqvm_print_wconsole"); // windows console
int vmIdx = *(int*)((std::uintptr_t)sqvm + 0x18);
std::string vmStr = vmType[vmIdx].c_str();
oss_print.str("");
oss_print.clear();
static spdlog::logger logger("sqvm_print", { log_sink_print, ostream_sink_print });
if (!initialized)
{
iconsole = std::make_shared<spdlog::logger>("ostream", ostream_sink_print);
iconsole->set_pattern("[%S.%e] %v");
iconsole->set_level(spdlog::level::debug);
wconsole->set_pattern("[%S.%e] %v");
wconsole->set_level(spdlog::level::debug);
log_sink_print->set_level(spdlog::level::debug);
ostream_sink_print->set_level(spdlog::level::debug);
logger.set_level(spdlog::level::debug);
logger.set_pattern("[%S.%e] %v");
initialized = true;
}
@ -50,8 +49,7 @@ void* Hooks::SQVM_Print(void* sqvm, char* fmt, ...)
vmStr.append(buf);
iconsole->debug(vmStr);
wconsole->debug(vmStr);
logger.debug(vmStr);
std::string s = oss_print.str();
const char* c = s.c_str();
@ -62,6 +60,7 @@ void* Hooks::SQVM_Print(void* sqvm, char* fmt, ...)
static std::ostringstream oss_warning;
static auto ostream_sink_warning = std::make_shared<spdlog::sinks::ostream_sink_st>(oss_warning);
static auto log_sink_warning = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/SQVM_Warning.txt", true);
__int64 Hooks::SQVM_Warning(void* sqvm, int a2, int a3, int* stringSize, void** string)
{
@ -73,33 +72,30 @@ __int64 Hooks::SQVM_Warning(void* sqvm, int a2, int a3, int* stringSize, void**
return result; // If not return.
static bool initialized = false;
static auto iconsole = spdlog::stdout_logger_mt("sqvm_warning_iconsole"); // in-game console
static auto wconsole = spdlog::stdout_logger_mt("sqvm_warning_wconsole"); // windows console
static std::string vmType[3] = { "Script(S) Warning:", "Script(C) Warning:", "Script(U) Warning:" };
int vmIdx = *(int*)((std::uintptr_t)sqvm + 0x18); // Get vm index.
int vmIdx = *(int*)((std::uintptr_t)sqvm + 0x18);
std::string vmStr = vmType[vmIdx].c_str();
std::string vmStr = vmType[vmIdx].c_str(); // Get string prefix for vm.
oss_print.str("");
oss_print.clear();
oss_warning.str("");
oss_warning.clear();
static spdlog::logger logger("sqvm_warning", { log_sink_warning, ostream_sink_warning });
if (!initialized)
{
iconsole = std::make_shared<spdlog::logger>("ostream", ostream_sink_warning);
iconsole->set_pattern("[%S.%e] %v");
iconsole->set_level(spdlog::level::debug);
wconsole->set_pattern("[%S.%e] %v\n");
wconsole->set_level(spdlog::level::debug);
log_sink_warning->set_level(spdlog::level::debug);
ostream_sink_warning->set_level(spdlog::level::debug);
logger.set_level(spdlog::level::debug);
logger.set_pattern("[%S.%e] %v");
initialized = true;
}
std::string stringConstructor((char*)*string, *stringSize); // Get string from memory via std::string constructor.
vmStr.append(stringConstructor);
iconsole->debug(vmStr.c_str());
wconsole->debug(vmStr.c_str());
logger.debug(vmStr);
std::string s = oss_warning.str();
const char* c = s.c_str();