summaryrefslogtreecommitdiff
path: root/src/effectvideo.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-09-21 20:43:21 -0500
committerColin Noga <Tempus@chronometry.ca>2012-09-21 20:43:21 -0500
commitd47a9ed57a826d60c37bfa8a4ae00ccaba0ed806 (patch)
treec3f6657118d71abcd1ce3b4584b3e0472841e53f /src/effectvideo.cpp
parent8d0a306f0a526a76182c8d2b513d7a0441d6f466 (diff)
parent5654d5c0a056f9cfc99ac608d16aa0a601b997f5 (diff)
downloadkamek-d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806.tar.gz
kamek-d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806.zip
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
-rw-r--r--src/effectvideo.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/effectvideo.cpp b/src/effectvideo.cpp
index d690263..24089ef 100644
--- a/src/effectvideo.cpp
+++ b/src/effectvideo.cpp
@@ -4,7 +4,6 @@
#include <sfx.h>
-extern "C" void *PlaySoundAsync(dEn_c *, int soundID);
extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*);
@@ -25,12 +24,6 @@ class EffectVideo : public dEn_c {
};
-struct EventTable_t {
- u64 events;
-};
-
-extern EventTable_t *EventTable;
-
EffectVideo *EffectVideo::build() {
void *buffer = AllocFromGameHeap1(sizeof(EffectVideo));
@@ -65,7 +58,7 @@ int EffectVideo::onDelete() {
int EffectVideo::onExecute() {
- if (EventTable->events & this->eventFlag) {
+ if (dFlagMgr_c::instance->flags & this->eventFlag) {
if (this->timer == this->delay) {