diff --git a/extern/aurora b/extern/aurora deleted file mode 160000 index 6f686121..00000000 --- a/extern/aurora +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6f6861215150abc4fa00197de43754525cac07a6 diff --git a/include/game/jmp.h b/include/game/jmp.h index 9d9e0664..a2c9c5a0 100755 --- a/include/game/jmp.h +++ b/include/game/jmp.h @@ -1,9 +1,12 @@ #ifndef _GAME_JMP_H #define _GAME_JMP_H +#ifdef TARGET_PC +#include +#else #include "dolphin.h" -typedef struct JMPBUF { +typedef struct jmp_buf { u32 lr; u32 cr; u32 sp; @@ -11,9 +14,10 @@ typedef struct JMPBUF { u32 pad; u32 regs[19]; double flt_regs[19]; -} JMPBUF; +} jmp_buf; -s32 gcsetjmp(JMPBUF *jump); -s32 gclongjmp(JMPBUF *jump, s32 status); +s32 gcsetjmp(jmp_buf *jump); +s32 gclongjmp(jmp_buf *jump, s32 status); #endif +#endif diff --git a/include/game/process.h b/include/game/process.h index 8d1b80f7..e51bdab7 100644 --- a/include/game/process.h +++ b/include/game/process.h @@ -3,12 +3,7 @@ #include "dolphin/types.h" -#ifdef TARGET_PC -#include -typedef int JMPBUF; -#else #include "game/jmp.h" -#endif #define PROCESS_STAT_PAUSE 0x1 #define PROCESS_STAT_UPAUSE 0x2 @@ -28,7 +23,7 @@ typedef struct process { u16 prio; s32 sleep_time; u32 base_sp; - JMPBUF jump; + jmp_buf jump; void (*dtor)(void); void *user_data; } Process; diff --git a/src/REL/m446Dll/main.c b/src/REL/m446Dll/main.c index b73f19e3..c094ea9d 100644 --- a/src/REL/m446Dll/main.c +++ b/src/REL/m446Dll/main.c @@ -5,7 +5,6 @@ #include "game/frand.h" #include "game/gamework_data.h" #include "game/hsfman.h" -#include "game/jmp.h" #include "game/minigame_seq.h" #include "game/window.h" #include "game/wipe.h" diff --git a/src/game/main.c b/src/game/main.c index c8119734..cbf96156 100644 --- a/src/game/main.c +++ b/src/game/main.c @@ -108,7 +108,7 @@ void main(void) #else HuSysInit(&GXPal528IntDf); #endif - //HuPrcInit(); + HuPrcInit(); // HuPadInit(); // GWInit(); // pfInit(); @@ -168,10 +168,10 @@ void main(void) HuPerfBegin(0); Hu3DPreProc(); HuPadRead(); - pfClsScr(); + pfClsScr();*/ HuPrcCall(1); - MGSeqMain(); + /* MGSeqMain(); HuPerfBegin(1); Hu3DExec(); HuDvdErrorWatch(); diff --git a/src/game/process.c b/src/game/process.c index cc13c72b..ec3e2993 100644 --- a/src/game/process.c +++ b/src/game/process.c @@ -14,7 +14,7 @@ #define EXEC_CHILDWATCH 2 #define EXEC_KILLED 3 -static JMPBUF processjmpbuf; +static jmp_buf processjmpbuf; static Process *processtop; static Process *processcur; static u16 processcnt; @@ -142,7 +142,7 @@ void HuPrcChildWatch() curr->exec = EXEC_CHILDWATCH; #ifdef TARGET_PC #else - if (!gcsetjmp(&curr->jump)) { + if (gcsetjmp(&curr->jump) == 0) { gclongjmp(&processjmpbuf, 1); } #endif @@ -219,7 +219,7 @@ void HuPrcSleep(s32 time) } #ifdef TARGET_PC #else - if (!gcsetjmp(&process->jump)) { + if (gcsetjmp(&process->jump) == 0) { gclongjmp(&processjmpbuf, 1); } #endif @@ -274,8 +274,8 @@ void HuPrcCall(s32 tick) if (!process) { return; } -#ifdef TARGET_PC -#else +#ifdef __MWERKS__ + // unused procfunc = process->jump.lr; #endif if ((process->stat & (PROCESS_STAT_PAUSE | PROCESS_STAT_UPAUSE)) && process->exec != EXEC_KILLED) { @@ -296,7 +296,7 @@ void HuPrcCall(s32 tick) case EXEC_CHILDWATCH: if (process->child) { - ret = 1; + ret = 1; } else { process->exec = EXEC_NORMAL;