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/bossRamboo.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/bossRamboo.cpp')
| -rw-r--r-- | src/bossRamboo.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/bossRamboo.cpp b/src/bossRamboo.cpp index c12b709..de01fe9 100644 --- a/src/bossRamboo.cpp +++ b/src/bossRamboo.cpp @@ -70,14 +70,6 @@ CREATE_STATE(daRamboo_c, Flee); CREATE_STATE(daRamboo_c, Outro); -struct EventTable_t { - u64 events; - // ... -}; - -extern EventTable_t *EventTable; - - void daRamboo_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { DamagePlayer(this, apThis, apOther); } void daRamboo_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { SpawnEffect("Wm_en_obakedoor_sm", 0, &apOther->owner->pos, &(S16Vec){0,0,0}, &(Vec){0.5, 0.5, 0.5}); @@ -236,7 +228,7 @@ int daRamboo_c::onExecute() { if(this->fogSrt.isEntryAnimationDone(0)) this->fogSrt.setFrameForEntry(1.0, 0); - if (EventTable->events & this->eventFlag) { + if (dFlagMgr_c::instance->flags & this->eventFlag) { doStateChange(&StateID_Outro); } |