summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-05-19 21:28:10 +0200
committeraap <aap@papnet.eu>2019-05-19 21:28:10 +0200
commitc4f9b9573f1535d3297946fbb5c73393594ffa24 (patch)
tree47acb1934d86d3ab220035258a2345f526c9b922 /src/audio
parentmore work on CPhysical (diff)
downloadre3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.gz
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.bz2
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.lz
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.xz
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.zst
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.zip
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/DMAudio.cpp4
-rw-r--r--src/audio/DMAudio.h3
2 files changed, 5 insertions, 2 deletions
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;