From 103242d4d37c3c20398a787db58c36c152f09ed6 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Thu, 21 Sep 2023 17:34:41 -0700 Subject: [PATCH] refactor(zc): move some things from .zmod to be hardcoded --- src/zc/ending.cpp | 2 +- src/zc/hero.cpp | 2 +- src/zc/title.cpp | 11 +++-------- src/zc/zc_sys.cpp | 2 +- src/zc/zc_sys.h | 2 +- src/zc/zelda.cpp | 6 +++--- src/zcmusic.cpp | 2 +- src/zcmusic.h | 2 +- 8 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/zc/ending.cpp b/src/zc/ending.cpp index 8ce69bd65d..a6971a15da 100644 --- a/src/zc/ending.cpp +++ b/src/zc/ending.cpp @@ -354,7 +354,7 @@ void ending() if(f==861) { blit(scrollbuf,framebuf,0,0,0,playing_field_offset!=0?168:0,256,passive_subscreen_height); - try_zcmusic((char*)moduledata.base_NSF_file, moduledata.ending_track, ZC_MIDI_ENDING); + try_zcmusic("zelda.nsf", moduledata.ending_track, ZC_MIDI_ENDING); for(int32_t y=0; y<224; y++) { diff --git a/src/zc/hero.cpp b/src/zc/hero.cpp index cf57c1f13b..df123935f3 100644 --- a/src/zc/hero.cpp +++ b/src/zc/hero.cpp @@ -30297,7 +30297,7 @@ void HeroClass::getTriforce(int32_t id2) if(itemsbuf[id2].misc1) jukebox(itemsbuf[id2].misc1+ZC_MIDI_COUNT-1); else - try_zcmusic((char*)moduledata.base_NSF_file,moduledata.tf_track, ZC_MIDI_TRIFORCE); + try_zcmusic("zelda.nsf",moduledata.tf_track, ZC_MIDI_TRIFORCE); } if(itemsbuf[id2].flags & ITEM_GAMEDATA) { diff --git a/src/zc/title.cpp b/src/zc/title.cpp index 8e15f75fcd..f1d5f8f6ac 100644 --- a/src/zc/title.cpp +++ b/src/zc/title.cpp @@ -326,16 +326,11 @@ static void list_saves() static void draw_cursor(int32_t pos,int32_t mode) { - int32_t cs = 0; - //al_trace( "moduledata.select_screen_tile_csets[sels_cusror_cset] is: %d\n", moduledata.select_screen_tile_csets[sels_cusror_cset]); - if ( (unsigned)moduledata.select_screen_tile_csets[sels_cusror_cset] < 15 ) cs = moduledata.select_screen_tile_csets[sels_cusror_cset]; - else cs = (mode==3)?13:9; - //al_trace("select screen cursor cset is: %d\n", cs); - + int32_t cs = (mode==3)?13:9; if(pos<3) - overtile8(framebuf,moduledata.select_screen_tiles[sels_cursor_tile],40,pos*24+77,cs,0); + overtile8(framebuf,0,40,pos*24+77,cs,0); else - overtile8(framebuf,moduledata.select_screen_tiles[sels_cursor_tile],40,(pos-3)*16+153,cs,0); + overtile8(framebuf,0,40,(pos-3)*16+153,cs,0); } static bool register_name() diff --git a/src/zc/zc_sys.cpp b/src/zc/zc_sys.cpp index c82f9b4fb6..ac9f1c1824 100644 --- a/src/zc/zc_sys.cpp +++ b/src/zc/zc_sys.cpp @@ -8275,7 +8275,7 @@ INLINE int32_t mixvol(int32_t v1,int32_t v2) } // Run an NSF, or a MIDI if the NSF is missing somehow. -bool try_zcmusic(char *filename, int32_t track, int32_t midi, int32_t fadeoutframes) +bool try_zcmusic(const char *filename, int32_t track, int32_t midi, int32_t fadeoutframes) { ZCMUSIC *newzcmusic = zcmusic_load_for_quest(filename, qstpath); diff --git a/src/zc/zc_sys.h b/src/zc/zc_sys.h index 060c046fb5..d0c9629ab5 100644 --- a/src/zc/zc_sys.h +++ b/src/zc/zc_sys.h @@ -221,7 +221,7 @@ int32_t high_flag(int32_t i, int32_t item_type, bool consecutive); int32_t item_tile_mod(); int32_t bunny_tile_mod(); -bool try_zcmusic(char *filename, int32_t track, int32_t midi, int32_t fadeoutframes = 0); +bool try_zcmusic(const char *filename, int32_t track, int32_t midi, int32_t fadeoutframes = 0); bool try_zcmusic_mix(ZCMUSIC* &zcm, char* filename, int32_t track, int32_t midi, int32_t fadevol, int32_t fadeoutframes = 0); bool try_zcmusic_ex(char *filename, int32_t track, int32_t midi); int32_t get_zcmusicpos(); diff --git a/src/zc/zelda.cpp b/src/zc/zelda.cpp index be7e77f03e..e7d01fd0c0 100644 --- a/src/zc/zelda.cpp +++ b/src/zc/zelda.cpp @@ -4831,7 +4831,7 @@ int main(int argc, char **argv) packfile_password(""); // Temporary measure. -L Z_message("Zelda.Dat..."); - if((datafile=load_datafile(moduledata.datafiles[zelda_dat]))==NULL) + if((datafile=load_datafile("modules/classic/classic_zelda.dat"))==NULL) { Z_error_fatal("failed to load zelda_dat"); } @@ -4846,7 +4846,7 @@ int main(int argc, char **argv) Z_message("Fonts.Dat..."); - if((fontsdata=load_datafile_count(moduledata.datafiles[fonts_dat], fontsdat_cnt))==NULL) + if((fontsdata=load_datafile_count("modules/classic/classic_fonts.dat", fontsdat_cnt))==NULL) { Z_error_fatal("failed to load fonts"); } @@ -4867,7 +4867,7 @@ int main(int argc, char **argv) Z_message("SFX.Dat..."); - if((sfxdata=load_datafile(moduledata.datafiles[sfx_dat]))==NULL) + if((sfxdata=load_datafile("sfx.dat"))==NULL) { Z_error_fatal("failed to load sfx_dat"); } diff --git a/src/zcmusic.cpp b/src/zcmusic.cpp index 2067cc71af..473af375fe 100644 --- a/src/zcmusic.cpp +++ b/src/zcmusic.cpp @@ -64,7 +64,7 @@ static int32_t zcmusic_bufsz_private = 64; ALLEGRO_MUTEX* playlistmutex = NULL; -ZCMUSIC* zcmusic_load_for_quest(char* filename, char* quest_path) +ZCMUSIC* zcmusic_load_for_quest(const char* filename, char* quest_path) { if (!al_is_audio_installed()) return nullptr; diff --git a/src/zcmusic.h b/src/zcmusic.h index a2445bf6ca..45fef57b91 100644 --- a/src/zcmusic.h +++ b/src/zcmusic.h @@ -50,7 +50,7 @@ typedef struct #endif } ZCMUSIC; -ZCM_EXTERN ZCMUSIC* zcmusic_load_for_quest(char* filename, char* quest_path); +ZCM_EXTERN ZCMUSIC* zcmusic_load_for_quest(const char* filename, char* quest_path); ZCM_EXTERN bool zcmusic_init(int32_t flags = -1); ZCM_EXTERN bool zcmusic_poll(int32_t flags = -1);