diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-09-21 20:43:21 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-09-21 20:43:21 -0500 |
| commit | d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806 (patch) | |
| tree | c3f6657118d71abcd1ce3b4584b3e0472841e53f /src/mrsun.cpp | |
| parent | 8d0a306f0a526a76182c8d2b513d7a0441d6f466 (diff) | |
| parent | 5654d5c0a056f9cfc99ac608d16aa0a601b997f5 (diff) | |
| download | kamek-d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806.tar.gz kamek-d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'src/mrsun.cpp')
| -rwxr-xr-x | src/mrsun.cpp | 9 |
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; |