Fix build

This commit is contained in:
Ryan Dwyer
2020-06-22 23:05:42 +10:00
parent 2bcb688944
commit 41282ffd03
3 changed files with 7 additions and 13 deletions
+5 -6
View File
@@ -8823,15 +8823,14 @@ glabel func0f0373dc
/* f03749c: 00601025 */ or $v0,$v1,$zero
);
s32 chrPatrolGetCurPadNum(struct chrdata *chr, bool arg1)
s16 chrPatrolGetCurPadNum(struct chrdata *chr, bool arg1)
{
struct pathnode *node;
s32 *padnumptr;
u32 sp32 = chr->act_patrol.unk034;
s32 nodeindex = func0f0373dc(chr, &sp32, arg1);
padnumptr = &chr->act_patrol.path->pads[nodeindex];
node = &chr->act_patrol.path->nodes[nodeindex];
return node->padnum;
return *padnumptr;
}
void chrPatrolGetCurWaypointInfoWithFlags(struct chrdata *chr, struct coord *pos, s16 *rooms, u32 *flags)
@@ -9570,7 +9569,7 @@ struct path *pathFindById(u32 path_id)
{
s32 i = 0;
for (i = 0; g_StageSetup.paths[i].nodes; i++) {
for (i = 0; g_StageSetup.paths[i].pads; i++) {
if (path_id == g_StageSetup.paths[i].id) {
return &g_StageSetup.paths[i];
}
+1 -1
View File
@@ -73,7 +73,7 @@ void chrGoPosConsiderRestart(struct chrdata *chr);
void chrGoPosInitExpensive(struct chrdata *chr);
void chrGoPosAdvanceWaypoint(struct chrdata *chr);
s32 func0f0373dc(struct chrdata *chr, u32 *arg1, bool arg2);
s32 chrPatrolGetCurPadNum(struct chrdata *chr, bool arg1);
s16 chrPatrolGetCurPadNum(struct chrdata *chr, bool arg1);
void chrPatrolGetCurWaypointInfoWithFlags(struct chrdata *chr, struct coord *pos, s16 *rooms, u32 *flags);
void func0f037580(struct chrdata *chr);
void func0f0375b0(struct chrdata *chr);
+1 -6
View File
@@ -2702,13 +2702,8 @@ struct ailist {
s32 id;
};
struct pathnode {
u16 unk00;
s16 padnum;
};
struct path {
struct pathnode *nodes;
s32 *pads;
u8 id;
u8 type;
};