mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-13 11:38:49 -04:00
Merge decomp/main into dusk
Merges 44 upstream commits from zeldaret/tp decomp/main. Conflict resolutions: - .github/workflows/build.yml: keep deleted (not needed for PC port) - README.md: keep PC port README - J3DAnimation.h: keep OFFSET_PTR macro + add upstream forward decl - J3DModelLoader.h: keep BE(u32) mBlockNum + add field_0x1c - d_com_inf_game.h: keep PC port inlines + add upstream declarations - global.h: keep MULTI_CHAR macro + add FABSF macro - JUTConsole.cpp: keep uintptr_t cast for 64-bit - JUTDbPrint.cpp: keep PC enter_() helper + add cstring include - JUTResFont.cpp: take upstream loop/struct improvements with BE types - JUTCacheFont.cpp: take upstream decomp fix - float.h: use upstream !PLATFORM_GCN guard - d_a_npc_bouS/theB.cpp: keep MULTI_CHAR() for PC portability - d_a_npc_henna.cpp: keep uintptr_t + use upstream var name - d_demo.cpp: keep near_/far_ field renames for PC - d_resorce.cpp: keep uintptr_t + fix var name to res - d_s_room.cpp, m_Do_graphic.cpp: keep dusk includes + add cstring - m_Do_main.cpp: keep JHIComPortManager + use JAS_GLOBAL_INSTANCE_INIT - angle_utils.h: remove redundant types.h include
This commit is contained in:
@@ -100,6 +100,8 @@ struct TValueIterator
|
||||
|
||||
TValueIterator(const void* begin) {
|
||||
mBegin = reinterpret_cast<const char*>(begin);
|
||||
bool unused = false;
|
||||
(void)&unused;
|
||||
}
|
||||
|
||||
const void* get() const { return mBegin; }
|
||||
|
||||
@@ -14,7 +14,12 @@ struct TLinkListNode {
|
||||
pPrev_ = NULL;
|
||||
}
|
||||
|
||||
~TLinkListNode() {}
|
||||
~TLinkListNode() {
|
||||
#if DEBUG
|
||||
JGADGET_ASSERTWARN(77, pNext_==NULL);
|
||||
JGADGET_ASSERTWARN(78, pPrev_==NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
TLinkListNode* getNext() const { return pNext_; }
|
||||
TLinkListNode* getPrev() const { return pPrev_; }
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <iterator>
|
||||
#include <functional>
|
||||
#include <algorithm>
|
||||
#include <cstring>
|
||||
|
||||
namespace JGadget {
|
||||
namespace search {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define JGADGET_STD_STREAMBUF_H
|
||||
|
||||
#include <dolphin/types.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
namespace JGadget {
|
||||
template <typename T>
|
||||
|
||||
Reference in New Issue
Block a user