plugins: use the short form of peekProc

The short form of peekProc automatically uses the correct size for the target.
dragan-radovic · Oct 31, 2016 · 921ee19 · 921ee19
1 parent ca2fd07
commit 921ee19
Show file tree

Hide file tree

Showing 41 changed files with 217 additions and 217 deletions.
diff --git a/plugins/aoc/aoc.cpp b/plugins/aoc/aoc.cpp
@@ -49,10 +49,10 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	wostringstream new_identity;
 	ostringstream new_context;
 
-	ok = peekProc(posptr, ipos, 12) &&
-	     peekProc(rotptr, rot, 12) &&
-	     peekProc(stateptr, &state, 1) &&
-	     peekProc(hostptr, chHostStr, 40);
+	ok = peekProc(posptr, ipos) &&
+	     peekProc(rotptr, rot) &&
+	     peekProc(stateptr, state) &&
+	     peekProc(hostptr, chHostStr);
 	if (!ok)
 		return false;
 
@@ -120,7 +120,7 @@ static int trylock(const std::multimap<std::wstring, unsigned long long int> &pi
 
 	//Gamecheck
 	char sMagic[13];
-	if (!peekProc(pModule + 0x7071e8, sMagic, 13) || strncmp("ageofchivalry", sMagic, 13)!=0)
+	if (!peekProc(pModule + 0x7071e8, sMagic) || strncmp("ageofchivalry", sMagic, 13)!=0)
 		return false;
 
 	// Check if we can get meaningful data from it

diff --git a/plugins/arma2/arma2.cpp b/plugins/arma2/arma2.cpp
@@ -35,9 +35,9 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	          return true; // This results in all vectors beeing zero which tells Mumble to ignore them.
 	*/
 
-	ok = peekProc(posptr, avatar_pos, 12) &&
-	     peekProc(frontptr, avatar_front, 12) &&
-	     peekProc(topptr, avatar_top, 12);
+	ok = peekProc(posptr, avatar_pos) &&
+	     peekProc(frontptr, avatar_front) &&
+	     peekProc(topptr, avatar_top);
 
 	if (avatar_pos[1] > 999000000.0)
 		return false;

diff --git a/plugins/bf1/bf1.cpp b/plugins/bf1/bf1.cpp
@@ -60,11 +60,11 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	if (!squad_offset_3) return false;
 
 	// Peekproc and assign game addresses to our containers, so we can retrieve positional data
-	ok = peekProc(state_offset_3 + 0x50, &state, 1) && // Magical state value: 1 when in-game and 0 when not spawned or playing.
-			peekProc(pModule + 0x35D2C60, avatar_pos, 12) && // Avatar position values (X, Y and Z).
-			peekProc(camera_base + 0x2B0, camera_pos, 12) && // Camera position values (X, Y and Z).
-			peekProc(camera_base + 0x260, camera_front, 12) && // Avatar front vector values (X, Y and Z).
-			peekProc(camera_base + 0x250, camera_top, 12) && // Avatar top vector values (X, Y and Z).
+	ok = peekProc(state_offset_3 + 0x50, state) && // Magical state value: 1 when in-game and 0 when not spawned or playing.
+			peekProc(pModule + 0x35D2C60, avatar_pos) && // Avatar position values (X, Y and Z).
+			peekProc(camera_base + 0x2B0, camera_pos) && // Camera position values (X, Y and Z).
+			peekProc(camera_base + 0x260, camera_front) && // Avatar front vector values (X, Y and Z).
+			peekProc(camera_base + 0x250, camera_top) && // Avatar top vector values (X, Y and Z).
 			peekProc(server_name_offset, server_name) && // Server name.
 			peekProc(team_offset_2 + 0x13, team) && // Team name.
 			peekProc(squad_offset_3 + 0x240, squad) && // Squad value: 0 (not in a squad), 1 (Apples), 2 (Butter), 3 (Charlie)... 26 (Zebra).

diff --git a/plugins/bf1942/bf1942.cpp b/plugins/bf1942/bf1942.cpp
@@ -27,9 +27,9 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 
 	//peekProc(contextptr, ccontext, 128);
 
-	ok = peekProc(0x00976274, avatar_pos, 12) &&
-	     peekProc(faceptr, avatar_front, 12) &&
-	     peekProc(topptr, avatar_top, 12);
+	ok = peekProc(0x00976274, avatar_pos) &&
+	     peekProc(faceptr, avatar_front) &&
+	     peekProc(topptr, avatar_top);
 
 	if (! ok)
 		return false;

diff --git a/plugins/bf2/bf2.cpp b/plugins/bf2/bf2.cpp
@@ -79,15 +79,15 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 
 	bool ok;
 	BYTE logincheck;
-	ok = peekProc(login_ptr, &logincheck, 1);
+	ok = peekProc(login_ptr, logincheck);
 	if (! ok)
 		return false;
 
 	if (logincheck == 0)
 		return false;
 
 	BYTE state;
-	ok = peekProc(state_ptr , &state, 1); // Magical state value
+	ok = peekProc(state_ptr , state); // Magical state value
 	if (! ok)
 		return false;
 
@@ -109,14 +109,14 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	BYTE is_in_squad;
 	BYTE is_opfor;
 
-	ok = peekProc(pos_ptr, avatar_pos, 12) &&
-	     peekProc(face_ptr, avatar_front, 12) &&
-	     peekProc(top_ptr, avatar_top, 12) &&
-	     peekProc(ipport_ptr, ccontext, 128) &&
-	     peekProc(commander_ptr, &is_commander, 1) &&
-	     peekProc(squad_leader_ptr, &is_squad_leader, 1) &&
-	     peekProc(squad_state_ptr, &is_in_squad, 1) &&
-	     peekProc(team_state_ptr, &is_opfor, 1);
+	ok = peekProc(pos_ptr, avatar_pos) &&
+	     peekProc(face_ptr, avatar_front) &&
+	     peekProc(top_ptr, avatar_top) &&
+	     peekProc(ipport_ptr, ccontext) &&
+	     peekProc(commander_ptr, is_commander) &&
+	     peekProc(squad_leader_ptr, is_squad_leader) &&
+	     peekProc(squad_state_ptr, is_in_squad) &&
+	     peekProc(team_state_ptr, is_opfor);
 
 	if (! ok)
 		return false;

diff --git a/plugins/bf2142/bf2142.cpp b/plugins/bf2142/bf2142.cpp
@@ -16,7 +16,7 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	char logincheck;
 	bool ok;
 
-	ok = peekProc(0x00A1D908, &logincheck, 1);
+	ok = peekProc(0x00A1D908, logincheck);
 	if (! ok)
 		return false;
 
@@ -33,10 +33,10 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	if (! ok)
 		return false;
 
-	ok = peekProc(posptr, avatar_pos, 12) &&
-	     peekProc(faceptr, avatar_front, 12) &&
-	     peekProc(topptr, avatar_top, 12) &&
-	     peekProc(0x00B527B8, ccontext, 128);
+	ok = peekProc(posptr, avatar_pos) &&
+	     peekProc(faceptr, avatar_front) &&
+	     peekProc(topptr, avatar_top) &&
+	     peekProc(0x00B527B8, ccontext);
 
 	if (! ok)
 		return false;

diff --git a/plugins/bf3/bf3.cpp b/plugins/bf3/bf3.cpp
@@ -146,13 +146,13 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
         ptr_chain_valid = true;
     }
 
