Fix linter errors

ThePhrozenKeep · Dec 8, 2024 · adbebe3 · adbebe3
1 parent 0cec897
commit adbebe3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/D2.Detours.patches/1.10f/D2Client.patch.cpp b/D2.Detours.patches/1.10f/D2Client.patch.cpp
@@ -5,7 +5,7 @@
 #include <Game/SCmd.h>
 #include <Game/Select.h>
 #include <Unit/Player.h>
-#include <UI/Chat.h>
+#include <UI/chat.h>
 #include <UI/UI.h>
 #include <Sound/Sound.h>
 #include <Fog.h>

diff --git a/source/D2Client/src/Core/WINMAIN.CPP b/source/D2Client/src/Core/WINMAIN.CPP
@@ -199,7 +199,7 @@ BOOL __fastcall ApplyConfiguration(D2ConfigStrc* pConfig)
 	*D2CLIENT_pgbAppliedConfiguration = TRUE;
 	for (int i = 0; i < 48; ++i)
 	{
-		if (const auto* setupFunc = D2CLIENT_paConfigSetupFunctions[i])
+		if (const auto setupFunc = D2CLIENT_paConfigSetupFunctions[i])
 			setupFunc(pConfig);
 	}
 	return *D2CLIENT_pgbAppliedConfiguration;

diff --git a/source/D2Client/src/Core/WNDPROC.CPP b/source/D2Client/src/Core/WNDPROC.CPP
@@ -158,9 +158,7 @@ int __fastcall ExecuteMessageLoop_6FAA25D0(int(__stdcall* pLoopBody)(int))
 			v3 = GetMessageA(&Msg, 0, 0, 0);
 			if (v3)
 			{
-				HWND v4; // eax
-				HACCEL v8;
-				if (!*D2CLIENT_hAcc_6FB9A710 || (v8 = *D2CLIENT_hAcc_6FB9A710, v4 = WINDOW_GetWindow(), !TranslateAcceleratorA(v4, v8, &Msg)))
+				if (!*D2CLIENT_hAcc_6FB9A710 || (!TranslateAcceleratorA(WINDOW_GetWindow(), *D2CLIENT_hAcc_6FB9A710, &Msg)))
 				{
 					if (*D2CLIENT_dword_6FB9A954)
 					{

diff --git a/source/D2CommonDefinitions/include/BnClient.h b/source/D2CommonDefinitions/include/BnClient.h
@@ -25,48 +25,48 @@ struct BnClientInterface
 	int(__fastcall* Logon)(int a1, int a2);
 	int(__stdcall* GetLogonInfo)();
 	int(__stdcall* CloseBNetConnection)();
-	BOOL(__thiscall* ChatCommand)(const char* _this);
+	BOOL(__fastcall* ChatCommand)(const char* a1);
 	void* (__stdcall* field_18)();
 	int(__fastcall* JoinChannel)(BYTE* a1, int a2, int a3);
-	int(__thiscall* GetChannelList)(void* _this);
+	int(__fastcall* GetChannelList)(void* a1);
 	int(__fastcall* BnMessQueue_Read)(DWORD* a1, void* a2);
-	int(__thiscall* BnMessageQueueGetLastError)(DWORD* errInfo);
+	int(__fastcall* BnMessageQueueGetLastError)(DWORD* errInfo);
 	int(__fastcall* field_2C)(int a1, int a2);
 	int(__stdcall* CheckAd)();
 	int(__fastcall* RefreshGame)(char *szGameName, char *szPassword, const char *szStatstring, int nGameType);
 	int(__fastcall* GetGamesList)(int a1, int a2, int a3, int a4);
 	int(__fastcall* NotifyJoinedGame)(int a1, int a2);
 	int(__stdcall* SendRealmList)();
 	struct RealmLogonInformation* (__fastcall* LogonRealm)(const char *szRealmName, const char *szRealmPassword);
-	int(__thiscall* PatchUnk)(DWORD* _this);
+	int(__fastcall* PatchUnk)(DWORD* a1);
 	int(__stdcall* field_4C)();
 	uintptr_t(__fastcall* PatchUnk0x4C)(BYTE* source, size_t size);
 	int(__fastcall* EnterChat)(int ecx0, int a2, int a3, BYTE* a1, char a5);
 	int(__stdcall* LeaveChat)();
 	int(__stdcall* GetVersion)();
 	int(__fastcall* CreateAccount)(int a1, int a2);
-	int(__thiscall* GetCreateAccountResult)(DWORD* _this);
+	int(__fastcall* GetCreateAccountResult)(DWORD* a1);
 	int(__stdcall* field_68)();
 	int(__fastcall* OnAdClick)(int a1, int a2);
 	int(__stdcall* UnkSet)();
 	int(__fastcall* BattleWriteUserData)(int a1, unsigned int a2, int a3, int a4);
 	BOOL(__fastcall* BattleRequestReadUserData)(int a1, unsigned int a2, int a3, int a4);
 	int(__fastcall* GetBattleReadUserData)(int a1, int a2, int a3, int a4);
-	int(__thiscall* GetConnectionState)(DWORD* pState);
+	int(__fastcall* GetConnectionState)(DWORD* pState);
 	void (*LOG_Write)(char* Format, ...);
 	int(__cdecl* StartLogging)(int a1, int a2);
-	int(__thiscall* GetCreateGameResult)(int* _this);
+	int(__fastcall* GetCreateGameResult)(int* a1);
 	int(__stdcall* SendKeepAlivePacket)();
 	int(__stdcall* field_94)();
 	struct BNGatewayAccess* (__stdcall* GetBnGatewayAccess)();
 	int(__fastcall* ChangePassword)(int ecx0, int a2, int a1);
-	int(__thiscall* GetChangePasswordResult)(int* _this);
-	int(__thiscall* QueryAdUrl)(void* _this);
+	int(__fastcall* GetChangePasswordResult)(int* a1);
+	int(__fastcall* QueryAdUrl)(void* a1);
 	int(__fastcall* LoadBNetNews)(int(__fastcall* a1)(DWORD, DWORD), int (*a2)(void));
 	int(__stdcall* FreeBNetNews)();
 	char(__stdcall* GetBuild)();
 	int(__stdcall* field_B4)();
-	BOOL(__thiscall* SetEmail)(const void* szEmail);
+	BOOL(__fastcall* SetEmail)(const void* szEmail);
 	BOOL(__fastcall* ResetPassword)(BYTE* szAccountName, BYTE* szEmailAddress);
 	BOOL(__fastcall* ChangeEmail)(BYTE* a1, BYTE* a2, BYTE* a3);
 	int(__stdcall* LeaveGame)();