Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #145 from diamante0018/refactor-logger-error

Browse Source 
[Logger] Use correct enum over numbers for com_error
This commit is contained in:
Dss0 2021-11-30 14:42:50 +01:00 committed by GitHub
commit e68c402095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Modules/Dedicated.cpp
View File

@ -97,7 +97,7 @@ namespace Components
Game::SV_GameSendServerCommand(-1, 0, list.data());
}
void Dedicated::TimeWrapStub(int code, const char* message)
void Dedicated::TimeWrapStub(Game::errorParm_t code, const char* message)
{
static bool partyEnable;
static std::string mapname;

2
src/Components/Modules/Dedicated.hpp
View File

@ -28,6 +28,6 @@ namespace Components
static void TransmitGuids();
static void TimeWrapStub(int code, const char* message);
static void TimeWrapStub(Game::errorParm_t code, const char* message);
};
}

8
src/Components/Modules/Logger.cpp
View File

@ -51,7 +51,7 @@ namespace Components
}
}
void Logger::ErrorPrint(int error, const std::string& message)
void Logger::ErrorPrint(Game::errorParm_t error, const std::string& message)
{
#ifdef DEBUG
if (IsDebuggerPresent()) __debugbreak();
@ -60,19 +60,19 @@ namespace Components
return Game::Com_Error(error, "%s", message.data());
}
void Logger::Error(int error, const char* message, ...)
void Logger::Error(Game::errorParm_t error, const char* message, ...)
{
return Logger::ErrorPrint(error, Logger::Format(&message));
}
void Logger::Error(const char* message, ...)
{
return Logger::ErrorPrint(0, Logger::Format(&message));
return Logger::ErrorPrint(Game::ERR_FATAL, Logger::Format(&message));
}
void Logger::SoftError(const char* message, ...)
{
return Logger::ErrorPrint(2, Logger::Format(&message));
return Logger::ErrorPrint(Game::ERR_SERVERDISCONNECT, Logger::Format(&message));
}
std::string Logger::Format(const char** message)

4
src/Components/Modules/Logger.hpp
View File

@ -11,9 +11,9 @@ namespace Components
static void MessagePrint(int channel, const std::string& message);
static void Print(int channel, const char* message, ...);
static void Print(const char* message, ...);
static void ErrorPrint(int error, const std::string& message);
static void ErrorPrint(Game::errorParm_t error, const std::string& message);
static void Error(const char* message, ...);
static void Error(int error, const char* message, ...);
static void Error(Game::errorParm_t error, const char* message, ...);
static void SoftError(const char* message, ...);
static bool IsConsoleReady();

2
src/Components/Modules/Renderer.cpp
View File

@ -108,7 +108,7 @@ namespace Components
void Renderer::R_TextureFromCodeError(const char* sampler, Game::GfxCmdBufState* state)
{
Game::Com_Error(0, "Tried to use sampler '%s' when it isn't valid for material '%s' and technique '%s'",
Game::Com_Error(Game::ERR_FATAL, "Tried to use sampler '%s' when it isn't valid for material '%s' and technique '%s'",
sampler, state->material->info.name, state->technique->name);
}

8
src/Components/Modules/Script.cpp
View File

@ -26,7 +26,7 @@ namespace Components
Logger::Print(23, "Error: unknown function %s in %s\n", funcName.data(), Script::ScriptName.data());
Logger::Print(23, "************************************\n");
Logger::Error(5, "script compile error\nunknown function %s\n%s\n\n", funcName.data(), Script::ScriptName.data());
Logger::Error(Game::ERR_SCRIPT_DROP, "script compile error\nunknown function %s\n%s\n\n", funcName.data(), Script::ScriptName.data());
}
__declspec(naked) void Script::StoreFunctionNameStub()
@ -170,7 +170,7 @@ namespace Components
Script::PrintSourcePos(Script::ScriptName.data(), offset);
Logger::Print(23, "************************************\n\n");
Logger::Error(5, "script compile error\n%s\n%s\n(see console for actual details)\n", msgbuf, Script::ScriptName.data());
Logger::Error(Game::ERR_SCRIPT_DROP, "script compile error\n%s\n%s\n(see console for actual details)\n", msgbuf, Script::ScriptName.data());
}
int Script::LoadScriptAndLabel(const std::string& script, const std::string& label)
@ -180,7 +180,7 @@ namespace Components
if (!Game::Scr_LoadScript(script.data()))
{
Logger::Print("Script %s encountered an error while loading. (doesn't exist?)", script.data());
Logger::Error(1, reinterpret_cast<char*>(0x70B810), script.data());
Logger::Error(Game::ERR_DROP, reinterpret_cast<char*>(0x70B810), script.data());
}
else
{
@ -497,7 +497,7 @@ namespace Components
{
if (!gentity->client)
{
Logger::Error(5, "Entity: %i is not a client", gentity);
Logger::Error(Game::ERR_SCRIPT_DROP, "Entity: %i is not a client", gentity);
}
return &Game::svs_clients[gentity->s.number];
}

4
src/Components/Modules/ZoneBuilder.cpp
View File

@ -851,7 +851,7 @@ namespace Components
Command::Add("error", [](Command::Params*)
{
Game::Com_Error(0, "This is a test %s\n", "error");
Game::Com_Error(Game::ERR_FATAL, "This is a test %s\n", "error");
});
// now load default assets and shaders
@ -1412,7 +1412,7 @@ namespace Components
// build final techsets fastfile
if (subCount > 24)
{
Logger::ErrorPrint(1, "How did you have 576 fastfiles?\n");
Logger::ErrorPrint(Game::ERR_DROP, "How did you have 576 fastfiles?\n");
}
curTechsets_list.clear();

2
src/Game/Functions.hpp
View File

@ -121,7 +121,7 @@ namespace Game
typedef void(__cdecl * Com_ClientPacketEvent_t)();
extern Com_ClientPacketEvent_t Com_ClientPacketEvent;
typedef void(__cdecl * Com_Error_t)(int type, const char* message, ...);
typedef void(__cdecl * Com_Error_t)(errorParm_t type, const char* message, ...);
extern Com_Error_t Com_Error;
typedef void(__cdecl * Com_Printf_t)(int channel, const char *fmt, ...);

12
src/Game/Structs.hpp
View File

@ -177,6 +177,18 @@ namespace Game
CS_ACTIVE = 0x5,
} clientstate_t;
typedef enum
{
ERR_FATAL = 0x0,
ERR_DROP = 0x1,
ERR_SERVERDISCONNECT = 0x2,
ERR_DISCONNECT = 0x3,
ERR_SCRIPT = 0x4,
ERR_SCRIPT_DROP = 0x5,
ERR_LOCALIZATION = 0x6,
ERR_MAPLOADERRORSUMMARY = 0x7
} errorParm_t;
struct FxEffectDef;
struct pathnode_t;
struct pathnode_tree_t;