mirror of
https://github.com/izzy2lost/Ghostship.git
synced 2026-06-19 01:17:03 -07:00
Removed audio remainings and fixed skybox crash on windows
This commit is contained in:
@@ -52,6 +52,7 @@ build/*
|
||||
.assets-local.txt
|
||||
|
||||
build/
|
||||
build*/
|
||||
build-cmake/*
|
||||
cmake-msvc-*/*
|
||||
cmake-build-*/*
|
||||
|
||||
+1
-1
Submodule libultraship updated: 6ae0476d55...69b7b61602
@@ -1,13 +0,0 @@
|
||||
#include "sound/sound_data.h"
|
||||
|
||||
unsigned char gSoundDataADSR[] = {
|
||||
#include "sound/sound_data.ctl.inc.c"
|
||||
};
|
||||
|
||||
unsigned char gSoundDataRaw[] = {
|
||||
#include "sound/sound_data.tbl.inc.c"
|
||||
};
|
||||
|
||||
unsigned char gMusicData[] = {
|
||||
#include "sound/sequences.bin.inc.c"
|
||||
};
|
||||
@@ -479,10 +479,6 @@ void load_sequence_internal(u32 player, u32 seqId, s32 loadAsync) {
|
||||
seqPlayer->scriptState.pc = sequenceData;
|
||||
}
|
||||
|
||||
unsigned char gBankTempData[] = {
|
||||
#include "sound/bank_sets.inc.c"
|
||||
};
|
||||
|
||||
// (void) must be omitted from parameters to fix stack with -framepointer
|
||||
void audio_init() {
|
||||
s32 i, j;
|
||||
|
||||
+5
-2
@@ -251,8 +251,8 @@ void draw_skybox_tile_grid(Gfx **dlist, s8 background, s8 player, s8 colorIndex)
|
||||
uint8_t* texture = gSkyboxTiles[tileIndex];
|
||||
|
||||
if(texture == NULL){
|
||||
texture = malloc(2048);
|
||||
gSkyboxTiles[tileIndex] = texture;
|
||||
gSkyboxTiles[tileIndex] = malloc(2048);
|
||||
texture = gSkyboxTiles[tileIndex];
|
||||
}
|
||||
|
||||
// Memcpy texture with calculated offset from x and y using the fact that every tile is 2048 bytes
|
||||
@@ -303,6 +303,9 @@ Gfx *init_skybox_display_list(s8 player, s8 background, s8 colorIndex) {
|
||||
Mtx *ortho = create_skybox_ortho_matrix(player);
|
||||
if(gSkyboxTiles == NULL){
|
||||
gSkyboxTiles = malloc(80 * sizeof(uint8_t*));
|
||||
for (size_t idx = 0; idx < 80; idx++) {
|
||||
gSkyboxTiles[idx] = NULL;
|
||||
}
|
||||
gLastSkybox = background;
|
||||
} else if(gLastSkybox != background ){
|
||||
for(size_t i = 0; i < 80; i++){
|
||||
|
||||
Reference in New Issue
Block a user