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/spritespawner.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/spritespawner.cpp')
| -rwxr-xr-x | src/spritespawner.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/spritespawner.cpp b/src/spritespawner.cpp index 56ac383..4be86a3 100755 --- a/src/spritespawner.cpp +++ b/src/spritespawner.cpp @@ -19,9 +19,6 @@ struct SpriteSpawner { u32 createdActor; }; -struct EventTable_t { - u64 events; -}; struct VEC { @@ -31,9 +28,6 @@ struct VEC { }; -extern EventTable_t *EventTable; -extern "C" dStageActor_c *CreateActor(u16 classID, int settings, VEC pos, char rot, char layer); -extern "C" dStageActor_c *Actor_SearchByID(u32 actorID); void SpriteSpawner_Update(SpriteSpawner *self); @@ -67,13 +61,13 @@ bool SpriteSpawner_Execute(SpriteSpawner *self) { void SpriteSpawner_Update(SpriteSpawner *self) { - if (EventTable->events & self->eventFlag) + if (dFlagMgr_c::instance->flags & self->eventFlag) { // Put an action for when the event turns on here if (self->createdActor == 0) { - VEC pos; + Vec pos; pos.x = self->x; pos.y = self->y; pos.z = self->z; |