mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-10 02:35:17 -04:00
Fix compilation errors after decomp/main merge
- Fix <string> -> <cstring> across all source files (upstream fix) - Add <cstring> to JASGadget.h, <cstdarg> to JUTDbPrint.cpp - Fix <string> -> <cstring> in JUTFont.h, d_save.h, f_ap_game.h - Fix std::isnan usage in c_cc_d.cpp - Fix cCcD_Src types: s32 -> u32 for bitmask fields (upstream fix) - Fix AT_TYPE_WOLF_ATTACK/AT_TYPE_UNK unsigned literals (upstream fix) - Remove (s32) casts on hex literals in collision data (upstream fix) - Fix 0xFFFFFFFF literal in d_a_obj_wood_statue.cpp (upstream fix) - Add braces to case 0 in d_a_e_gb.cpp to fix jump-over-init - Fix Z2AudioCS.h include path (Z2AudioLib -> Z2AudioCS) - Forward-declare Z2AudioCS in stubs.cpp to avoid revolution conflicts - Guard JASGlobalInstance specializations with __MWERKS__ in m_Do_main - Remove duplicate inline functions from d_com_inf_game.h - Mark dummy() functions as static (upstream fix) - Add JAUSectionHeap.h include to m_Do_main.cpp
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "JSystem/J2DGraph/J2DManage.h"
|
||||
#include "JSystem/JSupport/JSUInputStream.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
void* J2DDataManage::get(char const* name) {
|
||||
J2DataManageLink* link;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "JSystem/J2DGraph/J2DScreen.h"
|
||||
#include "JSystem/JSupport/JSupport.h"
|
||||
#include "JSystem/JUtility/JUTResource.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <dolphin/types.h>
|
||||
|
||||
J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
|
||||
#include "JSystem/J3DGraphAnimator/J3DModel.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
J3DSkinNList::J3DSkinNList() {
|
||||
field_0x0 = NULL;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "JSystem/J3DGraphBase/J3DSys.h"
|
||||
#include "JSystem/J3DGraphBase/J3DTransform.h"
|
||||
#include "global.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
inline void loadMatColors(const J3DGXColor* color) {
|
||||
J3DGDWriteXFCmdHdr(0x100C, 2);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "JSystem/J3DGraphBase/J3DShapeMtx.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include <dolphin/os.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include "global.h"
|
||||
|
||||
J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "JSystem/J3DGraphBase/J3DShapeDraw.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <stdint.h>
|
||||
#include <dolphin/gx.h>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "JSystem/J3DGraphAnimator/J3DJointTree.h"
|
||||
#include "JSystem/J3DGraphBase/J3DSys.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
J3DVertexData::J3DVertexData() {
|
||||
mVtxNum = 0;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "JSystem/JSupport/JSupport.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include <dolphin/os.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
void* J3DClusterLoaderDataBase::load(const void* i_data) {
|
||||
J3D_ASSERT_NULLPTR(41, i_data);
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "JSystem/JAudio2/JASTaskThread.h"
|
||||
#include "JSystem/JAudio2/JASMutex.h"
|
||||
#include "JSystem/JKernel/JKRDvdAramRipper.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <dolphin/os.h>
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include "JSystem/JHostIO/JHIRMcc.h"
|
||||
#include <revolution/hio2.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
void JHIReport(const char* fmt, ...) {}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "JSystem/JHostIO/JORFile.h"
|
||||
#include "JSystem/JHostIO/JORHostInfo.h"
|
||||
#include "JSystem/JSupport/JSUMemoryStream.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
void JOREventCallbackListNode::JORAppend() {
|
||||
JORServer* pServer = JORServer::getInstance();
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <dolphin/ar.h>
|
||||
#include <dolphin/os.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
#if PLATFORM_GCN
|
||||
const u32 stack_size = 0xc00;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <cmath>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
JKRAramArchive::JKRAramArchive() {}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "JSystem/JKernel/JKRArchive.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include <cctype>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
#if TARGET_PC
|
||||
#include <cassert>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <cmath>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <stdint.h>
|
||||
|
||||
JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection)
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <dolphin/os.h>
|
||||
#include <dolphin/vi.h>
|
||||
#include "global.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
static int JKRDecompressFromDVDToAram(JKRDvdFile*, u32, u32, u32, u32, u32, u32*);
|
||||
static int decompSZS_subroutine(u8*, u32);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <cmath>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include "global.h"
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "JSystem/JKernel/JKRDvdFile.h"
|
||||
#include "JSystem/JKernel/JKRDecomp.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <dolphin/os.h>
|
||||
#include <dolphin/vi.h>
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
|
||||
#include <cctype>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include "global.h"
|
||||
|
||||
JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#define MSL_USE_INLINES 1 // needed to inline tolower call. not inlined elsewhere in the repo
|
||||
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <cctype>
|
||||
#include "global.h"
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#endif
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <dolphin/os.h>
|
||||
|
||||
#if DEBUG
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "JSystem/JKernel/JKRDvdRipper.h"
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include "global.h"
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "JSystem/JGadget/search.h"
|
||||
#include "JSystem/JGadget/define.h"
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const {
|
||||
if (!oParse_TBlock_messageID_.getRaw()) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "JSystem/JParticle/JPAResourceManager.h"
|
||||
#include "JSystem/JParticle/JPADynamicsBlock.h"
|
||||
#include "JSystem/JParticle/JPAResource.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
struct JPAResourceLoader {
|
||||
JPAResourceLoader(u8 const*, JPAResourceManager*);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "JSystem/JStudio/JStudio/ctb.h"
|
||||
#include <iterator>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <algorithm>
|
||||
|
||||
JStudio::ctb::TObject::~TObject() {}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "JSystem/JStudio/JStudio/fvb.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
namespace JStudio {
|
||||
namespace fvb {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "JSystem/JStudio/JStudio/jstudio-control.h"
|
||||
#include "JSystem/JStudio/JStudio/jstudio-math.h"
|
||||
#include "JSystem/JStudio/JStudio/jstudio-data.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
JStudio::TControl::TControl() {
|
||||
mTransformOnSet = false;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "JSystem/JStudio/JStudio/jstudio-object.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
namespace JStudio {
|
||||
namespace stb {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "JSystem/JSystem.h" // IWYU pragma: keep
|
||||
|
||||
#include "JSystem/JSupport/JSUMemoryStream.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) {
|
||||
mBuffer = pBuffer;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "JSystem/JSupport/JSUOutputStream.h"
|
||||
#include "JSystem/JSupport/JSURandomOutputStream.h"
|
||||
#include <dolphin/dolphin.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
JSUOutputStream::~JSUOutputStream() {
|
||||
if (!isGood()) {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include "JSystem/JUtility/JUTVideo.h"
|
||||
#include <cstdarg>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "JSystem/JSystem.h" // IWYU pragma: keep
|
||||
|
||||
#include "JSystem/JUtility/JUTNameTab.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
JUTNameTab::JUTNameTab() {
|
||||
setResource(NULL);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "JSystem/JUtility/JUTResource.h"
|
||||
#include "JSystem/JKernel/JKRArchive.h"
|
||||
#include "JSystem/JSupport/JSUInputStream.h"
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchive* archive) {
|
||||
stream->read(mType);
|
||||
|
||||
Reference in New Issue
Block a user