Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select

1 files changed, 2 insertions, 9 deletions

diff --git a/src/spriteswapper.cpp b/src/spriteswapper.cpp
index 89ead56..3fc78e0 100755
--- a/src/spriteswapper.cpp
+++ b/src/spriteswapper.cpp
@@ -16,19 +16,12 @@ public:
 	u32 timer;
 };
 
-struct EventTable_t {
-	u64 events;
-};
-
 
 SpriteSpawnerTimed *SpriteSpawnerTimed::build() {
 	void *buffer = AllocFromGameHeap1(sizeof(SpriteSpawnerTimed));
 	return new(buffer) SpriteSpawnerTimed;
 }
 
-extern EventTable_t *EventTable;
-extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
-
 
 
 int SpriteSpawnerTimed::onCreate() {
@@ -48,7 +41,7 @@ int SpriteSpawnerTimed::onCreate() {
 
 int SpriteSpawnerTimed::onExecute() {
 
-	if (EventTable->events & this->eventFlag) {		 // If the event is on
+	if (dFlagMgr_c::instance->flags & this->eventFlag) {		 // If the event is on
 		if (this->timer < 1) {						// If the timer is empty
 			CreateActor(this->type, this->inheritSet, this->pos, 0, 0);
 			this->timer = 120;
@@ -62,4 +55,4 @@ int SpriteSpawnerTimed::onExecute() {
 	}
 
 	return true;
-}
\ No newline at end of file
+}