added laps cmd, removed .ini stuff

Author: tobii-dev

data/cfg.ini

@@ -1,8 +1,6 @@
-[GFX]
-boolForceWindowedMode = 0
+[NAME]
+name = "YOUR_NAME_HERE"
 
 [FPS]
 intFPSLimit = 31
 
-[NAME]
-name = "YOUR_NAME_HERE"

source/blur.cpp

@@ -24,6 +24,22 @@ gameAPI::gameAPI(uintptr_t p) : config("cfg.ini") {
 	moduleBase = p;
 }
 
+
+uint8_t gameAPI::lobby_get_laps() {
+	uint8_t laps = *(uint8_t*) (moduleBase + ADDY_LAN_LAPS_LOBBY);
+	return laps;
+}
+
+bool gameAPI::lobby_set_laps(uint8_t laps) {
+	bool ok = false;
+	*(uint8_t*)(moduleBase + ADDY_LAN_LAPS_LOBBY) = laps;
+	*(uint8_t*)(moduleBase + ADDY_LAN_LAPS_READ) = laps;
+	ok = true;
+
+	return ok;
+}
+
+
 uintptr_t gameAPI::lobby_entlist_get_first_player() {
 	uintptr_t addr = moduleBase + ADDY_LAN_PLAYERS_LL_PTR;
 
@@ -35,23 +51,18 @@ uintptr_t gameAPI::lobby_entlist_get_first_player() {
 	return addr;
 }
 
-
 uintptr_t gameAPI::get_next_player(uintptr_t p) {
 	uintptr_t addr = *(uintptr_t*) (p+OFFSET_PLAYER_NEXT);
 	return addr;
 }
 
-
 std::string gameAPI::lobby_get_player_name(uintptr_t p) {
 	std::string name = "";
 	short* ptr = ((short*)(p + OFFSET_PLAYER_NAME));
-	char c = NULL;
-	do {
-		c = (char) *ptr;
+	while (*ptr != NULL) {
+		name += (unsigned char) *ptr;
 		ptr++;
-		name += c;
-
-	} while (c != NULL);
+	}
 	return name;
 }
 
@@ -119,21 +130,22 @@ std::string gameAPI::lobby_get_player_green_mod_as_string(uintptr_t p) {
 	return str;
 }
 
-//TODO: lets have all the init code here
+
+//TODO: lets have "ALL" the init code here
 void gameAPI::load() {
 	console.start();
 	if (install_username_hook()) blurAPI->console.print("set_usr_hook() -> true");
 	//if (!install_menu_hook()) blurAPI->console.print("ERROR in gameAPI::load() [install_menu_hook() returned false]");
 }
 
-
 void gameAPI::unload() {
 	//TODO: unhooks
 	console.close();
 }
 
 
 //TODO: move this somewhere sane
+//TODO: add indicator to see what is currently set
 bool gameAPI::toggle_drifter_mod_SP() {
 	uintptr_t modAdr = moduleBase + ADDY_SP_MOD;
 	int* modPtr = (int*) modAdr;
@@ -154,11 +166,15 @@ bool gameAPI::toggle_drifter_mod_SP() {
 bool gameAPI::set_name_LAN(std::string szName) {
 	bool set = false;
 	int len = szName.length();
-	if (len && (len <= LEN_LAN_NAME)) {
-		uintptr_t nameAdr = moduleBase + ADDY_LAN_NAME;
-		short* ptr = (short*) nameAdr;
-		for (int i=0; i<len; i++) ptr[i] = szName[i];
-		ptr[len] = NULL;
+	if ((0<=len) && (len<=LEN_LAN_NAME)) {
+		short* namePtr = (short*)(moduleBase + ADDY_LAN_NAME);
+		short* dispPtr = (short*)(moduleBase + ADDY_DISP_NAME);
+		for (int i = 0; i < len; i++) {
+			namePtr[i] = szName[i];
+			dispPtr[i] = szName[i];
+		}
+		namePtr[len] = NULL;
+		dispPtr[len] = NULL;
 		set = true;
 	}
 	return set;

source/blur.h

@@ -6,8 +6,9 @@
 #include "blur_hooks.h"
 #include "mem.h"
 
+
 enum BLUR_MOD_ID {
-	//Y
+	//Yellow
 	IRON_FIST = 0,
 	JUMP_THE_GUN,
 	FRONT_RUNNER,
@@ -16,7 +17,7 @@ enum BLUR_MOD_ID {
 	SHOWY_FLOURISH,
 	STABLE_FRAME,
 	BATTERING_RAM,
-	//O
+	//Orange
 	DECOY_DROP,
 	MAGNETIC_FIELD,
 	SCRAMBLER,
@@ -25,7 +26,7 @@ enum BLUR_MOD_ID {
 	ADAPTIVE_SHIELDING,
 	SAFETY_NET,
 	SHIELDED_BAY,
-	//G
+	//Green
 	ECM,
 	VAMPIRIC_WRECK,
 	BRIBE,
@@ -43,7 +44,6 @@ enum BLUR_MOD_ID {
 	ARMOR_PLATING,
 	SCATTER_SHOT,
 	SUPER_SHUNT,
-
 	//aux
 	MOD_ID_MAX
 };
@@ -58,7 +58,6 @@ const char * const BLUR_MOD_NAMES[] = {
 	"(y) SHOWY FLOURISH",
 	"(y) STABLE FRAME",
 	"(y) BATTERING RAM",
-		
 	"(o) DECOY DROP",
 	"(o) MAGNETIC FIELD",
 	"(o) SCRAMBLER",
@@ -67,7 +66,6 @@ const char * const BLUR_MOD_NAMES[] = {
 	"(o) ADAPTIVE SHIELDING",
 	"(o) SAFETY NET",
 	"(o) SHIELDED BAY",
-
 	"(g) ECM",
 	"(g) VAMPIRIC WRECK",
 	"(g) BRIBE",
@@ -76,7 +74,6 @@ const char * const BLUR_MOD_NAMES[] = {
 	"(g) SILENT RUNNING",
 	"(g) LAST GASP",
 	"(g) MASTERMINE",
-
 	"(SP) QUADSHOCK",
 	"(SP) OVERBOLT",
 	"(SP) TITANIUM SHIELD",
@@ -86,40 +83,18 @@ const char * const BLUR_MOD_NAMES[] = {
 	"(SP) SCATTER SHOT",
 	"(SP) SUPER SHUNT"
 };
-/* // for "old" blur version"
-#define ADDY_LAN_MOD_YELLOW 0xE12F84
-#define ADDY_LAN_MOD_ORANGE 0xE12F88
-#define ADDY_LAN_MOD_GREENY 0xE12F8C
-#define ADDY_SP_MOD 0xE14240
-
-#define ADDY_LAN_NAME 0xCE5898
-#define LEN_LAN_NAME 32
 
 
-#define ADDY_UNLOCK_INPUT 0xCC221C
-#define OFFSETS_UNLOCK_INPUT {0x14, 0x35C, 0xC, 0x4B0}
-
-*/
-
-//for "new" (discord) blur version:
 #define ADDY_LAN_MOD_YELLOW 0xE142DC
 #define ADDY_LAN_MOD_ORANGE 0xE142E0
 #define ADDY_LAN_MOD_GREENY 0xE142E4
 #define ADDY_SP_MOD 0xE15598
 
 
-// "new" = "old" + 0x1290
 #define ADDY_LAN_NAME 0xCE6B28
+#define ADDY_DISP_NAME 0xDA8878
 #define LEN_LAN_NAME 32
 
-//TODO
-#define ADDY_UNLOCK_INPUT 0xCC221C
-
-//hope?
-#define OFFSETS_UNLOCK_INPUT {0x14, 0x35C, 0xC, 0x4B0}
-
-//"old"entlist start
-//0xDB31D8 @ {18}
 
 // TODO elaborate info:
 //addy of player_0 = value of whatever is @ [ [@base]+0x18 ]
@@ -136,6 +111,11 @@ const char * const BLUR_MOD_NAMES[] = {
 #define OFFSET_PLAYER_MOD_G 0x158
 
 
+// what the user sees as laps
+#define ADDY_LAN_LAPS_READ 0xE3E8F9
+//what the rest of the lobby sees
+#define ADDY_LAN_LAPS_LOBBY 0xE3923B
+
 
 struct gameConfig {
 	std::string user_name;
@@ -156,6 +136,8 @@ struct gameAPI {
 	void unload();
 	gameAPI(uintptr_t p);
 
+	uint8_t lobby_get_laps();
+	bool lobby_set_laps(uint8_t laps);
 	std::string lobby_get_player_name(uintptr_t p);
 	std::string lobby_get_player_mods_as_string(uintptr_t p);
 	std::string lobby_get_player_yellow_mod_as_string(uintptr_t p);

source/blur_console.cpp

@@ -69,7 +69,6 @@ void gameConsole::start() {
 	HANDLE input_thread_handle = CreateThread(NULL, 0, input_thread, input, 0, NULL);
 }
 
-
 void gameConsole::close() {
 	print("Closing console..."); // might not get printed
 	FreeConsole();
@@ -129,14 +128,37 @@ bool gameConsole::cmd_handler(std::string cmd) {
 			while (p != NULL) {
 				//TODO format & colours
 				print("\tNAME: \"" + blurAPI->lobby_get_player_name(p) + "\"");
-				//print("\t\tMODS: " + blurAPI->lobby_get_player_mods_as_string(p));
 				print("\t MODS:");
 				print("\t\t\t" + blurAPI->lobby_get_player_yellow_mod_as_string(p));
 				print("\t\t\t" + blurAPI->lobby_get_player_orange_mod_as_string(p));
 				print("\t\t\t" + blurAPI->lobby_get_player_green_mod_as_string(p));
 				p = blurAPI->get_next_player(p);
 			}
 			isCmd = true;
+		} else if (cmd_args[0] == "laps") {
+			int argsc = cmd_args.size();
+			//FIXME there HAS to be a more elegant way to do this, maybe by hooking the verify function...
+			if (argsc == 1) {
+				print("LAPS: OFF" );
+				restore_lobby_laps_func();
+				print("\tEnter and exit the lobby settings menu to apply.");
+				//let the player reset them from the game settings
+			} else if (argsc == 2) {
+				int laps = atoi(cmd_args[1].c_str());
+				if ((9<laps) && (laps<256)) {
+					//TODO patch verify func
+					patch_lobby_laps_func();
+					//set lobby laps to laps
+					blurAPI->lobby_set_laps((uint8_t)laps);
+					print("LAPS: " + std::to_string(laps));
+					//tell them to open and close the menu
+					print("\tEnter and exit the lobby settings menu to apply this change to other players.");
+				} else {
+					print("\t*Error*(We want more laps!) USAGE: laps <10..255>)");
+				}
+			} else {
+				print("\t*Error*(Too many args! (" + std::to_string(argsc) + ")) USAGE: laps <10..255>)");
+			}
 		}
 	}
 	return isCmd;

source/blur_hooks.cpp

@@ -53,7 +53,6 @@ bool install_username_hook() {
 }
 
 
-
 bool __stdcall hook_GetUserNameA(char* buff, unsigned long * len) {
 	//bool r = GetUserNameA(buff, len); //original func
 	bool r = true;
@@ -62,11 +61,55 @@ bool __stdcall hook_GetUserNameA(char* buff, unsigned long * len) {
 	for (int i=0; i<n; i++) buff[i] = name[i];
 	buff[n] = NULL;
 	*len = n;
-	blurAPI->console.print("Name set to: " + name);
+	blurAPI->console.print("Name set to: \"" + name + "\"");
 	return r;
 }
 
 
+bool patch_lobby_laps_func() {
+	bool ok = false;
+	//TODO (consider using) mem.h <> set_nops(adr, len)
+
+	void* dst = (void*) (blurAPI->moduleBase + FUNC_SET_LOBBY_LAPS_ADDY);
+	uint8_t* addy = (uint8_t*)dst;
+	DWORD org, _;
+	VirtualProtect(dst, FUNC_SET_LOBBY_LAPS_INS_LEN, PAGE_EXECUTE_READWRITE, &org);
+	/* Debug stuffs
+	unsigned char c;
+	c = addy[0];
+	blurAPI->console.print("addy0=" + std::to_string(c) + "");
+	c = addy[1];
+	blurAPI->console.print("addy1=" + std::to_string(c) + "");
+	*/
+	if ((addy[0] == FUNC_SET_LOBBY_LAPS_INS_BYTE0) && (addy[1] == FUNC_SET_LOBBY_LAPS_INS_BYTE1)) {
+		ok = true; //we actually patched something
+		//indicate patched function?
+	}
+	addy[0] = OP_NOP;
+	addy[1] = OP_NOP;
+	VirtualProtect(dst, FUNC_SET_LOBBY_LAPS_INS_LEN, org, &_);
+
+	return ok;
+}
+
+bool restore_lobby_laps_func() {
+	bool ok = false; //FIXME check if noped?
+	
+	void* dst = (void*) (blurAPI->moduleBase + FUNC_SET_LOBBY_LAPS_ADDY);
+	uint8_t* addy = (uint8_t*)dst;
+	DWORD org, _;
+	VirtualProtect(dst, FUNC_SET_LOBBY_LAPS_INS_LEN, PAGE_EXECUTE_READWRITE, &org);
+	if ((addy[0] == OP_NOP) && (addy[1] == OP_NOP)) {
+		ok = true; //we actually "did" something
+		//TODO indicate we did someting
+	}
+	addy[0] = FUNC_SET_LOBBY_LAPS_INS_BYTE0;
+	addy[1] = FUNC_SET_LOBBY_LAPS_INS_BYTE1;
+	VirtualProtect(dst, FUNC_SET_LOBBY_LAPS_INS_LEN, org, &_);
+
+	return ok;
+}
+
 
 //TODO: debug stuff
 //https://en.wikibooks.org/wiki/X86_Assembly/X86_Architecture

source/blur_hooks.h

@@ -6,11 +6,16 @@
 #define HOOK_MENU_FUNC_INS_LEN 6
 
 //winapi32 call to GetUserNameA() hook here
-//#define HOOK_NAME_FUNC_ADDY 0x95CD2A
-//in1.2:
 #define HOOK_NAME_FUNC_ADDY 0x95E0EA 
 #define HOOK_NAME_FUNC_INS_LEN 6
 
+
+// mov [edi], al   //gets EDI ptr register from some odd func earlier (im too dumb to dive into it)
+#define FUNC_SET_LOBBY_LAPS_ADDY 0x6F41B2
+#define FUNC_SET_LOBBY_LAPS_INS_LEN 0x2
+#define FUNC_SET_LOBBY_LAPS_INS_BYTE0 0x88
+#define FUNC_SET_LOBBY_LAPS_INS_BYTE1 0x07
+
 struct gameHooks {
 	fn_ptr_t fn_menu_trampoline = nullptr;
 	fn_ptr_t fn_menu_callback = nullptr;
@@ -27,5 +32,7 @@ void fn_hello_world();
 bool install_username_hook();
 bool __stdcall hook_GetUserNameA(char* buff, unsigned long *len);
 
+bool patch_lobby_laps_func();
+bool restore_lobby_laps_func();
 
 //void aux_print_registers();

source/d3d9.cpp

@@ -138,7 +138,7 @@ HRESULT f_IDirect3DDevice9::Reset(D3DPRESENT_PARAMETERS *pPresentationParameters
 	// NOTE: call onLostDevice for custom D3D components here.
 
 	HRESULT hr = f_pD3DDevice->Reset(pPresentationParameters);
-	blurAPI->console.print("\tf_pD3DDevice->Reset(pPresentationParameters)");
+	//blurAPI->console.print("\tf_pD3DDevice->Reset(pPresentationParameters)");
 
 	// NOTE: call onResetDevice for custom D3D components here.
 

source/mem.cpp

@@ -73,3 +73,17 @@ bool __stdcall set_call_func(void* src, fn_ptr_t f) {
 	}
 	return ok;
 }
+
+
+bool set_nops(void* dst, unsigned int len) {
+	bool ok = false;
+	if ((len > 0) && (dst != NULL)) {
+		DWORD org, _;
+		uint8_t* ptr = (uint8_t*) dst;
+		VirtualProtect(dst, len, PAGE_EXECUTE_READWRITE, &org);
+		for (unsigned int i = 0; i < len; i++) ptr[i] = OP_NOP;
+		VirtualProtect(dst, len, org, &_);
+		ok = true;
+	}
+	return ok;
+}