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/firelaser.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/firelaser.cpp')
| -rwxr-xr-x | src/firelaser.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/firelaser.cpp b/src/firelaser.cpp index 32eb0bd..fa240d0 100755 --- a/src/firelaser.cpp +++ b/src/firelaser.cpp @@ -25,18 +25,9 @@ daFireLaser_c *daFireLaser_c::build() { } -extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer); - - CREATE_STATE(daFireLaser_c, pewpewpew); -struct EventTable_t { - u64 events; -}; - -extern EventTable_t *EventTable; - int daFireLaser_c::onCreate() { @@ -77,7 +68,7 @@ void daFireLaser_c::beginState_pewpewpew() { void daFireLaser_c::executeState_pewpewpew() { - if (EventTable->events & this->eventFlag) { + if (dFlagMgr_c::instance->flags & this->eventFlag) { this->timer = this->timer + 1; |