[Scummvm-cvs-logs] SF.net SVN: scummvm: [25417] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 25417
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25417&view=rev
Author:   lordhoto
Date:     2007-02-07 11:51:19 -0800 (Wed, 07 Feb 2007)

Log Message:
-----------
Fixed credits in FM-Towns version.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.h
    scummvm/trunk/engines/kyra/sequences_v1.cpp
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h	2007-02-07 19:30:49 UTC (rev 25416)
+++ scummvm/trunk/engines/kyra/resource.h	2007-02-07 19:51:19 UTC (rev 25417)
@@ -199,6 +199,7 @@
 	kConfigStrings,
 	
 	kKyra1TownsSFXTable,
+	kCreditsStrings,
 	
 	kMaxResIDs
 };

Modified: scummvm/trunk/engines/kyra/sequences_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v1.cpp	2007-02-07 19:30:49 UTC (rev 25416)
+++ scummvm/trunk/engines/kyra/sequences_v1.cpp	2007-02-07 19:51:19 UTC (rev 25417)
@@ -1035,10 +1035,20 @@
 		snd_playWanderScoreViaMap(53, 1);
 
 	uint8 *buffer = 0;
-	uint32 size;
+	uint32 size = 0;
 	
-	buffer = _res->fileData("CREDITS.TXT", &size);
-	assert(buffer);
+	if (_flags.platform == Common::kPlatformFMTowns) {
+		int sizeTmp = 0;
+		const uint8 *bufferTmp = _staticres->loadRawData(kCreditsStrings, sizeTmp);
+		buffer = new uint8[sizeTmp];
+		assert(buffer);
+		memcpy(buffer, bufferTmp, sizeTmp);
+		size = sizeTmp;
+		_staticres->unloadId(kCreditsStrings);
+	} else {
+		buffer = _res->fileData("CREDITS.TXT", &size);
+		assert(buffer);
+	}
 
 	uint8 *nextString = buffer;
 	uint8 *currentString = buffer;
@@ -1134,9 +1144,9 @@
 		if (nextLoop > now)
 			_system->delayMillis(nextLoop - now);
 	}
+
+	delete [] buffer;
 	
-	delete[] buffer;
-	
 	_screen->fadeToBlack();
 	_screen->clearCurPage();
 	_screen->showMouse();

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2007-02-07 19:30:49 UTC (rev 25416)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2007-02-07 19:51:19 UTC (rev 25417)
@@ -207,6 +207,7 @@
 		
 		// FM-TOWNS specific
 		{ kKyra1TownsSFXTable, kRawData, "SFXTABLE" },
+		{ kCreditsStrings, kRawData, "CREDITS" },
 
 		{ 0, 0, 0 }
 	};


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