diff options
| -rw-r--r-- | scumm/charset.cpp | 8 | ||||
| -rw-r--r-- | scumm/imuse_player.cpp | 4 | ||||
| -rw-r--r-- | scumm/midiparser_eup.cpp | 4 | ||||
| -rw-r--r-- | scumm/resource_v3.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v5.cpp | 10 | ||||
| -rw-r--r-- | scumm/sound.cpp | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 8ef53243b5..79b7a8acda 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -70,15 +70,15 @@ void ScummEngine::loadCJKFont() { fp.read(_2byteFontPtr, ((_2byteWidth + 7) / 8) * _2byteHeight * numChar); fp.close(); } - } else if (_language == Common::JA_JPN && _version == 5) { //FM Towns Kanji + } else if (_language == Common::JA_JPN && _version == 5) { // FM-TOWNS Kanji File fp; int numChar = 256 * 32; _2byteWidth = 16; _2byteHeight = 16; - //use FM Towns font rom, since game files don't have kanji font resources + // use FM-TOWNS font rom, since game files don't have kanji font resources if (fp.open("fmt_fnt.rom")) { _useCJKMode = true; - debug(2, "Loading FM Towns Kanji rom"); + debug(2, "Loading FM-TOWNS Kanji rom"); _2byteFontPtr = new byte[((_2byteWidth + 7) / 8) * _2byteHeight * numChar]; fp.read(_2byteFontPtr, ((_2byteWidth + 7) / 8) * _2byteHeight * numChar); fp.close(); @@ -1116,7 +1116,7 @@ void CharsetRendererV3::setColor(byte color) { _color = color; _shadowColor = (_vm->_features & GF_FMTOWNS) ? 8 : 0; - // FM Towns version of Loom uses old colour method as well + // FM-TOWNS version of Loom uses old colour method as well if ((_vm->_version >= 2) && (_vm->_features & GF_16COLOR || _vm->_gameId == GID_LOOM)) { _dropShadow = ((_color & 0xF0) != 0); _color &= 0x0f; diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index 39cba34369..681922170c 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -196,7 +196,7 @@ int Player::start_seq_sound(int sound, bool reset_vars) { // Old style 'RO' resource _parser = MidiParser_createRO(); } else if (!memcmp (ptr, "SO", 2)) { - // Euphony (FM Towns) resource + // Euphony (FM-TOWNS) resource _parser = MidiParser_createEUP(); } else if (!memcmp(ptr, "FORM", 4)) { // Humongous Games XMIDI resource @@ -368,7 +368,7 @@ void Player::sysEx(byte *p, uint16 len) { part->_instrument.send(part->_mc); } } else if (a == YM2612_SYSEX_ID) { - // FM-Towns custom instrument definition + // FM-TOWNS custom instrument definition _midi->sysEx_customInstrument (p[0], 'EUP ', p + 1); } else { warning("Unknown SysEx manufacturer 0x%02X", (int) a); diff --git a/scumm/midiparser_eup.cpp b/scumm/midiparser_eup.cpp index 3b8afcb907..ebc82ff36c 100644 --- a/scumm/midiparser_eup.cpp +++ b/scumm/midiparser_eup.cpp @@ -28,7 +28,7 @@ namespace Scumm { /** - * The FM Towns Euphony version of MidiParser. + * The FM-TOWNS Euphony version of MidiParser. */ class MidiParser_EUP : public MidiParser { protected: @@ -70,7 +70,7 @@ void MidiParser_EUP::parseNextEvent (EventInfo &info) { // in the music header. We're sending fixed GM // program changes to get a reasonable "one-size- // fits-all" sound until we actually support the - // FM synthesis capabilities of FM Towns. + // FM synthesis capabilities of FM-TOWNS. for (; _presend < 12; ++_presend) { if (_instr_to_channel[_presend >> 1] >= 16) continue; diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp index 234b0bbd30..92f3d06db0 100644 --- a/scumm/resource_v3.cpp +++ b/scumm/resource_v3.cpp @@ -153,7 +153,7 @@ void ScummEngine_v3::readIndexFile() { break; default: - // FIXME: this is a little hack because Indy3 FM Towns has + // FIXME: this is a little hack because Indy3 FM-TOWNS has // 32 extra bytes of unknown meaning appended to 00.LFL if (!(_gameId == GID_INDY3 && _features & GF_FMTOWNS)) error("Bad ID %c%c found in directory!", blocktype & 0xFF, blocktype >> 8); diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 5d9b6339b3..a135399c19 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -1774,15 +1774,15 @@ void ScummEngine_v5::o5_resourceRoutines() { // TODO: For the following see also Hibarnatus' information on bug #805691. case 32: - // TODO (apparently never used in FM Towns) + // TODO (apparently never used in FM-TOWNS) warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F, vm.slot[_currentScript].number); break; case 33: - // TODO (apparently never used in FM Towns) + // TODO (apparently never used in FM-TOWNS) warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F, vm.slot[_currentScript].number); break; case 35: - // TODO: Might be used to set CD volume in FM Towns Loom + // TODO: Might be used to set CD volume in FM-TOWNS Loom foo = getVarOrDirectByte(PARAM_2); warning("o5_resourceRoutines %d not yet handled (script %d)", _opcode & 0x3F, vm.slot[_currentScript].number); break; @@ -2095,7 +2095,7 @@ void ScummEngine_v5::o5_setVarRange() { void ScummEngine_v5::o5_startMusic() { if (_features & GF_FMTOWNS && _version == 3) { - // In FM Towns games this is some kind of Audio CD status query function. + // In FM-TOWNS games this is some kind of Audio CD status query function. // See also bug #762589 (thanks to Hibernatus for providing the information). getResultPos(); int b = getVarOrDirectByte(PARAM_1); @@ -2114,7 +2114,7 @@ void ScummEngine_v5::o5_startMusic() { result = _sound->getCurrentCDSound(); break; case 0xFF: - // TODO: Might return current CD volume in FM Towns Loom. See also bug #805691. + // TODO: Might return current CD volume in FM-TOWNS Loom. See also bug #805691. break; default: // TODO: return track length in seconds. We'll have to extend Sound and OSystem for this. diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 96f01833fa..52edc56d46 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -435,7 +435,7 @@ void Sound::playSound(int soundID, int offset) { } break; case 1: - case 255: // 255 is the type used in Indy3 FMTowns + case 255: // 255 is the type used in Indy3 FM-TOWNS // Music (Euphony format) if (_vm->_musicEngine) _vm->_musicEngine->startSound(soundID); |