Merge remote-tracking branch 'origin/master'

6 files changed, 39 insertions, 13 deletions

diff --git a/csgo-loader/csgo-client/Client.cpp b/csgo-loader/csgo-client/Client.cpp
index 69920bb..dc08da2 100644
--- a/csgo-loader/csgo-client/Client.cpp
+++ b/csgo-loader/csgo-client/Client.cpp
@@ -9,6 +9,8 @@
 #define SERVER_IP   0xE53CA523 // Hexadecimal representation of the server IP, obtained by inet_addr()

 #define SERVER_PORT 0xF2C      // Hexadecimal representation of the server port.

 

+// hey nave just wanna let u know u r epic

+// yea

 #if 0

 void hhahahaha()

 {

@@ -43,23 +45,49 @@ void hhahahaha()
 }

 #endif

 

-int __stdcall WinMain(HINSTANCE inst, HINSTANCE prev, char* str, int cmdshow)

+// is this loss/

+__forceinline void OpenConsole()

 {

 #ifdef DEBUG

+	// ;ddDDDDdDDDd

 	AllocConsole();

+

+	// yo dude

+	// get this handles

 	FILE *file;

 	freopen_s(&file, "CONOUT$", "w", stdout);

-#endif

+#endif // DEBUG

+}

+

+int __stdcall WinMain(HINSTANCE inst, HINSTANCE prev, char* str, int cmdshow)

