[Scummvm-cvs-logs] SF.net SVN: scummvm:[42235] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 42235
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42235&view=rev
Author:   lordhoto
Date:     2009-07-07 19:18:53 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Change all uses of FM-Towns/fm-towns to FM-TOWNS.

Modified Paths:
--------------
    scummvm/trunk/NEWS
    scummvm/trunk/engines/kyra/sequences_hof.cpp
    scummvm/trunk/engines/kyra/sequences_lok.cpp
    scummvm/trunk/engines/scumm/verbs.cpp
    scummvm/trunk/tools/create_kyradat/create_kyradat.cpp

Modified: scummvm/trunk/NEWS
===================================================================
--- scummvm/trunk/NEWS	2009-07-07 19:18:32 UTC (rev 42234)
+++ scummvm/trunk/NEWS	2009-07-07 19:18:53 UTC (rev 42235)
@@ -323,7 +323,7 @@
    - Renamed Simon engine to AGOS.
 
  Kyrandia:
-   - Added support for FM-Towns version (both English and Japanese).
+   - Added support for FM-TOWNS version (both English and Japanese).
 
  BASS:
    - Fixed long-standing font bug. We were using the control panel font for

Modified: scummvm/trunk/engines/kyra/sequences_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_hof.cpp	2009-07-07 19:18:32 UTC (rev 42234)
+++ scummvm/trunk/engines/kyra/sequences_hof.cpp	2009-07-07 19:18:53 UTC (rev 42235)
@@ -770,12 +770,12 @@
 }
 
 int KyraEngine_HoF::seq_introDarm(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-	//NULLSUB (at least in fm-towns version)
+	//NULLSUB (at least in FM-TOWNS version)
 	return frm;
 }
 
 int KyraEngine_HoF::seq_introLibrary2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-	//NULLSUB (at least in fm-towns version)
+	//NULLSUB (at least in FM-TOWNS version)
 	return frm;
 }
 
@@ -788,7 +788,7 @@
 }
 
 int KyraEngine_HoF::seq_introHand1a(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-	//NULLSUB (at least in fm-towns version)
+	//NULLSUB (at least in FM-TOWNS version)
 	return frm;
 }
 
@@ -805,12 +805,12 @@
 }
 
 int KyraEngine_HoF::seq_introHand2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-	//NULLSUB (at least in fm-towns version)
+	//NULLSUB (at least in FM-TOWNS version)
 	return frm;
 }
 
 int KyraEngine_HoF::seq_introHand3(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-	//NULLSUB (at least in fm-towns version)
+	//NULLSUB (at least in FM-TOWNS version)
 	return frm;
 }
 

Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-07-07 19:18:32 UTC (rev 42234)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-07-07 19:18:53 UTC (rev 42235)
@@ -1049,7 +1049,7 @@
 	_screen->setTextColorMap(colorMap);
 	_screen->_charWidth = -1;
 
-	// we only need this for the fm-towns version
+	// we only need this for the FM-TOWNS version
 	if (_flags.platform == Common::kPlatformFMTowns && _configMusic == 1)
 		snd_playWanderScoreViaMap(53, 1);
 

Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp	2009-07-07 19:18:32 UTC (rev 42234)
+++ scummvm/trunk/engines/scumm/verbs.cpp	2009-07-07 19:18:53 UTC (rev 42235)
@@ -567,7 +567,7 @@
 		}
 
 		if (_game.platform == Common::kPlatformFMTowns && _game.version == 3) {
-			// HACK: In the FM-Towns games Indy3, Loom and Zak the most significant bit is set for special keys
+			// HACK: In the FM-TOWNS games Indy3, Loom and Zak the most significant bit is set for special keys
 			// like F5 (=0x8005) or joystick buttons (mask 0xFE00, e.g. SELECT=0xFE40 for the save/load menu).
 			// Hence the distinction with (_mouseAndKeyboardStat < MBS_MAX_KEY) between mouse- and key-events is not applicable
 			// to this games, so we have to remap the special keys here.

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-07-07 19:18:32 UTC (rev 42234)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2009-07-07 19:18:53 UTC (rev 42235)
@@ -507,14 +507,14 @@
 			if (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ ||
 				g->special == k2TownsFile1E || g->special == k2TownsFile1J ||
 				g->special == k2TownsFile2E || g->special == k2TownsFile2J || fmtPatch == 5) {
-				// prevents creation of empty entries (which we have mostly between all strings in the fm-towns version)
+				// prevents creation of empty entries (which we have mostly between all strings in the FM-TOWNS version)
 				while (!data[++i]) {
 					if (i == size)
 						break;
 					targetsize--;
 				}
 				if (fmtPatch == 1) {
-					// Here is the first step of the extra treatment for all fm-towns string arrays that
+					// Here is the first step of the extra treatment for all FM-TOWNS string arrays that
 					// contain more than one string and which the original code
 					// addresses via stringname[boolJapanese].
 					// We simply skip every other string
@@ -593,7 +593,7 @@
 			}
 
 			if (fmtPatch == 1) {
-				// Here is the extra treatment for all fm-towns string arrays that
+				// Here is the extra treatment for all FM-TOWNS string arrays that
 				// contain more than one string and which the original code
 				// addresses via stringname[boolJapanese].
 				// We simply skip every other string
@@ -637,7 +637,7 @@
 }
 
 bool extractRooms(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
-	// different entry size for the fm-towns version
+	// different entry size for the FM-TOWNS version
 	const int roomEntrySize = (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ) ? (0x69) : ((g->special == kAmigaVersion) ? 0x52 : 0x51);
 	const int countRooms = size / roomEntrySize;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.