diff options
| author | Treeki <treeki@gmail.com> | 2013-01-19 00:12:33 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-01-19 00:12:33 +0100 |
| commit | 15afe4d423d3966b90f6c72b9cdc06914b0ac363 (patch) | |
| tree | 85cb6490a0d6c26bc5b202788f119e34feeed805 /src/koopatlas/core.cpp | |
| parent | 1e2fe2181af8215e6da3f55d0350385d0af2f7e0 (diff) | |
| download | kamek-15afe4d423d3966b90f6c72b9cdc06914b0ac363.tar.gz kamek-15afe4d423d3966b90f6c72b9cdc06914b0ac363.zip | |
hammer model added
Diffstat (limited to '')
| -rw-r--r-- | src/koopatlas/core.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp index f0a57af..f130359 100644 --- a/src/koopatlas/core.cpp +++ b/src/koopatlas/core.cpp @@ -142,15 +142,9 @@ bool WMInit_LoadSIAnims(void *ptr) { DVD_LoadFile(GetDVDClass(), "WorldMap", "SI_penguin", 0); DVD_LoadFile(GetDVDClass(), "WorldMap", "SI_propeller", 0); DVD_LoadFile(GetDVDClass(), "WorldMap", "SI_star", 0); - DVD_LoadFile(GetDVDClass(), "Object", "I_hammer", 0); + DVD_LoadFile(GetDVDClass(), "Maps", "SI_hammer", 0); + DVD_LoadFile(GetDVDClass(), "Object", "cobCourse", 0); - DVD_LoadFile(GetDVDClass(), "Object", "obj_coin", 0); - DVD_LoadFile(GetDVDClass(), "Object", "I_kinoko", 0); - DVD_LoadFile(GetDVDClass(), "Object", "I_fireflower", 0); - DVD_LoadFile(GetDVDClass(), "Object", "I_iceflower", 0); - DVD_LoadFile(GetDVDClass(), "Object", "I_penguin", 0); - DVD_LoadFile(GetDVDClass(), "Object", "I_propeller", 0); - DVD_LoadFile(GetDVDClass(), "Object", "I_star", 0); DVD_LoadFile(GetDVDClass(), "Object", "I_kinoko_bundle", 0); DVD_LoadFile(GetDVDClass(), "Object", "lakitu", 0); DVD_LoadFile(GetDVDClass(), "Object", "star_coin", 0); @@ -241,7 +235,7 @@ bool WMInit_SetupExtra(void *ptr) { // next: items for the Powerup screen for (int i = 0; i < 8; i++) { - void *obj = CreateChildObject(WM_ITEM, wm, i==7?6:i, 0, 0); + void *obj = CreateChildObject(WM_ITEM, wm, i, 0, 0); wm->stockItem->newItemPtr[i] = obj; } @@ -437,6 +431,12 @@ int dScKoopatlas_c::onDelete() { DVD_FreeFile(GetDVDClass2(), "SI_penguin"); DVD_FreeFile(GetDVDClass2(), "SI_propeller"); DVD_FreeFile(GetDVDClass2(), "SI_star"); + DVD_FreeFile(GetDVDClass2(), "SI_hammer"); + + DVD_FreeFile(GetDVDClass2(), "cobCourse"); + DVD_FreeFile(GetDVDClass2(), "I_kinoko_bundle"); + DVD_FreeFile(GetDVDClass2(), "lakitu"); + DVD_FreeFile(GetDVDClass2(), "star_coin"); mapListLoader.unload(); |