ihateninjas/OdysseyDecomp
1
0
Fork 0
mirror of https://github.com/MonsterDruide1/OdysseyDecomp synced 2026-04-23 09:04:21 +00:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

weirdly match calcAlivePlayerActor

Browse source
This commit is contained in:
MonsterDruide1 2025-10-25 21:37:42 +02:00
parent e95383213d
commit 4fcc8f113d
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/file_list.yml
View file

@ -273514,7 +273514,7 @@ Library/Player/PlayerUtil.o:
- offset: 0x9a4d1c
size: 200
label: _ZN2al20calcAlivePlayerActorEPKNS_9LiveActorEPS2_j
status: NonMatchingMajor
status: Matching
- offset: 0x9a4de4
size: 96
label: _ZN2al34tryFindNearestPlayerActorConditionEPKNS_9LiveActorEPFbS2_E

40
lib/al/Library/Player/PlayerUtil.cpp
View file

@ -310,20 +310,42 @@ u32 calcPlayerListOrderByDistance(const LiveActor* actor, const LiveActor** acto
return size;
}
// NON_MATCHING: major mismatch, it's doing something weird with flags
// (https://decomp.me/scratch/c1lVL)
// TODO: flag-loop issue, this shouldn't be written like this
static s32 blackBox(s32 value) {
__asm__("" : "+r"(value));
return value;
}
u32 calcAlivePlayerActor(const LiveActor* actor, const LiveActor** actorList, u32 size) {
u32 playerNum = getPlayerNumMax(actor);
s32 flag = 2;
u32 result;
u32 resultNum = 0;
for (u32 i = 0; i != playerNum; i++) {
LiveActor* player = getPlayerActor(actor, i);
if (!isDead(player)) {
actorList[resultNum] = player;
resultNum++;
if (resultNum >= size)
return size;
if (playerNum != 0) {
for (u32 i = 0; i < playerNum; i++) {
LiveActor* player = getPlayerActor(actor, i);
if (!isDead(player)) {
actorList[resultNum] = player;
resultNum++;
if (resultNum >= size) {
result = size;
flag = 1;
} else {
flag = 0;
}
} else {
flag = 4;
}
if ((blackBox(flag | 4) & 7) != 4)
goto end;
}
flag = 2;
}
end:
if (flag != 2)
resultNum = result;
return resultNum;
}