mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-24 05:46:51 -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_e_bee.cpp
+18 -18
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_e_nest.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "d/d_s_play.h"
#include "f_op/f_op_camera_mng.h"
#include "SSystem/SComponent/c_math.h"
@@ -135,12 +135,12 @@ static int bee_fly_action(e_bee_class* i_this, bee_s* i_bee) {
i_bee->mTarget.z = cM_rndFX(100.0f);
i_bee->mSpeedF = cM_rndF(5.0f) + 17.0f;
}
if (fopAcM_GetName(hit_actor) != PROC_ALINK) {
if (fopAcM_GetName(hit_actor) != fpcNm_ALINK_e) {
vec = hit_actor->current.pos - i_bee->mPos;
vec.y += 125.0f;
vec += i_bee->mTarget;
if (i_bee->mHomeTimer == 0) {
if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) {
if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) {
i_bee->mAction = bee_s::ACT_DEAD;
} else {
i_bee->mAction = bee_s::ACT_FLY_HOME_A;
@@ -616,7 +616,7 @@ static void bee_control(e_bee_class* i_this) {
if (i_this->mCcSph.ChkAtHit()) {
cCcD_Obj* hitObj = i_this->mCcSph.GetAtHitObj();
fopAc_ac_c* hit_actor = dCc_GetAc(hitObj->GetAc());
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_ALINK) {
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) {
dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
}
}
@@ -816,20 +816,20 @@ static actor_method_class l_daE_Bee_Method = {
};
actor_process_profile_definition g_profile_E_BEE = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_E_BEE,
&g_fpcLf_Method.base,
sizeof(e_bee_class),
0,
0,
&g_fopAc_Method.base,
0xB7,
&l_daE_Bee_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BEE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_bee_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BEE_e,
/* Actor SubMtd */ &l_daE_Bee_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;