Skip to content

Commit 7e0b3df

Browse files
committed
xCutscene: Correctly order xCutsceneConvertBreak for eventual linking
1 parent ec1f5ef commit 7e0b3df

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

src/SB/Core/x/xCutscene.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,37 @@ S32 xCutscene_LoadStart(xCutscene* csn)
144144
return 1;
145145
}
146146

147+
F32 xCutsceneConvertBreak(float param_1, xCutsceneBreak* param_2, U32 param_3, int param_4)
148+
{
149+
int i = 0;
150+
if (param_3 == 0)
151+
{
152+
return param_1;
153+
}
154+
while (true)
155+
{
156+
if (param_4 != param_2[i].Index)
157+
{
158+
break;
159+
}
160+
if (param_2[i].Time - param_1 <= 0.0f)
161+
{
162+
break;
163+
}
164+
if (0.03333333f <= param_2[i].Time - param_1)
165+
{
166+
break;
167+
}
168+
i++;
169+
param_3--;
170+
if (param_3 == 0)
171+
{
172+
return param_1;
173+
}
174+
}
175+
return param_2[i].Time - 0.03333333f;
176+
}
177+
147178
S32 xCutscene_Update(xCutscene* csn, F32 dt)
148179
{
149180
if ((csn->SndStarted == FALSE) && (csn->SndNumChannel != 0))
@@ -263,37 +294,6 @@ void xVec3Lerp(xVec3* out, const xVec3* a, const xVec3* b, float alpha)
263294
out->z = a->z + (b->z - a->z) * alpha;
264295
}
265296

266-
F32 xCutsceneConvertBreak(float param_1, xCutsceneBreak* param_2, U32 param_3, int param_4)
267-
{
268-
int i = 0;
269-
if (param_3 == 0)
270-
{
271-
return param_1;
272-
}
273-
while (true)
274-
{
275-
if (param_4 != param_2[i].Index)
276-
{
277-
break;
278-
}
279-
if (param_2[i].Time - param_1 <= 0.0f)
280-
{
281-
break;
282-
}
283-
if (0.03333333f <= param_2[i].Time - param_1)
284-
{
285-
break;
286-
}
287-
i++;
288-
param_3--;
289-
if (param_3 == 0)
290-
{
291-
return param_1;
292-
}
293-
}
294-
return param_2[i].Time - 0.03333333f;
295-
}
296-
297297
void CutsceneShadowRender(CutsceneShadowModel* smod)
298298
{
299299
RpAtomic* model = smod->model;

0 commit comments

Comments
 (0)