vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed ifndefs from main

This commit is contained in:
Zerocker 2020-05-25 17:06:50 +09:00
parent ce864043c1
commit 6166402626
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/debug.c
View File

@ -391,7 +391,7 @@ static void try_change_debug_page(void) {
* sDebugSysCursor. This is used to adjust enemy and effect behaviors
* on the fly. (unused)
*/
#ifndef VERSION_SH
#ifdef VERSION_SH
static
#endif
void try_modify_debug_controls(void) {
@ -524,7 +524,7 @@ void try_do_mario_debug_object_spawn(void) {
}
// TODO: figure out what this is
#ifndef VERSION_SH
#ifdef VERSION_SH
static
#endif
void debug_print_obj_move_flags(void) {

28
src/game/main.c
View File

@ -13,6 +13,12 @@
#include "main.h"
#include "thread6.h"
/**
* WARNING!
* This entry point is deprecated because TARGET_N64 is no longer required for building PC version.
* The new entry point is located in 'pc/pc_main.c'
**/
// Message IDs
#define MESG_SP_COMPLETE 100
#define MESG_DP_COMPLETE 101
@ -25,11 +31,6 @@ OSThread gIdleThread;
OSThread gMainThread;
OSThread gGameLoopThread;
OSThread gSoundThread;
#ifndef VERSION_SH
OSThread gRumblePakThread;
s32 gRumblePakPfs; // Actually an OSPfs but we don't have that header yet
#endif
OSIoMesg gDmaIoMesg;
OSMesg D_80339BEC;
@ -38,19 +39,20 @@ OSMesgQueue gSIEventMesgQueue;
OSMesgQueue gPIMesgQueue;
OSMesgQueue gIntrMesgQueue;
OSMesgQueue gSPTaskMesgQueue;
#ifndef VERSION_SH
OSMesgQueue gRumblePakSchedulerMesgQueue;
OSMesgQueue gRumbleThreadVIMesgQueue;
#endif
OSMesg gDmaMesgBuf[1];
OSMesg gPIMesgBuf[32];
OSMesg gSIEventMesgBuf[1];
OSMesg gIntrMesgBuf[16];
OSMesg gUnknownMesgBuf[16];
#ifndef VERSION_SH
#ifdef VERSION_SH
OSThread gRumblePakThread;
OSMesgQueue gRumblePakSchedulerMesgQueue;
OSMesgQueue gRumbleThreadVIMesgQueue;
OSMesg gRumblePakSchedulerMesgBuf[1];
OSMesg gRumbleThreadVIMesgBuf[1];
s32 gRumblePakPfs; // Actually an OSPfs but we don't have that header yet
struct RumbleData gRumbleDataQueue[3];
struct StructSH8031D9B0 gCurrRumbleSettings;
#endif
@ -152,7 +154,7 @@ void create_thread(OSThread *thread, OSId id, void (*entry)(void *), void *arg,
osCreateThread(thread, id, entry, arg, sp, pri);
}
#ifndef VERSION_SH
#ifdef VERSION_SH
extern void func_sh_802F69CC(void);
#endif
@ -162,7 +164,7 @@ void handle_nmi_request(void) {
func_80320890();
sound_banks_disable(2, 0x037A);
fadeout_music(90);
#ifndef VERSION_SH
#ifdef VERSION_SH
func_sh_802F69CC();
#endif
}
@ -233,7 +235,7 @@ void handle_vblank(void) {
stub_main_3();
sNumVblanks++;
#ifndef VERSION_SH
#ifdef VERSION_SH
if (gResetTimer > 0 && gResetTimer < 100) {
gResetTimer++;
}

19
src/game/main.h
View File

@ -24,19 +24,11 @@ extern OSThread gIdleThread;
extern OSThread gMainThread;
extern OSThread gGameLoopThread;
extern OSThread gSoundThread;
#ifndef VERSION_SH
extern OSThread gRumblePakThread;
extern s32 gRumblePakPfs; // Actually an OSPfs but we don't have that header yet
#endif
extern OSMesgQueue gPIMesgQueue;
extern OSMesgQueue gIntrMesgQueue;
extern OSMesgQueue gSPTaskMesgQueue;
#ifndef VERSION_SH
extern OSMesgQueue gRumblePakSchedulerMesgQueue;
extern OSMesgQueue gRumbleThreadVIMesgQueue;
#endif
extern OSMesg gDmaMesgBuf[1];
extern OSMesg gPIMesgBuf[32];
extern OSMesg gSIEventMesgBuf[1];
@ -46,13 +38,18 @@ extern OSIoMesg gDmaIoMesg;
extern OSMesg D_80339BEC;
extern OSMesgQueue gDmaMesgQueue;
extern OSMesgQueue gSIEventMesgQueue;
#ifndef VERSION_SH
#ifdef VERSION_SH
extern OSThread gRumblePakThread;
extern OSMesg gRumblePakSchedulerMesgBuf[1];
extern OSMesg gRumbleThreadVIMesgBuf[1];
extern OSMesgQueue gRumblePakSchedulerMesgQueue;
extern OSMesgQueue gRumbleThreadVIMesgQueue;
#endif
extern s32 gRumblePakPfs; // Actually an OSPfs but we don't have that header yet
extern struct RumbleData gRumbleDataQueue[3];
extern struct StructSH8031D9B0 gCurrRumbleSettings;
#endif
extern struct VblankHandler *gVblankHandler1;
extern struct VblankHandler *gVblankHandler2;