big refactor (#171)v1.10.0-rc1

* use in-file macros rather than global funcs for registering dll load callbacks

* move more things to macros

* fix debug crashes

* move sqvm funcs to sq managers

* get rid of context file

* refactor some squirrel stuff and ingame compilation error message

* move tier0 and playlist funcs to namespaces

* uiscript_reset concommand: don't loop forever if compilation fails

* improve showing console for ui script compile errors

* standardise concommand func naming in c++

* use lambdas for dll load callbacks so intellisense shits itself less

* use cvar change callbacks for unescaping ns_server_name and ns_server_desc

* add proper helpstrings to masterserver cvars

* add cvar help and find

* allow parsing of convar flags from string

* normalise mod fs paths to be lowercase

* move hoststate to its own file and add host_init hooks

* better IsFlagSet def

* replace files in ReadFromCache

* rename g_ModManager to g_pModManager

* formatting changes

* make cvar print work on dedi, move demo fix stuff, add findflags

* add proper map autocompletes and maps command

* formatting changes

* separate gameutils into multiple r2 headers

* Update keyvalues.cpp

* move sqvm funcs into wrappers in the manager class

* remove unnecessary header files

* lots of cleanup and starting moving to new hooking macros

* update more stuff to new hook macros

* rename project folder (:tf: commit log)

* fix up postbuild commands to use relative dir

* almost fully replaced hooking lib

* completely remove old hooking

* add nsprefix because i forgot to include it

* move exploit prevention and limits code out of serverauthentication, and have actual defs for CBasePlayer

* use modular ServerPresence system for registering servers

* add new memory lib

* accidentally pushed broke code oops

* lots of stuff idk

* implement some more prs

* improve rpakfilesystem

* fix line endings on vcxproj

* Revert "fix line endings on vcxproj"

This reverts commit 4ff7d022d2602c2dba37beba8b8df735cf5cd7d9.

* add more prs

* i swear i committed these how are they not there

* Add ability to load Datatables from files (#238)

* first version of kinda working custom datatables

* Fix copy error

* Finish custom datatables

* Fix Merge

* Fix line endings

* Add fallback to rpak when ns_prefere_datatable_from_disk is true

* fix typo

* Bug fixess

* Fix Function Registration hook

* Set convar value

* Fix Client and Ui VM

* enable server auth with ms agian

* Add Filters

* FIx unused import

* Merge remote-tracking branch 'upsteam/bobs-big-refactor-pr' into datatables

Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>

* Add some changes from main to refactor (#243)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Fix line endings (hopefully) (#244)

* Fix line endings (hopefully)

* Fix more line endings

* Update refactor (#250)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Add editorconfig file (#246)

* Add editorconfig file

It's a cross-editor compatible config file that defines certain editor
behaviour (e.g. adding/removing newline at end of file)

It is supported by major editors like Visual Studio (Code) and by
version control  providers like GitHub.

Should end the constant adding/removing of final newline in PRs

* More settings

- unicode by default
- trim newlines
- use tabs for indentation (ugh)

* Ignore folder rename (#245)

* Hot reload banlist on player join (#233)

* added banlist hotreload

* fix formatting

* didnt append, cleared whole file oopsie

* unfuckedunban not rewriting file

* fixed not checking for new line

Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>

* Refactor cleanup (#256)

* Fix indentation

* Fix path in clang-format command in readme

* Refactor cleanup (some formatting fixes) (#257)

* Fix some formatting

* More formatting fixes

* add scriptdatatable.cpp rewrite

* Some formatting fixes (#260)

* More formatting stuff (#261)

* various formatting changes and fixes

* Fix changed icon (#264)

* clang format, fix issues with server registration and rpak loading

* fix more formatting

* update postbuild step

* set launcher directory and error on fail creating log files

* change some stuff in exploitfixes

* only unrestrict dev commands when commandline flag is present

* fix issues with cvar flag commit

* fixup command flags better and reformat

* bring up to date with main

* fixup formatting

* improve cvar flag fixup and remove temp thing from findflags

* set serverfilter better

* avoid ptr decay when setting auth token

* add more entity functions

* Fix the MS server registration issues. (#285)

* Port ms presence reporter to std::async

* Fix crash due to std::optional being assigned nullptr.

* Fix formatting.

* Wait 20 seconds if MS returns DUPLICATE_SERVER.

* Change PERSISTENCE_MAX_SIZE to fix player authentication (#287)

The size check added in the refactor was incorrect:

- 56306: expected pdata size based on the pdef
- 512: allowance for trailing junk (r2 adds 137 bytes of trailing junk)
- 100: for some wiggle room

Co-Authored-By: pg9182 <96569817+pg9182@users.noreply.github.com>

* change miscserverscript to use actual entity arguments rather than
player index jank

* Fix token clearing hook (#290)

A certain someone forgot to put an `0x` in front of their hex number, meaning the offset is wrong.
This would cause token to be leaked again

Co-authored-by: Maya <malte.hoermeyer@web.de>
Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>
Co-authored-by: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>
Co-authored-by: Erlite <ys.aameziane@gmail.com>
Co-authored-by: Emma Miler <emma.pi@protonmail.com>
Co-authored-by: pg9182 <96569817+pg9182@users.noreply.github.com>

1 files changed, 45 insertions, 42 deletions

diff --git a/NorthstarDLL/localchatwriter.cpp b/NorthstarDLL/localchatwriter.cpp
index 72a5afa7..efa7eeee 100644
--- a/NorthstarDLL/localchatwriter.cpp
+++ b/NorthstarDLL/localchatwriter.cpp
@@ -37,12 +37,11 @@ class vgui_BaseRichText_vtable
 
 	void(__fastcall* SetVerticalScrollbar)(vgui_BaseRichText* self, bool state);
 	void(__fastcall* SetMaximumCharCount)(vgui_BaseRichText* self, int maxChars);
-	void(__fastcall* InsertColorChange)(vgui_BaseRichText* self, vgui_Color col);
+	void(__fastcall* InsertColorChange)(vgui_BaseRichText* self, Color col);
 	void(__fastcall* InsertIndentChange)(vgui_BaseRichText* self, int pixelsIndent);
 	void(__fastcall* InsertClickableTextStart)(vgui_BaseRichText* self, const char* pchClickAction);
 	void(__fastcall* InsertClickableTextEnd)(vgui_BaseRichText* self);
-	void(__fastcall* InsertPossibleURLString)(
-		vgui_BaseRichText* self, const char* text, vgui_Color URLTextColor, vgui_Color normalTextColor);
+	void(__fastcall* InsertPossibleURLString)(vgui_BaseRichText* self, const char* text, Color URLTextColor, Color normalTextColor);
 	void(__fastcall* InsertFade)(vgui_BaseRichText* self, float flSustain, float flLength);
 	void(__fastcall* ResetAllFades)(vgui_BaseRichText* self, bool bHold, bool bOnlyExpired, float flNewSustain);
 	void(__fastcall* SetToFullHeight)(vgui_BaseRichText* self);
@@ -81,25 +80,25 @@ LocalChatWriter::SwatchColor swatchColors[4] = {
 	LocalChatWriter::NetworkNameColor,
 };
 
-vgui_Color darkColors[8] = {
-	vgui_Color {0, 0, 0, 255},
-	vgui_Color {205, 49, 49, 255},
-	vgui_Color {13, 188, 121, 255},
-	vgui_Color {229, 229, 16, 255},
-	vgui_Color {36, 114, 200, 255},
-	vgui_Color {188, 63, 188, 255},
-	vgui_Color {17, 168, 205, 255},
-	vgui_Color {229, 229, 229, 255}};
-
-vgui_Color lightColors[8] = {
-	vgui_Color {102, 102, 102, 255},
-	vgui_Color {241, 76, 76, 255},
-	vgui_Color {35, 209, 139, 255},
-	vgui_Color {245, 245, 67, 255},
-	vgui_Color {59, 142, 234, 255},
-	vgui_Color {214, 112, 214, 255},
-	vgui_Color {41, 184, 219, 255},
-	vgui_Color {255, 255, 255, 255}};
+Color darkColors[8] = {
+	Color {0, 0, 0, 255},
+	Color {205, 49, 49, 255},
+	Color {13, 188, 121, 255},
+	Color {229, 229, 16, 255},
+	Color {36, 114, 200, 255},
+	Color {188, 63, 188, 255},
+	Color {17, 168, 205, 255},
+	Color {229, 229, 229, 255}};
+
+Color lightColors[8] = {
+	Color {102, 102, 102, 255},
+	Color {241, 76, 76, 255},
+	Color {35, 209, 139, 255},
+	Color {245, 245, 67, 255},
+	Color {59, 142, 234, 255},
+	Color {214, 112, 214, 255},
+	Color {41, 184, 219, 255},
+	Color {255, 255, 255, 255}};
 
 class AnsiEscapeParser
 {
@@ -144,7 +143,7 @@ class AnsiEscapeParser
 
 	LocalChatWriter* m_writer;
 	Next m_next = Next::ControlType;
-	vgui_Color m_expandedColor {0, 0, 0, 0};
+	Color m_expandedColor {0, 0, 0, 0};
 
 	Next HandleControlType(unsigned long val)
 	{
@@ -190,7 +189,7 @@ class AnsiEscapeParser
 		// Next values are r,g,b
 		if (val == 2)
 		{
-			m_expandedColor = {0, 0, 0, 255};
+			m_expandedColor.SetColor(0, 0, 0, 255);
 			return Next::ForegroundR;
 		}
 		// Next value is 8-bit swatch color
@@ -219,13 +218,12 @@ class AnsiEscapeParser
 			unsigned char blue = code % 6;
 			unsigned char green = ((code - blue) / 6) % 6;
 			unsigned char red = (code - blue - (green * 6)) / 36;
-			m_writer->InsertColorChange(
-				vgui_Color {(unsigned char)(red * 51), (unsigned char)(green * 51), (unsigned char)(blue * 51), 255});
+			m_writer->InsertColorChange(Color {(unsigned char)(red * 51), (unsigned char)(green * 51), (unsigned char)(blue * 51), 255});
 		}
 		else if (val < UCHAR_MAX)
 		{
 			unsigned char brightness = (val - 232) * 10 + 8;
-			m_writer->InsertColorChange(vgui_Color {brightness, brightness, brightness, 255});
+			m_writer->InsertColorChange(Color {brightness, brightness, brightness, 255});
 		}
 
 		return Next::ControlType;
@@ -236,7 +234,7 @@ class AnsiEscapeParser
 		if (val >= UCHAR_MAX)
 			return Next::ControlType;
 
-		m_expandedColor.r = (unsigned char)val;
+		m_expandedColor[0] = (unsigned char)val;
 		return Next::ForegroundG;
 	}
 
@@ -245,7 +243,7 @@ class AnsiEscapeParser
 		if (val >= UCHAR_MAX)
 			return Next::ControlType;
 
-		m_expandedColor.g = (unsigned char)val;
+		m_expandedColor[1] = (unsigned char)val;
 		return Next::ForegroundB;
 	}
 
@@ -254,7 +252,7 @@ class AnsiEscapeParser
 		if (val >= UCHAR_MAX)
 			return Next::ControlType;
 
-		m_expandedColor.b = (unsigned char)val;
+		m_expandedColor[2] = (unsigned char)val;
 		m_writer->InsertColorChange(m_expandedColor);
 		return Next::ControlType;
 	}
@@ -280,12 +278,11 @@ void LocalChatWriter::Write(const char* str)
 		if (startOfEscape != str)
 		{
 			// There is some text before the escape sequence, just print that
-
 			size_t copyChars = startOfEscape - str;
 			if (copyChars > 255)
 				copyChars = 255;
-			strncpy(writeBuffer, str, copyChars);
-			writeBuffer[copyChars] = 0;
+
+			strncpy_s(writeBuffer, copyChars + 1, str, copyChars);
 
 			InsertText(writeBuffer);
 		}
@@ -320,6 +317,8 @@ void LocalChatWriter::InsertChar(wchar_t ch)
 
 void LocalChatWriter::InsertText(const char* str)
 {
+	spdlog::info(str);
+
 	WCHAR messageUnicode[288];
 	ConvertANSIToUnicode(str, -1, messageUnicode, 274);
 
@@ -347,7 +346,7 @@ void LocalChatWriter::InsertText(const wchar_t* str)
 	InsertDefaultFade();
 }
 
-void LocalChatWriter::InsertColorChange(vgui_Color color)
+void LocalChatWriter::InsertColorChange(Color color)
 {
 	for (CHudChat* hud = *CHudChat::allHuds; hud != NULL; hud = hud->next)
 	{
@@ -358,20 +357,24 @@ void LocalChatWriter::InsertColorChange(vgui_Color color)
 	}
 }
 
-static vgui_Color GetHudSwatchColor(CHudChat* hud, LocalChatWriter::SwatchColor swatchColor)
+static Color GetHudSwatchColor(CHudChat* hud, LocalChatWriter::SwatchColor swatchColor)
 {
 	switch (swatchColor)
 	{
 	case LocalChatWriter::MainTextColor:
 		return hud->m_mainTextColor;
+
 	case LocalChatWriter::SameTeamNameColor:
 		return hud->m_sameTeamColor;
+
 	case LocalChatWriter::EnemyTeamNameColor:
 		return hud->m_enemyTeamColor;
+
 	case LocalChatWriter::NetworkNameColor:
 		return hud->m_networkNameColor;
 	}
-	return vgui_Color {0, 0, 0, 0};
+
+	return Color(0, 0, 0, 0);
 }
 
 void LocalChatWriter::InsertSwatchColorChange(SwatchColor swatchColor)
@@ -436,12 +439,12 @@ void LocalChatWriter::InsertDefaultFade()
 	}
 }
 
-void InitialiseLocalChatWriter(HMODULE baseAddress)
+ON_DLL_LOAD_CLIENT("client.dll", LocalChatWriter, (CModule module))
 {
-	gGameSettings = (CGameSettings**)((char*)baseAddress + 0x11BAA48);
-	gChatFadeLength = (CGameFloatVar**)((char*)baseAddress + 0x11BAB78);
-	gChatFadeSustain = (CGameFloatVar**)((char*)baseAddress + 0x11BAC08);
-	CHudChat::allHuds = (CHudChat**)((char*)baseAddress + 0x11BA9E8);
+	gGameSettings = module.Offset(0x11BAA48).As<CGameSettings**>();
+	gChatFadeLength = module.Offset(0x11BAB78).As<CGameFloatVar**>();
+	gChatFadeSustain = module.Offset(0x11BAC08).As<CGameFloatVar**>();
+	CHudChat::allHuds = module.Offset(0x11BA9E8).As<CHudChat**>();
 
-	ConvertANSIToUnicode = (ConvertANSIToUnicodeType)((char*)baseAddress + 0x7339A0);
+	ConvertANSIToUnicode = module.Offset(0x7339A0).As<ConvertANSIToUnicodeType>();
 }