mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-28 23:15:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor status consolidation & process profile definition editing (#3117)

Browse Source 
* Consolidate fopAcM_STATUS into fopAc_Status_e

* Add _e suffix to fopAcStts enums

* Prepare for profile enumeration
* Correct typo in scene_process_profile_definition
* Manually handle g_profile_Obj_DamCps (inline preprocessing)
* Correct g_profile_TAG_LV5SOUP procname to enum
* Create d_priority.h

* Update process profile definitions
* Moved inline comments to the left
* Add missing fopAcStts enums
* Add d_priority.h include in f_pc_leaf.h
* Manually update d_a_obj_damCps profile

* Replace fopAcStts enums replacing and anticipatory profile size correction
* Changed profile size from literal to sizeof() in anticipation of PR #3116
* Provided putative names to staff-related status enums
* Replaced appropriate literals with fopAcStts enums

* Fix borked merge

* Rename item number enums and move to d_item_data.h

* Rename process profile name & draw priority enums

* Move process profile name & draw priority enums to appropriate files
* Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h
* Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h

* ACTUALLY (whoops) stage merge

* Correct item mistranslation

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Huitzi
2026-03-09 21:33:31 -04:00
committed by GitHub
parent 30e839c28b
commit 0b0fdd1f60
873 changed files with 19721 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc4.cpp
+7 -7
View File
@@ -697,7 +697,7 @@ int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10*
void daNpcF_c::tgHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_1, fopAc_ac_c* i_actor,
dCcD_GObjInf* param_3) {
if (i_actor != NULL && fopAcM_GetProfName(i_actor) == PROC_ALINK) {
if (i_actor != NULL && fopAcM_GetProfName(i_actor) == fpcNm_ALINK_e) {
daNpcF_c* npc = static_cast<daNpcF_c*>(i_this);
if (daPy_getPlayerActorClass() == i_actor) {
npc->setCutType(static_cast<daPy_py_c*>(i_actor)->getCutType());
@@ -735,9 +735,9 @@ void* daNpcF_c::srchAttnActor1(void* i_proc, void* param_1) {
void* param_1_copy = param_1;
fopAc_ac_c* actor = NULL;
if (mFindCount < 100 && fopAcM_IsActor(i_proc)
&& (fopAcM_GetName(i_proc) == PROC_NI || fopAcM_GetName(i_proc) == PROC_COW
|| fopAcM_GetName(i_proc) == PROC_NPC_NE || fopAcM_GetName(i_proc) == PROC_DO
|| fopAcM_GetName(i_proc) == PROC_SQ || fopAcM_GetName(i_proc) == PROC_BD))
&& (fopAcM_GetName(i_proc) == fpcNm_NI_e || fopAcM_GetName(i_proc) == fpcNm_COW_e
|| fopAcM_GetName(i_proc) == fpcNm_NPC_NE_e || fopAcM_GetName(i_proc) == fpcNm_DO_e
|| fopAcM_GetName(i_proc) == fpcNm_SQ_e || fopAcM_GetName(i_proc) == fpcNm_BD_e))
{
actor = static_cast<fopAc_ac_c*>(i_proc);
mFindActorPList[mFindCount] = actor;
@@ -1196,7 +1196,7 @@ BOOL daNpcF_c::hitChk2(dCcD_Cyl* i_ccCyl, BOOL param_1, BOOL param_2) {
if (hit_actor != NULL) {
actorAngleY = fopAcM_searchActorAngleY(this, hit_actor);
field_0x990 = actorAngleY - mCurAngle.y;
if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) {
if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) {
if (param_1) {
static_cast<daNPC_TK_c*>(hit_actor)->setBump();
return true;
@@ -1508,7 +1508,7 @@ fopAc_ac_c* daNpcF_c::getEvtAreaTagP(int i_type, int i_no) {
int r29 = 0;
f32 f31 = G_CM3D_F_INF;
mFindCount = 0;
mSrchActorName = PROC_TAG_EVTAREA;
mSrchActorName = fpcNm_TAG_EVTAREA_e;
fpcM_Search(this->srchActor, this);
for (int i = 0; i < mFindCount; i++) {
@@ -1657,7 +1657,7 @@ BOOL daNpcF_c::chkPointInArea(cXyz i_point, cXyz i_center, cXyz i_bounds, s16 i_
cXyz daNpcF_c::getAttentionPos(fopAc_ac_c* i_actor_p) {
cXyz pos = i_actor_p->attention_info.position;
if (fopAcM_GetName(i_actor_p) == PROC_ALINK) {
if (fopAcM_GetName(i_actor_p) == fpcNm_ALINK_e) {
pos.y -= daPy_py_c::getAttentionOffsetY();
}