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

[peres001 at users.sourceforge.net]

Revision: 49147
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49147&view=rev
Author:   peres001
Date:     2010-05-22 18:00:16 +0000 (Sat, 22 May 2010)

Log Message:
-----------
Cleanup (removed more Parallaction::getGameType() calls).

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

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2010-05-22 17:59:49 UTC (rev 49146)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2010-05-22 18:00:16 UTC (rev 49147)
@@ -536,12 +536,12 @@
 
 		setupLabelSurface(*cnv, w, h);
 
-		font->setColor((_vm->getGameType() == GType_BRA) ? 0 : 7);
+		font->setColor((_gameType == GType_BRA) ? 0 : 7);
 		font->drawString((byte*)cnv->pixels + 1, cnv->w, text);
 		font->drawString((byte*)cnv->pixels + 1 + cnv->w * 2, cnv->w, text);
 		font->drawString((byte*)cnv->pixels + cnv->w, cnv->w, text);
 		font->drawString((byte*)cnv->pixels + 2 + cnv->w, cnv->w, text);
-		font->setColor((_vm->getGameType() == GType_BRA) ? 11 : 1);
+		font->setColor((_gameType == GType_BRA) ? 11 : 1);
 		font->drawString((byte*)cnv->pixels + 1 + cnv->w, cnv->w, text);
 	} else {
 		w = font->getStringWidth(text);
@@ -833,7 +833,7 @@
 		// The PC version of BRA needs the entries 20-31 of the palette to be constant, but
 		// the background resource files are screwed up. The right colors come from an unused
 		// bitmap (pointer.bmp). Nothing is known about the Amiga version so far.
-		if ((_vm->getGameType() == GType_BRA) && (_vm->getPlatform() == Common::kPlatformPC)) {
+		if ((_gameType == GType_BRA) && (_vm->getPlatform() == Common::kPlatformPC)) {
 			int r, g, b;
 			for (uint i = 16; i < 32; i++) {
 				_backupPal.getEntry(i, r, g, b);

Modified: scummvm/trunk/engines/parallaction/input.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/input.cpp	2010-05-22 17:59:49 UTC (rev 49146)
+++ scummvm/trunk/engines/parallaction/input.cpp	2010-05-22 18:00:16 UTC (rev 49147)
@@ -204,13 +204,13 @@
 		return event;
 	}
 
-	if (_vm->getGameType() == GType_Nippon) {
+	if (_gameType == GType_Nippon) {
 		if (_hasKeyPressEvent && (_vm->getFeatures() & GF_DEMO) == 0) {
 			if (_keyPressed.keycode == Common::KEYCODE_l) event = kEvLoadGame;
 			if (_keyPressed.keycode == Common::KEYCODE_s) event = kEvSaveGame;
 		}
 	} else
-	if (_vm->getGameType() == GType_BRA) {
+	if (_gameType == GType_BRA) {
 		if (_hasKeyPressEvent && (_vm->getFeatures() & GF_DEMO) == 0) {
 			if (_keyPressed.keycode == Common::KEYCODE_F5) event = kEvIngameMenu;
 		}


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