mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-19 14:23:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation on windows

Browse Source
This commit is contained in:
KiritoDv
2024-04-02 09:39:25 -06:00
parent 9e6800d369
commit 11ddc641c0
15 changed files with 441 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/audio_general.c
+1 -1
View File
@@ -2008,7 +2008,7 @@ s32 Audio_GetCurrentVoice(void) {
s32 Audio_GetCurrentVoiceStatus(void) {
// LAudioTODO: Stub for now
return 0;
return 1;
SequenceChannel* channel = gSeqPlayers[SEQ_PLAYER_VOICE].channels[15];
SequenceLayer* layer = channel->layers[0];
src/dmatable.c
+2 -2
View File
@@ -5,7 +5,7 @@
#define DMA_ENTRY_NONE \
{ NULL, { NULL, NULL }, false }
DmaEntry gDmaTable[90] = {
// DmaEntry gDmaTable[90] = {
// { SEGMENT_ROM_START(makerom), { SEGMENT_ROM_START(makerom), SEGMENT_ROM_END(makerom) }, false },
// { SEGMENT_ROM_START(main), { SEGMENT_ROM_START(main), SEGMENT_ROM_END(main) }, false },
// { SEGMENT_ROM_START(dma_table), { SEGMENT_ROM_START(dma_table), SEGMENT_ROM_END(dma_table) }, false },
@@ -84,4 +84,4 @@ DmaEntry gDmaTable[90] = {
// { SEGMENT_ROM_START(ovl_menu), { SEGMENT_ROM_START(ovl_menu), SEGMENT_ROM_END(ovl_menu) }, false },
// { SEGMENT_ROM_START(ovl_ending), { SEGMENT_ROM_START(ovl_ending), SEGMENT_ROM_END(ovl_ending) }, false },
// { SEGMENT_ROM_START(ovl_unused), { SEGMENT_ROM_START(ovl_unused), SEGMENT_ROM_END(ovl_unused) }, false },
};
// };
src/engine/fox_load.c
+46 -57
View File
@@ -28,20 +28,9 @@ OverlayInit sCurrentOverlay = {
void Overlay_LoadSegment(void* vRomAddress, void* dest, ptrdiff_t size) {
s32 i;
for (i = 0; gDmaTable[i].pRom.end != NULL; i++) {
if (gDmaTable[i].vRomAddress == vRomAddress) {
if (gDmaTable[i].compFlag == 0) {
Lib_DmaRead(gDmaTable[i].pRom.start, dest, size);
} else {
Lib_FillScreen(true);
sFillTimer = 3;
D_80161A39 = true;
// Lib_DmaRead(gDmaTable[i].pRom.start, gFrameBuffers, SEGMENT_SIZE(gDmaTable[i].pRom));
// Mio0_Decompress(gFrameBuffers, dest);
}
break;
}
}
Lib_FillScreen(true);
sFillTimer = 3;
D_80161A39 = true;
}
u8 Overlay_Init(OverlayInit* ovlInit) {
@@ -49,51 +38,51 @@ u8 Overlay_Init(OverlayInit* ovlInit) {
sCurrentOverlay = *ovlInit;
return true;
u8* ramPtr = SEGMENT_VRAM_START(ovl_i1);
u8 segment;
u8 changeOvl = false;
// u8* ramPtr = SEGMENT_VRAM_START(ovl_i1);
// u8 segment;
// u8 changeOvl = false;
if (ovlInit->ovl.rom.start == (0, sCurrentOverlay.ovl.rom.start)) { // fake because D_800CBDD4 is probably 2D array
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->ovl.rom);
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->ovl.bss);
} else {
sCurrentOverlay.ovl.rom.start = ovlInit->ovl.rom.start;
sCurrentOverlay.ovl.rom.end = ramPtr;
if (ovlInit->ovl.rom.start != 0) {
changeOvl = true;
Overlay_LoadSegment(ovlInit->ovl.rom.start, ramPtr, SEGMENT_SIZE(ovlInit->ovl.rom));
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->ovl.rom);
bzero(ovlInit->ovl.bss.start, SEGMENT_SIZE(ovlInit->ovl.bss));
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->ovl.bss);
}
}
segment = 0;
while ((segment < 15) && (ovlInit->assets[segment].start == sCurrentOverlay.assets[segment].start) &&
changeOvl == 0) {
if (ovlInit->assets[segment].start != 0) {
gSegments[segment + 1] = K0_TO_PHYS(ramPtr);
gSPSegment(gUnkDisp1++, segment + 1, K0_TO_PHYS(ramPtr));
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->assets[segment]);
}
segment += 1;
}
for (segment; segment < 15; segment += 1) {
sCurrentOverlay.assets[segment].start = ovlInit->assets[segment].start;
sCurrentOverlay.assets[segment].end = ramPtr;
if (ovlInit->assets[segment].start != 0) {
gSegments[segment + 1] = K0_TO_PHYS(ramPtr);
gSPSegment(gUnkDisp1++, segment + 1, K0_TO_PHYS(ramPtr));
Overlay_LoadSegment(ovlInit->assets[segment].start, ramPtr, SEGMENT_SIZE(ovlInit->assets[segment]));
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->assets[segment]);
}
}
// if (ovlInit->ovl.rom.start == (0, sCurrentOverlay.ovl.rom.start)) { // fake because D_800CBDD4 is probably 2D array
// ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->ovl.rom);
// ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->ovl.bss);
// } else {
// sCurrentOverlay.ovl.rom.start = ovlInit->ovl.rom.start;
// sCurrentOverlay.ovl.rom.end = ramPtr;
// if (ovlInit->ovl.rom.start != 0) {
// changeOvl = true;
// Overlay_LoadSegment(ovlInit->ovl.rom.start, ramPtr, SEGMENT_SIZE(ovlInit->ovl.rom));
// ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->ovl.rom);
// bzero(ovlInit->ovl.bss.start, SEGMENT_SIZE(ovlInit->ovl.bss));
// ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->ovl.bss);
// }
// }
// segment = 0;
// while ((segment < 15) && (ovlInit->assets[segment].start == sCurrentOverlay.assets[segment].start) &&
// changeOvl == 0) {
// if (ovlInit->assets[segment].start != 0) {
// gSegments[segment + 1] = K0_TO_PHYS(ramPtr);
// gSPSegment(gUnkDisp1++, segment + 1, K0_TO_PHYS(ramPtr));
// ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->assets[segment]);
// }
// segment += 1;
// }
// for (segment; segment < 15; segment += 1) {
// sCurrentOverlay.assets[segment].start = ovlInit->assets[segment].start;
// sCurrentOverlay.assets[segment].end = ramPtr;
// if (ovlInit->assets[segment].start != 0) {
// gSegments[segment + 1] = K0_TO_PHYS(ramPtr);
// gSPSegment(gUnkDisp1++, segment + 1, K0_TO_PHYS(ramPtr));
// Overlay_LoadSegment(ovlInit->assets[segment].start, ramPtr, SEGMENT_SIZE(ovlInit->assets[segment]));
// ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->assets[segment]);
// }
// }
if (sFillTimer != 0) {
sFillTimer--;
} else if (gStartNMI == 0) {
Lib_FillScreen(false);
}
return changeOvl;
// if (sFillTimer != 0) {
// sFillTimer--;
// } else if (gStartNMI == 0) {
// Lib_FillScreen(false);
// }
// return changeOvl;
}
u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
src/port/Engine.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
#include <Fast3D/gfx_pc.h>
#include <Fast3D/gfx_rendering_api.h>
#include <SDL2/SDL_net.h>
#include <SDL2/SDL.h>
#include <utility>
@@ -122,10 +122,10 @@ extern "C" int GameEngine_OTRSigCheck(const char* data) {
}
extern "C" float SIN_DEG(float angle) {
return sinf(M_DTOR * angle);
return SDL_sinf(M_DTOR * angle);
}
extern "C" float COS_DEG(float angle) {
return cosf(M_DTOR * angle);
return SDL_cosf(M_DTOR * angle);
}
struct TimedEntry {
src/port/ui/ImguiUI.cpp
+1 -1
View File
@@ -383,7 +383,7 @@ void DrawMenuBarIcon() {
}
void DrawGameMenu() {
if (UIWidgets::BeginMenu("Ghostship")) {
if (UIWidgets::BeginMenu("Lylat64")) {
if (UIWidgets::MenuItem("Reset",
#ifdef __APPLE__
"Command-R"