diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-09-04 01:28:29 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-09-04 01:28:29 +0300 |
| commit | 9efe77035f72c0a0ee046e3b2cda0157acd2a8ca (patch) | |
| tree | 6e1ef697e208386e2eabab75699c19c138ffe893 /utils | |
| parent | f2a62189128a508be9d5bcbc30aabc69c3112efb (diff) | |
| parent | 5c9eb9c4fb736a004af31874d457a183d7a3cbe5 (diff) | |
| download | libADLMIDI-9efe77035f72c0a0ee046e3b2cda0157acd2a8ca.tar.gz libADLMIDI-9efe77035f72c0a0ee046e3b2cda0157acd2a8ca.tar.bz2 libADLMIDI-9efe77035f72c0a0ee046e3b2cda0157acd2a8ca.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 | 2 | ||||
| -rw-r--r-- | utils/vlc_codec/libadlmidi.c | 2 |
3 files changed, 3 insertions, 2 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 51a0497..7ea1dc0 100644 --- a/utils/gen_adldata/scrapped.txt +++ b/utils/gen_adldata/scrapped.txt @@ -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 }; |