kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Match ObjectLoad

Browse source
This commit is contained in:
gamemasterplc 2023-12-04 10:43:52 -06:00
parent 95d01254be
commit 48d707f23c
2 changed files with 60 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/game/hsfformat.h
View file

@ -189,7 +189,7 @@ typedef struct hsf_object_data {
typedef struct hsf_object {
char *name;
u32 type;
s32 type;
HsfConstData *constData;
u32 flags;
HsfObjectData data;

62
src/game/hsfload.c
View file

@ -412,7 +412,6 @@ static void DispObject(HsfObject *parent, HsfObject *object)
HsfCluster *cluster;
} temp;
temp.parent = parent;
object->type = object->type;
switch(object->type) {
@ -523,9 +522,7 @@ static void DispObject(HsfObject *parent, HsfObject *object)
}
}
break;
case 3:
{
HsfObjectData *data;
@ -619,6 +616,65 @@ static void DispObject(HsfObject *parent, HsfObject *object)
}
}
static inline void FixupObject(HsfObject *object)
{
HsfObjectData *objdata_8;
HsfObjectData *objdata_7;
s32 obj_type = object->type;
switch(obj_type) {
case 8:
{
objdata_8 = &object->data;
object->type = 8;
}
break;
case 7:
{
objdata_7 = &object->data;
object->type = 7;
}
break;
default:
break;
}
}
static void ObjectLoad(void)
{
s32 i;
HsfObject *object;
HsfObject *new_object;
s32 obj_type;
if(head.object.count) {
objtop = object = (HsfObject *)((u32)fileptr+head.object.ofs);
for(i=0; i<head.object.count; i++, object++) {
new_object = object;
new_object->name = SetName((u32 *)&object->name);
}
object = objtop;
for(i=0; i<head.object.count; i++, object++) {
if((s32)object->data.parent == -1) {
break;
}
}
DispObject(NULL, object);
Model.objectCnt = head.object.count;
object = objtop;
for(i=0; i<head.object.count; i++, object++) {
FixupObject(object);
}
}
}
static s32 SearchObjectSetName(HsfData *data, char *name)
{
HsfObject *object = data->object;