-    ok = peekProc(avatar_pos_ptr, avatar_pos, 12) &&
-        peekProc(avatar_front_ptr, avatar_front, 12) &&
-        peekProc(avatar_top_ptr, avatar_top, 12) &&
-        peekProc(squad_state_ptr,&squad_state,1) &&
-        peekProc(squad_lead_state_ptr, &is_squadleader,1) &&
-        peekProc(team_state_ptr,&team_state,1) &&
-        peekProc(ipport_ptr,ccontext,128);
+    ok = peekProc(avatar_pos_ptr, avatar_pos) &&
+        peekProc(avatar_front_ptr, avatar_front) &&
+        peekProc(avatar_top_ptr, avatar_top) &&
+        peekProc(squad_state_ptr,squad_state) &&
+        peekProc(squad_lead_state_ptr, is_squadleader) &&
+        peekProc(team_state_ptr,team_state) &&
+        peekProc(ipport_ptr,ccontext);
 
     if (! ok)
         return false;

diff --git a/plugins/bf4/bf4.cpp b/plugins/bf4/bf4.cpp
@@ -36,11 +36,11 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
     if (!squad_offset_2) return false;
 
     // Peekproc and assign game addresses to our containers, so we can retrieve positional data
-    ok = peekProc(pModule + 0x21CAFF0, &state, 1) && // Magical state value: 0 when in-game and 1 when in menu/dead.
-            peekProc(pModule + 0x21C6D40, avatar_pos, 12) && // Avatar Position values (X, Y and Z).
-            peekProc(pModule + 0x21CAF80, camera_pos, 12) && // Camera Position values (X, Y and Z).
-            peekProc(pModule + 0x21CAF60, avatar_top, 12) && // Avatar Top Vector values (X, Y and Z).
-            peekProc(pModule + 0x21CAF70, avatar_front, 12) && // Avatar Front Vector values (X, Y and Z).
+    ok = peekProc(pModule + 0x21CAFF0, state) && // Magical state value: 0 when in-game and 1 when in menu/dead.
+            peekProc(pModule + 0x21C6D40, avatar_pos) && // Avatar Position values (X, Y and Z).
+            peekProc(pModule + 0x21CAF80, camera_pos) && // Camera Position values (X, Y and Z).
+            peekProc(pModule + 0x21CAF60, avatar_top) && // Avatar Top Vector values (X, Y and Z).
+            peekProc(pModule + 0x21CAF70, avatar_front) && // Avatar Front Vector values (X, Y and Z).
             peekProc(serverid_offset, serverid) && // Server ID (36 characters).
             peekProc(pModule + 0x21B80C0, host) && // Host value: "IP:Port" when in a server, "bot" when loading and empty when it's hidden.
             peekProc(pModule + 0x24AFAE5, team) && // Team value: US (United States); RU (Russia); CH (China).

