summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bossPlayerClown.cpp8
-rw-r--r--src/challengeStar.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/bossPlayerClown.cpp b/src/bossPlayerClown.cpp
index eb67db3..522314e 100644
--- a/src/bossPlayerClown.cpp
+++ b/src/bossPlayerClown.cpp
@@ -126,7 +126,15 @@ extern "C" void __dt__Q23m3d5mdl_cFv(m3d::mdl_c *mdl, u32 willDelete);
extern "C" void __dt__16mHeapAllocator_cFv(mHeapAllocator_c *al, u32 willDelete);
extern "C" void __dt__20daJrClownForPlayer_cFv(dEn_c *clown, u32 willDelete);
+extern "C" u32 sAllocatorFunc__FrmHeap;
+
void newClownDtor(dEn_c *clown, u32 willDelete) {
+ void **al = (void **)(((u32)clown) + 0x524);
+ if (*al != &sAllocatorFunc__FrmHeap) {
+ OSReport("oh no! bad allocator %p\n", *al);
+ *al = &sAllocatorFunc__FrmHeap;
+ }
+
__dt__Q23m3d5mdl_cFv(cModel, 0xFFFFFFFF);
__dt__16mHeapAllocator_cFv(cAllocator, 0xFFFFFFFF);
__dt__20daJrClownForPlayer_cFv(clown, willDelete);
diff --git a/src/challengeStar.cpp b/src/challengeStar.cpp
index 03b4089..ec863f1 100644
--- a/src/challengeStar.cpp
+++ b/src/challengeStar.cpp
@@ -72,7 +72,7 @@ dChallengeStar *dChallengeStar::build() {
int dChallengeStar::onCreate() {
char die = this->settings & 0xF;
- if (GetSpecificPlayerActor(die) == 0) { this->Delete(1); return; }
+ if (GetSpecificPlayerActor(die) == 0) { this->Delete(1); return 2; }
GlobalStarsCollected++;