Skip to content

Commit db4ddc5

Browse files
authored
zEntSimpleObj - Most Functions to 100% Code Match (#401)
* Merge upstream/main into z_ent_simple_obj * Run clang-format on zEntSimpleObj.cpp * zEntSimpleObj full match on most functions * zEntSimpleObj: Init 99% match * zEntSimpleObj clang-format pass two * Add frontier functions used in zEntSimpleObjEventCB method * zEntSimpleObj: Init to 100% code match Thank u Square
1 parent f5aceb7 commit db4ddc5

File tree

7 files changed

+994
-175
lines changed

7 files changed

+994
-175
lines changed

src/SB/Core/gc/iAnim.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
extern U8* giAnimScratch;
77

88
void iAnimInit();
9+
F32 iAnimDuration(void* RawData);
910
U32 iAnimBoneCount(void* RawData);
1011
void iAnimBlend(F32 BlendFactor, F32 BlendRecip, U16* BlendTimeOffset, F32* BoneTable,
1112
U32 BoneCount, xVec3* Tran1, xQuat* Quat1, xVec3* Tran2, xQuat* Quat2,

src/SB/Core/x/xEnt.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <rwcore.h>
55
#include <rpworld.h>
6+
#include <string.h>
67

78
#include "xBase.h"
89
#include "xMath3.h"
@@ -40,7 +41,7 @@ struct xEntAsset : xBaseAsset
4041
F32 greenMult;
4142
F32 blueMult;
4243
F32 seeThru;
43-
44+
4445
// Offset: 0x48
4546
F32 seeThruSpeed;
4647
U32 modelInfoID;

src/SB/Core/x/xShadow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,4 +269,4 @@ void xShadowManager_Remove(xEnt* ent)
269269
a++;
270270
}
271271
}
272-
}
272+
}

0 commit comments

Comments
 (0)