diff options
| author | Max Roncace <me@caseif.net> | 2026-01-06 07:45:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-06 04:45:15 -0800 |
| commit | fd863582d657bb2c70f7ac73d5f534c6b0be7aa6 (patch) | |
| tree | adf9a30b0fe674c718918ee058154ecdbe84e133 /include/d | |
| parent | 3679e7abab82df6447f7b55aa472b5b9c8062fb0 (diff) | |
f_pc mostly linked for Wii/Shield (#3015)
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/d_error_msg.h | 4 | ||||
| -rw-r--r-- | include/d/d_particle.h | 11 | ||||
| -rw-r--r-- | include/d/d_resorce.h | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/d/d_error_msg.h b/include/d/d_error_msg.h index ebd87ec633..87817bbb05 100644 --- a/include/d/d_error_msg.h +++ b/include/d/d_error_msg.h @@ -1,15 +1,13 @@ #ifndef D_D_ERROR_MSG_H #define D_D_ERROR_MSG_H -#include "d/d_com_inf_game.h" - struct dShutdownErrorMsg_c { static bool execute(); }; struct dDvdErrorMsg_c { static void draw(s32); - static u8 execute(); + static bool execute(); }; #if !PLATFORM_GCN diff --git a/include/d/d_particle.h b/include/d/d_particle.h index 74e304a531..63b7a4f044 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -436,8 +436,15 @@ public: } static void onStatus(u8 status) { mStatus |= status; } - static void offStatus(u8 status) { mStatus &= ~status; } - static bool isStatus(u8 status) { return mStatus & status; } + static void offStatus(u8 status) { + //TODO: reconcile this +#if DEBUG + mStatus &= (u8)~status; +#else + mStatus &= ~status; +#endif + } + static BOOL isStatus(u8 status) { return mStatus & status; } static dPa_selectTexEcallBack* getTsuboSelectTexEcallBack(int idx) { return &mTsubo[idx]; diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 86722f7bf9..8666f369cd 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -130,11 +130,9 @@ public: return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo)); } - #if DEBUG void dumpTag() { // TODO } - #endif /* 0x0000 */ dRes_info_c mObjectInfo[128]; /* 0x1200 */ dRes_info_c mStageInfo[64]; |
