diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/JParticle/JPAEmitter.h | 23 | ||||
| -rw-r--r-- | include/d/d_particle.h | 2 |
2 files changed, 17 insertions, 8 deletions
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index cc50bc6d..366b9aba 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -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 */ diff --git a/include/d/d_particle.h b/include/d/d_particle.h index b7545af7..8fb51a66 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -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 { |