Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for MacOS

This commit is contained in:
djoslin 2023-06-23 16:40:46 -07:00
parent d55ba19c2f
commit 0dae1cb5e9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/dynos_bin_lvl.cpp
View File

@ -1004,12 +1004,12 @@ static DataNode<LevelScript>* DynOS_Lvl_Load(BinFile *aFile, GfxData *aGfxData)
void *_Ptr = DynOS_Pointer_Load(aFile, aGfxData, _Value, &_Node->mFlags); void *_Ptr = DynOS_Pointer_Load(aFile, aGfxData, _Value, &_Node->mFlags);
if (_Ptr) { if (_Ptr) {
if (!requirePointer) { 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; _Node->mData[i] = (uintptr_t) _Ptr;
} else { } else {
if (requirePointer) { 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; _Node->mData[i] = 0;
} else { } else {
_Node->mData[i] = (uintptr_t) _Value; _Node->mData[i] = (uintptr_t) _Value;

BIN
lib/coopnet/mac/libcoopnet.dylib
View File

Binary file not shown.

6
src/pc/crash_handler.c
View File

@ -1,6 +1,8 @@
// Adapted from PeachyPeach's sm64pc-omm (now sm64ex-omm) // Adapted from PeachyPeach's sm64pc-omm (now sm64ex-omm)
#include "crash_handler.h" #include "crash_handler.h"
char gLastRemoteBhv[256] = "";
#if (defined(_WIN32) || defined(__linux__)) && !defined(WAPI_DUMMY) #if (defined(_WIN32) || defined(__linux__)) && !defined(WAPI_DUMMY)
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
@ -26,8 +28,6 @@
#include "pc/mods/mods.h" #include "pc/mods/mods.h"
#include "pc/debuglog.h" #include "pc/debuglog.h"
char gLastRemoteBhv[256] = "";
typedef struct { typedef struct {
s32 x, y; s32 x, y;
u8 r, g, b; u8 r, g, b;
@ -733,4 +733,4 @@ void crash_handler_init(void) {
} }
tag++; tag++;
} }
} }