d_a_npc work (#2306)

This commit is contained in:
Caroline Madsen
2025-02-23 17:43:25 -05:00
committed by GitHub
parent f628e2e6ff
commit c1d444de70
89 changed files with 2058 additions and 2945 deletions
+7 -7
View File
@@ -22,12 +22,12 @@ dPath* dPath_GetRoomPath(int path_index, int room_no) {
if (room_no == -1) {
path = dComIfGp_getStage()->getPath2Inf();
} else {
dStage_roomStatus_c* roomSt = dComIfGp_roomControl_getStatusRoomDt(room_no);
if (roomSt == NULL) {
dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(room_no);
if (roomDt == NULL) {
return NULL;
}
path = roomSt->mRoomDt.getPath2Inf();
path = roomDt->getPath2Inf();
}
if (path == NULL || path_index < 0 || path_index >= path->m_num) {
@@ -45,12 +45,12 @@ dPath* dPath_GetNextRoomPath(dPath const* p_path, int room_no) {
if (room_no == -1) {
path = dComIfGp_getStage()->getPath2Inf();
} else {
dStage_roomStatus_c* roomSt = dComIfGp_roomControl_getStatusRoomDt(room_no);
if (roomSt == NULL) {
dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(room_no);
if (roomDt == NULL) {
return NULL;
}
path = roomSt->mRoomDt.getPath2Inf();
path = roomDt->getPath2Inf();
}
int next_id = p_path->m_nextID;
@@ -110,4 +110,4 @@ u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* par
*param_2 = path->field_0x4;
return 1;
}
}