summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErilea <erilea@erilea.fr>2024-05-24 10:57:15 +0200
committerErilea <erilea@erilea.fr>2024-05-24 18:56:46 +0200
commit6f01730ab2c17c4a3b64479727e4e7ee7602bc15 (patch)
tree92250484b6a836b6443a5354bdf84f738f4a896e
parenta9f55dc18763b124b7b5b312fa629ebaa439d9d3 (diff)
Add dComIfGp_particle_addModelEmitter wrapper
-rw-r--r--include/d/d_com_inf_game.h4
-rw-r--r--include/d/d_particle.h2
-rw-r--r--src/d/actor/d_a_obj_eskban.cpp2
3 files changed, 7 insertions, 1 deletions
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 78eca9a2..2bb4943d 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -3163,6 +3163,10 @@ inline void dComIfGp_particle_calcMenu() {
g_dComIfG_gameInfo.play.getParticle()->calcMenu();
}
+inline int dComIfGp_particle_addModelEmitter(dPa_modelEmitter_c* emitter){
+ return g_dComIfG_gameInfo.play.getParticle()->addModelEmitter(emitter);
+}
+
inline void dComIfGp_particle_drawModelParticle() {
g_dComIfG_gameInfo.play.getParticle()->drawModelParticle();
}
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index eb028c1b..57ebeca3 100644
--- a/include/d/d_particle.h
+++ b/include/d/d_particle.h
@@ -363,6 +363,7 @@ public:
static J3DModel * newModel(J3DModelData*);
void draw();
+ int add(dPa_modelEmitter_c *emitter) { return cLs_Addition(this, emitter); }
static dPa_J3Dmodel_c * mModel;
};
@@ -469,6 +470,7 @@ public:
u32 getParticleNum() { return mEmitterMng->getParticleNumber(); }
u32 getEmitterNum() { return mEmitterMng->getEmitterNumber(); }
+ int addModelEmitter(dPa_modelEmitter_c *emitter) { return mModelControl->add(emitter); }
void drawModelParticle() { mModelControl->draw(); }
JKRHeap * getHeap() { return mHeap; }
diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp
index 4cc3d750..e26d0259 100644
--- a/src/d/actor/d_a_obj_eskban.cpp
+++ b/src/d/actor/d_a_obj_eskban.cpp
@@ -226,7 +226,7 @@ void daObjEskban::Act_c::eff_m_break(u16 particleID, u16 prm_b) {
if (!pMdlEmtr) {
return;
}
- cLs_Addition(g_dComIfG_gameInfo.play.getParticle()->mModelControl, pMdlEmtr);
+ dComIfGp_particle_addModelEmitter(pMdlEmtr);
}
/* 00000C80-00000D44 .text eff_b_break__Q211daObjEskban5Act_cFUs */