[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.399,1.400 script_v5.cpp,1.264,1.265 charset.cpp,2.111,2.112 imuse_player.cpp,2.45,2.46 midiparser_eup.cpp,1.13,1.14 resource_v3.cpp,1.27,1.28
Max Horn
fingolfin at users.sourceforge.net
Wed Sep 29 02:55:06 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21794
Modified Files:
sound.cpp script_v5.cpp charset.cpp imuse_player.cpp
midiparser_eup.cpp resource_v3.cpp
Log Message:
Use FM-TOWNS consistently
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -d -r1.399 -r1.400
--- sound.cpp 28 Sep 2004 20:19:29 -0000 1.399
+++ sound.cpp 29 Sep 2004 09:47:37 -0000 1.400
@@ -435,7 +435,7 @@
}
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);
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- script_v5.cpp 28 Sep 2004 19:28:58 -0000 1.264
+++ script_v5.cpp 29 Sep 2004 09:47:37 -0000 1.265
@@ -1774,15 +1774,15 @@
// 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_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 @@
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.
Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.111
retrieving revision 2.112
diff -u -d -r2.111 -r2.112
--- charset.cpp 29 Sep 2004 00:04:38 -0000 2.111
+++ charset.cpp 29 Sep 2004 09:47:38 -0000 2.112
@@ -70,15 +70,15 @@
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 @@
{
_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;
Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.45
retrieving revision 2.46
diff -u -d -r2.45 -r2.46
--- imuse_player.cpp 2 Jun 2004 13:32:15 -0000 2.45
+++ imuse_player.cpp 29 Sep 2004 09:47:38 -0000 2.46
@@ -196,7 +196,7 @@
// 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 @@
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);
Index: midiparser_eup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/midiparser_eup.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- midiparser_eup.cpp 11 Jan 2004 21:57:24 -0000 1.13
+++ midiparser_eup.cpp 29 Sep 2004 09:47:38 -0000 1.14
@@ -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 @@
// 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;
Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- resource_v3.cpp 27 Jun 2004 21:52:23 -0000 1.27
+++ resource_v3.cpp 29 Sep 2004 09:47:38 -0000 1.28
@@ -153,7 +153,7 @@
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);
More information about the Scummvm-git-logs
mailing list