diff options
| author | Jan Klass <kissaki@posteo.de> | 2016-11-17 14:59:45 +0300 |
|---|---|---|
| committer | Jan Klass <kissaki@posteo.de> | 2016-11-17 14:59:45 +0300 |
| commit | e2ad9c05f0cff73defe5083e6728ab9b1af63ab9 (patch) | |
| tree | e3882263e01ace81722863d84e86337e82b06114 /plugins/gtaiv | |
| parent | 486381c95a5d83f61c47b8e43538c03f341cc8a5 (diff) | |
Fix 2643: Revert "Merge PR #2611: plugins: use the short form of peekProc"
This reverts commit e9c558ffdbc1501d63f3fd6d73578f6fd6611aa1, reversing
changes made to ca2fd07b90746a17dba13963f7bdd54812c5d016.
This is a quick-fix for crashing PA plugins. The intended change is
still useful and planned to land later.
Diffstat (limited to 'plugins/gtaiv')
| -rw-r--r-- | plugins/gtaiv/gtaiv.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/gtaiv/gtaiv.cpp b/plugins/gtaiv/gtaiv.cpp index 02321d0b3..43c78fbe7 100644 --- a/plugins/gtaiv/gtaiv.cpp +++ b/plugins/gtaiv/gtaiv.cpp @@ -51,10 +51,10 @@ static int setuppointers() { if (!peekProc(base_address + 0x11A7008 + (playerid * 4), &playerptr, 4) || !playerptr) return false; - if (!peekProc(playerptr + 0x58C, charptr) || !charptr) + if (!peekProc(playerptr + 0x58C, &charptr, 4) || !charptr) return false; - if (!peekProc(charptr + 0x20, cvecptr) || !cvecptr) + if (!peekProc(charptr + 0x20, &cvecptr, 4) || !cvecptr) return false; return true; @@ -84,12 +84,12 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa float camtop_corrector[3]; // Peekproc and assign game addresses to our containers, so we can retrieve positional data - ok = peekProc(cvecptr + 0x30, pos_corrector) && - peekProc(cvecptr + 0x20, top_corrector) && - peekProc(cvecptr + 0x10, front_corrector) && - peekProc(displayptr + 0x30, campos_corrector) && - peekProc(displayptr + 0x10, camtop_corrector) && - peekProc(displayptr + 0x20, camfront_corrector); + ok = peekProc(cvecptr + 0x30, &pos_corrector, 12) && + peekProc(cvecptr + 0x20, &top_corrector, 12) && + peekProc(cvecptr + 0x10, &front_corrector, 12) && + peekProc(displayptr + 0x30, &campos_corrector, 12) && + peekProc(displayptr + 0x10, &camtop_corrector, 12) && + peekProc(displayptr + 0x20, &camfront_corrector, 12); if (!ok) return false; @@ -135,7 +135,7 @@ static int trylock(const std::multimap<std::wstring, unsigned long long int> &pi base_address = pModule - 0x400000; - if (!peekProc(base_address + 0x10F47F0, viewportptr) || !viewportptr) + if (!peekProc(base_address + 0x10F47F0, &viewportptr, 4) || !viewportptr) return false; displayptr = viewportptr + 0x50; |