mirror of
https://github.com/zeldaret/tww.git
synced 2026-10-11 22:19:52 -04:00
Process profiles and enums cleanup (#1031)
* Fix some profile comments * Add missing static for local visibility data * Move proc name and draw priority enums to f_pc * Add _e suffix to daObjBarrier_c proc enum * Change proc name enum format to match TP * Change draw prio enum format to match TP * Change ItemNo enum format, finish fixing item names * Revert static for cb1 hio * Clean up formatting of profile comments * Fix comment alignment
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
#include "dolphin/types.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "d/d_salvage.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/actor/d_a_lod_bg.h"
|
||||
#include "d/actor/d_a_agb.h"
|
||||
#include "d/actor/d_a_agbsw0.h"
|
||||
@@ -405,7 +404,7 @@ void daTagKbItem_c::dig_main() {
|
||||
if (!fopAcM_IsActor(mpActor)) {
|
||||
return;
|
||||
}
|
||||
if (fopAcM_GetName(mpActor) != PROC_KB) {
|
||||
if (fopAcM_GetName(mpActor) != fpcNm_KB_e) {
|
||||
// Not a pig.
|
||||
return;
|
||||
}
|
||||
@@ -464,14 +463,14 @@ BOOL daStandItem_c::daiItemNodeCallBack(J3DNode* node, int calcTiming) {
|
||||
s32 jntNo = joint->getJntNo();
|
||||
J3DModel* model = j3dSys.getModel();
|
||||
void* userArea = (void*)model->getUserArea();
|
||||
if (userArea && fopAcM_IsActor(userArea) && fopAcM_GetName(userArea) == PROC_STANDITEM) {
|
||||
if (userArea && fopAcM_IsActor(userArea) && fopAcM_GetName(userArea) == fpcNm_STANDITEM_e) {
|
||||
daStandItem_c* i_this = (daStandItem_c*)userArea;
|
||||
mDoMtx_stack_c::copy(model->getAnmMtx(jntNo));
|
||||
switch (i_this->getItemNo()) {
|
||||
case WIND_FLAG:
|
||||
case dItemNo_PINWHEEL_e:
|
||||
mDoMtx_stack_c::XrotM(i_this->m6B4);
|
||||
break;
|
||||
case WATER_STATUE:
|
||||
case dItemNo_FOUNTAIN_IDOL_e:
|
||||
if (jntNo == 0) {
|
||||
mDoMtx_copy(mDoMtx_stack_c::get(), i_this->m630);
|
||||
} else if (jntNo == 1) {
|
||||
|
||||
Reference in New Issue
Block a user