nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix rebase mistakes

Browse Source
This commit is contained in:
TotallyNotElite 2020-03-30 18:35:10 +02:00
parent 5cbf55663a
commit 75f6a39396
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/helpers.hpp
View File

@ -140,7 +140,6 @@ inline const char *classname(int clazz)
} }
void PrintChat(const char *fmt, ...); void PrintChat(const char *fmt, ...);
void PrintChat(bool cat, const char *fmt, ...);
void ChangeName(std::string name); void ChangeName(std::string name);
void WhatIAmLookingAt(int *result_eindex, Vector *result_pos); void WhatIAmLookingAt(int *result_eindex, Vector *result_pos);

23
src/helpers.cpp
View File

@ -1489,29 +1489,6 @@ CatCommand print_classnames("debug_print_classnames", "Lists classnames currentl
} }
}); });
void PrintChat(bool cat, const char *fmt, ...)
{
#if ENABLE_VISUALS
CHudBaseChat *chat = (CHudBaseChat *) g_CHUD->FindElement("CHudChat");
if (chat)
{
std::unique_ptr<char[]> buf(new char[1024]);
va_list list;
va_start(list, fmt);
vsprintf(buf.get(), fmt, list);
va_end(list);
std::unique_ptr<char[]> str;
if (cat)
str = std::move(strfmt("\x07%06X[\x07%06XCAT\x07%06X]\x01 %s", 0x5e3252, 0xba3d9a, 0x5e3252, buf.get()));
else
str = std::move(strfmt("%s", buf.get()));
// FIXME DEBUG LOG
logging::Info("%s", str.get());
chat->Printf(str.get());
}
#endif
}
void PrintChat(const char *fmt, ...) void PrintChat(const char *fmt, ...)
{ {
#if ENABLE_VISUALS #if ENABLE_VISUALS

2
src/nullnexus.cpp
View File

@ -34,7 +34,7 @@ void printmsg(std::string &usr, std::string &msg, int colour = 0xff9340)
if (g_Settings.bInvalid) if (g_Settings.bInvalid)
g_ICvar->ConsoleColorPrintf(MENU_COLOR, "[Nullnexus] %s: %s\n", usr.c_str(), msg.c_str()); g_ICvar->ConsoleColorPrintf(MENU_COLOR, "[Nullnexus] %s: %s\n", usr.c_str(), msg.c_str());
else else
PrintChat(false, "\x07%06X[\x07%06XNullnexus\x07%06X] \x07%06X%s\x01: %s", 0x5e3252, 0xba3d9a, 0x5e3252, colour, usr.c_str(), msg.c_str()); PrintChat("\x07%06X[\x07%06XNullnexus\x07%06X] \x07%06X%s\x01: %s", 0x5e3252, 0xba3d9a, 0x5e3252, colour, usr.c_str(), msg.c_str());
#endif #endif
} }
void printmsgcopy(std::string usr, std::string msg) void printmsgcopy(std::string usr, std::string msg)