mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 12:52:51 -04:00
Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)
* Remove NDEBUG_DEFINED fakematch, clean up getName temps * Fix ifdef * Fix bad JSystem pch ifdef breaking decomp.me * Remove Acch Chk fakematches * Private Acch fields * Fix some clangd errors in headers * Add UNUSED macro for matching debug parameters * Enable clangd unused-parameter warning * Remove extern from initializers Probably added by dol2asm? * Fix process profile definitions * Remove leftover dol2asm address comments * Remove some unnecessary double casts * Enable some more clangd warnings * Fix missing usages of fopAcM_ct * Fix wrong enum usage * Fix more fakematches
This commit is contained in:
@@ -1035,7 +1035,7 @@ void daNpcTks_c::waitNude() {
|
||||
|
||||
if (fVar1 > -200.0f && fVar1 < 150.0f && fopAcM_searchPlayerDistanceXZ(this) <= 300.0f) {
|
||||
if (!fopAcM_otherBgCheck(this, daPy_getPlayerActorClass())) {
|
||||
eventInfo.onCondition(dEvtCmd_INTALK_e);
|
||||
eventInfo.onCondition(dEvtCnd_CANTALK_e);
|
||||
fopAcM_orderSpeakEvent(this, 0, 0);
|
||||
}
|
||||
}
|
||||
@@ -1089,7 +1089,7 @@ void daNpcTks_c::waitLv6() {
|
||||
|
||||
if (current.pos.y - fopAcM_GetPosition_p(daPy_getPlayerActorClass())->y < 100.0f && fopAcM_searchPlayerDistanceXZ(this) <= 400.0f) {
|
||||
attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
|
||||
eventInfo.onCondition(dEvtCmd_INTALK_e);
|
||||
eventInfo.onCondition(dEvtCnd_CANTALK_e);
|
||||
fopAcM_orderSpeakEvent(this, 0, 0);
|
||||
}
|
||||
|
||||
@@ -3019,7 +3019,7 @@ static actor_method_class daNpcTks_MethodTable = {
|
||||
(process_method_func)daNpcTks_Draw,
|
||||
};
|
||||
|
||||
extern actor_process_profile_definition g_profile_NPC_TKS = {
|
||||
actor_process_profile_definition g_profile_NPC_TKS = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
7, // mListID
|
||||
fpcPi_CURRENT_e, // mListPrio
|
||||
|
||||
Reference in New Issue
Block a user