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:
authorJan Klass <kissaki@posteo.de>2016-11-17 14:59:45 +0300
committerJan Klass <kissaki@posteo.de>2016-11-17 14:59:45 +0300
commite2ad9c05f0cff73defe5083e6728ab9b1af63ab9 (patch)
treee3882263e01ace81722863d84e86337e82b06114 /plugins/etqw
parent486381c95a5d83f61c47b8e43538c03f341cc8a5 (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/etqw')
-rw-r--r--plugins/etqw/etqw.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/etqw/etqw.cpp b/plugins/etqw/etqw.cpp
index 5fc94064f..970a1e7ec 100644
--- a/plugins/etqw/etqw.cpp
+++ b/plugins/etqw/etqw.cpp
@@ -31,18 +31,18 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa
0x013F9E1C float Vertical view
0x013E8D18 byte Magic value (32 ingame / 0 spectating)
*/
- ok = peekProc(0x00801BA4, menustate);
+ ok = peekProc(0x00801BA4, &menustate, 1);
if (! ok)
return false;
if (menustate == 0)
return true;
- ok = peekProc(pos1ptr, avatar_pos[1]) && //Y
- peekProc(pos2ptr, avatar_pos[0]) && //X
- peekProc(pos3ptr, avatar_pos[2]) && //Z
- peekProc(rot1ptr, viewHor) && //Hor
- peekProc(rot2ptr, viewVer) && //Ver
- peekProc(0x0122E0B8, ccontext);
+ ok = peekProc(pos1ptr, avatar_pos+1, 4) && //Y
+ peekProc(pos2ptr, avatar_pos, 4) && //X
+ peekProc(pos3ptr, avatar_pos+2, 4) && //Z
+ peekProc(rot1ptr, &viewHor, 4) && //Hor
+ peekProc(rot2ptr, &viewVer, 4) && //Ver
+ peekProc(0x0122E0B8, ccontext, 128);
if (! ok)
return false;