diff --git a/data/dynos_bin_lvl.cpp b/data/dynos_bin_lvl.cpp index 5a3bec71..07bb2cdb 100644 --- a/data/dynos_bin_lvl.cpp +++ b/data/dynos_bin_lvl.cpp @@ -1004,12 +1004,12 @@ static DataNode* DynOS_Lvl_Load(BinFile *aFile, GfxData *aGfxData) void *_Ptr = DynOS_Pointer_Load(aFile, aGfxData, _Value, &_Node->mFlags); if (_Ptr) { if (!requirePointer) { - PrintError("Didn't expect a pointer while reading level script: %s, %u", _Node->mName, _Value); + PrintError("Didn't expect a pointer while reading level script: %s, %u", _Node->mName.begin(), _Value); } _Node->mData[i] = (uintptr_t) _Ptr; } else { if (requirePointer) { - PrintError("Expected a pointer while reading level script: %s, %u", _Node->mName, _Value); + PrintError("Expected a pointer while reading level script: %s, %u", _Node->mName.begin(), _Value); _Node->mData[i] = 0; } else { _Node->mData[i] = (uintptr_t) _Value; diff --git a/lib/coopnet/mac/libcoopnet.dylib b/lib/coopnet/mac/libcoopnet.dylib index 27df69ff..c70262ce 100755 Binary files a/lib/coopnet/mac/libcoopnet.dylib and b/lib/coopnet/mac/libcoopnet.dylib differ diff --git a/src/pc/crash_handler.c b/src/pc/crash_handler.c index a1333e42..b7fc8ae6 100644 --- a/src/pc/crash_handler.c +++ b/src/pc/crash_handler.c @@ -1,6 +1,8 @@ // Adapted from PeachyPeach's sm64pc-omm (now sm64ex-omm) #include "crash_handler.h" +char gLastRemoteBhv[256] = ""; + #if (defined(_WIN32) || defined(__linux__)) && !defined(WAPI_DUMMY) #ifdef HAVE_SDL2 @@ -26,8 +28,6 @@ #include "pc/mods/mods.h" #include "pc/debuglog.h" -char gLastRemoteBhv[256] = ""; - typedef struct { s32 x, y; u8 r, g, b; @@ -733,4 +733,4 @@ void crash_handler_init(void) { } tag++; } -} \ No newline at end of file +}