mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 12:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_stage cleanup (#2392)

Browse Source
This commit is contained in:
LagoLunatic
2025-04-13 23:54:57 -04:00
committed by GitHub
parent 3df5c7bb42
commit f891887626
47 changed files with 1184 additions and 1609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc.cpp
+8 -8
View File
@@ -2535,11 +2535,11 @@ BOOL daNpcT_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz* o_spawn
csXyz* o_angle) {
BOOL ret = FALSE;
dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
stage_actor_data_class* entry = room_dt->getPlayer()->mEntries;
stage_actor_data_class* entry = room_dt->getPlayer()->m_entries;
for (int i = 0; i < room_dt->getPlayerNum(); entry++, i++) {
if (param_0 == (entry->mAngle.z & 0xff)) {
*o_spawnPos = entry->mSpawnPos;
*o_angle = entry->mAngle;
if (param_0 == (entry->base.angle.z & 0xff)) {
*o_spawnPos = entry->base.position;
*o_angle = entry->base.angle;
ret = TRUE;
break;
}
@@ -5094,12 +5094,12 @@ int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2,
int rv = 0;
dStage_roomDt_c* roomP = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
stage_actor_data_class* entries = roomP->getPlayer()->mEntries;
stage_actor_data_class* entries = roomP->getPlayer()->m_entries;
for (int i = 0; i < roomP->getPlayerNum(); entries++, i++) {
if (param_0 == (u8)entries->mAngle.z) {
param_2 = entries->mSpawnPos;
param_3 = entries->mAngle;
if (param_0 == (u8)entries->base.angle.z) {
param_2 = entries->base.position;
param_3 = entries->base.angle;
rv = 1;
break;
}