Skip to content

Commit

Permalink
refactor(zc): move some things from .zmod to be hardcoded
Browse files Browse the repository at this point in the history
  • Loading branch information
connorjclark committed Sep 22, 2023
1 parent 8362c1e commit 103242d
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/zc/ending.cpp
Expand Up @@ -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++)
{
Expand Down
2 changes: 1 addition & 1 deletion src/zc/hero.cpp
Expand Up @@ -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)
{
Expand Down
11 changes: 3 additions & 8 deletions src/zc/title.cpp
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/zc/zc_sys.cpp
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/zc/zc_sys.h
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/zc/zelda.cpp
Expand Up @@ -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");
}
Expand All @@ -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");
}
Expand All @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion src/zcmusic.cpp
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/zcmusic.h
Expand Up @@ -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);
Expand Down

0 comments on commit 103242d

Please sign in to comment.