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/cod4
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/cod4')
-rw-r--r--plugins/cod4/cod4.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/cod4/cod4.cpp b/plugins/cod4/cod4.cpp
index 9bc18125e..6de8e7aa7 100644
--- 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); // Magical state value
+ ok = peekProc(0x0074E380, &state, 1); // 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]) && //Z
- peekProc(0x0072AFE0, avatar_pos[0]) && //X
- peekProc(0x0072AFF0, avatar_pos[1]) && //Y
- peekProc(0x0072AF3C, viewHor) && //Hor
- peekProc(0x0072AF38, viewVer) && //Ver
- peekProc(0x00956D88, ccontext);
+ 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);
if (! ok)
return false;