mirror of
https://github.com/libretro/libretro-prboom.git
synced 2024-11-30 11:40:23 +00:00
Merge pull request #25 from knuxyl/patch-2
Updated music file name section
This commit is contained in:
Twinaphex
GitHub
commit
e09831c627
169
src/m_misc.c
169
src/m_misc.c
@ -599,142 +599,173 @@ default_t defaults[] =
|
||||
{"weapon_choice_9", {&weapon_preferences[0][8], NULL}, {1, NULL}, 0,9,
|
||||
def_int,ss_weap, NULL, NULL}, // ninth choice for weapon (worst)
|
||||
|
||||
// cournia - support for arbitrary music file (defaults are mp3)
|
||||
{"Music", {NULL},{0},UL,UL,def_none,ss_none, NULL, NULL},
|
||||
{"mus_e1m1", {0,&S_music_files[mus_e1m1]}, {0,"e1m1.mp3"},UL,UL,
|
||||
// cournia - support for arbitrary music file (defaults are mp3)
|
||||
|
||||
{"Music", {NULL},{0},UL,UL,def_none,ss_none, NULL, NULL},
|
||||
|
||||
//Fixed support for Doom, Doom 2, and Doom Final
|
||||
//You must use a seperate folder for each wad to be able to have all Dooms use their correct music
|
||||
//In ~/RetroPie/roms/ports/ have a folder for each game, put the wad of each game in their related folder
|
||||
//Then put all the music in their folder
|
||||
//Also don't forget to include the prboom.wad into each game folder
|
||||
|
||||
//An example folder structure would be like so
|
||||
// roms
|
||||
// +ports
|
||||
// ++doom
|
||||
// +++doom.wad
|
||||
// +++prboom.wad
|
||||
// +++doomusic.mp3
|
||||
// ++doom2
|
||||
// +++doom2.wad
|
||||
// +++prboom.wad
|
||||
// +++doom2music.mp3
|
||||
|
||||
//An example launcher script in ~/RetroPie/roms/ports/*.sh would be like this
|
||||
// #!/bin/bash
|
||||
// /opt/retropie/supplementary/runcommand/runcommand.sh 0 "/opt/retropie/emulators/retroarch/bin/retroarch -L /opt/retropie/libretrocores/lr-prboom/prboom_libretro.so --config /opt/retropie/configs/doom/retroarch.cfg /home/pi/RetroPie/roms/ports/doom2/doom2.wad" "lr-prboom"
|
||||
//You must change the folder name and wad name for each game you want and save it as a .sh file in ~/RetroPie/roms/ports/
|
||||
|
||||
//Although all 3 games (Doom 2, Plutonia, TNT) use the same file names, the files are not the same
|
||||
|
||||
//Begin Doom 1
|
||||
{"mus_bunny", {0,&S_music_files[mus_bunny]}, {0,"bunny.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e1m2", {0,&S_music_files[mus_e1m2]}, {0,"e1m2.mp3"},UL,UL,
|
||||
{"mus_e1m1", {0,&S_music_files[mus_e1m1]}, {0,"e1m1.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e1m3", {0,&S_music_files[mus_e1m3]}, {0,"e1m3.mp3"},UL,UL,
|
||||
{"mus_e1m2", {0,&S_music_files[mus_e1m2]}, {0,"e1m2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e1m4", {0,&S_music_files[mus_e1m4]}, {0,"e1m4.mp3"},UL,UL,
|
||||
{"mus_e1m3", {0,&S_music_files[mus_e1m3]}, {0,"e1m3.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e1m5", {0,&S_music_files[mus_e1m5]}, {0,"e1m5.mp3"},UL,UL,
|
||||
{"mus_e1m4", {0,&S_music_files[mus_e1m4]}, {0,"e1m4.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e1m6", {0,&S_music_files[mus_e1m6]}, {0,"e1m6.mp3"},UL,UL,
|
||||
{"mus_e1m5", {0,&S_music_files[mus_e1m5]}, {0,"e1m5.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e1m7", {0,&S_music_files[mus_e1m7]}, {0,"e1m7.mp3"},UL,UL,
|
||||
{"mus_e1m6", {0,&S_music_files[mus_e1m6]}, {0,"e1m6.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e1m8", {0,&S_music_files[mus_e1m8]}, {0,"e1m8.mp3"},UL,UL,
|
||||
{"mus_e1m7", {0,&S_music_files[mus_e1m7]}, {0,"e1m7.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e1m9", {0,&S_music_files[mus_e1m9]}, {0,"e1m9.mp3"},UL,UL,
|
||||
{"mus_e1m8", {0,&S_music_files[mus_e1m8]}, {0,"e1m8.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m1", {0,&S_music_files[mus_e2m1]}, {0,"e2m1.mp3"},UL,UL,
|
||||
{"mus_e1m9", {0,&S_music_files[mus_e1m9]}, {0,"e1m9.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m2", {0,&S_music_files[mus_e2m2]}, {0,"e2m2.mp3"},UL,UL,
|
||||
{"mus_e2m1", {0,&S_music_files[mus_e2m1]}, {0,"e2m1.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m3", {0,&S_music_files[mus_e2m3]}, {0,"e2m3.mp3"},UL,UL,
|
||||
{"mus_e2m2", {0,&S_music_files[mus_e2m2]}, {0,"e2m2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m4", {0,&S_music_files[mus_e2m4]}, {0,"e2m4.mp3"},UL,UL,
|
||||
{"mus_e2m3", {0,&S_music_files[mus_e2m3]}, {0,"e2m3.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m5", {0,&S_music_files[mus_e2m5]}, {0,"e1m7.mp3"},UL,UL,
|
||||
{"mus_e2m4", {0,&S_music_files[mus_e2m4]}, {0,"e2m4.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m6", {0,&S_music_files[mus_e2m6]}, {0,"e2m6.mp3"},UL,UL,
|
||||
{"mus_e2m5", {0,&S_music_files[mus_e2m5]}, {0,"e1m5.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m7", {0,&S_music_files[mus_e2m7]}, {0,"e2m7.mp3"},UL,UL,
|
||||
{"mus_e2m6", {0,&S_music_files[mus_e2m6]}, {0,"e2m6.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m8", {0,&S_music_files[mus_e2m8]}, {0,"e2m8.mp3"},UL,UL,
|
||||
{"mus_e2m7", {0,&S_music_files[mus_e2m7]}, {0,"e2m7.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e2m9", {0,&S_music_files[mus_e2m9]}, {0,"e3m1.mp3"},UL,UL,
|
||||
{"mus_e2m8", {0,&S_music_files[mus_e2m8]}, {0,"e2m8.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m1", {0,&S_music_files[mus_e3m1]}, {0,"e3m1.mp3"},UL,UL,
|
||||
{"mus_e2m9", {0,&S_music_files[mus_e2m9]}, {0,"e2m9.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m2", {0,&S_music_files[mus_e3m2]}, {0,"e3m2.mp3"},UL,UL,
|
||||
{"mus_e3m1", {0,&S_music_files[mus_e3m1]}, {0,"e3m1.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m3", {0,&S_music_files[mus_e3m3]}, {0,"e3m3.mp3"},UL,UL,
|
||||
{"mus_e3m2", {0,&S_music_files[mus_e3m2]}, {0,"e3m2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m4", {0,&S_music_files[mus_e3m4]}, {0,"e1m8.mp3"},UL,UL,
|
||||
{"mus_e3m3", {0,&S_music_files[mus_e3m3]}, {0,"e3m3.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m5", {0,&S_music_files[mus_e3m5]}, {0,"e1m7.mp3"},UL,UL,
|
||||
{"mus_e3m4", {0,&S_music_files[mus_e3m4]}, {0,"e3m4.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m6", {0,&S_music_files[mus_e3m6]}, {0,"e1m6.mp3"},UL,UL,
|
||||
{"mus_e3m5", {0,&S_music_files[mus_e3m5]}, {0,"e3m5.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m7", {0,&S_music_files[mus_e3m7]}, {0,"e2m7.mp3"},UL,UL,
|
||||
{"mus_e3m6", {0,&S_music_files[mus_e3m6]}, {0,"e3m6.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m8", {0,&S_music_files[mus_e3m8]}, {0,"e3m8.mp3"},UL,UL,
|
||||
{"mus_e3m7", {0,&S_music_files[mus_e3m7]}, {0,"e3m7.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_e3m9", {0,&S_music_files[mus_e3m9]}, {0,"e1m9.mp3"},UL,UL,
|
||||
{"mus_e3m8", {0,&S_music_files[mus_e3m8]}, {0,"e3m8.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_inter", {0,&S_music_files[mus_inter]}, {0,"e2m3.mp3"},UL,UL,
|
||||
{"mus_e3m9", {0,&S_music_files[mus_e3m9]}, {0,"e3m9.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_intro", {0,&S_music_files[mus_intro]}, {0,"intro.mp3"},UL,UL,
|
||||
{"mus_inter", {0,&S_music_files[mus_inter]}, {0,"inter.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_bunny", {0,&S_music_files[mus_bunny]}, {0,"bunny.mp3"},UL,UL,
|
||||
{"mus_introa", {0,&S_music_files[mus_introa]}, {0,"intro.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_victor", {0,&S_music_files[mus_victor]}, {0,"victor.mp3"},UL,UL,
|
||||
{"mus_intro", {0,&S_music_files[mus_intro]}, {0,"intro.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_introa", {0,&S_music_files[mus_introa]}, {0,"intro.mp3"},UL,UL,
|
||||
{"mus_victor", {0,&S_music_files[mus_victor]}, {0,"victor.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_runnin", {0,&S_music_files[mus_runnin]}, {0,"runnin.mp3"},UL,UL,
|
||||
//End Doom 1
|
||||
//Begin Doom 2 & Final Doom
|
||||
{"mus_adrian", {0,&S_music_files[mus_adrian]}, {0,"adrian.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_stalks", {0,&S_music_files[mus_stalks]}, {0,"stalks.mp3"},UL,UL,
|
||||
{"mus_ampie", {0,&S_music_files[mus_ampie]}, {0,"ampie.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_countd", {0,&S_music_files[mus_countd]}, {0,"countd.mp3"},UL,UL,
|
||||
{"mus_betwee", {0,&S_music_files[mus_betwee]}, {0,"betwee.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_betwee", {0,&S_music_files[mus_betwee]}, {0,"betwee.mp3"},UL,UL,
|
||||
{"mus_count2", {0,&S_music_files[mus_count2]}, {0,"count2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_doom", {0,&S_music_files[mus_doom]}, {0,"doom.mp3"},UL,UL,
|
||||
{"mus_countd", {0,&S_music_files[mus_countd]}, {0,"countd.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_the_da", {0,&S_music_files[mus_the_da]}, {0,"the_da.mp3"},UL,UL,
|
||||
{"mus_ddtbl2", {0,&S_music_files[mus_ddtbl2]}, {0,"ddtbl2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_shawn", {0,&S_music_files[mus_shawn]}, {0,"shawn.mp3"},UL,UL,
|
||||
{"mus_ddtbl3", {0,&S_music_files[mus_ddtbl3]}, {0,"ddtbl3.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_ddtblu", {0,&S_music_files[mus_ddtblu]}, {0,"ddtblu.mp3"},UL,UL,
|
||||
{"mus_ddtblu", {0,&S_music_files[mus_ddtblu]}, {0,"ddtblu.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_in_cit", {0,&S_music_files[mus_in_cit]}, {0,"in_cit.mp3"},UL,UL,
|
||||
{"mus_dead2", {0,&S_music_files[mus_dead2]}, {0,"dead2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_dead", {0,&S_music_files[mus_dead]}, {0,"dead.mp3"},UL,UL,
|
||||
{"mus_dead", {0,&S_music_files[mus_dead]}, {0,"dead.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_stlks2", {0,&S_music_files[mus_stlks2]}, {0,"stalks.mp3"},UL,UL,
|
||||
{"mus_dm2int", {0,&S_music_files[mus_dm2int]}, {0,"dm2int.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_theda2", {0,&S_music_files[mus_theda2]}, {0,"the_da.mp3"},UL,UL,
|
||||
{"mus_dm2ttl", {0,&S_music_files[mus_dm2ttl]}, {0,"dm2ttl.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_doom2", {0,&S_music_files[mus_doom2]}, {0,"doom.mp3"},UL,UL,
|
||||
{"mus_doom2", {0,&S_music_files[mus_doom2]}, {0,"doom2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_ddtbl2", {0,&S_music_files[mus_ddtbl2]}, {0,"ddtblu.mp3"},UL,UL,
|
||||
{"mus_doom", {0,&S_music_files[mus_doom]}, {0,"doom.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_runni2", {0,&S_music_files[mus_runni2]}, {0,"runnin.mp3"},UL,UL,
|
||||
{"mus_evil", {0,&S_music_files[mus_evil]}, {0,"evil.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_dead2", {0,&S_music_files[mus_dead2]}, {0,"dead.mp3"},UL,UL,
|
||||
{"mus_in_cit", {0,&S_music_files[mus_in_cit]}, {0,"in_cit.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_stlks3", {0,&S_music_files[mus_stlks3]}, {0,"stalks.mp3"},UL,UL,
|
||||
{"mus_messag", {0,&S_music_files[mus_messag]}, {0,"messag.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_romero", {0,&S_music_files[mus_romero]}, {0,"romero.mp3"},UL,UL,
|
||||
{"mus_messg2", {0,&S_music_files[mus_messg2]}, {0,"messg2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_shawn2", {0,&S_music_files[mus_shawn2]}, {0,"shawn.mp3"},UL,UL,
|
||||
{"mus_openin", {0,&S_music_files[mus_openin]}, {0,"openin.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_messag", {0,&S_music_files[mus_messag]}, {0,"messag.mp3"},UL,UL,
|
||||
{"mus_read_m", {0,&S_music_files[mus_read_m]}, {0,"read_m.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_count2", {0,&S_music_files[mus_count2]}, {0,"countd.mp3"},UL,UL,
|
||||
{"mus_romer2", {0,&S_music_files[mus_romer2]}, {0,"romer2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_ddtbl3", {0,&S_music_files[mus_ddtbl3]}, {0,"ddtblu.mp3"},UL,UL,
|
||||
{"mus_romero", {0,&S_music_files[mus_romero]}, {0,"romero.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_ampie", {0,&S_music_files[mus_ampie]}, {0,"ampie.mp3"},UL,UL,
|
||||
{"mus_runni2", {0,&S_music_files[mus_runni2]}, {0,"runni2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_theda3", {0,&S_music_files[mus_theda3]}, {0,"the_da.mp3"},UL,UL,
|
||||
{"mus_runnin", {0,&S_music_files[mus_runnin]}, {0,"runnin.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_adrian", {0,&S_music_files[mus_adrian]}, {0,"adrian.mp3"},UL,UL,
|
||||
{"mus_shawn2", {0,&S_music_files[mus_shawn2]}, {0,"shawn2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_messg2", {0,&S_music_files[mus_messg2]}, {0,"messag.mp3"},UL,UL,
|
||||
{"mus_shawn3", {0,&S_music_files[mus_shawn3]}, {0,"shawn3.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_romer2", {0,&S_music_files[mus_romer2]}, {0,"romero.mp3"},UL,UL,
|
||||
{"mus_shawn", {0,&S_music_files[mus_shawn]}, {0,"shawn.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_tense", {0,&S_music_files[mus_tense]}, {0,"tense.mp3"},UL,UL,
|
||||
{"mus_stalks", {0,&S_music_files[mus_stalks]}, {0,"stalks.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_shawn3", {0,&S_music_files[mus_shawn3]}, {0,"shawn.mp3"},UL,UL,
|
||||
{"mus_stlks2", {0,&S_music_files[mus_stlks2]}, {0,"stlks2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_openin", {0,&S_music_files[mus_openin]}, {0,"openin.mp3"},UL,UL,
|
||||
{"mus_stlks3", {0,&S_music_files[mus_stlks3]}, {0,"stlks3.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_evil", {0,&S_music_files[mus_evil]}, {0,"evil.mp3"},UL,UL,
|
||||
{"mus_tense", {0,&S_music_files[mus_tense]}, {0,"tense.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_ultima", {0,&S_music_files[mus_ultima]}, {0,"ultima.mp3"},UL,UL,
|
||||
{"mus_theda2", {0,&S_music_files[mus_theda2]}, {0,"theda2.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_read_m", {0,&S_music_files[mus_read_m]}, {0,"read_m.mp3"},UL,UL,
|
||||
{"mus_theda3", {0,&S_music_files[mus_theda3]}, {0,"theda3.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_dm2ttl", {0,&S_music_files[mus_dm2ttl]}, {0,"dm2ttl.mp3"},UL,UL,
|
||||
{"mus_the_da", {0,&S_music_files[mus_the_da]}, {0,"the_da.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
{"mus_dm2int", {0,&S_music_files[mus_dm2int]}, {0,"dm2int.mp3"},UL,UL,
|
||||
{"mus_ultima", {0,&S_music_files[mus_ultima]}, {0,"ultima.mp3"},UL,UL,
|
||||
def_str,ss_none, NULL, NULL},
|
||||
//End Doom 2 and Final Doom
|
||||
};
|
||||
|
||||
int numdefaults;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user