diff options
| author | Wohlstand <admin@wohlnet.ru> | 2018-09-25 19:26:21 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2018-09-25 19:26:21 +0300 |
| commit | bb0d23251324fadd49cbf53c1673b80ef07ffeff (patch) | |
| tree | 57a9a9b754f40877add55bde772d06791f5727e1 /utils | |
| parent | 36f58b5c73766e4173b1cb04168909fdbcf9a5bf (diff) | |
| parent | 923ea2f4d2c26248d518c9af7cafb938cd5ee9d6 (diff) | |
| download | libADLMIDI-bb0d23251324fadd49cbf53c1673b80ef07ffeff.tar.gz libADLMIDI-bb0d23251324fadd49cbf53c1673b80ef07ffeff.tar.bz2 libADLMIDI-bb0d23251324fadd49cbf53c1673b80ef07ffeff.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/gen_adldata/file_formats/load_bnk2.h | 1 | ||||
| -rw-r--r-- | utils/gen_adldata/scrapped.txt | 4 | ||||
| -rw-r--r-- | utils/vlc_codec/libadlmidi.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/utils/gen_adldata/file_formats/load_bnk2.h b/utils/gen_adldata/file_formats/load_bnk2.h index a55551a..b4f8da9 100644 --- a/utils/gen_adldata/file_formats/load_bnk2.h +++ b/utils/gen_adldata/file_formats/load_bnk2.h @@ -93,6 +93,7 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix, if(xxP24NNN & 8) { // dual-op + tmp2.real4op = true; tmp[1].diff = true; size_t resno = InsertIns(tmp[0], tmp[1], tmp2, std::string(1, '\377') + name, name2); SetBank(bank, (unsigned int)gmno, resno); diff --git a/utils/gen_adldata/scrapped.txt b/utils/gen_adldata/scrapped.txt index 10c15cd..7ea1dc0 100644 --- a/utils/gen_adldata/scrapped.txt +++ b/utils/gen_adldata/scrapped.txt @@ -75,7 +75,7 @@ static const char *const banknames[] = "TMB (Shadow Warrior)", "DMX (Raptor)", "OP3 (Modded GMOPL by Wohlstand)", - "SB (Jammey O'Connel's bank)", + "SB (Jamie O'Connell's bank)", "TMB (Default bank of Build Engine)", "OP3 (4op bank by James Alan Nguyen)", "TMB (Blood)", @@ -254,7 +254,7 @@ LoadTMB("fm_banks/tmb_files/bloodtmb.tmb", 69, "apgblood"); LoadTMB("fm_banks/tmb_files/lee.tmb", 70, "apglee"); LoadTMB("fm_banks/tmb_files/nam.tmb", 71, "apgnam"); -LoadDoom("fm_banks/doom2/DMXOPL-by-sneakernets.op2", 72, "skeakernets"); +LoadDoom("fm_banks/doom2/DMXOPL-by-sneakernets.op2", 72, "sneakernets"); //LoadBNK("bnk_files/grassman1.bnk", 63, "b63", false); //LoadBNK("bnk_files/grassman2.bnk", 64, "b64", false); diff --git a/utils/vlc_codec/libadlmidi.c b/utils/vlc_codec/libadlmidi.c index 187ee84..0440fe5 100644 --- a/utils/vlc_codec/libadlmidi.c +++ b/utils/vlc_codec/libadlmidi.c @@ -98,7 +98,7 @@ static const char * const emulator_type_descriptions[] = { N_("Nuked OPL3 1.8"), N_("Nuked OPL3 1.7.4 (Optimized)"), - N_("DosBox"), + N_("DOSBox"), NULL }; |