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/wolfet | |
| 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/wolfet')
| -rw-r--r-- | plugins/wolfet/wolfet.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/wolfet/wolfet.cpp b/plugins/wolfet/wolfet.cpp index 06119ea44..a8463acac 100644 --- a/plugins/wolfet/wolfet.cpp +++ b/plugins/wolfet/wolfet.cpp @@ -57,7 +57,7 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa avatar_pos[i] = avatar_front[i] = avatar_top[i] = camera_pos[i] = camera_front[i] = camera_top[i] = 0.0f; bool ok; - ok = peekProc(0x013E8DFC, team); + ok = peekProc(0x013E8DFC, &team, 1); if (!ok) return false; @@ -65,9 +65,9 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa if (team == 0 || team == 3) return true; - ok = peekProc(0x013E8CF4, avatar_pos) && // X, Y, Z - peekProc(0x013F9E20, viewHor) && // Hor-Angle - peekProc(0x013F9E1C, viewVer); // Ver-Angle + ok = peekProc(0x013E8CF4, avatar_pos, 12) && // X, Y, Z + peekProc(0x013F9E20, &viewHor, 4) && // Hor-Angle + peekProc(0x013F9E1C, &viewVer, 4); // Ver-Angle if (!ok) return false; @@ -91,8 +91,8 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa // Context - concatenated server-ip, mapname and team value char hostip[32]; char mapname[40]; - ok = peekProc(0x009FFD30, hostip) && - peekProc(0x010B4908, mapname); + ok = peekProc(0x009FFD30, hostip, sizeof(hostip)) && + peekProc(0x010B4908, mapname, sizeof(hostip)); hostip[sizeof(hostip)-1] = '\0'; mapname[sizeof(mapname)-1] = '\0'; // Context in JSON format, {} with fields ipport (server hostname), map, and team (: int) |