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/levelspecial.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 '')
| -rw-r--r-- | src/levelspecial.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/levelspecial.cpp b/src/levelspecial.cpp index dc503e0..adadc50 100644 --- a/src/levelspecial.cpp +++ b/src/levelspecial.cpp @@ -19,12 +19,6 @@ struct LevelSpecial { u8 func; // 0x3D7 }; -struct EventTable_t { - u64 events; - // ... -}; - -extern EventTable_t *EventTable; extern u16 TimeStopFlag; extern u32 TimerBranch; @@ -50,7 +44,6 @@ float GlobalRiderFloatModifications [] = {1, 0.6, 0.7, 0.9, 1, 1, 1, 1.1, 1.25, -extern "C" dAc_Py_c *GetSpecificPlayerActor(int number); void LevelSpecial_Update(LevelSpecial *self); bool ResetAfterLevel(); @@ -105,7 +98,7 @@ bool LevelSpecial_Execute(LevelSpecial *self) { void LevelSpecial_Update(LevelSpecial *self) { u8 newEvState = 0; - if (EventTable->events & self->eventFlag) + if (dFlagMgr_c::instance->flags & self->eventFlag) newEvState = 1; if (newEvState == self->lastEvState) |