diff options
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPicture.h | 4 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio_JAudio2/control.h | 4 | ||||
| -rw-r--r-- | include/JSystem/JUtility/JUTAssert.h | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h index 94165f44df..c37a8c2d7f 100644 --- a/include/JSystem/J2DGraph/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture.h @@ -90,8 +90,8 @@ public: /* 802FF320 */ virtual void prepend(JUTTexture* param_0, f32 param_1) { insert(param_0, 0, param_1); } - /* 801BDD70 */ virtual bool insert(ResTIMG const*, u8, f32) { - // NONMATCHING + /* 801BDD70 */ virtual bool insert(ResTIMG const* param_0, u8 param_1, f32 param_2) { + return insert(param_0, NULL, param_1, param_2); } /* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32); /* 80020368 */ virtual bool insert(char const* param_0, u8 param_1, f32 param_2) { diff --git a/include/JSystem/JStudio/JStudio_JAudio2/control.h b/include/JSystem/JStudio/JStudio_JAudio2/control.h index 7671c6a1c0..8753338dee 100644 --- a/include/JSystem/JStudio/JStudio_JAudio2/control.h +++ b/include/JSystem/JStudio/JStudio_JAudio2/control.h @@ -93,11 +93,7 @@ struct TAdaptor_sound : public JStudio::TAdaptor_sound { void set_bPermit_onExit_notEnd_(bool param_1) { field_0x11c = param_1; } - #ifndef NONMATCHING static TVVOSetValue_ saoVVOSetValue_[6]; - #else - static u8 saoVVOSetValue_[72]; - #endif /* 0x114 */ TCreateObject* pCreateObject_; /* 0x118 */ JAISoundHandle opJAISoundHandle_; diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index e951fe4f98..6fa2d62d5d 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -30,9 +30,12 @@ #define JUT_LOG(LINE, ...) \ JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__) -#define JUT_CONFIRM(LINE, COND) \ +#define JUT_SET_CONFIRM(LINE, COND) \ JUTAssertion::setConfirmMessage(JUTAssertion::getSDevice(), __FILE__, LINE, COND, #COND) +#define JUT_CONFIRM(LINE, COND) \ + JUT_SET_CONFIRM(LINE, COND) + #else #define JUT_ASSERT(...) (void)0; #define JUT_ASSERT_MSG(...) (void)0; |