From c4f9b9573f1535d3297946fbb5c73393594ffa24 Mon Sep 17 00:00:00 2001 From: aap Date: Sun, 19 May 2019 21:28:10 +0200 Subject: CPhysical almost done --- src/audio/DMAudio.cpp | 4 +++- src/audio/DMAudio.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/audio') diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp index cc8d4e8b..1ab5a52f 100644 --- a/src/audio/DMAudio.cpp +++ b/src/audio/DMAudio.cpp @@ -2,4 +2,6 @@ #include "patcher.h" #include "DMAudio.h" -WRAPPER void cDMAudio::ReportCollision(CEntity *A, CEntity *B, uint8 surfA, uint8 surfB, float impulse, float speed) { EAXJMP(0x161684); } +cDMAudio &DMAudio = *(cDMAudio*)0x95CDBE; + +WRAPPER void cDMAudio::ReportCollision(CEntity *A, CEntity *B, uint8 surfA, uint8 surfB, float impulse, float speed) { EAXJMP(0x57CBE0); } diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h index 8d49be27..140c6493 100644 --- a/src/audio/DMAudio.h +++ b/src/audio/DMAudio.h @@ -5,5 +5,6 @@ class CEntity; class cDMAudio { public: - static void ReportCollision(CEntity *A, CEntity *B, uint8 surfA, uint8 surfB, float impulse, float speed); + void ReportCollision(CEntity *A, CEntity *B, uint8 surfA, uint8 surfB, float impulse, float speed); }; +extern cDMAudio &DMAudio; -- cgit v1.2.3