mirror of
https://github.com/zeldaret/tp
synced 2026-08-22 06:44:53 -04:00
Debug version now builds OK and all_source compiles (#2343)
* Fix missing arg to JUT_ASSERT * Fix some MWCC version diff errors * Compile m_Do_ext, d_demo, actor_mng * Add VSCode task to quickly switch between versions * Unlink magLift for debug * Update the hash of the debug dol The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment. The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol. The DOL now builds OK. * Fix all debug REL dtor splits All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds. * Add genMessage declarations to all HIO subclasses * Fixing more compilation errors * m_Do_mtx 100% on debug Cannot be linked due to weak function name mangling? * Improve various matches * Fix all remaining compilation errors * Fix new compilation errors from main * Fix retail regression * Link f_pc_profile_lst
This commit is contained in:
@@ -64,6 +64,9 @@ enum fopAc_Cull_e {
|
||||
fopAc_CULLBOX_11_e,
|
||||
fopAc_CULLBOX_12_e,
|
||||
fopAc_CULLBOX_13_e,
|
||||
#ifdef DEBUG
|
||||
fopAc_CULLBOX_14_e,
|
||||
#endif
|
||||
fopAc_CULLBOX_CUSTOM_e,
|
||||
fopAc_CULLSPHERE_0_e,
|
||||
fopAc_CULLSPHERE_1_e,
|
||||
@@ -79,6 +82,9 @@ enum fopAc_Cull_e {
|
||||
fopAc_CULLSPHERE_11_e,
|
||||
fopAc_CULLSPHERE_12_e,
|
||||
fopAc_CULLSPHERE_13_e,
|
||||
#ifdef DEBUG
|
||||
fopAc_CULLSPHERE_14_e,
|
||||
#endif
|
||||
fopAc_CULLSPHERE_CUSTOM_e,
|
||||
};
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
"Delete -> " actor_name_str "(id=%d)\n"
|
||||
|
||||
#define fopAcM_RegisterCreateID(actor_class, i_this, actor_name_str) \
|
||||
static_cast<actor_class*>(i_this); \
|
||||
actor_class* a_this = static_cast<actor_class*>(i_this); \
|
||||
const fpc_ProcID procID = fopAcM_GetID(i_this); \
|
||||
"Create -> " actor_name_str "(id=%d)\n"
|
||||
|
||||
@@ -376,7 +376,7 @@ inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) {
|
||||
}
|
||||
|
||||
inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
|
||||
return (i_culltype >= 0 && i_culltype < 14) || i_culltype == 14;
|
||||
return (i_culltype >= 0 && i_culltype < fopAc_CULLBOX_CUSTOM_e) || i_culltype == fopAc_CULLBOX_CUSTOM_e;
|
||||
}
|
||||
|
||||
inline const cXyz& fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
|
||||
@@ -757,12 +757,14 @@ inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
#define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg, ...) \
|
||||
fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg, __VA_ARGS__)
|
||||
#define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg) \
|
||||
fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg)
|
||||
#else
|
||||
#define fopAcM_setWarningMessage(...)
|
||||
#endif
|
||||
|
||||
void fopAcM_getNameString(fopAc_ac_c*, char*);
|
||||
|
||||
class fopAcM_lc_c {
|
||||
public:
|
||||
fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); }
|
||||
|
||||
Reference in New Issue
Block a user