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

Fix ordering issues

Browse source
This commit is contained in:
gamemasterplc 2023-12-05 00:48:36 -06:00
parent 83140bb795
commit 5754048056
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/game/hsfload.c
View file

@ -886,6 +886,26 @@ static void ShapeLoad(void)
} }
} }
static void MapAttrLoad(void)
{
s32 i;
HsfMapAttr *mapattr_base;
HsfMapAttr *mapattr_file;
HsfMapAttr *mapattr_new;
s16 *data;
if(head.mapAttr.count) {
mapattr_file = mapattr_base = (HsfMapAttr *)((u32)fileptr+head.mapAttr.ofs);
mapattr_new = mapattr_base;
Model.mapAttrCnt = head.mapAttr.count;
Model.mapAttr = mapattr_base;
data = (s16 *)&mapattr_base[head.mapAttr.count];
for(i=0; i<head.mapAttr.count; i++, mapattr_file++, mapattr_new++) {
mapattr_new->data = &data[(u32)mapattr_file->data];
}
}
}
static void BitmapLoad(void) static void BitmapLoad(void)
{ {
HsfBitmap *bitmap_file; HsfBitmap *bitmap_file;
@ -1388,26 +1408,6 @@ static void MatrixLoad(void)
} }
} }
static void MapAttrLoad(void)
{
s32 i;
HsfMapAttr *mapattr_base;
HsfMapAttr *mapattr_file;
HsfMapAttr *mapattr_new;
s16 *data;
if(head.mapAttr.count) {
mapattr_file = mapattr_base = (HsfMapAttr *)((u32)fileptr+head.mapAttr.ofs);
mapattr_new = mapattr_base;
Model.mapAttrCnt = head.mapAttr.count;
Model.mapAttr = mapattr_base;
data = (s16 *)&mapattr_base[head.mapAttr.count];
for(i=0; i<head.mapAttr.count; i++, mapattr_file++, mapattr_new++) {
mapattr_new->data = &data[(u32)mapattr_file->data];
}
}
}
static s32 SearchObjectSetName(HsfData *data, char *name) static s32 SearchObjectSetName(HsfData *data, char *name)
{ {
HsfObject *object = data->object; HsfObject *object = data->object;