mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-27 08:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix particle headers, d_a_am matching

Browse Source
This commit is contained in:
LagoLunatic
2023-10-06 00:07:04 -04:00
parent 7372aa189b
commit 41e656a4d2
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1325,7 +1325,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_wbird"),
ActorRel(NonMatching, "d_a_ykgr"),
ActorRel(Matching, "d_a_alldie"),
ActorRel(NonMatching, "d_a_am"),
ActorRel(Matching, "d_a_am", extra_cflags=["-sym off"]),
ActorRel(NonMatching, "d_a_am2"),
ActorRel(NonMatching, "d_a_amiprop"),
ActorRel(NonMatching, "d_a_arrow_iceeff"),
include/JSystem/JParticle/JPAEmitter.h
+16 -7
View File
@@ -30,10 +30,10 @@ public:
JPACallBackBase() {}
virtual ~JPACallBackBase() {}
virtual void init(T) {}
virtual void execute(T) {}
virtual void executeAfter(T) {}
virtual void draw(T) {}
inline virtual void init(T);
inline virtual void execute(T);
inline virtual void executeAfter(T);
inline virtual void draw(T);
};
template<typename T, typename U>
@@ -42,9 +42,9 @@ public:
JPACallBackBase2() {}
virtual ~JPACallBackBase2() {}
virtual void init(T, U) {}
virtual void execute(T, U) {}
virtual void draw(T, U) {}
inline virtual void init(T, U);
inline virtual void execute(T, U);
inline virtual void draw(T, U);
};
class JPABaseEmitter {
@@ -166,4 +166,13 @@ public:
/* 0x216 */ u8 field_0x216[0x218 - 0x216];
};
void JPACallBackBase<JPABaseEmitter*>::init(JPABaseEmitter*) {}
void JPACallBackBase<JPABaseEmitter*>::execute(JPABaseEmitter*) {}
void JPACallBackBase<JPABaseEmitter*>::executeAfter(JPABaseEmitter*) {}
void JPACallBackBase<JPABaseEmitter*>::draw(JPABaseEmitter*) {}
void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::init(JPABaseEmitter*, JPABaseParticle*) {}
void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::execute(JPABaseEmitter*, JPABaseParticle*) {}
void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::draw(JPABaseEmitter*, JPABaseParticle*) {}
#endif /* JPAEMITTER_H */
include/d/d_particle.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
class dPa_levelEcallBack : public JPACallBackBase<JPABaseEmitter*> {
public:
virtual ~dPa_levelEcallBack() {}
virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) = 0;
};
class dPa_followEcallBack : public dPa_levelEcallBack {