[Scummvm-cvs-logs] SF.net SVN: scummvm:[39629] scummvm/trunk/engines/parallaction

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Mon Mar 23 11:07:23 CET 2009


Revision: 39629
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39629&view=rev
Author:   Kirben
Date:     2009-03-23 10:07:22 +0000 (Mon, 23 Mar 2009)

Log Message:
-----------
Correct label font used by Amiga version of BRA.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/font.cpp
    scummvm/trunk/engines/parallaction/graphics.cpp

Modified: scummvm/trunk/engines/parallaction/font.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/font.cpp	2009-03-23 09:16:26 UTC (rev 39628)
+++ scummvm/trunk/engines/parallaction/font.cpp	2009-03-23 10:07:22 UTC (rev 39629)
@@ -692,15 +692,12 @@
 		_dialogueFont = _disk->loadFont("comic");
 		_labelFont = _menuFont;
 	} else {
-		// TODO: Confirm fonts matches
-		// fonts/natasha/16
-		// fonts/sonya/18
+		// TODO: Where is vanya used?
 		// fonts/vanya/16
 
 		_menuFont = _disk->loadFont("sonya");
 		_dialogueFont = _disk->loadFont("natasha");
-		Common::MemoryReadStream stream(_amigaTopazFont, 2600, false);
-		_labelFont = new AmigaFont(stream);
+		_labelFont = _menuFont;
 	}
 }
 

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2009-03-23 09:16:26 UTC (rev 39628)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2009-03-23 10:07:22 UTC (rev 39629)
@@ -529,8 +529,7 @@
 	Graphics::Surface *cnv = new Graphics::Surface;
 
 	uint w, h;
-
-	if (_vm->getPlatform() == Common::kPlatformAmiga) {
+	if (_vm->getGameType() == GType_Nippon && _vm->getPlatform() == Common::kPlatformAmiga) {
 		w = font->getStringWidth(text) + 16;
 		h = 10;
 


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




More information about the Scummvm-git-logs mailing list