mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-23 14:41:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix JUT_ASSERT and several other macros (#2711)

Browse Source 
* Fix JUT_ASSERT to be a nested define

* Switch names that appear in asserts to be constants instead of defines

* Replace `0` in asserts with `NULL` or `FALSE`

* Fix fpclassify

* Fix ARRAY_SIZE

* Use G_CM3D_F_INF

* More fixes for fpclassify

* Remove FLOAT_LABEL

* Remove incorrect FLAG_ON macro

* Remove UNK_BSS macro

* Silence clangd unused header warning for PCH
This commit is contained in:
LagoLunatic
2025-09-28 16:11:07 -04:00
committed by GitHub
parent 737250d7f5
commit 6ec6fce8cb
1008 changed files with 3172 additions and 3237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JAudio2/JAISoundHandles.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
bool isSoundAttached() const { return sound_ != NULL; }
JAISound* operator->() const {
JUT_ASSERT(58, sound_ != 0);
JUT_ASSERT(58, sound_ != NULL);
return sound_;
}
include/JSystem/JAudio2/JASGadget.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
JASGlobalInstance(bool param_1) {
if (param_1) {
JUT_ASSERT(186, sInstance == 0);
JUT_ASSERT(186, sInstance == NULL);
sInstance = (T*)this;
}
}
include/JSystem/JAudio2/JASTrack.h
+2 -2
View File
@@ -17,8 +17,6 @@ namespace JASDsp {
extern const u32 FILTER_MODE_IIR;
};
#define MAX_CHILDREN 16
/**
* @ingroup jsystem-jaudio
*
@@ -126,6 +124,8 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
static JASDefaultBankTable sDefaultBankTable;
static TList sTrackList;
static const int MAX_CHILDREN = 16;
JASSeqCtrl* getSeqCtrl() { return &mSeqCtrl; }
u16 getPort(u32 param_0) const { return mTrackPort.get(param_0); }
void setPort(u32 param_0, u16 param_1) { mTrackPort.set(param_0, param_1); }
include/JSystem/JAudio2/JAUStreamAramMgr.h
+1 -1
View File
@@ -28,7 +28,7 @@ public:
JASHeap* heap = &mHeaps[0]; // should probably be mHeaps[i] but that doesn't match
heap->free();
if (!heap) {
JUT_ASSERT(47, 0);
JUT_ASSERT(47, FALSE);
}
}
}
include/JSystem/JGadget/linklist.h
+4 -4
View File
@@ -191,19 +191,19 @@ struct TLinkList : public TNodeLinkList {
};
static TLinkListNode* Element_toNode(T* p) {
JUT_ASSERT(0x2F1, p!=0);
JUT_ASSERT(0x2F1, p!=NULL);
return reinterpret_cast<TLinkListNode*>(reinterpret_cast<char*>(p) - I);
}
static const TLinkListNode* Element_toNode(const T* p) {
JUT_ASSERT(0x2F6, p!=0);
JUT_ASSERT(0x2F6, p!=NULL);
return reinterpret_cast<const TLinkListNode*>(reinterpret_cast<const char*>(p) - I);
}
static T* Element_toValue(TLinkListNode* p) {
JUT_ASSERT(0x2FB, p!=0);
JUT_ASSERT(0x2FB, p!=NULL);
return reinterpret_cast<T*>(reinterpret_cast<char*>(p) + I);
}
static const T* Element_toValue(const TLinkListNode* p) {
JUT_ASSERT(0x300, p!=0);
JUT_ASSERT(0x300, p!=NULL);
return reinterpret_cast<const T*>(reinterpret_cast<const char*>(p) + I);
}
include/JSystem/JGadget/search.h
+1 -1
View File
@@ -25,7 +25,7 @@ struct TExpandStride_<s32> {
//! Target: toValueFromIndex<PFdd_d>__7JGadgetFiPCPFdd_dUlRCPFdd_d_RCPFdd_d
template <typename T>
inline const T& toValueFromIndex(int idx, const T* pValue, u32 count, const T& fallback) {
JUT_ASSERT(200, pValue!=0);
JUT_ASSERT(200, pValue!=NULL);
u32 index = idx;
if (index >= count) {
return fallback;
include/JSystem/JGadget/std-memory.h
+1 -1
View File
@@ -23,7 +23,7 @@ struct TAllocator {
}
void destroy(T* p) {
JUT_ASSERT(68, p!=0);
JUT_ASSERT(68, p!=NULL);
}
/* 0x0 */ u8 mAllocator;
include/JSystem/JGadget/std-vector.h
+1 -1
View File
@@ -125,7 +125,7 @@ struct TVector {
u32 capacity() { return mCapacity; }
u32 GetSize_extend_(u32 count) {
JUT_ASSERT(0x22B, pfnExtend_!=0);
JUT_ASSERT(0x22B, pfnExtend_!=NULL);
u32 oldSize = size();
u32 neededNewSpace = oldSize + count;
include/JSystem/JHostIO/JORServer.h
+2 -2
View File
@@ -56,12 +56,12 @@ public:
void releaseMCTX(JORMContext*);
void appendEventCallbackListNode(JOREventCallbackListNode* p) {
JUT_ASSERT(256, p!=0);
JUT_ASSERT(256, p!=NULL);
m_eventCallbackList.Push_front(p);
}
void removeEventCallbackListNode(JOREventCallbackListNode* p) {
JUT_ASSERT(257, p!=0);
JUT_ASSERT(257, p!=NULL);
m_eventCallbackList.Remove(p);
}
include/JSystem/JKernel/JKRArchive.h
+3 -3
View File
@@ -202,12 +202,12 @@ public:
static JKRCompression convertAttrToCompressionType(u32 attr) {
#define JKRARCHIVE_ATTR_COMPRESSION 0x04
#define JKRARCHIVE_ATTR_YAY0 0x80
#define JKRARCHIVE_ATTR_YAZ0 0x80
JKRCompression compression;
if (FLAG_ON(attr, JKRARCHIVE_ATTR_COMPRESSION)) {
if (!(attr & JKRARCHIVE_ATTR_COMPRESSION)) {
compression = COMPRESSION_NONE;
} else if (!FLAG_ON(attr, JKRARCHIVE_ATTR_YAY0)) {
} else if (attr & JKRARCHIVE_ATTR_YAZ0) {
compression = COMPRESSION_YAZ0;
} else {
compression = COMPRESSION_YAY0;
include/JSystem/JMessage/control.h
+2 -2
View File
@@ -36,8 +36,8 @@ struct TControl {
}
int setMessageCode_inReset_(const TProcessor* pProcessor, u16 u16GroupID, u16 u16Index) {
JUT_ASSERT(138, pEntry_==0);
JUT_ASSERT(139, pszText_update_current_==0);
JUT_ASSERT(138, pEntry_==NULL);
JUT_ASSERT(139, pszText_update_current_==NULL);
JUT_ASSERT(140, oStack_renderingProcessor_.empty());
if (!setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) {
include/JSystem/JMessage/processor.h
+4 -4
View File
@@ -20,7 +20,7 @@ struct TReference {
/* 802A7B40 */ virtual const char* do_word(u32) const;
int on_parseCharacter(const char** ppszText) const {
JUT_ASSERT(97, pcResource_!=0);
JUT_ASSERT(97, pcResource_!=NULL);
return pcResource_->parseCharacter(ppszText);
}
@@ -46,7 +46,7 @@ struct TProcessor {
pResourceCache_(NULL),
pszCurrent_(NULL)
{
JUT_ASSERT(584, pReference_!=0);
JUT_ASSERT(584, pReference_!=NULL);
}
typedef bool (*pfnProcess_func)(TProcessor*);
@@ -175,7 +175,7 @@ struct TProcessor {
void on_character(int iCharacter) { do_character(iCharacter); }
const char* on_message_limited(u16 u16Index) const {
JUT_ASSERT(482, pResourceCache_!=0);
JUT_ASSERT(482, pResourceCache_!=NULL);
return pResourceCache_->getMessageText_messageIndex(u16Index);
}
@@ -190,7 +190,7 @@ struct TProcessor {
}
int setBegin_messageEntryText(const TProcessor* pProcessor, const void* pEntry, const char* pszText) {
JUT_ASSERT(306, pProcessor!=0);
JUT_ASSERT(306, pProcessor!=NULL);
setBegin_messageEntryText(pProcessor->getResourceCache(), pEntry, pszText);
return 1;
}
include/JSystem/JMessage/resource.h
+2 -2
View File
@@ -41,7 +41,7 @@ struct TResource {
}
char* getMessageText_messageEntry(const void* pEntry) const {
JUT_ASSERT(141, pEntry!=0);
JUT_ASSERT(141, pEntry!=NULL);
return pMessageText_ + *(int*)pEntry;
}
@@ -124,7 +124,7 @@ struct TResourceContainer {
/* 802A90F0 */ void setEncoding_(u8 e);
int parseCharacter(const char** ppszText) const {
JUT_ASSERT(330, pfnParseCharacter_!=0);
JUT_ASSERT(330, pfnParseCharacter_!=NULL);
return pfnParseCharacter_(ppszText);
}
include/JSystem/JStudio/JStudio/ctb.h
+1 -1
View File
@@ -11,7 +11,7 @@ namespace ctb {
struct TObject : public object::TObject_ID {
TObject(const void* id, u32 size, const void* param_2) : object::TObject_ID(id, size) {
pData_ = param_2;
JUT_ASSERT(82, pData_!=0);
JUT_ASSERT(82, pData_!=NULL);
}
/* 80280F18 */ virtual ~TObject() = 0;
virtual int getScheme() const = 0;
include/JSystem/JStudio/JStudio/functionvalue.h
+2 -2
View File
@@ -338,7 +338,7 @@ public:
f32 operator*() {
#ifdef DEBUG
JUT_ASSERT(947, pf_!=0);
JUT_ASSERT(947, pf_!=NULL);
#endif
return *pf_;
}
@@ -451,7 +451,7 @@ public:
f32 operator*() {
#ifdef DEBUG
JUT_ASSERT(1098, pf_!=0);
JUT_ASSERT(1098, pf_!=NULL);
#endif
return *pf_;
}
include/JSystem/JStudio/JStudio/jstudio-control.h
+11 -11
View File
@@ -123,13 +123,13 @@ public:
CMtxP transformOnSet_getMatrix() const { return mTransformOnSet_Matrix; }
void transformOnSet_transformTranslation(const Vec& rSrc, Vec* pDst) const {
JUT_ASSERT(226, pDst!=0);
JUT_ASSERT(226, pDst!=NULL);
JUT_ASSERT(227, &rSrc!=pDst);
MTXMultVec(transformOnSet_getMatrix(), &rSrc, pDst);
}
void transformOnSet_transformRotation(const Vec& rSrc, Vec* pDst) const {
JUT_ASSERT(232, pDst!=0);
JUT_ASSERT(232, pDst!=NULL);
JUT_ASSERT(233, &rSrc!=pDst);
pDst->x = rSrc.x;
pDst->y = rSrc.y + mTransformOnSet_RotationY;
@@ -137,7 +137,7 @@ public:
}
void transformOnSet_transformScaling(const Vec& rSrc, Vec* pDst) const {
JUT_ASSERT(240, pDst!=0);
JUT_ASSERT(240, pDst!=NULL);
JUT_ASSERT(241, &rSrc!=pDst);
*pDst = rSrc;
}
@@ -176,20 +176,20 @@ public:
CMtxP transformOnGet_getMatrix() const { return mTransformOnGet_Matrix; }
void transformOnGet_transformTranslation(const Vec& rSrc, Vec* pDst) const {
JUT_ASSERT(296, pDst!=0);
JUT_ASSERT(296, pDst!=NULL);
JUT_ASSERT(297, &rSrc!=pDst);
MTXMultVec(transformOnGet_getMatrix(), &rSrc, pDst);
}
void transformOnGet_transformDirection(const Vec& rSrc, Vec* pDst) const {
JUT_ASSERT(316, pDst!=0);
JUT_ASSERT(316, pDst!=NULL);
JUT_ASSERT(317, &rSrc!=pDst);
MTXMultVecSR(transformOnGet_getMatrix(), &rSrc, pDst);
}
void transformOnGet_transform(TTransform_position_direction* param_1,
TTransform_position_direction* pDst) const {
JUT_ASSERT(289, pDst!=0);
JUT_ASSERT(289, pDst!=NULL);
transformOnGet_transformTranslation(param_1->position, &pDst->position);
transformOnGet_transformDirection(param_1->direction, &pDst->direction);
}
@@ -220,7 +220,7 @@ public:
}
void transformOnGet_transformRotation(const Vec& rSrc, Vec* pDst) const {
JUT_ASSERT(302, pDst!=0);
JUT_ASSERT(302, pDst!=NULL);
JUT_ASSERT(303, &rSrc!=pDst);
pDst->x = rSrc.x;
pDst->y = rSrc.y + mTransformOnGet_RotationY;
@@ -228,14 +228,14 @@ public:
}
void transformOnGet_transformScaling(const Vec& rSrc, Vec* pDst) const {
JUT_ASSERT(310, pDst!=0);
JUT_ASSERT(310, pDst!=NULL);
JUT_ASSERT(311, &rSrc!=pDst);
*pDst = rSrc;
}
void transformOnGet_transform(TTransform_translation_rotation_scaling* param_1,
TTransform_translation_rotation_scaling* pDst) const {
JUT_ASSERT(263, pDst!=0);
JUT_ASSERT(263, pDst!=NULL);
transformOnGet_transformTranslation(param_1->translation, &pDst->translation);
transformOnGet_transformRotation(param_1->rotation, &pDst->rotation);
transformOnGet_transformScaling(param_1->scaling, &pDst->scaling);
@@ -252,14 +252,14 @@ public:
}
void transformOnSet_transformDirection(const Vec& rSrc, Vec* pDst) const {
JUT_ASSERT(246, pDst!=0);
JUT_ASSERT(246, pDst!=NULL);
JUT_ASSERT(247, &rSrc!=pDst);
MTXMultVecSR(transformOnSet_getMatrix(), &rSrc, pDst);
}
void transformOnSet_transform(TTransform_position_direction* param_1,
TTransform_position_direction* pDst) const {
JUT_ASSERT(219, pDst!=0);
JUT_ASSERT(219, pDst!=NULL);
transformOnSet_transformTranslation(param_1->position, &pDst->position);
transformOnSet_transformDirection(param_1->direction, &pDst->direction);
}
include/JSystem/JStudio/JStudio_JAudio2/control.h
+1 -1
View File
@@ -15,7 +15,7 @@ struct TCreateObject : public JStudio::TCreateObject {
pJAISoundStarter_ = p_soundStarter;
pJSGSystem_ = p_system;
mPermit_onExit_notEnd = false;
JUT_ASSERT(45, pJAISoundStarter_!=0);
JUT_ASSERT(45, pJAISoundStarter_!=NULL);
}
/* 8028D550 */ virtual ~TCreateObject();
include/JSystem/JStudio/JStudio_JParticle/control.h
+2 -2
View File
@@ -14,7 +14,7 @@ struct TCreateObject : public JStudio::TCreateObject {
pJPAEmitterManager_ = p_emitMgr;
pJSGSystem_ = p_system;
mPermit_onExit_notEnd = false;
JUT_ASSERT(48, pJPAEmitterManager_!=0);
JUT_ASSERT(48, pJPAEmitterManager_!=NULL);
}
/* 8028E3A0 */ virtual ~TCreateObject();
@@ -42,7 +42,7 @@ struct TAdaptor_particle : public JStudio::TAdaptor_particle {
TJPACallback_emitter_(TAdaptor_particle* param_1) {
pThis_ = param_1;
pOld = NULL;
JUT_ASSERT(113, pThis_!=0);
JUT_ASSERT(113, pThis_!=NULL);
}
/* 8028ECC0 */ virtual void execute(JPABaseEmitter*);
/* 8028F060 */ virtual void executeAfter(JPABaseEmitter*);
include/JSystem/JStudio/JStudio_JStage/control.h
+1 -1
View File
@@ -17,7 +17,7 @@ typedef JStudio::TObject* (*ObjCreateFuncT)(const JStudio::stb::data::TParse_TBl
struct TCreateObject : public JStudio::TCreateObject {
TCreateObject(const JStage::TSystem* pSystem) {
pJSGSystem_ = pSystem;
JUT_ASSERT(42, pJSGSystem_!=0);
JUT_ASSERT(42, pJSGSystem_!=NULL);
}
/* 80289B00 */ virtual ~TCreateObject();
include/JSystem/JUtility/JUTAssert.h
+3 -1
View File
@@ -4,8 +4,10 @@
#include "dolphin/os.h"
#ifdef DEBUG
#define JUT_SHOW_ASSERT(LINE, COND) JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND)
#define JUT_ASSERT(LINE, COND) \
(COND) ? (void)0 : (JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND), OSPanic(__FILE__, LINE, "Halt"));
(COND) ? (void)0 : (JUT_SHOW_ASSERT(LINE, COND), OSPanic(__FILE__, LINE, "Halt"));
#define JUT_ASSERT_MSG(LINE, COND, MSG) \
(COND) ? (void)0 : (JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, MSG), OSPanic(__FILE__, LINE, "Halt"));
include/JSystem/JUtility/JUTResFont.h
+2 -1
View File
@@ -57,7 +57,8 @@ public:
initialize_state();
}
static IsLeadByte_func const saoAboutEncoding_[3];
static const int suAboutEncoding_ = 3;
static IsLeadByte_func const saoAboutEncoding_[suAboutEncoding_];
// some types uncertain, may need to be fixed
/* 0x1C */ int mWidth;
include/d/actor/d_a_formation_mng.h
+3 -3
View File
@@ -78,7 +78,7 @@ struct daFmtMng_Path_c {
} else {
field_0x4 = decIndex(field_0x4);
}
field_0x8 = 1000000000.0f;
field_0x8 = G_CM3D_F_INF;
}
void setNextPoint(cXyz *param_1) {
@@ -175,7 +175,7 @@ struct daFmtMng_c : public fopAc_ac_c {
int getEndTime() { return (fopAcM_GetParam(this) >> 24) & 0xff; }
void callExecute() {
JUT_ASSERT(680, mAction != 0);
JUT_ASSERT(680, mAction != NULL);
(this->*(mAction[1]))();
}
@@ -203,7 +203,7 @@ struct daFmtMng_c : public fopAc_ac_c {
}
void callInit() {
JUT_ASSERT(667, mAction != 0)
JUT_ASSERT(667, mAction != NULL)
(this->*(*mAction))();
}
include/d/actor/d_a_obj_boumato.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
cXyz sp2C;
cXyz sp20;
JUT_ASSERT(164, 0 != arrow_p);
JUT_ASSERT(164, NULL != arrow_p);
if (field_0xa38 != 0) {
return 0;
include/d/actor/d_a_obj_itamato.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
cXyz sp2C;
cXyz sp20;
JUT_ASSERT(170, 0 != arrow_p);
JUT_ASSERT(170, NULL != arrow_p);
if (field_0xa16 != 0 || health == 0) {
return 0;
include/d/actor/d_a_obj_sekizoa.h
+1 -1
View File
@@ -132,7 +132,7 @@ public:
void setWolfHowling() {
if (mType != 0) {
fopAc_ac_c* actor_p = mActorMngrs[3].getActorP();
JUT_ASSERT(0x1A3, 0 != actor_p);
JUT_ASSERT(0x1A3, NULL != actor_p);
((daObj_Sekizoa_c*)actor_p)->setWolfHowling();
} else {
include/d/actor/d_a_tag_kmsg.h
+1 -1
View File
@@ -90,7 +90,7 @@ public:
f32 getAttnPosOffset() {
u32 attnPosOffset = (fopAcM_GetParam(this) & 0xff0000) >> 0x10;
if (attnPosOffset == 0xff) {
return 1000000000.0f;
return G_CM3D_F_INF;
} else {
return attnPosOffset;
}
include/d/d_demo.h
+3 -3
View File
@@ -86,11 +86,11 @@ public:
/* 80038098 */ virtual ~dDemo_actor_c();
/* 800387EC */ virtual void JSGSetData(u32, void const*, u32);
/* 8003A05C */ virtual s32 JSGFindNodeID(char const* param_0) const {
JUT_ASSERT(0, mModel != 0);
JUT_ASSERT(0, mModel != NULL);
return mModel->getModelData()->getJointName()->getIndex(param_0);
}
/* 8003A088 */ virtual bool JSGGetNodeTransformation(u32 param_0, Mtx param_1) const {
JUT_ASSERT(0, mModel != 0);
JUT_ASSERT(0, mModel != NULL);
cMtx_copy(mModel->getAnmMtx((u16)param_0), param_1);
return true;
}
@@ -375,7 +375,7 @@ public:
static jmessage_tControl* getMesgControl() { return m_mesgControl; }
static dDemo_camera_c* getCamera() {
JUT_ASSERT(0, m_object != 0);
JUT_ASSERT(0, m_object != NULL);
return m_object->getActiveCamera();
}
include/d/d_save.h
+29 -28
View File
@@ -9,35 +9,36 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JHostIO/JORReflexible.h"
#define DEFAULT_SELECT_ITEM_INDEX 0
#define MAX_SELECT_ITEM 4
#define SELECT_ITEM_NUM 2
#define MAX_EQUIPMENT 6
#define MAX_EVENTS 256
#define MAX_ITEM_SLOTS 24
#define LIGHT_DROP_STAGE 4
#define LETTER_INFO_BIT 64
#define MAX_INSECT_NUM 24
#define MAX_VISIBLE_HEARTPIECES 4
#define MAX_POH_NUM 100
#define TBOX_MAX 64
#define DSV_MEMBIT_ENUM_MAX 8
#define ITEM_MAX_DAN 128
#define SWITCH_ZONE_MAX 0x20
#define SWITCH_ONE_ZONE_MAX 0x10
#define ITEM_ZONE_MAX 0x20
#define ITEM_ONE_ZONE_MAX 0x10
#define QUEST_LOG_SIZE 0xA94
#define QUIVER_MAX 30
#define BIG_QUIVER_MAX 60
#define GIANT_QUIVER_MAX 100
#define WALLET_MAX 300
#define BIG_WALLET_MAX 600
#define GIANT_WALLET_MAX 1000
#define MAX_FINDABLE_FISHES 6
#define ITEM_XY_MAX_DUMMY 8
#define ITEM_BIT_MAX 0x100
static const int DEFAULT_SELECT_ITEM_INDEX = 0;
static const int MAX_SELECT_ITEM = 4;
static const int SELECT_ITEM_NUM = 2;
static const int MAX_EQUIPMENT = 6;
static const int MAX_EVENTS = 256;
static const int MAX_ITEM_SLOTS = 24;
static const int LIGHT_DROP_STAGE = 4;
static const int LETTER_INFO_BIT = 64;
static const int MAX_INSECT_NUM = 24;
static const int MAX_VISIBLE_HEARTPIECES = 4;
static const int MAX_POH_NUM = 100;
static const int TBOX_MAX = 64;
static const int DSV_MEMBIT_ENUM_MAX = 8;
static const int ITEM_MAX_DAN = 128;
static const int SWITCH_ZONE_MAX = 0x20;
static const int SWITCH_ONE_ZONE_MAX = 0x10;
static const int ITEM_ZONE_MAX = 0x20;
static const int ITEM_ONE_ZONE_MAX = 0x10;
static const int QUEST_LOG_SIZE = 0xA94;
static const int QUIVER_MAX = 30;
static const int BIG_QUIVER_MAX = 60;
static const int GIANT_QUIVER_MAX = 100;
static const int WALLET_MAX = 300;
static const int BIG_WALLET_MAX = 600;
static const int GIANT_WALLET_MAX = 1000;
static const int MAX_FINDABLE_FISHES = 6;
static const int ITEM_BIT_MAX = 0x100;
static const int ITEM_XY_MAX_DUMMY = 8;
enum ButtonIndexes {
/* 0 */ A_BUTTON,
include/d/d_stage.h
+48 -48
View File
@@ -581,22 +581,22 @@ public:
(void)i_LightVecInfo;
dStage_SetErrorStage();
OSReport("stage non LightVec data !!\n");
JUT_ASSERT(3003, 0);
JUT_ASSERT(3003, FALSE);
}
/* vt[43] */ virtual stage_pure_lightvec_info_class* getLightVecInfo(void) const {
OSReport("stage non LightVec data !!\n");
JUT_ASSERT(3007, 0);
JUT_ASSERT(3007, FALSE);
return NULL;
}
/* vt[44] */ virtual void setLightVecInfoNum(int i_LightVecInfoNum) {
(void)i_LightVecInfoNum;
dStage_SetErrorStage();
OSReport("stage non LightVecNum data !!\n");
JUT_ASSERT(3014, 0);
JUT_ASSERT(3014, FALSE);
}
/* vt[45] */ virtual int getLightVecInfoNum(void) const {
OSReport("stage non LightVecNum data !!\n");
JUT_ASSERT(3018, 0);
JUT_ASSERT(3018, FALSE);
return NULL;
}
/* vt[40] */ virtual void setPlightNumInfo(int i_PlightNumInfo) { mPlightNumInfo = i_PlightNumInfo; }
@@ -623,22 +623,22 @@ public:
(void)list;
dStage_SetErrorStage();
OSReport("stage non filelist2 data!\n");
JUT_ASSERT(3123, 0);
JUT_ASSERT(3123, FALSE);
}
/* vt[65] */ virtual dStage_FileList2_dt_c* getFileList2Info(void) const {
OSReport("stage non filelist2 data!\n");
JUT_ASSERT(3127, 0);
JUT_ASSERT(3127, FALSE);
return NULL;
}
/* vt[66] */ virtual void setFileListInfo(dStage_FileList_dt_c* list) {
(void)list;
dStage_SetErrorStage();
OSReport("stage non filelist data!\n");
JUT_ASSERT(3138, 0);
JUT_ASSERT(3138, FALSE);
}
/* vt[67] */ virtual dStage_FileList_dt_c* getFileListInfo(void) const {
OSReport("stage non filelist data!\n");
JUT_ASSERT(3142, 0);
JUT_ASSERT(3142, FALSE);
return NULL;
}
/* vt[68] */ virtual void setFloorInfo(dStage_FloorInfo_c* i_FloorInfo) { mFloorInfo = i_FloorInfo; }
@@ -656,11 +656,11 @@ public:
(void)lbnk;
dStage_SetErrorStage();
OSReport("stage non Lbnk data!\n");
JUT_ASSERT(3231, 0);
JUT_ASSERT(3231, FALSE);
}
/* vt[80] */ virtual dStage_Lbnk_c* getLbnk(void) const {
OSReport("stage non Lbnk data!\n");
JUT_ASSERT(3238, 0);
JUT_ASSERT(3238, FALSE);
return NULL;
}
/* vt[81] */ virtual void setTresure(stage_tresure_class* i_Tresure) { mTresure = i_Tresure; }
@@ -741,11 +741,11 @@ public:
(void)i_Room;
dStage_SetErrorRoom();
OSReport("Room non room data !!\n");
JUT_ASSERT(2095, 0);
JUT_ASSERT(2095, FALSE);
}
virtual roomRead_class* getRoom(void) const {
OSReport("Room non room data !!\n");
JUT_ASSERT(2100, 0);
JUT_ASSERT(2100, FALSE);
return NULL;
}
virtual void setMapInfo(stage_map_info_class* i_MapInfo) { mMapInfo = i_MapInfo; }
@@ -757,33 +757,33 @@ public:
(void)i_PaletteInfo;
dStage_SetErrorRoom();
OSReport("Room non palet data !!\n");
JUT_ASSERT(2126, 0);
JUT_ASSERT(2126, FALSE);
}
virtual stage_palette_info_class* getPaletteInfo(void) const {
OSReport("Room non palet data !!\n");
JUT_ASSERT(2130, 0);
JUT_ASSERT(2130, FALSE);
return NULL;
}
virtual void setPselectInfo(stage_pselect_info_class* i_PselectInfo) {
(void)i_PselectInfo;
dStage_SetErrorRoom();
OSReport("Room non pselect data !!\n");
JUT_ASSERT(2137, 0);
JUT_ASSERT(2137, FALSE);
}
virtual stage_pselect_info_class* getPselectInfo(void) const {
OSReport("Room non pselect data !!\n");
JUT_ASSERT(2141, 0);
JUT_ASSERT(2141, FALSE);
return NULL;
}
virtual void setEnvrInfo(stage_envr_info_class* i_EnvrInfo) {
(void)i_EnvrInfo;
dStage_SetErrorRoom();
OSReport("Room non envr data !!\n");
JUT_ASSERT(2148, 0);
JUT_ASSERT(2148, FALSE);
}
virtual stage_envr_info_class* getEnvrInfo(void) const {
OSReport("Room non envr data !!\n");
JUT_ASSERT(2152, 0);
JUT_ASSERT(2152, FALSE);
return NULL;
}
virtual void setVrboxInfo(stage_vrbox_info_class* i_VrboxInfo) { mVrboxInfo = i_VrboxInfo; }
@@ -794,44 +794,44 @@ public:
(void)i_PlightInfo;
dStage_SetErrorRoom();
OSReport("Room non plight data !!\n");
JUT_ASSERT(2174, 0);
JUT_ASSERT(2174, FALSE);
}
virtual stage_plight_info_class* getPlightInfo(void) const {
OSReport("Room non plight data !!\n");
JUT_ASSERT(2178, 0);
JUT_ASSERT(2178, FALSE);
return NULL;
}
virtual void setPaletteNumInfo(int i_PaletteNumInfo) {
(void)i_PaletteNumInfo;
dStage_SetErrorRoom();
OSReport("Room non palette num data !!\n");
JUT_ASSERT(2186, 0);
JUT_ASSERT(2186, FALSE);
}
virtual int getPaletteNumInfo(void) const {
OSReport("Room non palette num data !!\n");
JUT_ASSERT(2190, 0);
JUT_ASSERT(2190, FALSE);
return NULL;
}
virtual void setPselectNumInfo(int i_PselectNumInfo) {
(void)i_PselectNumInfo;
dStage_SetErrorRoom();
OSReport("Room non pselect num data !!\n");
JUT_ASSERT(2197, 0);
JUT_ASSERT(2197, FALSE);
}
virtual int getPselectNumInfo(void) const {
OSReport("Room non pselect num data !!\n");
JUT_ASSERT(2201, 0);
JUT_ASSERT(2201, FALSE);
return NULL;
}
virtual void setEnvrNumInfo(int i_EnvrNumInfo) {
(void)i_EnvrNumInfo;
dStage_SetErrorRoom();
OSReport("Room non envr num data !!\n");
JUT_ASSERT(2208, 0);
JUT_ASSERT(2208, FALSE);
}
virtual int getEnvrNumInfo(void) const {
OSReport("Room non envr num data !!\n");
JUT_ASSERT(2212, 0);
JUT_ASSERT(2212, FALSE);
return NULL;
}
virtual void setVrboxNumInfo(int i_VrboxNumInfo) { mVrboxNumInfo = i_VrboxNumInfo; }
@@ -842,11 +842,11 @@ public:
(void)i_PlightNumInfo;
dStage_SetErrorRoom();
OSReport("Room non plight num data !!\n");
JUT_ASSERT(2223, 0);
JUT_ASSERT(2223, FALSE);
}
virtual int getPlightNumInfo(void) const {
OSReport("Room non plight num data !!\n");
JUT_ASSERT(2227, 0);
JUT_ASSERT(2227, FALSE);
return NULL;
}
virtual void setLightVecInfo(stage_pure_lightvec_info_class* i_LightVecInfo) { mLightVecInfo = i_LightVecInfo; }
@@ -857,11 +857,11 @@ public:
(void)i_StagInfo;
dStage_SetErrorRoom();
OSReport("Room non stag data !!\n");
JUT_ASSERT(2256, 0);
JUT_ASSERT(2256, FALSE);
}
virtual stage_stag_info_class* getStagInfo(void) const {
OSReport("Room non stag data !!\n");
JUT_ASSERT(2260, 0);
JUT_ASSERT(2260, FALSE);
return NULL;
}
virtual void setSclsInfo(stage_scls_info_dummy_class* i_SclsInfo) { mSclsInfo = i_SclsInfo; }
@@ -870,22 +870,22 @@ public:
(void)i_PntInfo;
dStage_SetErrorRoom();
OSReport("Room non Pnt data !\n");
JUT_ASSERT(2281, 0);
JUT_ASSERT(2281, FALSE);
}
virtual dStage_dPnt_c* getPntInf(void) const {
OSReport("Room non Pnts data !\n");
JUT_ASSERT(2285, 0);
JUT_ASSERT(2285, FALSE);
return NULL;
}
virtual void setPathInfo(dStage_dPath_c* i_PathInfo) {
(void)i_PathInfo;
dStage_SetErrorRoom();
OSReport("Room non Path data !\n");
JUT_ASSERT(2292, 0);
JUT_ASSERT(2292, FALSE);
}
virtual dStage_dPath_c* getPathInf(void) const {
OSReport("Room non Path data !\n");
JUT_ASSERT(2296, 0);
JUT_ASSERT(2296, FALSE);
return NULL;
}
virtual void setPnt2Info(dStage_dPnt_c* i_Pnt2Info) { mPnt2Info = i_Pnt2Info; }
@@ -907,44 +907,44 @@ public:
virtual void setMemoryConfig(dStage_MemoryConfig_c* i_MemoryConfig) {
(void)i_MemoryConfig;
OSReport("Room non memory config data!\n");
JUT_ASSERT(2414, 0);
JUT_ASSERT(2414, FALSE);
}
virtual dStage_MemoryConfig_c* getMemoryConfig(void) const {
OSReport("Room non memory config data!\n");
JUT_ASSERT(2423, 0);
JUT_ASSERT(2423, FALSE);
return NULL;
}
virtual void setMemoryMap(dStage_MemoryMap_c* i_MemoryMap) {
(void)i_MemoryMap;
OSReport("Room non memory map data!\n");
JUT_ASSERT(2433, 0);
JUT_ASSERT(2433, FALSE);
}
virtual dStage_MemoryMap_c* getMemoryMap(void) const {
OSReport("Room non memory map data!\n");
JUT_ASSERT(2442, 0);
JUT_ASSERT(2442, FALSE);
return NULL;
}
virtual void setMulti(dStage_Multi_c* i_Multi) {
(void)i_Multi;
OSReport("Room non multi data!\n");
JUT_ASSERT(2452, 0);
JUT_ASSERT(2452, FALSE);
}
virtual dStage_Multi_c* getMulti(void) const {
OSReport("Room non multi data!\n");
JUT_ASSERT(2457, 0);
JUT_ASSERT(2457, FALSE);
return NULL;
}
virtual void setOldMulti(void) {
OSReport("Room non old multi data!\n");
JUT_ASSERT(2462, 0);
JUT_ASSERT(2462, FALSE);
}
virtual void resetOldMulti(void) {
OSReport("Room non old multi data!\n");
JUT_ASSERT(2467, 0);
JUT_ASSERT(2467, FALSE);
}
virtual dStage_Multi_c* getOldMulti(void) const {
OSReport("Room non old multi data!\n");
JUT_ASSERT(2472, 0);
JUT_ASSERT(2472, FALSE);
return NULL;
}
virtual void setLbnk(dStage_Lbnk_c* i_Lbnk) { mLbnk = i_Lbnk; }
@@ -954,11 +954,11 @@ public:
virtual void setDMap(dStage_DMap_c* i_DMap) {
(void)i_DMap;
OS_REPORT("Room non DMap data\n");
JUT_ASSERT(2508, 0);
JUT_ASSERT(2508, FALSE);
}
virtual dStage_DMap_c* getDMap(void) const {
OS_REPORT("Room non DMap data\n");
JUT_ASSERT(2513, 0);
JUT_ASSERT(2513, FALSE);
return NULL;
}
virtual void setDrTg(stage_tgsc_class* i_DrTg) { mDrTg = i_DrTg; }
@@ -968,18 +968,18 @@ public:
virtual void setMapPath(void* i_MapPath) {
(void)i_MapPath;
OSReport("stage non 2d map path data !!\n");
JUT_ASSERT(2557, 0);
JUT_ASSERT(2557, FALSE);
}
virtual void* getMapPath(void) {
OSReport("stage non 2d map path data !!\n");
JUT_ASSERT(2561, 0);
JUT_ASSERT(2561, FALSE);
return NULL;
}
virtual void setElst(dStage_Elst_c* i_Elst) {
(void)i_Elst;
dStage_SetErrorRoom();
OSReport("Room non envLayserSet data\n");
JUT_ASSERT(2572, 0);
JUT_ASSERT(2572, FALSE);
}
virtual dStage_Elst_c* getElst(void) {
dStage_SetErrorRoom();
include/global.h
+2 -9
View File
@@ -23,8 +23,8 @@
#define ALIGN_DECL(ALIGNMENT) __attribute__((aligned(ALIGNMENT)))
#define ARRAY_SIZE(o) (s32)(sizeof((o)) / sizeof(*(o)))
#define ARRAY_SIZEU(o) (sizeof((o)) / sizeof(*(o)))
#define ARRAY_SIZE(o) (s32)(sizeof(o) / sizeof(o[0]))
#define ARRAY_SIZEU(o) (sizeof(o) / sizeof(o[0]))
// Align X to the previous N bytes (N must be power of two)
#define ALIGN_PREV(X, N) ((X) & ~((N)-1))
@@ -37,10 +37,6 @@
#define TRUNC(n, a) (((u32)(n)) & ~((a)-1))
#define JUT_EXPECT(...)
#define FLAG_ON(V, F) (((V) & (F)) == 0)
#define FLOAT_LABEL(x) (*(f32*)&x)
#define DOUBLE_LABEL(x) (*(f64*)&x)
#define _SDA_BASE_(dummy) 0
#define _SDA2_BASE_(dummy) 0
@@ -76,9 +72,6 @@ void* __memcpy(void*, const void*, int);
// hack to make strings with no references compile properly
#define DEAD_STRING(s) OSReport(s)
#define UNK_BSS(name) \
static u8 lit_##name[1 + 3 /* padding */];
#define READU32_BE(ptr, offset) \
(((u32)ptr[offset] << 24) | ((u32)ptr[offset + 1] << 16) | ((u32)ptr[offset + 2] << 8) | (u32)ptr[offset + 3]);
src/JSystem/JAudio2/JASBNKParser.cpp
+5 -5
View File
@@ -186,7 +186,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
TInst* tinst = header->mOffsets.mInstOffset[i].ptr(header);
if (tinst != NULL) {
JASBasicInst* instp = new (heap, 0) JASBasicInst();
JUT_ASSERT(368, instp != 0);
JUT_ASSERT(368, instp != NULL);
instp->setVolume(tinst->mVolume);
instp->setPitch(tinst->mPitch);
@@ -199,7 +199,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
instp->setOsc(osc_idx, osc);
} else {
osc = new (heap, 0) JASOscillator::Data();
JUT_ASSERT(386, osc != 0);
JUT_ASSERT(386, osc != NULL);
osc->mTarget = tosc->mTarget;
osc->_04 = tosc->field_0x4;
@@ -208,7 +208,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
const JASOscillator::Point* endPtr = getOscTableEndPtr(points);
int size = endPtr - points;
JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size];
JUT_ASSERT(396, table != 0);
JUT_ASSERT(396, table != NULL);
JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point));
osc->mTable = table;
} else {
@@ -220,7 +220,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
const JASOscillator::Point* endPtr = getOscTableEndPtr(points);
int size = endPtr - points;
JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size];
JUT_ASSERT(409, table != 0);
JUT_ASSERT(409, table != NULL);
JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point));
osc->_0C = table;
} else {
@@ -255,7 +255,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
TPerc* tperc = header->mOffsets.mPercOffset[i].ptr(header);
if (tperc != NULL) {
JASDrumSet* setp = new (heap, 0) JASDrumSet();
JUT_ASSERT(509, setp != 0);
JUT_ASSERT(509, setp != NULL);
setp->newPercArray(0x80, heap);
for (int j = 0; j < 0x80; j++) {
src/JSystem/JAudio2/JASBasicWaveBank.cpp
+3 -3
View File
@@ -40,7 +40,7 @@ void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) {
delete[] mWaveGroupArray;
mGroupCount = param_0;
mWaveGroupArray = new(param_1, 0) TWaveGroup[param_0];
JUT_ASSERT(62, mWaveGroupArray != 0);
JUT_ASSERT(62, mWaveGroupArray != NULL);
for (int i = 0; i < mGroupCount; i++) {
mWaveGroupArray[i].mBank = this;
}
@@ -51,7 +51,7 @@ void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) {
void JASBasicWaveBank::setWaveTableSize(u32 param_0, JKRHeap* param_1) {
delete[] mWaveTable;
mWaveTable = new(param_1, 0) TWaveHandle[param_0];
JUT_ASSERT(92, mWaveTable != 0);
JUT_ASSERT(92, mWaveTable != NULL);
mHandleCount = param_0;
}
@@ -129,7 +129,7 @@ void JASBasicWaveBank::TWaveGroup::setWaveCount(u32 param_0, JKRHeap* param_1) {
delete[] mCtrlWaveArray;
mWaveCount = param_0;
mCtrlWaveArray = new(param_1, 0) TGroupWaveInfo[param_0];
JUT_ASSERT(255, mCtrlWaveArray != 0);
JUT_ASSERT(255, mCtrlWaveArray != NULL);
}
/* 80298B04-80298B2C 293444 0028+00 1/0 0/0 0/0 .text
src/JSystem/JAudio2/JASHeapCtrl.cpp
+3 -3
View File
@@ -32,7 +32,7 @@ void JASHeap::initRootHeap(void* param_0, u32 param_1) {
/* 8029021C-802903F4 28AB5C 01D8+00 0/0 2/2 0/0 .text alloc__7JASHeapFP7JASHeapUl */
bool JASHeap::alloc(JASHeap* mother, u32 param_1) {
JUT_ASSERT(120, mother != 0);
JUT_ASSERT(120, mother != NULL);
JASMutexLock lock(&mMutex);
if (isAllocated()) {
#ifdef DEBUG
@@ -147,8 +147,8 @@ bool JASHeap::free() {
* insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb */
// NONMATCHING regalloc
void JASHeap::insertChild(JASHeap* heap, JASHeap* next, void* param_2, u32 param_3, bool param_4) {
JUT_ASSERT(537, heap != 0);
JUT_ASSERT(538, next == 0 || &mTree == next->mTree.getParent());
JUT_ASSERT(537, heap != NULL);
JUT_ASSERT(538, next == NULL || &mTree == next->mTree.getParent());
JASMutexLock lock(&mMutex);
if (!param_4) {
JSUTreeIterator<JASHeap> it;
src/JSystem/JAudio2/JAUSectionHeap.cpp
+7 -7
View File
@@ -138,7 +138,7 @@ JAUSoundTable* JAUSection::newSoundTable(void const* bst, u32 param_1, bool para
JUT_ASSERT(286, isBuilding());
JUT_ASSERT(287, bst);
JUT_ASSERT(288, asSectionHeap() == this);
JUT_ASSERT(289, sectionHeap_->sectionHeapData_.soundTable == 0);
JUT_ASSERT(289, sectionHeap_->sectionHeapData_.soundTable == NULL);
{
TPushCurrentHeap push(getHeap_());
void const* bstDst = bst;
@@ -161,7 +161,7 @@ JAUSoundNameTable* JAUSection::newSoundNameTable(void const* bstn, u32 param_1,
JUT_ASSERT(316, isBuilding());
JUT_ASSERT(317, bstn);
JUT_ASSERT(318, asSectionHeap() == this);
JUT_ASSERT(319, sectionHeap_->sectionHeapData_.soundNameTable == 0);
JUT_ASSERT(319, sectionHeap_->sectionHeapData_.soundNameTable == NULL);
{
TPushCurrentHeap push(getHeap_());
void const* bstnDst = bstn;
@@ -183,7 +183,7 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param
JUT_ASSERT(345, asSectionHeap() == this);
JUT_ASSERT(346, isOpen());
JUT_ASSERT(347, isBuilding());
JUT_ASSERT(348, sectionHeap_->sectionHeapData_.streamDataMgr_ == 0);
JUT_ASSERT(348, sectionHeap_->sectionHeapData_.streamDataMgr_ == NULL);
{
TPushCurrentHeap push(getHeap_());
JAIStreamDataMgr* r28 = NULL;
@@ -207,7 +207,7 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param
/* 802A5500-802A5598 29FE40 0098+00 0/0 1/1 0/0 .text newSeSeqCollection__10JAUSectionFPCvUl */
JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) {
// JUT_ASSERT(398, asSectionHeap() == this);
JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == 0);
JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == NULL);
if (param_1) {
bsc = newCopy(bsc, param_1, 4);
}
@@ -340,7 +340,7 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
JUT_ASSERT(647, isOpen());
JUT_ASSERT(648, isBuilding());
JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_1);
JUT_ASSERT(650, waveBank != 0);
JUT_ASSERT(650, waveBank != NULL);
TPushCurrentHeap push(getHeap_());
u32 bank_no = JASBNKParser::getBankNumber(param_0);
s32 r25 = getHeap_()->getFreeSize();
@@ -368,7 +368,7 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
JUT_ASSERT(685, isOpen());
JUT_ASSERT(686, isBuilding());
JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_1);
JUT_ASSERT(688, waveBank != 0);
JUT_ASSERT(688, waveBank != NULL);
TPushCurrentHeap push(getHeap_());
JASBank* voiceBank = new JASVoiceBank();
JASVoiceBank* voiceBank2 = (JASVoiceBank*)voiceBank;
@@ -392,7 +392,7 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) {
JUT_ASSERT(714, isOpen());
JUT_ASSERT(715, isBuilding());
JUT_ASSERT(716, buildingBankTable_ == 0);
JUT_ASSERT(716, buildingBankTable_ == NULL);
JAUBankTableLink* bankTableLink = NULL;
{
TPushCurrentHeap push(getHeap_());
src/JSystem/JFramework/JFWSystem.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC;
/* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */
void JFWSystem::firstInit() {
JUT_ASSERT(80, rootHeap == 0);
JUT_ASSERT(80, rootHeap == NULL);
OSInit();
DVDInit();
rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false);
src/JSystem/JHostIO/JORServer.cpp
+2 -2
View File
@@ -9,13 +9,13 @@
void JOREventCallbackListNode::JORAppend() {
JORServer* pServer = JORServer::getInstance();
JUT_ASSERT(51, pServer!=0);
JUT_ASSERT(51, pServer!=NULL);
pServer->appendEventCallbackListNode(this);
}
void JOREventCallbackListNode::JORRemove() {
JORServer* pServer = JORServer::getInstance();
JUT_ASSERT(57, pServer!=0);
JUT_ASSERT(57, pServer!=NULL);
pServer->removeEventCallbackListNode(this);
}
src/JSystem/JKernel/JKRAramArchive.cpp
+1 -1
View File
@@ -286,7 +286,7 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap*
case COMPRESSION_NONE:
{
buffer = (u8*)(JKRAllocFromHeap(pHeap, alignedLen, 0x20));
JUT_ASSERT(677, buffer != 0);
JUT_ASSERT(677, buffer != NULL);
JKRAramToMainRam(entryNum, buffer, alignedLen, EXPAND_SWITCH_UNKNOWN0, alignedLen, NULL, -1, NULL);
*out = buffer;
return length;
src/JSystem/JKernel/JKRArchivePub.cpp
+3 -3
View File
@@ -295,7 +295,7 @@ void JKRArchive::removeResourceAll() {
/* 802D603C-802D609C 2D097C 0060+00 1/0 2/0 0/0 .text removeResource__10JKRArchiveFPv */
bool JKRArchive::removeResource(void* resource) {
JUT_ASSERT(678, resource != 0);
JUT_ASSERT(678, resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
return false;
@@ -307,7 +307,7 @@ bool JKRArchive::removeResource(void* resource) {
/* 802D609C-802D60D8 2D09DC 003C+00 1/0 4/0 0/0 .text detachResource__10JKRArchiveFPv */
bool JKRArchive::detachResource(void* resource) {
JUT_ASSERT(707, resource != 0);
JUT_ASSERT(707, resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
return false;
@@ -318,7 +318,7 @@ bool JKRArchive::detachResource(void* resource) {
/* 802D60D8-802D610C 2D0A18 0034+00 1/0 4/0 0/0 .text getResSize__10JKRArchiveCFPCv */
u32 JKRArchive::getResSize(const void* resource) const {
JUT_ASSERT(732, resource != 0);
JUT_ASSERT(732, resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
return -1;
src/JSystem/JKernel/JKRDvdArchive.cpp
+1 -1
View File
@@ -290,7 +290,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
switch (fileCompression) {
case COMPRESSION_NONE:
buffer = (u8*)JKRAllocFromHeap(heap, alignedSize, sizeof(SArcHeader));
JUT_ASSERT(675, buffer != 0);
JUT_ASSERT(675, buffer != NULL);
JKRDvdToMainRam(entryNum, buffer, EXPAND_SWITCH_UNKNOWN0, alignedSize, NULL,
JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL, NULL);
src/JSystem/JKernel/JKRHeap.cpp
+1 -1
View File
@@ -492,7 +492,7 @@ void operator delete[](void* ptr) {
/* 802CED84-802CED88 2C96C4 0004+00 1/0 1/0 0/0 .text
* state_register__7JKRHeapCFPQ27JKRHeap6TStateUl */
void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(1213, p != 0);
JUT_ASSERT(1213, p != NULL);
JUT_ASSERT(1214, p->getHeap() == this);
}
src/JSystem/JKernel/JKRSolidHeap.cpp
+1 -1
View File
@@ -252,7 +252,7 @@ bool JKRSolidHeap::dump(void) {
/* 802D11FC-802D1258 2CBB3C 005C+00 1/0 0/0 0/0 .text
* state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl */
void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(604, p != 0);
JUT_ASSERT(604, p != NULL);
JUT_ASSERT(605, p->getHeap() == this);
getState_(p);
src/JSystem/JKernel/JKRThread.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
/* 802D1A14-802D1A70 2CC354 005C+00 0/0 1/1 0/0 .text createManager__15JKRThreadSwitchFP7JKRHeap
*/
JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
JUT_ASSERT(343, sManager == 0);
JUT_ASSERT(343, sManager == NULL);
if (!heap) {
heap = JKRGetCurrentHeap();
src/JSystem/JMessage/control.cpp
+3 -3
View File
@@ -67,14 +67,14 @@ void JMessage::TControl::render() {
/* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */
int JMessage::TControl::setMessageCode(u16 u16GroupID, u16 u16Index) {
TProcessor* pProcessor = getProcessor();
JUT_ASSERT(120, pProcessor!=0);
JUT_ASSERT(120, pProcessor!=NULL);
return setMessageCode_inReset_(pProcessor, u16GroupID, u16Index);
}
/* 802A78F4-802A7A20 2A2234 012C+00 0/0 6/6 0/0 .text setMessageID__Q28JMessage8TControlFUlUlPb */
int JMessage::TControl::setMessageID(u32 uMsgID, u32 param_1, bool* pbValid) {
TProcessor* pProcessor = getProcessor();
JUT_ASSERT(132, pProcessor!=0);
JUT_ASSERT(132, pProcessor!=NULL);
u32 uCode = pProcessor->toMessageCode_messageID(uMsgID, param_1, pbValid);
if (uCode == 0xFFFFFFFF) {
@@ -96,7 +96,7 @@ bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const*
uMessageID_ = u16Index;
pResourceCache_ = pProcessor->getResourceCache();
JUT_ASSERT(155, pResourceCache_!=0);
JUT_ASSERT(155, pResourceCache_!=NULL);
pMessageText_begin_ = pResourceCache_->getMessageText_messageEntry(pEntry_);
pMessageText_current_ = pMessageText_begin_;
src/JSystem/JMessage/processor.cpp
+21 -21
View File
@@ -101,9 +101,9 @@ void JMessage::TProcessor::on_select_begin(char const* (*pfn)(JMessage::TProcess
oProcess_.rData.pOffset = pOffset;
oProcess_.rData.uRest = uNumber;
JUT_ASSERT(205, pfn!=0);
JUT_ASSERT(205, pfn!=NULL);
const char* psz = pfn(this);
JUT_ASSERT(207, psz!=0);
JUT_ASSERT(207, psz!=NULL);
stack_pushCurrent_(psz);
do_select_begin(uNumber);
@@ -131,10 +131,10 @@ void JMessage::TProcessor::on_select_separate() {
JUT_ASSERT(237, rData.uRest>0);
const char* (*pfn)(TProcessor*) = rData.pfn;
JUT_ASSERT(240, pfn!=0);
JUT_ASSERT(240, pfn!=NULL);
const char* psz = pfn(this);
JUT_ASSERT(242, psz!=0);
JUT_ASSERT(242, psz!=NULL);
stack_pushCurrent_(psz);
do_select_separate();
@@ -175,7 +175,7 @@ void JMessage::TProcessor::do_select_separate() {}
void JMessage::TProcessor::on_tag_() {
u32 uSize;
char* psz = (char*)getCurrent();
JUT_ASSERT(292, psz!=0);
JUT_ASSERT(292, psz!=NULL);
JUT_ASSERT(293, psz[-1]==data::gcTagBegin);
uSize = *(u8*)psz;
@@ -254,7 +254,7 @@ void JMessage::TProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
/* 802A81EC-802A828C 2A2B2C 00A0+00 2/2 0/0 0/0 .text
* process_character___Q28JMessage10TProcessorFv */
bool JMessage::TProcessor::process_character_() {
JUT_ASSERT(397, pszCurrent_!=0);
JUT_ASSERT(397, pszCurrent_!=NULL);
int iCharacter = on_parseCharacter(&pszCurrent_);
switch (iCharacter) {
@@ -311,8 +311,8 @@ bool JMessage::TProcessor::process_onCharacterEnd_select_(JMessage::TProcessor*
const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor* pThis) {
TProcess_::rdata& rData = pThis->oProcess_.rData;
JUT_ASSERT(454, rData.pfn==&process_onSelect_limited_);
JUT_ASSERT(455, rData.pcBase!=0);
JUT_ASSERT(456, rData.pOffset!=0);
JUT_ASSERT(455, rData.pcBase!=NULL);
JUT_ASSERT(456, rData.pOffset!=NULL);
JUT_ASSERT(457, rData.uRest>0);
u16* puOffset = (u16*)rData.pOffset;
@@ -327,8 +327,8 @@ const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor
const char* JMessage::TProcessor::process_onSelect_(JMessage::TProcessor* pThis) {
TProcess_::rdata& rData = pThis->oProcess_.rData;
JUT_ASSERT(471, rData.pfn==&process_onSelect_);
JUT_ASSERT(472, rData.pcBase!=0);
JUT_ASSERT(473, rData.pOffset!=0);
JUT_ASSERT(472, rData.pcBase!=NULL);
JUT_ASSERT(473, rData.pOffset!=NULL);
JUT_ASSERT(474, rData.uRest>0);
u32* puOffset = (u32*)rData.pOffset;
@@ -358,7 +358,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
case STATUS_NORMAL:
break;
case STATUS_JUMP: {
JUT_ASSERT(549, pControl_!=0);
JUT_ASSERT(549, pControl_!=NULL);
if (!on_jump_isReady()) {
return pszCurrent_;
@@ -368,7 +368,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
TProcess_& process = oProcess2_;
TSequenceProcessor::jumpPfn pfn = process.process.jump_process.jumpFn;
JUT_ASSERT(556, pfn!=0);
JUT_ASSERT(556, pfn!=NULL);
const void* pEntry = pfn(this);
if (pEntry != NULL) {
@@ -377,7 +377,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
break;
}
case STATUS_BRANCH: {
JUT_ASSERT(567, pControl_!=0);
JUT_ASSERT(567, pControl_!=NULL);
u32 queryResult = on_branch_queryResult();
if (queryResult > 0x7FFFFFFF) {
@@ -398,7 +398,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
JGADGET_WARNMSG1(588, "unknown result : ", queryResult);
} else {
TSequenceProcessor::branchPfn pfn = process.process.branch_process.branchFn;
JUT_ASSERT(592, pfn!=0);
JUT_ASSERT(592, pfn!=NULL);
const void* pEntry = pfn(this, queryResult);
if (pEntry != NULL) {
@@ -456,8 +456,8 @@ void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszTe
on_resetStatus_(pszText);
JUT_ASSERT(658, eStatus_==STATUS_NORMAL);
JUT_ASSERT(659, pEntry!=0);
JUT_ASSERT(660, pszText!=0);
JUT_ASSERT(659, pEntry!=NULL);
JUT_ASSERT(660, pszText!=NULL);
do_jump(pEntry, pszText);
}
@@ -495,8 +495,8 @@ void JMessage::TSequenceProcessor::on_branch(void const* pEntry, char const* psz
on_resetStatus_(pszText);
JUT_ASSERT(717, eStatus_==STATUS_NORMAL);
JUT_ASSERT(718, pEntry!=0);
JUT_ASSERT(719, pszText!=0);
JUT_ASSERT(718, pEntry!=NULL);
JUT_ASSERT(719, pszText!=NULL);
do_branch(pEntry, pszText);
}
@@ -653,7 +653,7 @@ void* JMessage::TSequenceProcessor::process_setMessageCode_(JMessage::TSequenceP
}
TControl* pControl = pProcessor->getControl();
JUT_ASSERT(911, pControl!=0);
JUT_ASSERT(911, pControl!=NULL);
if (!pControl->setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) {
JGADGET_WARNMSG1(914, "message-code undefined : ", pControl->getMessageCode());
@@ -687,7 +687,7 @@ const void*
JMessage::TSequenceProcessor::process_onBranch_limited_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) {
const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process;
JUT_ASSERT(942, rData.pTarget!=0);
JUT_ASSERT(942, rData.pTarget!=NULL);
JUT_ASSERT(943, uTargetIndex<rData.uTarget);
u16 u16Index = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u16> >::parse(rData.pTarget, uTargetIndex);
@@ -700,7 +700,7 @@ const void*
JMessage::TSequenceProcessor::process_onBranch_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) {
const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process;
JUT_ASSERT(957, rData.pTarget!=0);
JUT_ASSERT(957, rData.pTarget!=NULL);
JUT_ASSERT(958, uTargetIndex<rData.uTarget);
u32 uCode = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u32> >::parse(rData.pTarget, uTargetIndex);
src/JSystem/JMessage/resource.cpp
+10 -10
View File
@@ -66,7 +66,7 @@ u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, boo
int nMsgNumber = oParse_TBlock_messageID_.get_number();
const u32* pContent = oParse_TBlock_messageID_.getContent();
JUT_ASSERT(131, pContent!=0);
JUT_ASSERT(131, pContent!=NULL);
const u32* pFirst = pContent;
const u32* pLast = pFirst + nMsgNumber;
@@ -156,13 +156,13 @@ void JMessage::TResourceContainer::setEncoding(u8 e) {
void JMessage::TResourceContainer::setEncoding_(u8 e) {
encodingType_ = e;
pfnParseCharacter_ = JGadget::toValueFromIndex<JMessage::locale::parseCharacter_function>(e, sapfnParseCharacter_, 5, NULL);
JUT_ASSERT(299, pfnParseCharacter_!=0);
JUT_ASSERT(299, pfnParseCharacter_!=NULL);
}
/* 802A9130-802A9158 2A3A70 0028+00 0/0 2/2 0/0 .text
* __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer */
JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) {
JUT_ASSERT(324, pContainer!=0);
JUT_ASSERT(324, pContainer!=NULL);
pContainer_ = pContainer;
pResource_ = NULL;
}
@@ -174,17 +174,17 @@ JMessage::TParse::~TParse() {}
* parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */
// NONMATCHING regalloc, missing clrlwi
bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 param_2) {
JUT_ASSERT(343, ppData_inout!=0);
JUT_ASSERT(344, puBlock_out!=0);
JUT_ASSERT(343, ppData_inout!=NULL);
JUT_ASSERT(344, puBlock_out!=NULL);
const void* pData = *ppData_inout;
JUT_ASSERT(346, pData!=0);
JUT_ASSERT(346, pData!=NULL);
data::TParse_THeader oHeader(pData);
*ppData_inout = oHeader.getContent();
*puBlock_out = oHeader.get_blockNumber();
JUT_ASSERT(350, pContainer_!=0);
JUT_ASSERT(350, pContainer_!=NULL);
if (memcmp(oHeader.get_signature(), &data::ga4cSignature, sizeof(data::ga4cSignature)) != 0) {
JGADGET_WARNMSG(355, "unknown signature");
@@ -230,11 +230,11 @@ bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_
/* 802A92F4-802A9490 2A3C34 019C+00 1/0 0/0 0/0 .text
* parseBlock_next__Q28JMessage6TParseFPPCvPUlUl */
bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_out, u32 param_2) {
JUT_ASSERT(401, ppData_inout!=0);
JUT_ASSERT(402, puData_out!=0);
JUT_ASSERT(401, ppData_inout!=NULL);
JUT_ASSERT(402, puData_out!=NULL);
const void* pData = *ppData_inout;
JUT_ASSERT(404, pData!=0);
JUT_ASSERT(404, pData!=NULL);
data::TParse_TBlock oBlock(pData);
src/JSystem/JParticle/JPAEmitterManager.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(JGeometry::TVec3<f32> c
JPAParticleCallBack* ptclCB) {
JUT_ASSERT(88, group_id < gidMax);
JUT_ASSERT(89, res_mgr_id < ridMax);
JUT_ASSERT(90, pResMgrAry[res_mgr_id] != 0);
JUT_ASSERT(90, pResMgrAry[res_mgr_id] != NULL);
JPAResource* pRes = pResMgrAry[res_mgr_id]->getResource(resID);
if (pRes == NULL) {
@@ -160,7 +160,7 @@ void JPAEmitterManager::forceDeleteEmitter(JPABaseEmitter* emtr) {
/* 8027E344-8027E354 278C84 0010+00 0/0 2/2 0/0 .text
* entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc */
void JPAEmitterManager::entryResourceManager(JPAResourceManager* resMgr, u8 resMgrID) {
JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == 0,
JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == NULL,
"res_id %d res_id_max %d array[%d] = %x", resMgrID, ridMax, resMgrID,
pResMgrAry[resMgrID]);
pResMgrAry[resMgrID] = resMgr;
src/JSystem/JStudio/JStudio/ctb.cpp
+7 -7
View File
@@ -111,10 +111,10 @@ JStudio::ctb::TParse::~TParse() {}
/* 802813DC-80281470 27BD1C 0094+00 1/0 0/0 0/0 .text
* parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl */
bool JStudio::ctb::TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 param_3) {
JUT_ASSERT(221, ppData_inout!=0);
JUT_ASSERT(222, puBlock_out!=0);
JUT_ASSERT(221, ppData_inout!=NULL);
JUT_ASSERT(222, puBlock_out!=NULL);
void const* pData = *ppData_inout;
JUT_ASSERT(224, pData!=0);
JUT_ASSERT(224, pData!=NULL);
data::TParse_THeader aTStack_478(pData);
*ppData_inout = aTStack_478.getContent();
*puBlock_out = aTStack_478.get_blockNumber();
@@ -134,15 +134,15 @@ bool JStudio::ctb::TParse::parseHeader_next(void const** ppData_inout, u32* puBl
/* 80281470-80281554 27BDB0 00E4+00 1/0 0/0 0/0 .text
* parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl */
bool JStudio::ctb::TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 param_3) {
JUT_ASSERT(260, ppData_inout!=0);
JUT_ASSERT(261, puData_out!=0);
JUT_ASSERT(260, ppData_inout!=NULL);
JUT_ASSERT(261, puData_out!=NULL);
void const* pData = *ppData_inout;
JUT_ASSERT(263, pData!=0);
JUT_ASSERT(263, pData!=NULL);
data::TParse_TBlock aTStack_260(pData);
*ppData_inout = aTStack_260.getNext();
*puData_out = aTStack_260.get_size();
JStudio::ctb::TControl* pControl = getControl();
JUT_ASSERT(269, pControl!=0);
JUT_ASSERT(269, pControl!=NULL);
if ((param_3 & 0x10) != 0) {
if (pControl->getObject(aTStack_260.get_ID(), aTStack_260.get_IDSize()) != NULL) {
return true;
src/JSystem/JStudio/JStudio/functionvalue.cpp
+7 -7
View File
@@ -301,7 +301,7 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer<TFunctionValue*> c
}
TFunctionValue** local_148 = (TFunctionValue**)param_1.begin();
TFunctionValue* pFront = *local_148;
JUT_ASSERT(599, pFront!=0);
JUT_ASSERT(599, pFront!=NULL);
f64 dVar4 = pFront->getValue(param_3);
s32 index = floor(dVar4);
u32 uVar2 = param_2.get_unsignedInteger();
@@ -397,7 +397,7 @@ f64 TFunctionValue_composite::composite_subtract(TVector_pointer<TFunctionValue*
TContainerEnumerator_const_TVector<TFunctionValue*> aTStack_18(param_1);
TFunctionValue* const* local_148 = *aTStack_18;
TFunctionValue* pFront = *local_148;
JUT_ASSERT(688, pFront!=0);
JUT_ASSERT(688, pFront!=NULL);
f64 dVar4 = pFront->getValue(param_3);
while (aTStack_18) {
TFunctionValue* const* ppiVar3 = *aTStack_18;
@@ -436,7 +436,7 @@ f64 TFunctionValue_composite::composite_divide(TVector_pointer<TFunctionValue*>
TContainerEnumerator_const_TVector<TFunctionValue*> aTStack_18(param_1);
TFunctionValue* const* local_148 = *aTStack_18;
TFunctionValue* pFront = *local_148;
JUT_ASSERT(724, pFront!=0);
JUT_ASSERT(724, pFront!=NULL);
f64 dVar4 = pFront->getValue(param_3);
while (aTStack_18) {
TFunctionValue* const* ppiVar3 = *aTStack_18;
@@ -624,7 +624,7 @@ f64 TFunctionValue_list::getValue(f64 param_1) {
}
local_178._8 = floor(local_178._0);
local_178._10 = local_178._8;
JUT_ASSERT(1063, pfnUpdate_!=0);
JUT_ASSERT(1063, pfnUpdate_!=NULL);
return pfnUpdate_(*this, local_178);
}
@@ -751,7 +751,7 @@ void TFunctionValue_list_parameter::prepare() {
* getValue__Q27JStudio29TFunctionValue_list_parameterFd */
f64 TFunctionValue_list_parameter::getValue(f64 param_0) {
param_0 = range_getParameter(param_0, data_getValue_front(), data_getValue_back());
JUT_ASSERT(1395, pfData_!=0)
JUT_ASSERT(1395, pfData_!=NULL)
dat3 = JGadget::findUpperBound_binary_current(dat1, dat2, dat3, param_0);
if (dat3 == dat1) {
@@ -764,7 +764,7 @@ f64 TFunctionValue_list_parameter::getValue(f64 param_0) {
const f32* pf = dat3.get();
JUT_ASSERT(1411, (pfData_<=pf-suData_size)&&(pf<pfData_+suData_size*uData_));
JUT_ASSERT(1412, pfnUpdate_!=0);
JUT_ASSERT(1412, pfnUpdate_!=NULL);
return pfnUpdate_(*this, param_0);
}
@@ -915,7 +915,7 @@ void TFunctionValue_hermite::prepare() {
* getValue__Q27JStudio22TFunctionValue_hermiteFd */
f64 TFunctionValue_hermite::getValue(f64 param_0) {
param_0 = range_getParameter(param_0, data_getValue_front(), data_getValue_back());
JUT_ASSERT(1716, pfData_!=0)
JUT_ASSERT(1716, pfData_!=NULL)
dat3 = JGadget::findUpperBound_binary_current(dat1, dat2, dat3, param_0);
src/JSystem/JStudio/JStudio/jstudio-control.cpp
+5 -5
View File
@@ -133,7 +133,7 @@ bool JStudio::TParse::parseHeader(JStudio::stb::data::TParse_THeader const& para
return false;
}
JStudio::TControl* pControl = getControl();
JUT_ASSERT(322, pControl!=0);
JUT_ASSERT(322, pControl!=NULL);
if ((param_1 & 0x100) == 0) {
Vec local_468 = {0.0f, 0.0f, 0.0f};
pControl->transform_setOrigin_TxyzRy(local_468, 0.0f);
@@ -161,9 +161,9 @@ bool JStudio::TParse::parseBlock_block(JStudio::stb::data::TParse_TBlock const&
bool JStudio::TParse::parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock const& param_0,
u32 param_1) {
TControl* pControl = getControl();
JUT_ASSERT(361, pControl!=0);
JUT_ASSERT(361, pControl!=NULL);
const void* pContent = param_0.getContent();
JUT_ASSERT(363, pContent!=0);
JUT_ASSERT(363, pContent!=NULL);
u32 uVar4 = param_1 & 0xf;
if ((param_1 & 0x10) != 0) {
uVar4 |= 0x10;
@@ -186,9 +186,9 @@ bool JStudio::TParse::parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock co
bool JStudio::TParse::parseBlock_block_ctb_(JStudio::stb::data::TParse_TBlock const& param_0,
u32 param_1) {
TControl* pControl = getControl();
JUT_ASSERT(386, pControl!=0);
JUT_ASSERT(386, pControl!=NULL);
const void* pContent = param_0.getContent();
JUT_ASSERT(388, pContent!=0);
JUT_ASSERT(388, pContent!=NULL);
u32 uVar4 = param_1 & 0xf;
if ((param_1 & 0x10) != 0) {
uVar4 |= 0x10;
src/JSystem/JStudio/JStudio/jstudio-object.cpp
+7 -7
View File
@@ -97,7 +97,7 @@ JStudio::TVariableValue::TOutput::~TOutput() {}
void JStudio::TVariableValue::update(f64 param_0, JStudio::TAdaptor* param_1) {
if (field_0x8) {
field_0x8(this, param_0);
JUT_ASSERT(200, pOutput_!=0);
JUT_ASSERT(200, pOutput_!=NULL);
(*pOutput_)(mValue, param_1);
}
}
@@ -175,7 +175,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u3
JStudio::data::TEOperationData param_3,
void const* param_4, u32 param_5) {
setVarFunc func;
JUT_ASSERT(304, pControl!=0);
JUT_ASSERT(304, pControl!=NULL);
switch (param_3) {
case JStudio::data::UNK_0x1:
func = &adaptor_setVariableValue_VOID_;
@@ -207,7 +207,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl,
u32 const* param_2, u32 param_3,
JStudio::data::TEOperationData param_4,
void const* param_5, u32 param_6) {
JUT_ASSERT(343, pControl!=0);
JUT_ASSERT(343, pControl!=NULL);
setVarFunc pcVar6;
u32 iVar7;
switch(param_4) {
@@ -254,7 +254,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue_immediate(
/* 80286204-80286274 280B44 0070+00 0/0 4/4 0/0 .text
* adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec */
void JStudio::TAdaptor::adaptor_setVariableValue_Vec(u32 const* puIndex, Vec const& param_2) {
JUT_ASSERT(400, puIndex!=0);
JUT_ASSERT(400, puIndex!=NULL);
adaptor_referVariableValue(puIndex[0])->setValue_immediate(param_2.x);
adaptor_referVariableValue(puIndex[1])->setValue_immediate(param_2.y);
adaptor_referVariableValue(puIndex[2])->setValue_immediate(param_2.z);
@@ -272,7 +272,7 @@ void JStudio::TAdaptor::adaptor_getVariableValue_Vec(Vec* param_1, u32 const* pa
* adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor */
void JStudio::TAdaptor::adaptor_setVariableValue_GXColor(u32 const* puIndex,
GXColor const& param_2) {
JUT_ASSERT(431, puIndex!=0);
JUT_ASSERT(431, puIndex!=NULL);
adaptor_referVariableValue(puIndex[0])->setValue_immediate(param_2.r);
adaptor_referVariableValue(puIndex[1])->setValue_immediate(param_2.g);
adaptor_referVariableValue(puIndex[2])->setValue_immediate(param_2.b);
@@ -292,7 +292,7 @@ void JStudio::TAdaptor::adaptor_getVariableValue_GXColor(GXColor* param_1,
/* 802864D8-8028656C 280E18 0094+00 1/1 0/0 0/0 .text
* adaptor_updateVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUl */
void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TControl* pControl, u32 param_2) {
JUT_ASSERT(479, pControl!=0);
JUT_ASSERT(479, pControl!=NULL);
f64 dVar3 = pControl->getSecondPerFrame();
JGadget::TEnumerator<JStudio::TVariableValue*> enumerator(pValue_, pValue_ + uvv_);
while (enumerator) {
@@ -1057,7 +1057,7 @@ void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u3
default:
return;
}
JUT_ASSERT(1161, pmfn_!=0);
JUT_ASSERT(1161, pmfn_!=NULL);
(((TAdaptor_message*)adaptor)->*pmfn_)(operation, param_2, param_3);
}
src/JSystem/JStudio/JStudio/stb-data-parse.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ void TParse_TParagraph::getData(TData* pData) const {
}
void TParse_TParagraph_data::getData(TParse_TParagraph_data::TData* pData) const {
JUT_ASSERT(104, pData!=0);
JUT_ASSERT(104, pData!=NULL);
pData->entrySize = 0;
pData->entryCount = 0;
pData->content = NULL;
src/JSystem/JStudio/JStudio_JAudio2/control.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ JStudio_JAudio2::TCreateObject::~TCreateObject() {}
*/
bool JStudio_JAudio2::TCreateObject::create(
JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) {
JUT_ASSERT(40, ppObject!=0);
JUT_ASSERT(40, ppObject!=NULL);
CreateFunc func;
switch (param_2.get_type()) {
case 'JSND':
src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
+17 -17
View File
@@ -56,7 +56,7 @@ JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject*
field_0x13c = NULL;
field_0x140 = 0xffffffff;
field_0x144 = 0;
JUT_ASSERT(112, pCreateObject_!=0);
JUT_ASSERT(112, pCreateObject_!=NULL);
}
/* 8028D8F4-8028D9A4 288234 00B0+00 1/0 0/0 0/0 .text __dt__Q215JStudio_JAudio214TAdaptor_soundFv
@@ -120,9 +120,9 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_end() {
* adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl */
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(194, pObject!=0);
JUT_ASSERT(194, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(196, pControl!=0);
JUT_ASSERT(196, pControl!=NULL);
JStudio::TControl::TTransform_position VStack_148;
JStudio::TControl::TTransform_position VStack_154;
JStudio::TControl::TTransform_position* pVVar2;
@@ -165,7 +165,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperatio
void const* pContent, u32 uSize) {
switch(param_1) {
case JStudio::data::UNK_0x19:
JUT_ASSERT(283, pContent!=0);
JUT_ASSERT(283, pContent!=NULL);
JUT_ASSERT(284, uSize==4);
field_0x124 = *(u32*)pContent;
prepareSound_();
@@ -192,7 +192,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(323, pContent!=0);
JUT_ASSERT(323, pContent!=NULL);
JUT_ASSERT(324, uSize==4);
beginSound_fadeIn_(*(f32*)pContent);
break;
@@ -218,7 +218,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(364, pContent!=0);
JUT_ASSERT(364, pContent!=NULL);
JUT_ASSERT(365, uSize==4);
endSound_fadeOut_(*(f32*)pContent);
break;
@@ -231,14 +231,14 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(387, pContent!=0);
JUT_ASSERT(387, pContent!=NULL);
JUT_ASSERT(388, uSize!=0);
field_0x13c = NULL;
JStage::TSystem* pJSGSystem = (JStage::TSystem*)pCreateObject_->get_pJSGSystem_();
JUT_ASSERT(396, pJSGSystem != 0);
JUT_ASSERT(396, pJSGSystem != NULL);
JStage::TObject* pJSGObject;
if (!pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED)) {
JUT_ASSERT(405, pJSGObject != 0);
JUT_ASSERT(405, pJSGObject != NULL);
field_0x13c = pJSGObject;
}
break;
@@ -253,7 +253,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp
switch (param_1) {
case JStudio::data::UNK_0x18:
if (field_0x13c != NULL) {
JUT_ASSERT(431, pContent!=0);
JUT_ASSERT(431, pContent!=NULL);
JUT_ASSERT(432, uSize==0);
field_0x140 = field_0x13c->JSGFindNodeID((char*)pContent);
if (field_0x140 == -1) {
@@ -263,7 +263,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(447, uSize==4);
JUT_ASSERT(448, pContent!=0);
JUT_ASSERT(448, pContent!=NULL);
field_0x140 = *(u32*)pContent;
break;
}
@@ -276,7 +276,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(468, uSize == 4);
JUT_ASSERT(469, pContent != 0);
JUT_ASSERT(469, pContent != NULL);
field_0x144 = *(u32*)pContent ? 1 : 0;
}
}
@@ -287,7 +287,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperati
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(490, uSize == 4);
JUT_ASSERT(491, pContent != 0);
JUT_ASSERT(491, pContent != NULL);
field_0x11e = *(u32*)pContent ? 1 : 0;
}
}
@@ -299,7 +299,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOpe
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(512, uSize == 4);
JUT_ASSERT(513, pContent != 0);
JUT_ASSERT(513, pContent != NULL);
field_0x11d = *(u32*)pContent ? 1 : 0;
}
}
@@ -309,7 +309,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOpe
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(534, pContent != 0);
JUT_ASSERT(534, pContent != NULL);
JUT_ASSERT(535, uSize == 4);
u32 val = *(u32*)pContent;
field_0x12c = NULL;
@@ -326,7 +326,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(512, uSize == 4);
JUT_ASSERT(513, pContent != 0);
JUT_ASSERT(513, pContent != NULL);
field_0x11f = *(u32*)pContent ? 1 : 0;
}
}
@@ -335,7 +335,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END(
* __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor */
void JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::operator()(f32 param_1,
JStudio::TAdaptor* param_2) const {
JUT_ASSERT(596, param_2 != 0);
JUT_ASSERT(596, param_2 != NULL);
if (((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_) {
JAISound* sound = ((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_.sound_;
field_0x08(sound, param_1);
src/JSystem/JStudio/JStudio_JParticle/control.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ JStudio_JParticle::TCreateObject::~TCreateObject() {}
bool
JStudio_JParticle::TCreateObject::create(JStudio::TObject** ppObject,
JStudio::stb::data::TParse_TBlock_object const& param_2) {
JUT_ASSERT(40, ppObject!=0);
JUT_ASSERT(40, ppObject!=NULL);
CreateFunc func;
switch (param_2.get_type()) {
case 'JPTC':
src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
+18 -18
View File
@@ -27,7 +27,7 @@ JStudio_JParticle::TAdaptor_particle::TAdaptor_particle(
field_0x1d0 = NULL;
field_0x1d4 = -1;
field_0x1d8 = 0;
JUT_ASSERT(90, pCreateObject_!=0);
JUT_ASSERT(90, pCreateObject_!=NULL);
}
/* 8028E760-8028E850 2890A0 00F0+00 1/0 0/0 0/0 .text
@@ -80,12 +80,12 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_end() {
* adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl */
void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(179, pObject != 0);
JUT_ASSERT(179, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(181, pControl != 0);
JUT_ASSERT(181, pControl != NULL);
if (u32FadeTime_end != 0 && field_0x1c4 < u32FadeTime_end) {
JUT_ASSERT(187, state_isFade_());
JUT_ASSERT(188, pJPAEmitter_ != 0);
JUT_ASSERT(188, pJPAEmitter_ != NULL);
field_0x1c4 += param_1;
if (field_0x1c4 >= u32FadeTime_end) {
switch (field_0x1b8) {
@@ -116,7 +116,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x19) {
JUT_ASSERT(232, uSize==4);
JUT_ASSERT(233, pContent!=0);
JUT_ASSERT(233, pContent!=NULL);
field_0x1bc = *(u32*)pContent;
}
}
@@ -141,7 +141,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(272, pContent!=0);
JUT_ASSERT(272, pContent!=NULL);
JUT_ASSERT(273, uSize==4);
beginParticle_fadeIn_(*(f32*)pContent);
break;
@@ -165,7 +165,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(336, pContent!=0);
JUT_ASSERT(336, pContent!=NULL);
JUT_ASSERT(337, uSize==4);
endParticle_fadeOut_(*(f32*)pContent);
break;
@@ -179,14 +179,14 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(313, pContent!=0);
JUT_ASSERT(313, pContent!=NULL);
JUT_ASSERT(314, uSize==4);
field_0x1d0 = NULL;
const JStage::TSystem* pJSGSystem = pCreateObject_->get_pJSGSystem_();
JUT_ASSERT(345, pJSGSystem!=0);
JUT_ASSERT(345, pJSGSystem!=NULL);
JStage::TObject* pJSGObject;
if (pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED) == 0) {
JUT_ASSERT(354, pJSGObject!=0);
JUT_ASSERT(354, pJSGObject!=NULL);
field_0x1d0 = pJSGObject;
}
break;
@@ -201,7 +201,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE(
switch (param_1) {
case JStudio::data::UNK_0x18:
if (field_0x1d0 != NULL) {
JUT_ASSERT(380, pContent!=0);
JUT_ASSERT(380, pContent!=NULL);
JUT_ASSERT(381, uSize==4);
field_0x1d4 = field_0x1d0->JSGFindNodeID((const char*)pContent);
if (field_0x1d4 == -1) {
@@ -211,7 +211,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE(
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(397, uSize==4);
JUT_ASSERT(396, pContent!=0);
JUT_ASSERT(396, pContent!=NULL);
field_0x1d4 = *(u32*)pContent;
break;
}
@@ -224,7 +224,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::dat
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(417, uSize==4);
JUT_ASSERT(418, pContent!=0);
JUT_ASSERT(418, pContent!=NULL);
field_0x1d8 = *(u32*)pContent ? 1 : 0;
}
}
@@ -236,7 +236,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::d
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(439, uSize==4);
JUT_ASSERT(439, pContent!=0);
JUT_ASSERT(439, pContent!=NULL);
field_0x1cc = *(u32*)pContent;
}
}
@@ -248,7 +248,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOp
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(460, uSize==4);
JUT_ASSERT(461, pContent!=0);
JUT_ASSERT(461, pContent!=NULL);
field_0x1b5 = *(u32*)pContent ? 1 : 0;
}
}
@@ -260,7 +260,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::d
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(460, uSize==4);
JUT_ASSERT(461, pContent!=0);
JUT_ASSERT(461, pContent!=NULL);
field_0x1b6 = *(u32*)pContent ? 1 : 0;
}
}
@@ -279,9 +279,9 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmit
return;
}
const JStudio::TObject* pObject = pThis_->adaptor_getObject();
JUT_ASSERT(534, pObject!=0);
JUT_ASSERT(534, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(536, pControl!=0);
JUT_ASSERT(536, pControl!=NULL);
TJPAEmitter_stopDrawParticle_ aTStack_21c(pJPAEmitter);
JStudio::TControl::TTransform_translation_rotation_scaling VStack_19c;
JStudio::TControl::TTransform_translation_rotation_scaling aTStack_1c0;
src/JSystem/JStudio/JStudio_JStage/control.cpp
+4 -4
View File
@@ -20,7 +20,7 @@ JStudio_JStage::TCreateObject::~TCreateObject() {}
*/
bool JStudio_JStage::TCreateObject::create(
JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& rParse) {
JUT_ASSERT(83, ppObject!=0);
JUT_ASSERT(83, ppObject!=NULL);
*ppObject = NULL;
ObjCreateFuncT pfnCreateObject;
JStage::TEObject eObject;
@@ -48,14 +48,14 @@ bool JStudio_JStage::TCreateObject::create(
default:
return NULL;
}
JUT_ASSERT(99, pfnCreateObject!=0);
JUT_ASSERT(99, pfnCreateObject!=NULL);
JUT_ASSERT(100, eObject!=JStage::OBJECT_UNDEFINED);
JUT_ASSERT(109, pJSGSystem_!=0);
JUT_ASSERT(109, pJSGSystem_!=NULL);
JStage::TObject* pJSGObject;
int pJVar2 = pJSGSystem_->JSGFindObject(&pJSGObject, (char const*)rParse.get_ID(), eObject);
switch(pJVar2) {
case 0:
JUT_ASSERT(115, pJSGObject!=0);
JUT_ASSERT(115, pJSGObject!=NULL);
*ppObject = pfnCreateObject(rParse, pJSGObject, pJSGSystem_);
return true;
case 2:
src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
+15 -15
View File
@@ -52,9 +52,9 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() {
#ifdef DEBUG
{ // This block is needed to match the stack in debug
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(72, pObject!=0);
JUT_ASSERT(72, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(74, pControl!=0);
JUT_ASSERT(74, pControl!=NULL);
getJSG_SRT_(pControl);
}
#else
@@ -85,9 +85,9 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_end() {
* adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl */
void JStudio_JStage::TAdaptor_actor::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(104, pObject != 0);
JUT_ASSERT(104, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(106, pControl != 0);
JUT_ASSERT(106, pControl != NULL);
setJSG_SRT_(pControl);
pJSGObject_->JSGUpdate();
}
@@ -123,7 +123,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TE
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(153, uSize==4);
JUT_ASSERT(154, pContent!=0);
JUT_ASSERT(154, pContent!=NULL);
field_0x130 = *(u32*)pContent;
break;
}
@@ -145,7 +145,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE(
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(182, uSize==4);
JUT_ASSERT(183, pContent!=0);
JUT_ASSERT(183, pContent!=NULL);
field_0x134 = *(u32*)pContent;
break;
}
@@ -157,7 +157,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT(
JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
switch (operation) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(203, pContent!=0);
JUT_ASSERT(203, pContent!=NULL);
JUT_ASSERT(204, uSize!=0);
field_0x13c = adaptor_object_findJSGObject_((const char*)pContent);
break;
@@ -171,13 +171,13 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE(
JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
switch (operation) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(226, pContent!=0);
JUT_ASSERT(226, pContent!=NULL);
JUT_ASSERT(227, uSize!=0);
field_0x140 = adaptor_object_findJSGObjectNode_(field_0x13c, (const char*)pContent);
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(237, uSize==4);
JUT_ASSERT(238, pContent!=0);
JUT_ASSERT(238, pContent!=NULL);
field_0x140 = *(u32*)pContent;
break;
}
@@ -191,7 +191,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE(
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(257, uSize==4);
JUT_ASSERT(258, pContent!=0);
JUT_ASSERT(258, pContent!=NULL);
bool v0 = (*(u32*)pContent != 0);
if (field_0x144 != v0) {
field_0x144 = v0;
@@ -221,7 +221,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION(
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(303, uSize==4);
JUT_ASSERT(304, pContent!=0);
JUT_ASSERT(304, pContent!=NULL);
field_0x138 = *(u32*)pContent;
break;
}
@@ -233,7 +233,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION(
JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
switch (operation) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(324, pContent!=0);
JUT_ASSERT(324, pContent!=NULL);
JUT_ASSERT(325, uSize!=0);
field_0x148 = adaptor_object_findJSGObject_((const char*)pContent);
break;
@@ -247,13 +247,13 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE(
JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
switch (operation) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(347, pContent!=0);
JUT_ASSERT(347, pContent!=NULL);
JUT_ASSERT(348, uSize!=0);
field_0x14c = adaptor_object_findJSGObjectNode_(field_0x13c, (const char*)pContent);
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(358, uSize==4);
JUT_ASSERT(359, pContent!=0);
JUT_ASSERT(359, pContent!=NULL);
field_0x14c = *(u32*)pContent;
break;
}
@@ -267,7 +267,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE(
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(378, uSize==4);
JUT_ASSERT(379, pContent!=0);
JUT_ASSERT(379, pContent!=NULL);
pJSGObject_->JSGSetRelation(*(u32*)pContent, field_0x148, field_0x14c);
break;
}
src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
+13 -13
View File
@@ -56,9 +56,9 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_begin() {
adaptor_object_begin_();
JStage::TCamera* pCamera = get_pJSG_();
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(70, pObject != 0);
JUT_ASSERT(70, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(72, pControl != 0);
JUT_ASSERT(72, pControl != NULL);
getJSG_position_(pControl);
getJSG_targetPosition_(pControl);
TVVOutput* pOutput = saoVVOutput_;
@@ -78,9 +78,9 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_end() {
* adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl */
void JStudio_JStage::TAdaptor_camera::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(98, pObject != 0);
JUT_ASSERT(98, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(100, pControl != 0);
JUT_ASSERT(100, pControl != NULL);
setJSG_position_(pControl);
setJSG_targetPosition_(pControl);
pJSGObject_->JSGUpdate();
@@ -99,7 +99,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperati
void const* pContent, u32 uSize) {
switch(param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(132, pContent!=0);
JUT_ASSERT(132, pContent!=NULL);
JUT_ASSERT(133, uSize!=0);
field_0x10c = adaptor_object_findJSGObject_((char*)pContent);
break;
@@ -113,13 +113,13 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOp
void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(155, pContent!=0);
JUT_ASSERT(155, pContent!=NULL);
JUT_ASSERT(156, uSize!=0);
field_0x110 = adaptor_object_findJSGObjectNode_(field_0x10c, (char*)pContent);
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(166, uSize==4);
JUT_ASSERT(167, pContent!=0);
JUT_ASSERT(167, pContent!=NULL);
field_0x110 = *(int*)pContent;
break;
}
@@ -134,7 +134,7 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOpera
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(185, uSize==4);
JUT_ASSERT(186, pContent!=0);
JUT_ASSERT(186, pContent!=NULL);
field_0x114 = *(u32*)pContent ? 1 : 0;
switch(field_0x108) {
case 1:
@@ -162,7 +162,7 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOpe
switch(param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(226, uSize==4);
JUT_ASSERT(227, pContent!=0);
JUT_ASSERT(227, pContent!=NULL);
field_0x108 = *(int*)pContent;
break;
}
@@ -175,7 +175,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch(param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(247, pContent!=0);
JUT_ASSERT(247, pContent!=NULL);
JUT_ASSERT(248, uSize!=0);
field_0x118 = adaptor_object_findJSGObject_((char*)pContent);
break;
@@ -189,13 +189,13 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(270, pContent!=0);
JUT_ASSERT(270, pContent!=NULL);
JUT_ASSERT(271, uSize!=0);
field_0x11c = adaptor_object_findJSGObjectNode_(field_0x118, (char*)pContent);
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(282, uSize==4);
JUT_ASSERT(283, pContent!=0);
JUT_ASSERT(283, pContent!=NULL);
field_0x11c = *(int*)pContent;
break;
}
@@ -209,7 +209,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE(
switch(param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(301, uSize==4);
JUT_ASSERT(302, pContent!=0);
JUT_ASSERT(302, pContent!=NULL);
field_0x120 = *(int*)pContent ? 1 : 0;
break;
}
src/JSystem/JStudio/JStudio_JStage/object-light.cpp
+5 -5
View File
@@ -61,9 +61,9 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
adaptor_object_begin_();
JStage::TLight* pLightObj = get_pJSG_();
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(60, pObject != 0);
JUT_ASSERT(60, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(62, pControl != 0);
JUT_ASSERT(62, pControl != NULL);
GXColor lightColor = pLightObj->JSGGetColor();
adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, lightColor);
JStudio::TControl::TTransform_position_direction lightObjTransform;
@@ -98,9 +98,9 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_end() {
void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
JStage::TLight* lightObj = get_pJSG_();
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(118, pObject!=0);
JUT_ASSERT(118, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(120, pControl!=0);
JUT_ASSERT(120, pControl!=NULL);
GXColor lightColor;
adaptor_getVariableValue_GXColor(&lightColor, sauVariableValue_4_COLOR_RGBA);
lightObj->JSGSetColor(lightColor);
@@ -145,7 +145,7 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_FACULTY(JStudio::data::TEOperati
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(198, uSize==4);
JUT_ASSERT(199, pContent!=0);
JUT_ASSERT(199, pContent!=NULL);
JStage::TELight lightType;
switch (*(u32*)pContent) {
case 0x301:
src/JSystem/JStudio/JStudio_JStage/object.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ JStage::TObject*
JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObject_(char const* param_1) {
JStage::TObject* pJSGObject;
if (pJSGSystem_->JSGFindObject(&pJSGObject, param_1, JStage::OBJECT_UNDEFINED) == 0) {
JUT_ASSERT(122, pJSGObject != 0);
JUT_ASSERT(122, pJSGObject != NULL);
} else {
return NULL;
}
@@ -133,7 +133,7 @@ JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperat
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(157, uSize==4);
JUT_ASSERT(158, pContent!=0);
JUT_ASSERT(158, pContent!=NULL);
if (*(u32*)pContent != 0) {
pJSGObject_->JSGFEnableFlag(2);
} else {
src/JSystem/JUtility/JUTConsole.cpp
+6 -6
View File
@@ -17,7 +17,7 @@ JUTConsoleManager* JUTConsoleManager::sManager;
*/
JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRHeap* pHeap) {
JUTConsoleManager* pManager = JUTConsoleManager::getManager();
JUT_ASSERT(33, pManager != 0);
JUT_ASSERT(33, pManager != NULL);
u8* buffer = (u8*)JKRAllocFromHeap(pHeap, getObjectSizeFromBufferSize(param_0, maxLines), 0);
@@ -32,7 +32,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRH
/* 802E73E4-802E746C 2E1D24 0088+00 0/0 1/1 0/0 .text create__10JUTConsoleFUiPvUl */
JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSize) {
JUTConsoleManager* pManager = JUTConsoleManager::getManager();
JUT_ASSERT(59, pManager != 0);
JUT_ASSERT(59, pManager != NULL);
JUT_ASSERT(62, ( (u32)buffer & 0x3 ) == 0);
u32 maxLines = getLineFromObjectSize(bufferSize, param_0);
@@ -262,7 +262,7 @@ void JUTConsole::print(char const* str) {
/* 802E7F30-802E7F7C 2E2870 004C+00 1/1 1/1 0/0 .text JUTConsole_print_f_va_ */
extern "C" void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_list args) {
JUT_ASSERT(563, console!=0);
JUT_ASSERT(563, console!=NULL);
char buf[1024];
vsnprintf(buf, sizeof(buf), fmt, args);
@@ -361,7 +361,7 @@ JUTConsoleManager::JUTConsoleManager() {
/* 802E81F4-802E8240 2E2B34 004C+00 0/0 1/1 0/0 .text createManager__17JUTConsoleManagerFP7JKRHeap
*/
JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
JUT_ASSERT(0x39c, sManager == 0);
JUT_ASSERT(0x39c, sManager == NULL);
if (pHeap == NULL) {
pHeap = JKRGetCurrentHeap();
@@ -375,7 +375,7 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
/* 802E8240-802E82B0 2E2B80 0070+00 3/3 0/0 0/0 .text
* appendConsole__17JUTConsoleManagerFP10JUTConsole */
void JUTConsoleManager::appendConsole(JUTConsole* console) {
JUT_ASSERT(961, sManager != 0 && console != 0);
JUT_ASSERT(961, sManager != NULL && console != NULL);
JUT_ASSERT(964, soLink_.Find( console ) == soLink_.end());
soLink_.Push_back(console);
@@ -388,7 +388,7 @@ void JUTConsoleManager::appendConsole(JUTConsole* console) {
/* 802E82B0-802E8384 2E2BF0 00D4+00 2/2 0/0 0/0 .text
* removeConsole__17JUTConsoleManagerFP10JUTConsole */
void JUTConsoleManager::removeConsole(JUTConsole* console) {
JUT_ASSERT(982, sManager != 0 && console != 0);
JUT_ASSERT(982, sManager != NULL && console != NULL);
JUT_ASSERT(985, soLink_.Find( console ) != soLink_.end());
if (mActiveConsole == console) {
src/JSystem/JUtility/JUTResFont.cpp
-2
View File
@@ -12,8 +12,6 @@
#include "JSystem/JUtility/JUTConsole.h"
#include "dolphin/gx.h"
#define suAboutEncoding_ 3
/* 802DEF48-802DEF94 2D9888 004C+00 0/0 1/1 0/0 .text __ct__10JUTResFontFv */
JUTResFont::JUTResFont() {
initialize_state();
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h
+17 -1
View File
@@ -12,9 +12,14 @@
#define FP_NAN FP_QNAN
#define fpclassify(x) ((sizeof(x) == sizeof(float)) ? __fpclassifyf(x) : __fpclassifyd(x))
#define fpclassify(x) \
((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : \
(sizeof(x) == sizeof(double)) ? __fpclassifyd((double)(x)) : \
__fpclassifyl((long double)(x)) )
#define signbit(x) ((sizeof(x) == sizeof(float)) ? __signbitf(x) : __signbitd(x))
#define isfinite(x) ((fpclassify(x) > 2))
#define isnan(x) (fpclassify(x) == FP_NAN)
#define isinf(x) (fpclassify(x) == FP_INFINITE)
#define __signbitf(x) ((int)(__HI(x) & 0x80000000))
@@ -26,6 +31,10 @@ extern unsigned long __float_huge[];
extern unsigned long __float_max[];
extern unsigned long __float_epsilon[];
#ifdef __cplusplus
extern "C" {
#endif
inline int __fpclassifyf(float __value) {
unsigned long integer = *(unsigned long*)&__value;
@@ -66,6 +75,13 @@ inline int __fpclassifyd(double __value) {
return FP_NORMAL;
}
// Stripped function.
int __fpclassifyl(long double __value);
#ifdef __cplusplus
}; // extern "C"
#endif
#define FLT_MANT_DIG 24
#define FLT_DIG 6
#define FLT_MIN_EXP (-125)
src/SSystem/SComponent/c_cc_d.cpp
+3 -4
View File
@@ -6,7 +6,6 @@
#include "SSystem/SComponent/c_cc_d.h"
#include "JSystem/JUtility/JUTAssert.h"
#define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !(((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : __fpclassifyd((double)(x)) ) == 1));
#define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
/* 80430CB4-80430CC0 05D9D4 000C+00 1/1 2/2 0/0 .bss m_virtual_center__14cCcD_ShapeAttr
@@ -224,9 +223,9 @@ void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) {
m_cc_move.y += y;
m_cc_move.z += z;
CHECK_FLOAT_CLASS(422, m_cc_move.x);
CHECK_FLOAT_CLASS(423, m_cc_move.y);
CHECK_FLOAT_CLASS(424, m_cc_move.z);
JUT_ASSERT(422, !isnan(m_cc_move.x));
JUT_ASSERT(423, !isnan(m_cc_move.y));
JUT_ASSERT(424, !isnan(m_cc_move.z));
CHECK_FLOAT_RANGE(426, m_cc_move.x);
CHECK_FLOAT_RANGE(427, m_cc_move.y);
src/SSystem/SComponent/c_cc_s.cpp
+7 -9
View File
@@ -6,9 +6,7 @@
#include "SSystem/SComponent/c_cc_s.h"
#include "JSystem/JUtility/JUTAssert.h"
#define CHECK_FLOAT_CLASS(line, x) \
JUT_ASSERT(line, !(((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : \
__fpclassifyd((double)(x))) == 1));
#define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !isnan(x));
#define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
/* 80264A6C-80264A94 25F3AC 0028+00 0/0 1/1 0/0 .text __ct__4cCcSFv */
@@ -165,7 +163,7 @@ void cCcS::ChkAtTg() {
continue;
cCcD_ShapeAttr* pat_sa = (*pat_obj)->GetShapeAttr();
JUT_ASSERT(0, pat_sa != 0);
JUT_ASSERT(0, pat_sa != NULL);
for (cCcD_Obj** ptg_obj = mpObjTg; ptg_obj < objTgEnd; ++ptg_obj) {
if (*ptg_obj == NULL || !(*ptg_obj)->ChkTgSet())
@@ -176,7 +174,7 @@ void cCcS::ChkAtTg() {
continue;
cCcD_ShapeAttr* ptg_sa = (*ptg_obj)->GetShapeAttr();
JUT_ASSERT(0, ptg_sa != 0);
JUT_ASSERT(0, ptg_sa != NULL);
static cXyz cross;
bool didCross = pat_sa->CrossAtTg(*ptg_sa, &cross);
@@ -225,7 +223,7 @@ void cCcS::ChkCo() {
continue;
cCcD_ShapeAttr* pco1_sa = (*pco1_obj)->GetShapeAttr();
JUT_ASSERT(0, pco1_sa != 0);
JUT_ASSERT(0, pco1_sa != NULL);
for (cCcD_Obj** pco2_obj = pco1_obj + 1; pco2_obj < objCoEnd; ++pco2_obj) {
if (*pco2_obj == NULL || !(*pco2_obj)->ChkCoSet())
@@ -236,7 +234,7 @@ void cCcS::ChkCo() {
continue;
cCcD_ShapeAttr* pco2_sa = (*pco2_obj)->GetShapeAttr();
JUT_ASSERT(0, pco2_sa != 0);
JUT_ASSERT(0, pco2_sa != NULL);
f32 cross_len;
if (pco1_sa->CrossCo(*pco2_sa, &cross_len)) {
@@ -456,7 +454,7 @@ void cCcS::CalcArea() {
for (cCcD_Obj** pset_obj = mpObj; pset_obj < mpObj + mObjCount; ++pset_obj) {
if (*pset_obj != NULL) {
cCcD_ShapeAttr* pset_sa = (*pset_obj)->GetShapeAttr();
JUT_ASSERT(0, pset_sa != 0);
JUT_ASSERT(0, pset_sa != NULL);
pset_sa->CalcAabBox();
aab.SetMinMax(pset_sa->GetWorkAab());
@@ -467,7 +465,7 @@ void cCcS::CalcArea() {
for (cCcD_Obj** pset_obj = mpObj; pset_obj < mpObj + mObjCount; ++pset_obj) {
if (*pset_obj != NULL) {
const cCcD_ShapeAttr* pset_sa = (*pset_obj)->GetShapeAttr();
JUT_ASSERT(0, pset_sa != 0);
JUT_ASSERT(0, pset_sa != NULL);
cCcD_DivideInfo* divideInfo = &(*pset_obj)->GetDivideInfo();
mDivideArea.CalcDivideInfo(divideInfo, pset_sa->GetWorkAab(),
src/SSystem/SComponent/c_m3d_g_aab.cpp
+2 -2
View File
@@ -40,8 +40,8 @@ bool cM3dGAab::TopPlaneYUnder(f32 y) const {
/* 8026ECF8-8026ED1C 0024+00 s=0 e=6 z=0 None .text ClearForMinMax__8cM3dGAabFv */
void cM3dGAab::ClearForMinMax() {
mMin.x = mMin.y = mMin.z = 1000000000.0f;
mMax.x = mMax.y = mMax.z = -1000000000.0f;
mMin.x = mMin.y = mMin.z = G_CM3D_F_INF;
mMax.x = mMax.y = mMax.z = -G_CM3D_F_INF;
}
/* 8026ED1C-8026ED60 0044+00 s=1 e=3 z=0 None .text SetMinMax__8cM3dGAabFRC4cXyz */
src/SSystem/SComponent/c_xyz.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ cXyz cXyz::normZC() const {
/* 80266EF4-80266F48 0054+00 s=0 e=13 z=17 None .text normalize__4cXyzFv */
cXyz cXyz::normalize() {
JUT_ASSERT(285, isNearZeroSquare() == 0);
JUT_ASSERT(285, isNearZeroSquare() == FALSE);
PSVECNormalize(this, this);
return *this;
}
src/Z2AudioLib/Z2SpeechMgr2.cpp
+1 -1
View File
@@ -486,7 +486,7 @@ void Z2SpeechMgr2::setString(u16 const* s, s16 i_textNum, u8 i_speaker, u16 i_mo
mText[i] = 0;
}
JUT_ASSERT(383, s != 0);
JUT_ASSERT(383, s != NULL);
if (i_textNum > 500) {
mTextNum = 500;
src/d/actor/d_a_L7demo_dr.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_L7demo_dr.h"
#include "d/actor/d_a_player.h"
@@ -326,7 +326,7 @@ static int daDr_Delete(daDr_c* i_this) {
/* 805AA084-805AA17C 000EC4 00F8+00 1/1 0/0 0/0 .text CreateHeap__6daDr_cFv */
int daDr_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
JUT_ASSERT(655, modelData != 0);
JUT_ASSERT(655, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x1E), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
src/d/actor/d_a_L7low_dr.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_L7low_dr.h"
#include "d/d_com_inf_game.h"
@@ -136,7 +136,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
/* 805AAC5C-805AAD58 0006DC 00FC+00 1/1 0/0 0/0 .text CreateHeap__11daL7lowDr_cFv */
int daL7lowDr_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L7lowDr", 10);
JUT_ASSERT(244, modelData != 0);
JUT_ASSERT(244, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 4), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
src/d/actor/d_a_L7op_demo_dr.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_L7op_demo_dr.h"
#include "d/actor/d_a_player.h"
@@ -775,7 +775,7 @@ static int daL7ODR_Delete(daL7ODR_c* i_this) {
/* 805AD90C-805ADA0C 0028EC 0100+00 1/1 0/0 0/0 .text CreateHeap__9daL7ODR_cFv */
int daL7ODR_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
JUT_ASSERT(1146, modelData != 0);
JUT_ASSERT(1146, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
field_0x890 = 0x2F;
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
src/d/actor/d_a_alink.cpp
+20 -20
View File
@@ -3,7 +3,7 @@
* Player (Link) Actor
*/
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_alink.h"
#include "JSystem/J2DGraph/J2DAnmLoader.h"
@@ -3698,11 +3698,11 @@ void daAlink_c::footBgCheck() {
mLinkGndChk.SetPos(&sp44);
f32 temp_f1 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (-1000000000.0f != temp_f1) {
if (-G_CM3D_F_INF != temp_f1) {
dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp98);
}
if (-1000000000.0f != temp_f1 && cBgW_CheckBGround(sp98.mNormal.y) && sp44.y - temp_f1 < l_autoUpHeight - l_autoDownHeight) {
if (-G_CM3D_F_INF != temp_f1 && cBgW_CheckBGround(sp98.mNormal.y) && sp44.y - temp_f1 < l_autoUpHeight - l_autoDownHeight) {
*sp24 = temp_f1;
var_r29->field_0x0 = 1;
sp20[i] = getGroundAngle(&mLinkGndChk, shape_angle.y);
@@ -3820,7 +3820,7 @@ void daAlink_c::handBgCheck() {
mLinkGndChk.SetPos(&sp28);
f32 temp_f1 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (-1000000000.0f != temp_f1 && (sp28.y - temp_f1 < l_autoUpHeight - l_autoDownHeight)) {
if (-G_CM3D_F_INF != temp_f1 && (sp28.y - temp_f1 < l_autoUpHeight - l_autoDownHeight)) {
*var_r25 = temp_f1;
if (dComIfG_Bgsp().GetGroundCode(mLinkGndChk) != 8) {
@@ -4362,7 +4362,7 @@ void daAlink_c::playerInit() {
m_mSwordBrk->searchUpdateMaterialID(modelData2);
modelData2->entryTevRegAnimator(m_mSwordBrk);
f32 tmp = -1000000000.0f;
f32 tmp = -G_CM3D_F_INF;
mWaterY = tmp;
field_0x33b8 = tmp;
field_0x33bc = tmp;
@@ -4737,7 +4737,7 @@ int daAlink_c::create() {
mLinkAcch.CrrPos(dComIfG_Bgsp());
void* var_r24 = NULL;
if (mLinkAcch.GetGroundH() == -1000000000.0f ||
if (mLinkAcch.GetGroundH() == -G_CM3D_F_INF ||
(startMode == 14 && !dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) ||
(startPoint == -4 &&
!(var_r24 = fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchPortal, &current.pos))) ||
@@ -4917,7 +4917,7 @@ void daAlink_c::setShapeAngleOnGround() {
sp20.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
bool var_r29;
if (-1000000000.0f != sp20.y) {
if (-G_CM3D_F_INF != sp20.y) {
var_r29 = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp2C);
} else {
var_r29 = 0;
@@ -4934,7 +4934,7 @@ void daAlink_c::setShapeAngleOnGround() {
sp14.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
bool var_r29_2;
if (-1000000000.0f != sp14.y) {
if (-G_CM3D_F_INF != sp14.y) {
var_r29_2 = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp2C);
} else {
var_r29_2 = 0;
@@ -6782,7 +6782,7 @@ int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB,
if (checkWolf()) {
// "Player is Wolf, but setting Link animation\n"
OSReport("狼なのにリンクアニメ設定\n");
JUT_ASSERT(8591, 0);
JUT_ASSERT(8591, FALSE);
}
#endif
@@ -8602,13 +8602,13 @@ void daAlink_c::setFrontWallType() {
mLinkGndChk.SetPos(&chk_start_pos);
f32 sp38 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (-1000000000.0f != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) {
if (-G_CM3D_F_INF != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) {
found_gnd_tri = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &gndchk_tri);
}
if ((!checkModeFlg(0x40000) && sp38 < body_height) || !found_gnd_tri) {
return;
}
if (-1000000000.0f == sp38 || !cBgW_CheckBGround(gndchk_tri.mNormal.y)) {
if (-G_CM3D_F_INF == sp38 || !cBgW_CheckBGround(gndchk_tri.mNormal.y)) {
return;
}
@@ -8687,7 +8687,7 @@ void daAlink_c::setWaterY() {
} else {
offNoResetFlg0(FLG0_UNK_80);
field_0x2fbc = 16;
mWaterY = -1000000000.0f;
mWaterY = -G_CM3D_F_INF;
}
}
@@ -8737,7 +8737,7 @@ void daAlink_c::setHangWaterY() {
checkWaterInKandelaar(field_0x33b8);
}
} else {
field_0x33b8 = -1000000000.0f;
field_0x33b8 = -G_CM3D_F_INF;
field_0x2fc5 = 0x10;
field_0x2fc6 = 0;
}
@@ -13176,7 +13176,7 @@ void daAlink_c::autoGroundHit() {
}
BOOL var_r28;
if (-1000000000.0f != mLinkAcch.GetGroundH()) {
if (-G_CM3D_F_INF != mLinkAcch.GetGroundH()) {
dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &sp74);
var_r28 = cBgW_CheckBGround(sp74.mNormal.y);
} else {
@@ -13384,7 +13384,7 @@ BOOL daAlink_c::checkRestartRoom() {
return procCoLavaReturnInit(1);
} else if ((checkModeFlg(0x40000) || (checkNoResetFlg0(FLG0_UNK_80) && mWaterY - current.pos.y > daAlinkHIO_swim_c0::m.mInitHeight)) && fopAcM_GetRoomNo(this) == 0 && checkStageName("F_SP114")) {
return procCoSwimFreezeReturnInit();
} else if (!checkCargoCarry() && (field_0x3174 == 4 || field_0x3174 == 10 || (-1000000000.0f == mLinkAcch.GetGroundH() && !checkModeFlg(0x40000)))) {
} else if (!checkCargoCarry() && (field_0x3174 == 4 || field_0x3174 == 10 || (-G_CM3D_F_INF == mLinkAcch.GetGroundH() && !checkModeFlg(0x40000)))) {
BOOL temp_r28 = mWaterY > mLinkAcch.GetGroundH();
f32 var_f31;
@@ -13452,7 +13452,7 @@ BOOL daAlink_c::checkRestartRoom() {
return true;
}
} else if ((mLinkAcch.ChkGroundHit() && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x80)) || (checkWaterPolygonUnder() && checkNoResetFlg0(FLG0_UNK_80) && (dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x80)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && (field_0x2fc6 & 0x80)) || (field_0x2fbc == 6 && checkNoResetFlg0(FLG0_UNK_80) && checkWaterPolygonUnder() && mWaterY > (daAlinkHIO_basic_c0::m.mLavaDeathDepth + mLinkAcch.GetGroundH())) || (field_0x2fc5 == 6 && -1000000000.0f != field_0x33b8 && field_0x33bc < field_0x33b8 && checkModeFlg(0x40) && field_0x33b8 > (field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))) {
} else if ((mLinkAcch.ChkGroundHit() && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x80)) || (checkWaterPolygonUnder() && checkNoResetFlg0(FLG0_UNK_80) && (dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x80)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -G_CM3D_F_INF != field_0x33b8 && (field_0x2fc6 & 0x80)) || (field_0x2fbc == 6 && checkNoResetFlg0(FLG0_UNK_80) && checkWaterPolygonUnder() && mWaterY > (daAlinkHIO_basic_c0::m.mLavaDeathDepth + mLinkAcch.GetGroundH())) || (field_0x2fc5 == 6 && -G_CM3D_F_INF != field_0x33b8 && field_0x33bc < field_0x33b8 && checkModeFlg(0x40) && field_0x33b8 > (field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))) {
if (field_0x2fbc == 6 || (checkModeFlg(0x40) && field_0x2fc5 == 6)) {
return procCoLavaReturnInit(0);
}
@@ -17227,7 +17227,7 @@ int daAlink_c::procCoMetamorphoseInit() {
mLinkGndChk.SetPos(&pos);
f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (gnd_cross != -1000000000.0f) {
if (gnd_cross != -G_CM3D_F_INF) {
pos.y = gnd_cross;
cXyz sp14 = current.pos;
@@ -17624,7 +17624,7 @@ int daAlink_c::execute() {
}
}
} else if (mProcID != PROC_HOOKSHOT_FLY && !checkModeFlg(MODE_VINE_CLIMB | MODE_UNK_800) &&
mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -1000000000.0f &&
mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -G_CM3D_F_INF &&
dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) &&
dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd))
{
@@ -18013,7 +18013,7 @@ int daAlink_c::execute() {
speed.y = 0.0f;
if (field_0x3198 != 0) {
if (mLinkAcch.GetGroundH() != -1000000000.0f) {
if (mLinkAcch.GetGroundH() != -G_CM3D_F_INF) {
current.pos.y = mLinkAcch.GetGroundH();
}
}
@@ -18037,7 +18037,7 @@ int daAlink_c::execute() {
field_0x3178 = field_0x3174;
if (mLinkAcch.GetGroundH() != -1000000000.0f) {
if (mLinkAcch.GetGroundH() != -G_CM3D_F_INF) {
setRoomInfo();
if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO &&
src/d/actor/d_a_alink_bottle.inc
+2 -2
View File
@@ -70,14 +70,14 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E8, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31D, 0x1400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(142, 0);
JUT_ASSERT(142, FALSE);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_WORM) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E9, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31E, 0x2400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(151, 0);
JUT_ASSERT(151, FALSE);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) {
src/d/actor/d_a_alink_damage.inc
+1 -1
View File
@@ -308,7 +308,7 @@ int daAlink_c::checkPolyDamage() {
}
}
if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) {
if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -G_CM3D_F_INF != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) {
return 2;
}
src/d/actor/d_a_alink_demo.inc
+4 -4
View File
@@ -1297,7 +1297,7 @@ BOOL daAlink_c::checkDeadAction(int param_0) {
offCargoCarry();
int var_r29;
if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && -1000000000.0f != mLinkAcch.GetGroundH()) {
if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && -G_CM3D_F_INF != mLinkAcch.GetGroundH()) {
var_r29 = dComIfG_Bgsp().GetExitId(mLinkAcch.m_gnd);
} else {
var_r29 = 0x3F;
@@ -1605,7 +1605,7 @@ int daAlink_c::procCoToolDemo() {
}
}
} else if (sp1C == 1) {
JUT_ASSERT(2345, 0);
JUT_ASSERT(2345, FALSE);
} else if (sp1C == 2) {
if (sp18 == 1) {
if (sp14 == 2) {
@@ -2216,7 +2216,7 @@ int daAlink_c::procCoGetItem() {
// "Get Item is not an item!!! %d\n"
OSReport("ゲットするアイテムがアイテムじゃない！！！　%d\n",
fopAcM_GetName(item_partner_p));
JUT_ASSERT(3415, 0);
JUT_ASSERT(3415, FALSE);
}
#endif
@@ -3733,7 +3733,7 @@ int daAlink_c::procNotUseItem() {
// "Present Item is not this Item!!! %d\n"
OSReport("差し出すアイテムがアイテムじゃない！！！　%d\n",
fopAcM_GetName(item_partner_p));
JUT_ASSERT(5506, 0);
JUT_ASSERT(5506, FALSE);
}
#endif
if (item_partner_p != NULL) {
src/d/actor/d_a_alink_hang.inc
+2 -2
View File
@@ -354,7 +354,7 @@ int daAlink_c::procHangFallStartInit(cM3dGPla* param_0) {
f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
sp58.y = cross;
if (sp58.y != -1000000000.0f) {
if (sp58.y != -G_CM3D_F_INF) {
if (sp58.y < current.pos.y + l_autoDownHeight) {
return 0;
}
@@ -1986,7 +1986,7 @@ int daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) {
mLinkGndChk.SetPos(param_0);
f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (cross != -1000000000.0f && dBgS_CheckBGroundPoly(mLinkGndChk) &&
if (cross != -G_CM3D_F_INF && dBgS_CheckBGroundPoly(mLinkGndChk) &&
cross >= param_1 - 50.0f)
{
param_0->y = cross;
src/d/actor/d_a_alink_swindow.inc
+1 -1
View File
@@ -278,7 +278,7 @@ void daAlink_c::initStatusWindow() {
J3DAnmTransform* bck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0);
if (!m_sWindowBck->init(bck, 1, 2, 1.0f, 0, -1, false)) {
JUT_ASSERT(0x1B1, 0);
JUT_ASSERT(433, FALSE);
}
tmpBuffer = new (0x20) void*[0x100];
src/d/actor/d_a_alink_whistle.inc
+1 -1
View File
@@ -168,7 +168,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s
mLinkGndChk.SetPos(param_4);
f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (gnd_cross != -1000000000.0f) {
if (gnd_cross != -G_CM3D_F_INF) {
current.pos.set(param_4->x, gnd_cross, param_4->z);
}
src/d/actor/d_a_alink_wolf.inc
+8 -8
View File
@@ -1225,7 +1225,7 @@ int daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2,
if (!checkWolf()) {
// "Is Adult Link but setting Wolf animation\n"
OS_REPORT("リンクなのに狼アニメ設定\n");
JUT_ASSERT(0x82B, 0);
JUT_ASSERT(2091, FALSE);
}
J3DAnmTransform* var_r25 = getNowAnmPackUnder(UNDER_0);
@@ -1303,7 +1303,7 @@ int daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed,
if (!checkWolf()) {
// "Is Adult Link but setting Wolf animation\n"
OS_REPORT("リンクなのに狼アニメ設定\n");
JUT_ASSERT(0x82B, 0);
JUT_ASSERT(2091, FALSE);
}
J3DAnmTransform* var_r30 = getAnimeResource(&mUnderAnmHeap[0], m_wlAnmDataTable[i_anmID].field_0x0, 0x10800);
@@ -2036,7 +2036,7 @@ void daAlink_c::wolfFootBgCheck() {
temp_f31 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
temp_f30 = var_r26->y - temp_f31;
if (-1000000000.0f != temp_f31 && temp_f30 < temp_f27 && temp_f30 > sp1C) {
if (-G_CM3D_F_INF != temp_f31 && temp_f30 < temp_f27 && temp_f30 > sp1C) {
*sp20 = temp_f31;
var_r28->field_0x0 = 1;
sp48[i][j] = getGroundAngle(&mLinkGndChk, shape_angle.y);
@@ -2144,11 +2144,11 @@ void daAlink_c::wolfFootBgCheck() {
}
int sp18;
if (-1000000000.0f != temp_f31) {
if (-G_CM3D_F_INF != temp_f31) {
sp18 = dComIfG_Bgsp().GetPolyAtt0(mLinkGndChk);
}
if (-1000000000.0f == temp_f31 || sp18 == 3 || sp18 == 0xD) {
if (-G_CM3D_F_INF == temp_f31 || sp18 == 3 || sp18 == 0xD) {
sp90.y += mSinkShapeOffset;
}
@@ -2161,11 +2161,11 @@ void daAlink_c::wolfFootBgCheck() {
sp84.y = current.pos.y;
}
if (-1000000000.0f != temp_f31) {
if (-G_CM3D_F_INF != temp_f31) {
sp18 = dComIfG_Bgsp().GetPolyAtt0(mLinkGndChk);
}
if (-1000000000.0f == temp_f31 || sp18 == 3 || sp18 == 0xD) {
if (-G_CM3D_F_INF == temp_f31 || sp18 == 3 || sp18 == 0xD) {
sp84.y += mSinkShapeOffset;
}
@@ -5695,7 +5695,7 @@ int daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) {
mLinkGndChk.SetPos(&gnd_chk_pos);
gnd_chk_pos.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (gnd_chk_pos.y != -1000000000.0f) {
if (gnd_chk_pos.y != -G_CM3D_F_INF) {
if (gnd_chk_pos.y < current.pos.y + l_autoDownHeight) {
return 0;
}
src/d/actor/d_a_alldie.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Activates a switch when all enemies are defeated
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_alldie.h"
#include "d/d_com_inf_game.h"
src/d/actor/d_a_andsw.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* AND - Switch
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_andsw.h"
#include "d/d_procname.h"
src/d/actor/d_a_andsw2.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_andsw2.h"
#include "d/d_com_inf_game.h"
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_arrow.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
src/d/actor/d_a_b_bh.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_bh.h"
#include "d/actor/d_a_b_bq.h"
@@ -1462,7 +1462,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
void* modelData = dComIfG_getObjectRes("B_BH", BMDR_BH_KUKI);
JUT_ASSERT(2475, modelData != 0);
JUT_ASSERT(2475, modelData != NULL);
for (int i = 0; i < 17; i++) {
a_this->mpStemModels[i] = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
@@ -1474,7 +1474,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
modelData = dComIfG_getObjectRes("B_BH", BMDR_BH_LEAF);
JUT_ASSERT(2491, modelData != 0);
JUT_ASSERT(2491, modelData != NULL);
for (int i = 0; i < 17; i++) {
if ((i & 3) == 2) {
src/d/actor/d_a_b_bq.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
* Boss Baba (Diababa)
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_bq.h"
#include "d/d_com_inf_game.h"
@@ -2490,7 +2490,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_bq", BMDR_BQ_EYEBALL);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
a_this->mpEyeballModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (a_this->mpEyeballModel == NULL) {
src/d/actor/d_a_b_dr.cpp
+13 -13
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_dr.h"
#include "d/d_com_inf_game.h"
@@ -1115,7 +1115,7 @@ bool daB_DR_c::flapMove(bool param_0) {
}
}
if (-1000000000.0f == mAcch.GetGroundH()) {
if (-G_CM3D_F_INF == mAcch.GetGroundH()) {
target_y += home.pos.y;
} else {
target_y += mAcch.GetGroundH();
@@ -1195,7 +1195,7 @@ bool daB_DR_c::mPlayerHighCheck() {
gndchk.SetPos(&chk_pos);
field_0x734 = dComIfG_Bgsp().GroundCross(&gndchk);
if (-1000000000.0f == field_0x734 || field_0x734 < 0.0f) {
if (-G_CM3D_F_INF == field_0x734 || field_0x734 < 0.0f) {
field_0x734 = home.pos.y;
}
@@ -1217,7 +1217,7 @@ bool daB_DR_c::mBgFallGroundCheck() {
chkpos.y += 300.0f;
gndchk.SetPos(&chkpos);
chkpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (-1000000000.0f == chkpos.y) {
if (-G_CM3D_F_INF == chkpos.y) {
chkpos.y = home.pos.y;
}
if (chkpos.y < home.pos.y) {
@@ -2728,7 +2728,7 @@ void daB_DR_c::executeGliderAttack() {
field_0x7dc = 1;
}
if (-1000000000.0f != mAcch.GetGroundH()) {
if (-G_CM3D_F_INF != mAcch.GetGroundH()) {
if (mAnm == ANM_DR_WIND_ATTACKB) {
mCount[1]++;
if (mCount[1] > WREG_S(9)) {
@@ -2945,7 +2945,7 @@ void daB_DR_c::executePillarSearch() {
cLib_addCalcAngleS2(&current.angle.x, sp30.atan2sY_XZ(), 20, NREG_S(3) + 0x400);
cLib_addCalcAngleS2(&shape_angle.x, current.angle.x, NREG_S(2) + 20, NREG_S(3) + 0x400);
if (mPlayerHighCheck() && -1000000000.0f != mAcch.GetGroundH()) {
if (mPlayerHighCheck() && -G_CM3D_F_INF != mAcch.GetGroundH()) {
setActionMode(ACTION_BREATH_ATTACK, 0);
}
}
@@ -3571,7 +3571,7 @@ void daB_DR_c::action() {
if (abs(temp_r28) < 0x2000) {
field_0x74e = temp_r28;
}
if (mAnm == ANM_DR_WIND_ATTACKATOB || mAnm == ANM_DR_WIND_ATTACKB || -1000000000.0f != mAcch.GetGroundH() || mCount[3] == 0) {
if (mAnm == ANM_DR_WIND_ATTACKATOB || mAnm == ANM_DR_WIND_ATTACKB || -G_CM3D_F_INF != mAcch.GetGroundH() || mCount[3] == 0) {
field_0x74e = 0;
}
}
@@ -3632,7 +3632,7 @@ void daB_DR_c::mtx_set() {
sp28.SetPos(&sp1C);
f32 var_f31 = dComIfG_Bgsp().GroundCross(&sp28);
if (-1000000000.0f == var_f31 || var_f31 < 5250.0f + JREG_F(4)) {
if (-G_CM3D_F_INF == var_f31 || var_f31 < 5250.0f + JREG_F(4)) {
var_f31 = 5250.0f + JREG_F(4);
}
field_0x7a8.y = var_f31;
@@ -3648,7 +3648,7 @@ void daB_DR_c::mtx_set() {
}
}
if (mAnm == ANM_DR_WIND_ATTACKB && -1000000000.0f != mAcch.GetGroundH()) {
if (mAnm == ANM_DR_WIND_ATTACKB && -G_CM3D_F_INF != mAcch.GetGroundH()) {
cXyz sp10 = current.pos - home.pos;
if (sp10.abs() > 3000.0f || current.pos.y > 370.0f) {
if (field_0x7d8 == 0) {
@@ -3746,7 +3746,7 @@ void daB_DR_c::cc_set() {
mSound2.startCreatureSoundLevel(Z2SE_EN_DR_WIND_ATTACK, 0, -1);
}
if (mAnm == ANM_DR_WIND_ATTACKB && -1000000000.0f != mAcch.GetGroundH() && mCount[1] > WREG_S(9)) {
if (mAnm == ANM_DR_WIND_ATTACKB && -G_CM3D_F_INF != mAcch.GetGroundH() && mCount[1] > WREG_S(9)) {
var_r27 = 1;
}
@@ -4055,7 +4055,7 @@ int daB_DR_c::CreateHeap() {
if (arg0 == 0x14 || arg0 == 0x15) {
static int mPartDt[] = {74, 74, 75, 76, 77, 78};
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", mPartDt[mPartNo]);
JUT_ASSERT(6312, modelData != 0);
JUT_ASSERT(6312, modelData != NULL);
mpPartModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (mpPartModel == NULL) {
@@ -4066,7 +4066,7 @@ int daB_DR_c::CreateHeap() {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49);
JUT_ASSERT(6324, modelData != 0);
JUT_ASSERT(6324, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
@@ -4286,7 +4286,7 @@ int daB_DR_c::create() {
setActionMode(ACTION_GLIDER_ATTACK, 0);
mTargetHeight = 1500.0f + mAcch.GetGroundH();
if (-1000000000.0f == mAcch.GetGroundH()) {
if (-G_CM3D_F_INF == mAcch.GetGroundH()) {
mTargetHeight = 1500.0f + current.pos.y;
}
if (dComIfGs_isZoneSwitch(1, fopAcM_GetRoomNo(this))) {
src/d/actor/d_a_b_dre.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_dre.h"
#include "SSystem/SComponent/c_math.h"
@@ -18,7 +18,7 @@
int daB_DRE_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49);
JUT_ASSERT(0xB4, modelData != 0);
JUT_ASSERT(0xB4, modelData != NULL);
if (mAction == 0) {
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
src/d/actor/d_a_b_ds.cpp
+18 -18
View File
@@ -3,7 +3,7 @@
* Boss - Stallord
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_ds.h"
#include "d/actor/d_a_player.h"
@@ -441,7 +441,7 @@ void daB_DS_c::mSmokeSet() {
}
if (mAcch.ChkGroundHit()) {
if (field_0x84d == 0 && mAcch.GetGroundH() != -1000000000.0f) {
if (field_0x84d == 0 && mAcch.GetGroundH() != -G_CM3D_F_INF) {
cXyz particle_scale(1.0f, 1.0f, 1.0f);
cXyz particle_pos(current.pos);
csXyz particle_angle(shape_angle);
@@ -508,7 +508,7 @@ void daB_DS_c::handSPosSet(int i_hand) {
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y == -1000000000.0f) {
if (chk_pos.y == -G_CM3D_F_INF) {
chk_pos.y = mFingerPos[i_hand].y;
}
particle_pos = chk_pos - mHandPos[i_hand];
@@ -525,7 +525,7 @@ void daB_DS_c::handSPosSet(int i_hand) {
gnd_chk.SetPos(&particle_pos);
particle_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (particle_pos.y == -1000000000.0f) {
if (particle_pos.y == -G_CM3D_F_INF) {
particle_pos.y = mHandPos[i_hand].y;
}
chk_pos = particle_pos - mHandPos[i_hand];
@@ -600,7 +600,7 @@ void daB_DS_c::mZsMoveChk() {
zs_pos.y += 2000.0f;
gnd_chk.SetPos(&zs_pos);
if (zs_pos.y != -1000000000.0f) {
if (zs_pos.y != -G_CM3D_F_INF) {
zs_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
} else {
zs_pos.y = current.pos.y += 800.0f;
@@ -665,7 +665,7 @@ void daB_DS_c::mZsMoveChk_Guard() {
zs_pos.y += 2000.0f;
gnd_chk.SetPos(&zs_pos);
if (zs_pos.y != -1000000000.0f) {
if (zs_pos.y != -G_CM3D_F_INF) {
zs_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
} else {
zs_pos.y = current.pos.y += 800.0f;
@@ -1906,7 +1906,7 @@ void daB_DS_c::damageHitCamera() {
offset.y = 300.0f;
MtxPosition(&offset, &pos);
pos.x += current.pos.x;
if (mAcch.GetGroundH() != -1000000000.0f) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
pos.y += mAcch.GetGroundH();
}
pos.z += current.pos.z;
@@ -1916,7 +1916,7 @@ void daB_DS_c::damageHitCamera() {
offset.z = 700.0f;
MtxPosition(&offset, &pos);
pos.x += current.pos.x;
if (mAcch.GetGroundH() != -1000000000.0f) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
pos.y += mAcch.GetGroundH();
}
pos.z += current.pos.z;
@@ -2091,7 +2091,7 @@ void daB_DS_c::executeDamage() {
sp1BC.z = 1000.0f;
MtxPosition(&sp1BC, &sp1B0);
sp1B0 += current.pos;
if (mAcch.GetGroundH() != -1000000000.0f) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
sp1B0.y = mAcch.GetGroundH();
}
@@ -3329,7 +3329,7 @@ void daB_DS_c::executeBattle2Damage() {
chk_pos.y += 300.0f;
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y == -1000000000.0f) {
if (chk_pos.y == -G_CM3D_F_INF) {
chk_pos.y = current.pos.y - 200.0f;
}
@@ -5253,7 +5253,7 @@ int daB_DS_c::execute() {
chk_pos.y += 3000.0f;
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y == -1000000000.0f) {
if (chk_pos.y == -G_CM3D_F_INF) {
chk_pos.y = jnt_pos.y;
}
@@ -5276,7 +5276,7 @@ int daB_DS_c::execute() {
chk_pos.y += 3000.0f;
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y == -1000000000.0f) {
if (chk_pos.y == -G_CM3D_F_INF) {
chk_pos.y = jnt_pos.y;
}
@@ -5391,7 +5391,7 @@ int daB_DS_c::CreateHeap() {
anm_res = ANM_HEAD_FWAIT;
}
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", anm_res)),
@@ -5409,7 +5409,7 @@ int daB_DS_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpSwordMorf = new mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 63)), 0,
@@ -5431,7 +5431,7 @@ int daB_DS_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpZantMorf = new mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 66)), 2,
@@ -5441,7 +5441,7 @@ int daB_DS_c::CreateHeap() {
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("B_DS", 73));
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpOpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
if (mpOpPatternModel == NULL) {
@@ -5473,7 +5473,7 @@ int daB_DS_c::CreateHeap() {
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("B_DS", 72));
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
if (mpPatternModel == NULL) {
@@ -5624,7 +5624,7 @@ cPhs__Step daB_DS_c::create() {
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y != -1000000000.0f) {
if (chk_pos.y != -G_CM3D_F_INF) {
current.pos.y = chk_pos.y;
}
}
src/d/actor/d_a_b_gg.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_gg.h"
#include "d/d_com_inf_game.h"
@@ -154,7 +154,7 @@ daB_GG_HIO_c::daB_GG_HIO_c() {
int daB_GG_c::CreateHeap() {
J3DModelData* modelData;
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gg", 0x23);
JUT_ASSERT(207, modelData != 0);
JUT_ASSERT(207, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gg", 0xE), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
@@ -4494,7 +4494,7 @@ int daB_GG_c::Create() {
SetAnm(BCK_GG_WAIT, 2, 5.0f, 1.0f);
fopAcM_OnStatus(this, 0x200000);
if (-1000000000.0f != mAcch.GetGroundH()) {
if (-G_CM3D_F_INF != mAcch.GetGroundH()) {
current.pos.y = mAcch.GetGroundH();
field_0x648 = mAcch.GetGroundH();
}
src/d/actor/d_a_b_gm.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_gm.h"
#include "d/actor/d_a_e_gm.h"
@@ -2086,7 +2086,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
J3DModelData* modelData;
for (int i = 0; i < 4; i++) {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gm", 0x22);
JUT_ASSERT(0xCE9, modelData != 0);
JUT_ASSERT(0xCE9, modelData != NULL);
a_this->mpSpotLightModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
if (a_this->mpSpotLightModel[i] == NULL) {
return 0;
src/d/actor/d_a_b_gnd.cpp
+6 -6
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_gnd.h"
#include "d/d_com_inf_game.h"
@@ -4088,7 +4088,7 @@ static int daB_GND_Execute(b_gnd_class* i_this) {
sp6C->setBaseTRMtx(mDoMtx_stack_c::get());
u32 sp68;
if (i_this->mAcch.GetGroundH() != -1000000000.0f) {
if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) {
if (i_this->mAcch.ChkWaterHit() && i_this->mAcch.m_wtr.GetHeight() > a_this->current.pos.y) {
sp68 = dKy_pol_sound_get(&i_this->mAcch.m_wtr);
} else if (i_this->mAcch.ChkGroundHit()) {
@@ -4692,7 +4692,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
J3DModelData* modelData;
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x62);
JUT_ASSERT(6612, modelData != 0);
JUT_ASSERT(6612, modelData != NULL);
i_this->mpSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mpSwordModel == NULL) {
return 0;
@@ -4702,7 +4702,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
i_this->mpSwordModel->setBaseTRMtx(mDoMtx_stack_c::get());
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x61);
JUT_ASSERT(6626, modelData != 0);
JUT_ASSERT(6626, modelData != NULL);
i_this->mpSheathModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mpSheathModel == NULL) {
return 0;
@@ -4713,7 +4713,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
for (int i = 0; i < 2; i++) {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", blur_model[i]);
JUT_ASSERT(6647, modelData != 0);
JUT_ASSERT(6647, modelData != NULL);
i_this->mpSwordBlurModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mpSwordBlurModel[i] == NULL) {
return 0;
@@ -4724,7 +4724,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 99);
JUT_ASSERT(6670, modelData != 0);
JUT_ASSERT(6670, modelData != NULL);
for (int i = 0; i < 36; i++) {
i_this->mpMantShadowModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
src/d/actor/d_a_b_go.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_go.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_b_gos.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Combined Goron Child
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_gos.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_b_mgn.cpp
+13 -13
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_mgn.h"
#include "d/actor/d_a_obj_bhashi.h"
@@ -304,7 +304,7 @@ int daB_MGN_c::draw() {
dBgS_GndChk gndchk;
f32 gnd_height;
if (mAcch.GetGroundH() == -1000000000.0f) {
if (mAcch.GetGroundH() == -G_CM3D_F_INF) {
cXyz spC(current.pos);
gndchk.SetPos(&spC);
gnd_height = dComIfG_Bgsp().GroundCross(&gndchk);
@@ -406,7 +406,7 @@ void daB_MGN_c::setDashSmokeEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[var_r27], &field_0x2608[var_r27], &effpos, NULL, 3.0f, &tevStr, 1);
}
}
@@ -448,7 +448,7 @@ void daB_MGN_c::setBackJumpEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[var_r27], &field_0x2608[var_r27], &effpos, NULL, 3.0f, &tevStr, 1);
}
}
@@ -469,7 +469,7 @@ void daB_MGN_c::setSlideSmokeEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet2(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 3.0f, &tevStr);
}
}
@@ -496,7 +496,7 @@ void daB_MGN_c::setBodySlideEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet2(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 10.0f, &tevStr);
}
}
@@ -514,7 +514,7 @@ void daB_MGN_c::setOpeningEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[0], &field_0x2608[0], &effpos, NULL, 15.0f, &tevStr, 1);
}
@@ -524,7 +524,7 @@ void daB_MGN_c::setOpeningEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[1], &field_0x2608[1], &effpos, NULL, 15.0f, &tevStr, 1);
}
}
@@ -546,7 +546,7 @@ void daB_MGN_c::setStepEffect() {
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 3.0f, &tevStr, 1);
}
}
@@ -573,7 +573,7 @@ void daB_MGN_c::setFallAttackEffect() {
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 10.0f, &tevStr, 1);
}
}
@@ -3348,7 +3348,7 @@ static int daB_MGN_Delete(daB_MGN_c* i_this) {
/* 8060EAE0-8060F068 0094A0 0588+00 1/1 0/0 0/0 .text CreateHeap__9daB_MGN_cFv */
int daB_MGN_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN);
JUT_ASSERT(4010, modelData != 0);
JUT_ASSERT(4010, modelData != NULL);
mpMgnModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_mgn", BCK_MGN_WAIT), 2,
1.0f, 0, -1, &mSound, 0x80000, 0x11000284);
@@ -3389,7 +3389,7 @@ int daB_MGN_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN_TAIEKI);
JUT_ASSERT(4068, modelData != 0);
JUT_ASSERT(4068, modelData != NULL);
for (int i = 0; i < 20; i++) {
mpMgnTaiekiModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -3399,7 +3399,7 @@ int daB_MGN_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgne", BMDR_EF_GDGATE);
JUT_ASSERT(4084, modelData != 0);
JUT_ASSERT(4084, modelData != NULL);
for (int i = 0; i < 4; i++) {
mpGdgateModelMorf[i] = new mDoExt_McaMorfSO(modelData, NULL, NULL,
src/d/actor/d_a_b_ob.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
// Translation Unit: d_a_b_ob
//
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_ob.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -3491,7 +3491,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_EF_OISUI);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
a_this->mpSuiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
if (a_this->mpSuiModel == NULL) {
src/d/actor/d_a_b_oh.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Morpheel Tentacle
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_ob.h"
#include "d/actor/d_a_b_oh.h"
src/d/actor/d_a_b_oh2.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Morpheel Tentacle
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_oh2.h"
#include "d/actor/d_a_b_ob.h"
src/d/actor/d_a_b_tn.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_tn.h"
#include <cmath.h>
src/d/actor/d_a_b_yo.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_yo.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_b_yo_ice.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_yo_ice.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"

Some files were not shown because too many files have changed in this diff Show More