diff --git a/plugins/bf4_x86/bf4_x86.cpp b/plugins/bf4_x86/bf4_x86.cpp
@@ -34,11 +34,11 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
     if (!squad_offset_1) return false;
 
     // Peekproc and assign game addresses to our containers, so we can retrieve positional data
-    ok = peekProc(pModule + 0x1BB6AC2, &state, 1) && // Magical state value: 0 when in-game and 1 when in menu/dead.
-            peekProc(pModule + 0x1BB3C30, avatar_pos, 12) && // Avatar Position values (X, Y and Z).
-            peekProc(pModule + 0x1BB6A90, camera_pos, 12) && // Camera Position values (X, Y and Z).
-            peekProc(pModule + 0x1BB6A70, avatar_top, 12) && // Avatar Top Vector values (X, Y and Z).
-            peekProc(pModule + 0x1BB6A80, avatar_front, 12) && // Avatar Front Vector values (X, Y and Z).
+    ok = peekProc(pModule + 0x1BB6AC2, state) && // Magical state value: 0 when in-game and 1 when in menu/dead.
+            peekProc(pModule + 0x1BB3C30, avatar_pos) && // Avatar Position values (X, Y and Z).
+            peekProc(pModule + 0x1BB6A90, camera_pos) && // Camera Position values (X, Y and Z).
+            peekProc(pModule + 0x1BB6A70, avatar_top) && // Avatar Top Vector values (X, Y and Z).
+            peekProc(pModule + 0x1BB6A80, avatar_front) && // Avatar Front Vector values (X, Y and Z).
             peekProc(serverid_offset, serverid) && // Server ID (36 characters).
             peekProc(pModule + 0x1BA8A10, host) && // Host value: "IP:Port" when in a server, "bot" when loading and empty when it's hidden.
             peekProc(pModule + 0x1C814B5, team) && // Team value: US (United States); RU (Russia); CH (China).

diff --git a/plugins/bfbc2/bfbc2.cpp b/plugins/bfbc2/bfbc2.cpp
@@ -23,21 +23,21 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 
 	// Find out whether this is the steam version
 	char sMagic[6];
