Skip to content

Commit dd48f70

Browse files
committed
xParSys: Fix mismatches in xParSysSetup and render_par_sprite
1 parent ef79da0 commit dd48f70

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/SB/Core/x/xParSys.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static void par_sprite_update(xParSys& sys, xParGroup& group)
126126

127127
static void render_par_sprite(void* data, xParGroup* ps)
128128
{
129-
if (using_ptank_render((*(xParSysAsset*)&ps->m_culled)) == 0)
129+
if (!using_ptank_render(*((xParSys*)data)->tasset))
130130
{
131131
iParMgrRenderParSys_Sprite(data, ps);
132132
}
@@ -206,12 +206,11 @@ void xParSysInit(xBase* b, xParSysAsset* tasset)
206206

207207
void xParSysSetup(xParSys* t)
208208
{
209-
if (t != 0 && t->link != 0 && t->link->param[1])
209+
if (t != NULL && t->tasset != NULL && t->tasset->parentParSysID != 0x0)
210210
{
211-
t->parent = (xParSys*)zSceneFindObject(t->cmd->flag);
211+
t->parent = (xParSys*)zSceneFindObject(t->tasset->parentParSysID);
212212
}
213-
t->parent = (xParSys*)xSTFindAsset(t->cmd->flag, 0);
214-
t->parent = t->parent;
213+
t->txtr_particle = (RwTexture*)xSTFindAsset(t->tasset->textureID, 0);
215214
}
216215

217216
void xParSysReset(xParSys* t)

0 commit comments

Comments
 (0)