Merge branch 'file-select' into level-select

1 files changed, 1 insertions, 8 deletions

diff --git a/src/mrsun.cpp b/src/mrsun.cpp
index 86c5bfb..5b9130c 100755
--- a/src/mrsun.cpp
+++ b/src/mrsun.cpp
@@ -86,13 +86,6 @@ CREATE_STATE(daMrSun_c, Wait);
 #define DEACTIVATE	0
 
 
-struct EventTable_t {
-	u64 events;
-	// ...
-};
-
-extern EventTable_t *EventTable;
-
 
 
 void daMrSun_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) {  DamagePlayer(this, apThis, apOther); }
@@ -253,7 +246,7 @@ int daMrSun_c::onExecute() {
 	acState.execute();
 	updateModelMatrices();
 		
-	if (EventTable->events & this->eventFlag) {
+	if (dFlagMgr_c::instance->flags & this->eventFlag) {
 		if (this->killFlag == 0) {
 			this->kill();
 			this->pos.y = this->pos.y + 800.0;