-	if (!peekProc(0x015715b4, sMagic, 6)) {
+	if (!peekProc(0x015715b4, sMagic)) {
 		generic_unlock();
 		return false;
 	}
 
 	is_steam = (strncmp("Score:", sMagic, 6) == 0);
 
 	if (is_steam) {
-		ok = peekProc(0x01571E90, avatar_pos, 12) &&
-		     peekProc(0x01571E80, avatar_front, 12) &&
-		     peekProc(0x01571E70, avatar_top, 12);
+		ok = peekProc(0x01571E90, avatar_pos) &&
+		     peekProc(0x01571E80, avatar_front) &&
+		     peekProc(0x01571E70, avatar_top);
 	} else {
-		ok = peekProc(0x01579600, avatar_pos, 12) &&
-		     peekProc(0x015795F0, avatar_front, 12) &&
-		     peekProc(0x015795E0, avatar_top, 12);
+		ok = peekProc(0x01579600, avatar_pos) &&
+		     peekProc(0x015795F0, avatar_front) &&
+		     peekProc(0x015795E0, avatar_top);
 	}
 
 	if (! ok)

diff --git a/plugins/bfheroes/bfheroes.cpp b/plugins/bfheroes/bfheroes.cpp
@@ -15,17 +15,17 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	char logincheck;
 	bool ok;
 
-	ok = peekProc(0x00A24D6C, &logincheck, 1);
+	ok = peekProc(0x00A24D6C, logincheck);
 	if (! ok)
 		return false;
 
 	if (logincheck == 0)
 		return false;
 
-	ok = peekProc(posptr, avatar_pos, 12) &&
-	     peekProc(faceptr, avatar_front, 12) &&
-	     peekProc(topptr, avatar_top, 12) &&
-	     peekProc(stateptr, &state, 1);
+	ok = peekProc(posptr, avatar_pos) &&
+	     peekProc(faceptr, avatar_front) &&
+	     peekProc(topptr, avatar_top) &&
+	     peekProc(stateptr, state);
 
 	if (! ok)
 		return false;

diff --git a/plugins/blacklight/blacklight.cpp b/plugins/blacklight/blacklight.cpp
@@ -90,8 +90,8 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	bool ok;
 	char hostipport[sizeof(prev_hostipport)];
 
-	ok = peekProc(camfrontptr, camfront, 12) &&
-		 peekProc(camtopptr, camtop, 12) &&
+	ok = peekProc(camfrontptr, camfront) &&
+		 peekProc(camtopptr, camtop) &&
 		 peekProc(hostipportptr, hostipport) &&
 		 peekProc(camptr, cam);
 

diff --git a/plugins/borderlands/borderlands.cpp b/plugins/borderlands/borderlands.cpp
@@ -76,9 +76,9 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	float pos_corrector[3];
 	float front_corrector[3];
 	float top_corrector[3];
-	ok = peekProc(posptr, &pos_corrector, 12) &&
-	     peekProc(frontptr, &front_corrector, 12) &&
-	     peekProc(topptr, &top_corrector, 12);
+	ok = peekProc(posptr, pos_corrector) &&
+	     peekProc(frontptr, front_corrector) &&
+	     peekProc(topptr, top_corrector);
 	if (! ok)
 		return false;
 

diff --git a/plugins/breach/breach.cpp b/plugins/breach/breach.cpp
@@ -54,9 +54,9 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 		return true; // This results in all vectors beeing zero which tells Mumble to ignore them
 
 	// coordinate systems is already left handed so no change needed
-	ok = peekProc(posptr, avatar_pos, 12) &&
-	     peekProc(frontptr, avatar_front, 12) &&
-	     peekProc(topptr, avatar_top, 12);
+	ok = peekProc(posptr, avatar_pos) &&
+	     peekProc(frontptr, avatar_front) &&
+	     peekProc(topptr, avatar_top);
 	if (! ok)
 		return false;
 

diff --git a/plugins/cod2/cod2.cpp b/plugins/cod2/cod2.cpp
@@ -26,18 +26,18 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 			0x0151A110		float	Vertical view (degrees) (=0 out-of-game)
 			0x0096B688		byte	Magic value (0=ingame/out-of-game, 4=spectator)
 	*/
-	ok = peekProc(0x0096B688, &state, 1);
+	ok = peekProc(0x0096B688, state);
 	if (! ok)
 		return false;
 
 	if (state == 4)
 		return true; // If this magic value is 4 we are spectating, so switch of PA
 
-	ok = peekProc(0x01516608, avatar_pos+2, 4) &&	//Z
-	     peekProc(0x0151660C, avatar_pos, 4) &&	//X
-	     peekProc(0x01516610, avatar_pos+1, 4) && //Y
-	     peekProc(0x0151A114, &viewHor, 4) && //Hor
-	     peekProc(0x0151A110, &viewVer, 4); //Ver
+	ok = peekProc(0x01516608, avatar_pos[2]) &&	//Z
+	     peekProc(0x0151660C, avatar_pos[0]) &&	//X
+	     peekProc(0x01516610, avatar_pos[1]) && //Y
+	     peekProc(0x0151A114, viewHor) && //Hor
+	     peekProc(0x0151A110, viewVer); //Ver
 
 	if (! ok)
 		return false;

diff --git a/plugins/cod4/cod4.cpp b/plugins/cod4/cod4.cpp
@@ -30,7 +30,7 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 
 			0x0074E380		byte	Magical state value
 	*/
-	ok = peekProc(0x0074E380, &state, 1); // Magical state value
+	ok = peekProc(0x0074E380, state); // Magical state value
 	if (! ok)
 		return false;
 	/*
@@ -45,12 +45,12 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	if (state != 4)
 		return true; // This results in all vectors beeing zero which tells mumble to ignore them.
 
-	ok = peekProc(0x0072AFD0, avatar_pos+2, 4) &&	//Z
-	     peekProc(0x0072AFE0, avatar_pos, 4) &&	//X
-	     peekProc(0x0072AFF0, avatar_pos+1, 4) && //Y
-	     peekProc(0x0072AF3C, &viewHor, 4) && //Hor
-	     peekProc(0x0072AF38, &viewVer, 4) && //Ver
-	     peekProc(0x00956D88, ccontext, 128);
+	ok = peekProc(0x0072AFD0, avatar_pos[2]) &&	//Z
+	     peekProc(0x0072AFE0, avatar_pos[0]) &&	//X
+	     peekProc(0x0072AFF0, avatar_pos[1]) && //Y
+	     peekProc(0x0072AF3C, viewHor) && //Hor
+	     peekProc(0x0072AF38, viewVer) && //Ver
+	     peekProc(0x00956D88, ccontext);
 
 	if (! ok)
 		return false;

diff --git a/plugins/cod5/cod5.cpp b/plugins/cod5/cod5.cpp
@@ -27,7 +27,7 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 
 			0x0098FD2C		byte	Magical state value
 	*/
-	ok = peekProc(0x0098FD2C, &state, 1); // Magical state value
+	ok = peekProc(0x0098FD2C, state); // Magical state value
 	if (! ok)
 		return false;
 	/*
@@ -42,11 +42,11 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	if (state != 4)
 		return true; // This results in all vectors beeing zero which tells mumble to ignore them.
 
-	ok = peekProc(0x008DE23C, avatar_pos+2, 4) &&	//Z
-	     peekProc(0x008DE234, avatar_pos, 4) &&	//X
-	     peekProc(0x008DE238, avatar_pos+1, 4) && //Y
-	     peekProc(0x008DE244, &viewHor, 4) && //Hor
-	     peekProc(0x008DE240, &viewVer, 4); //Ver
+	ok = peekProc(0x008DE23C, avatar_pos[2]) &&	//Z
+	     peekProc(0x008DE234, avatar_pos[0]) &&	//X
+	     peekProc(0x008DE238, avatar_pos[1]) && //Y
+	     peekProc(0x008DE244, viewHor) && //Hor
+	     peekProc(0x008DE240, viewVer); //Ver
 
 	if (! ok)
 		return false;

diff --git a/plugins/codmw2/codmw2.cpp b/plugins/codmw2/codmw2.cpp
@@ -27,7 +27,7 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 
 			0x007F7A34		byte	Magical state value
 	*/
-	ok = peekProc(0x007F8AB4, &state, 1); // Magical state value
+	ok = peekProc(0x007F8AB4, state); // Magical state value
 	if (! ok)
 		return false;
 	/*
@@ -42,11 +42,11 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
 	if (state != 1)
 		return true; // This results in all vectors beeing zero which tells mumble to ignore them.
 
-	ok = peekProc(0x008F1FF8, avatar_pos+2, 4) &&	//Z
-	     peekProc(0x008F1FFC, avatar_pos, 4) &&	//X
-	     peekProc(0x008F2000, avatar_pos+1, 4) && //Y
-	     peekProc(0x008F2008, &viewHor, 4) && //Hor
-	     peekProc(0x008F2004, &viewVer, 4); //Ver
+	ok = peekProc(0x008F1FF8, avatar_pos[2]) &&	//Z
+	     peekProc(0x008F1FFC, avatar_pos[0]) &&	//X
+	     peekProc(0x008F2000, avatar_pos[1]) && //Y
+	     peekProc(0x008F2008, viewHor) && //Hor
+	     peekProc(0x008F2004, viewVer); //Ver
 
 	if (! ok)
 		return false;