Skip to content

Match em_external_value_accesser.cpp #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loserkidsblink wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Match em_external_value_accesser.cpp #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ def MatchingFor(*versions):
Object(Matching, "mo_enemy/sora_enemy/resource/em_resource_module_impl.cpp"),
Object(Matching, "mo_enemy/sora_enemy/stop/em_stop_module_impl.cpp"),
Object(Matching, "mo_enemy/sora_enemy/em_extend_param_accesser.cpp"),
Object(NonMatching, "mo_enemy/sora_enemy/em_external_value_accesser.cpp"),
Object(Matching, "mo_enemy/sora_enemy/em_external_value_accesser.cpp"),
Object(Matching, "mo_enemy/sora_enemy/em_target_search_unit.cpp"),
Object(Matching, "mo_enemy/sora_enemy/wnem/wn_em_resource_module_impl.cpp"),
Object(Matching, "mo_enemy/sora_enemy/wnem/wn_em_heap_module_impl.cpp"),
Expand Down
9 changes: 6 additions & 3 deletions src/mo_enemy/sora_enemy/em_external_value_accesser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,17 @@ s32 emExternalValueAccesser::getNameMsgId(Enemy* em, u32 taskId) {
return wn->unk21E8;
}

// NONMATCHING
nw4r::g3d::ResFileData* emExternalValueAccesser::getFaceTexPtr(Enemy* em, u32 taskId) {
if (taskId == -1 || taskId == em->m_taskId) {
return em->getFaceTexPtr();
}

const wnemSimple* wn = emWeaponManager::getInstance()->GetManagedWeaponFromTaskID(taskId);
return (!wn) ? em->getFaceTexPtr() : em->getFaceTexPtr(wn->unk21EC);
wnemSimple* wn = emWeaponManager::getInstance()->GetManagedWeaponFromTaskID(taskId);
if (!wn) {
return em->getFaceTexPtr();
}
taskId = wn->unk21EC;
return em->getFaceTexPtr(taskId);
}

float emExternalValueAccesser::getScore(Enemy* em) {
Expand Down
Loading