Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidebeatrici <davidebeatrici@gmail.com>2016-06-24 00:32:22 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-06-24 00:32:37 +0300
commited8748dc07536c2ca67f2e803bf183c20826ee42 (patch)
tree5d75edf1cccafdd15b96a9b4bbc9ad358a2c295f /plugins/bf3
parent51af7852474d92a7d0514a0f57903551c3595f97 (diff)
plugins: update memory addresses retrieval to use procptr32_t/procptr64_t.
Diffstat (limited to 'plugins/bf3')
-rw-r--r--plugins/bf3/bf3.cpp26
1 files changed, 12 insertions, 14 deletions
diff --git a/plugins/bf3/bf3.cpp b/plugins/bf3/bf3.cpp
index 5a16a8e06..2a6d9f8fe 100644
--- a/plugins/bf3/bf3.cpp
+++ b/plugins/bf3/bf3.cpp
@@ -36,24 +36,22 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_win32_x86.h"
static bool ptr_chain_valid = false;
// Magic ptrs
-static BYTE* const state_ptr = (BYTE *) 0x238ABDC;
+static procptr32_t const state_ptr = 0x238ABDC;
// Vector ptrs
-static BYTE* const avatar_pos_ptr = (BYTE *) 0x0238AB70;
-static BYTE* const avatar_front_ptr = (BYTE *) 0x0238ABA0;
-static BYTE* const avatar_top_ptr = (BYTE *) 0x0238AB90;
+static procptr32_t const avatar_pos_ptr = 0x0238AB70;
+static procptr32_t const avatar_front_ptr = 0x0238ABA0;
+static procptr32_t const avatar_top_ptr = 0x0238AB90;
// Context ptrs
-static BYTE* const ipport_ptr = (BYTE *) 0x0235DB90;
+static procptr32_t const ipport_ptr = 0x0235DB90;
// Identity ptrs
-static BYTE *team_state_ptr;
-static BYTE *squad_state_ptr;
-static BYTE *squad_lead_state_ptr;
+static procptr32_t team_state_ptr, squad_state_ptr, squad_lead_state_ptr;
// Offsets
static const int base_offset = 0x01EF25C4;
@@ -102,17 +100,17 @@ inline bool resolve_ptrs() {
Team state: BF3.exe+0x01EF25C4 + 0x1C + 0xBC + 0x31C BYTE 1 is blufor (US team, for example), 2 is opfor (RU), 0 is probably upcoming spec mode
*/
- BYTE *base_bf3 = peekProc<BYTE *>(pModule + base_offset);
+ procptr32_t base_bf3 = peekProc<procptr32_t>(pModule + base_offset);
if (!base_bf3)
return false;
- BYTE *offset_ptr1 = peekProc<BYTE *>(base_bf3 + identity_offset1);
+ procptr32_t offset_ptr1 = peekProc<procptr32_t>(base_bf3 + identity_offset1);
if (!offset_ptr1) return false;
- BYTE *offset_ptr2 = peekProc<BYTE *>(offset_ptr1 + identity_offset2);
+ procptr32_t offset_ptr2 = peekProc<procptr32_t>(offset_ptr1 + identity_offset2);
if (!offset_ptr2) return false;
- BYTE *offset_ptr3 = peekProc<BYTE *>(offset_ptr2 + identity_offset3);
+ procptr32_t offset_ptr3 = peekProc<procptr32_t>(offset_ptr2 + identity_offset3);
if (!offset_ptr3) return false;
- BYTE *offset_ptr4 = peekProc<BYTE *>(offset_ptr3 + identity_offset4);
+ procptr32_t offset_ptr4 = peekProc<procptr32_t>(offset_ptr3 + identity_offset4);
if (!offset_ptr4) return false;
squad_state_ptr = offset_ptr4 + squad_state_offset;