mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-22 05:49:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to dtk-template

Browse Source 
Co-authored-by: NWPlayer123 <NWPlayer123@users.noreply.github.com>
This commit is contained in:
Luke Street
2024-10-28 18:57:33 -06:00
parent b05a6d3ed8
commit 1b0b96665a
1586 changed files with 116505 additions and 84895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JGadget/define.h
-12
View File
@@ -25,24 +25,12 @@ private:
int mLine;
};
#ifdef DEBUG
#define JGADGET_ASSERTWARN(cond) \
((cond) || ((JGadget_outMessage(JGadget_outMessage::warning, __FILE__, __LINE__) << (#cond)), false))
#define JGADGET_EXITWARN(cond) \
if (!(cond)) { JGadget_outMessage(JGadget_outMessage::warning, __FILE__, __LINE__) << (#cond), false; return false; }
#else
#define JGADGET_ASSERTWARN(cond) \
((cond) || (false))
#define JGADGET_EXITWARN(cond) \
if (!(cond)) { false; return false; }
#endif
}
#endif
include/JSystem/JGadget/linklist.h
-1
View File
@@ -92,7 +92,6 @@ public:
}
TLinkListNode& operator*() const {
JUT_ASSERT(p_!=0);
return *this->p_;
}
include/JSystem/JSupport/JSUList.h
+4 -10
View File
@@ -3,9 +3,6 @@
#include "types.h"
#ifdef __cplusplus
extern "C" {
class JSUPtrLink;
class JSUPtrList
@@ -174,11 +171,11 @@ public:
bool insertChild(JSUTree<T> *before, JSUTree<T> *child) { return this->insert(before, child); }
JSUTree<T> *getEndChild() const { return nullptr; }
JSUTree<T> *getFirstChild() const { return (JSUTree<T> *)getFirstLink(); }
JSUTree<T> *getFirstChild() const { return (JSUTree<T> *)this->getFirstLink(); }
JSUTree<T> *getLastChild() const { return (JSUTree<T> *)this->getLast(); }
JSUTree<T> *getNextChild() const { return (JSUTree<T> *)mNext; }
JSUTree<T> *getNextChild() const { return (JSUTree<T> *)this->mNext; }
JSUTree<T> *getPrevChild() const { return (JSUTree<T> *)this->getPrev(); }
u32 getNumChildren() const { return mLinkCount; }
u32 getNumChildren() const { return this->mLinkCount; }
T *getObject() const { return (T *)this->mData; }
JSUTree<T> *getParent() const { return (JSUTree<T> *)this->mPtrList; }
};
@@ -223,7 +220,4 @@ private:
JSUTree<T> *mTree;
};
}
#endif
#endif /* JSULIST_H */
#endif /* JSULIST_H */
include/JSystem/JUtility/JUTAssertion.h
-14
View File
@@ -44,22 +44,8 @@ namespace JUTAssertion
#define JUT_MINMAX_ASSERT(...)
#define JUT_MAX_ASSERT(...)
#define JUT_LOG_F(...)
#if defined(DEBUG) || 1
#define JUT_ASSERT(...)
#define JUT_ASSERT_F(...)
#else
#define JUT_ASSERT(COND) \
((COND)) ? (void)0 : (JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, __LINE__, #COND), OSHalt("Halt"));
#define JUT_ASSERT_F(COND, ...) \
if ((COND) == false) \
{ \
JUTAssertion::showAssert_f(JUTAssertion::getSDevice(), __FILE__, __LINE__, __VA_ARGS__); \
OSHalt("Halt"); \
}
#endif
}
#endif
include/JSystem/JUtility/JUTDbPrint.h
+9 -1
View File
@@ -1,9 +1,17 @@
#ifndef _JSYSTEM_JUT_JUTDBPRINT_H
#define _JSYSTEM_JUT_JUTDBPRINT_H
#ifdef __cplusplus
extern "C" {
#endif
void* JC_JUTDbPrint_getManager(void);
void JC_JUTDbPrint_setVisible(void*, int); // I know these are C++ but these were used to match a c function so I'll fix these when I need them or fix zurumode update.
void JUTReport(int x, int y, int show_count, const char* fmt, ...);
#endif
#ifdef __cplusplus
}
#endif
#endif