From 4d9026121ece552ccd8a02c5a3009a27a646ad5c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 24 Dec 2021 14:50:32 -0800 Subject: [PATCH] build fix --- include/JSystem/JParticle/JPAResource.h | 2 +- libs/JSystem/JParticle/JPAEmitterManager.cpp | 6 ------ libs/JSystem/JParticle/JPAResource.cpp | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/JSystem/JParticle/JPAResource.h b/include/JSystem/JParticle/JPAResource.h index f207f15d883..5b3e891bc32 100644 --- a/include/JSystem/JParticle/JPAResource.h +++ b/include/JSystem/JParticle/JPAResource.h @@ -20,7 +20,7 @@ class JPAResource { public: /* 80274010 */ JPAResource(); /* 80274080 */ void init(JKRHeap*); - /* 802755E8 */ void calc(JPAEmitterWorkData*, JPABaseEmitter*); + /* 802755E8 */ bool calc(JPAEmitterWorkData*, JPABaseEmitter*); /* 80275A94 */ void draw(JPAEmitterWorkData*, JPABaseEmitter*); /* 80275B74 */ void drawP(JPAEmitterWorkData*); /* 80275EB0 */ void drawC(JPAEmitterWorkData*); diff --git a/libs/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/JParticle/JPAEmitterManager.cpp index 079cd5ca11b..bf11dba204e 100644 --- a/libs/JSystem/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/JParticle/JPAEmitterManager.cpp @@ -14,12 +14,6 @@ // Types: // -struct JPAResource; -struct JPAResource { - /* 802755E8 */ bool calc(JPAEmitterWorkData*, JPABaseEmitter*); - /* 80275A94 */ void draw(JPAEmitterWorkData*, JPABaseEmitter*); -}; - // // Forward References: // diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp index ecab76d0213..64df9b337e1 100644 --- a/libs/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/JParticle/JPAResource.cpp @@ -587,7 +587,7 @@ asm void JPAResource::init(JKRHeap* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JPAResource::calc(JPAEmitterWorkData* param_0, JPABaseEmitter* param_1) { +asm bool JPAResource::calc(JPAEmitterWorkData* param_0, JPABaseEmitter* param_1) { nofralloc #include "asm/JSystem/JParticle/JPAResource/calc__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter.s" }