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/challengeStar.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 '')
| -rw-r--r-- | src/challengeStar.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/challengeStar.cpp b/src/challengeStar.cpp index 051f9c4..790b0c4 100644 --- a/src/challengeStar.cpp +++ b/src/challengeStar.cpp @@ -4,17 +4,10 @@ #include <sfx.h> -extern "C" void *PlaySound(dEn_c *, int soundID); -extern "C" void *PlaySoundAsync(dStageActor_c *, int soundID); - extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*); -extern "C" dStageActor_c* GetSpecificPlayerActor(int number); extern int GlobalStarsCollected; -struct EventTable_t { u64 events; }; -extern EventTable_t *EventTable; - class dChallengeStar : public dEn_c { int onCreate(); @@ -51,7 +44,7 @@ void dChallengeStar::playerCollision(ActivePhysics *apThis, ActivePhysics *apOth GlobalStarsCollected--; if (GlobalStarsCollected == 0) { - EventTable->events |= this->eventFlag; + dFlagMgr_c::instance->flags |= this->eventFlag; } this->Delete(1); |