+{

+	OpenConsole();

+

 	Networking::TCPClient Client;

 

 	// Initialize the syscall manager.

 	if(!Syscalls->Start())

 		ERROR_ASSERT("[000F:00001A00] Failed to initialize. Please contact an administrator.");

-

+	

+	// Wait for connection.

 	UserInterface->m_Data.m_ExecutionState = UserExperience::EXECUTION_WAITING;

 

+	// Create a thread to handle UI.

+	std::thread WindowThread([]

+	{

+		// Create a window, initialise DirectX context.

+		if(!UserInterface->Start())

+			ERROR_ASSERT("[000F:00001B00] Failed to initialize. Please contact an administrator.");

+

+		// Create a loop to draw our UI.

+		UserInterface->RunUiFrame();

+	}); WindowThread.detach();

+

+	// Attempt to connect to the remote server.

 	if(!Client.Start(LOCAL_IP, SERVER_PORT))

 		ERROR_ASSERT("[000F:0002A000] Server did not accept the connection.");

+	// Allow the user to input their log-in data.

+	UserInterface->m_Data.m_ExecutionState = UserExperience::EXECUTION_LOG_IN;

 

 	// TODO: Add game selection.

 

diff --git a/csgo-loader/csgo-client/Login/RemoteLogin.cpp b/csgo-loader/csgo-client/Login/RemoteLogin.cpp
index 2f82744..b6912d8 100644
--- a/csgo-loader/csgo-client/Login/RemoteLogin.cpp
+++ b/csgo-loader/csgo-client/Login/RemoteLogin.cpp
@@ -57,9 +57,6 @@ namespace Login
 			case RemoteLoginResponse::OUTDATED_CLIENT:

 				INFO_ASSERT("[000A:%08x] Your client is outdated.\nPlease download the latest client at 'moneybot.cc'.", m_Header.m_HardwareId);

 				break;

-			case RemoteLoginResponse::INTEGRITY_FAILURE:

-				UserInterface->m_Data.m_Error = UserExperience::ERROR_SHADOW_BAN;

-				break;

 			case RemoteLoginResponse::USER_BANNED:

 				INFO_ASSERT("[000D:%08x] Your account is banned.\nPlease contact 'admin@moneybot.cc' for additional information.", m_Header.m_HardwareId);

 				break;

@@ -69,6 +66,7 @@ namespace Login
 			case RemoteLoginResponse::INVALID_CREDENTIALS:

 				INFO_ASSERT("[000C:%08x] Your credentials are invalid. Please check your spelling and try again.", m_Header.m_HardwareId);

 				break;

+			case RemoteLoginResponse::INTEGRITY_FAILURE:

 			case RemoteLoginResponse::NO_SUBSCRIPTION:

 				INFO_ASSERT("[000G:%08x] No active subscription found.", m_Header.m_HardwareId);

 				break;

diff --git a/csgo-loader/csgo-client/RemoteCode/RemoteProcess.cpp b/csgo-loader/csgo-client/RemoteCode/RemoteProcess.cpp
index 969f907..8d2509f 100644
--- a/csgo-loader/csgo-client/RemoteCode/RemoteProcess.cpp
+++ b/csgo-loader/csgo-client/RemoteCode/RemoteProcess.cpp
@@ -85,7 +85,7 @@ namespace RemoteCode
 		

 		while(Module32Next(Toolhelp, &ModuleEntry))

 		{

-			printf("%s\n", ModuleEntry.szModule);

+			//printf("%s\n", ModuleEntry.szModule);

 			if(strstr(ModuleEntry.szModule, ModuleName))

 			{

 				CloseHandle(Toolhelp);

diff --git a/csgo-loader/csgo-client/Security/SyscallManager.cpp b/csgo-loader/csgo-client/Security/SyscallManager.cpp
index 9de2459..bab2d5f 100644
--- a/csgo-loader/csgo-client/Security/SyscallManager.cpp
+++ b/csgo-loader/csgo-client/Security/SyscallManager.cpp
@@ -8,7 +8,7 @@ namespace Wrapper
 {

 	void SyscallStub::SetIndex(uint32_t Index)

 	{

-		unsigned long OldProtection{};

+		DWORD OldProtection{};

 

 		// Make the code executable and set the index.

 		if(VirtualProtect(m_Shellcode, sizeof m_Shellcode, PAGE_EXECUTE_READWRITE, &OldProtection))

diff --git a/csgo-loader/csgo-client/UserExperience/MoneybotShared/ui.h b/csgo-loader/csgo-client/UserExperience/MoneybotShared/ui.h
index 661ef1f..b061cd5 100644
--- a/csgo-loader/csgo-client/UserExperience/MoneybotShared/ui.h
+++ b/csgo-loader/csgo-client/UserExperience/MoneybotShared/ui.h
@@ -84,20 +84,20 @@ namespace ui {
 			auto choose_form = menu->add_item(std::make_shared<ui::c_form>(120, 20, 190, 115, "select a cheat"));

 			{

 				// Change these if you want to.

-				static std::vector<dropdowns::dropdown_item_t<int>> m_beta_items{

+				static std::vector<dropdowns::dropdown_item_t<uint16_t>> m_beta_items{

 					{ "cs:go (release)", 0 },

 					{ "cs:go (beta)", 1 },

 					{ "cs:go (debug)", 2 },

 				};

 

-				static std::vector<dropdowns::dropdown_item_t<int>> m_normal_items{

+				static std::vector<dropdowns::dropdown_item_t<uint16_t>> m_normal_items{

 					{ "cs:go", 0 },

 				};

 

-				choose_form->add_item(std::make_shared<ui::c_dropdown<int>>(15, 0, 140, "cheat selection:", &UserInterface->m_Data.m_SelectedGame, &m_beta_items))->set_cond([] {

+				choose_form->add_item(std::make_shared<ui::c_dropdown<uint16_t>>(15, 0, 140, "cheat selection:", &UserInterface->m_Data.m_SelectedGame, &m_beta_items))->set_cond([] {

 					return UserInterface->m_Data.m_SpecialAccess;

 				});

-				choose_form->add_item(std::make_shared<ui::c_dropdown<int>>(15, 0, 140, "cheat selection:", &UserInterface->m_Data.m_SelectedGame, &m_normal_items))->set_cond([] {

+				choose_form->add_item(std::make_shared<ui::c_dropdown<uint16_t>>(15, 0, 140, "cheat selection:", &UserInterface->m_Data.m_SelectedGame, &m_normal_items))->set_cond([] {

 					return !UserInterface->m_Data.m_SpecialAccess;

 				});

 

diff --git a/csgo-loader/csgo-client/UserExperience/UserInterface.hpp b/csgo-loader/csgo-client/UserExperience/UserInterface.hpp
index d855c85..e905b3b 100644
--- a/csgo-loader/csgo-client/UserExperience/UserInterface.hpp
+++ b/csgo-loader/csgo-client/UserExperience/UserInterface.hpp
@@ -45,7 +45,7 @@ namespace UserExperience
 		bool m_SpecialAccess = false;

 

 		// Holds the selected game.

-		SelectedGame m_SelectedGame = GAME_CSGO;

+		uint16_t m_SelectedGame = GAME_CSGO;

 

 		// Holds the current error message.

 		ErrorReason m_Error = ERROR_GENERIC_ERROR;