diff options
| author | Treeki <treeki@gmail.com> | 2012-09-16 20:13:29 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-09-16 20:13:29 +0200 |
| commit | 7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f (patch) | |
| tree | c79a81d147511fcad842e8f1a64d9c0e58828ebb /src/mrsun.cpp | |
| parent | be31f99777d00238151df5851042a9e896d24f74 (diff) | |
| parent | eb4b6edcbef13c80b0051abe9dc89c93e7a960d0 (diff) | |
| download | kamek-7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f.tar.gz kamek-7cccf6fd2715cd1fae9745ae2b15c077a97e4e2f.zip | |
Merge branch 'file-select' 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; |