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

[peres001 at users.sourceforge.net]

Revision: 26585
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26585&view=rev
Author:   peres001
Date:     2007-04-23 14:19:09 -0700 (Mon, 23 Apr 2007)

Log Message:
-----------
Fonts have been taking care of them being proportional for some time now, so it's time to remove old flags.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/callables.cpp
    scummvm/trunk/engines/parallaction/graphics.cpp
    scummvm/trunk/engines/parallaction/graphics.h
    scummvm/trunk/engines/parallaction/intro.cpp
    scummvm/trunk/engines/parallaction/location.cpp
    scummvm/trunk/engines/parallaction/menu.cpp

Modified: scummvm/trunk/engines/parallaction/callables.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables.cpp	2007-04-23 21:16:13 UTC (rev 26584)
+++ scummvm/trunk/engines/parallaction/callables.cpp	2007-04-23 21:19:09 UTC (rev 26585)
@@ -366,7 +366,6 @@
 
 	if (gameCompleted) {
 		_vm->_gfx->setFont(kFontMenu);
-		_vm->_gfx->_proportionalFont = false;
 		uint16 _ax = _vm->_gfx->getStringWidth(v4C[_language]);
 		_vm->_gfx->displayString((SCREEN_WIDTH - _ax)/2, 70, v4C[_language]);
 		_ax = _vm->_gfx->getStringWidth(v3C[_language]);
@@ -385,7 +384,6 @@
 		_engineFlags |= kEngineChangeLocation;
 	} else {
 		_vm->_gfx->setFont(kFontMenu);
-		_vm->_gfx->_proportionalFont = false;
 		uint16 _ax = _vm->_gfx->getStringWidth(v8C[_language]);
 		_vm->_gfx->displayString((SCREEN_WIDTH - _ax)/2, 70, v8C[_language]);
 		_ax = _vm->_gfx->getStringWidth(v7C[_language]);
@@ -437,7 +435,6 @@
 	_vm->parseLocation("common");
 
 	_vm->_gfx->setFont(kFontMenu);
-	_vm->_gfx->_proportionalFont = false;
 
 	uint16 _ax = _vm->_gfx->getStringWidth(_slideText[0]);
 	_vm->_gfx->displayString((SCREEN_WIDTH - _ax)/2, 38, _slideText[0]);

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2007-04-23 21:16:13 UTC (rev 26584)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2007-04-23 21:19:09 UTC (rev 26585)
@@ -49,7 +49,6 @@
   0x05, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x06, 0x05, 0x05, 0x05, 0x05
 };
 */
-bool		Gfx::_proportionalFont = false;
 byte *		Gfx::_buffers[];
 
 #define BALLOON_WIDTH	12
@@ -615,7 +614,6 @@
 	bool rv = false;
 	uint16 linewidth = 0;
 
-	_proportionalFont = true;
 	uint16 rx = x + 10;
 	uint16 ry = y + 4;
 
@@ -664,8 +662,6 @@
 	uint16 w = 0;
 	*width = 0;
 
-	_proportionalFont = true;
-
 	char token[40];
 
 	while (strlen(text) != 0) {

Modified: scummvm/trunk/engines/parallaction/graphics.h
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.h	2007-04-23 21:16:13 UTC (rev 26584)
+++ scummvm/trunk/engines/parallaction/graphics.h	2007-04-23 21:19:09 UTC (rev 26585)
@@ -223,7 +223,6 @@
 
 public:
 	Common::Point		_labelPosition[2];
-	static bool 		_proportionalFont;
 	uint16				_bgLayers[4];
 	PaletteFxRange		_palettefx[6];
 	Palette				_palette;

Modified: scummvm/trunk/engines/parallaction/intro.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/intro.cpp	2007-04-23 21:16:13 UTC (rev 26584)
+++ scummvm/trunk/engines/parallaction/intro.cpp	2007-04-23 21:19:09 UTC (rev 26585)
@@ -135,7 +135,6 @@
 void _c_endIntro(void *parm) {
 
 	_vm->_gfx->setFont(kFontMenu);
-	_vm->_gfx->_proportionalFont = false;
 
 	uint16 _di;
 	for (uint16 _si = 0; _si < 7; _si++) {

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-04-23 21:16:13 UTC (rev 26584)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-04-23 21:19:09 UTC (rev 26585)
@@ -43,7 +43,6 @@
     debugC(1, kDebugLocation, "parseLocation('%s')", filename);
 
 	uint16 _si = 1;
-	_gfx->_proportionalFont = false;
 	_gfx->setFont(kFontLabel);
 
 	Script *_locationScript = _disk->loadLocation(filename);
@@ -272,7 +271,6 @@
 
 	debugC(1, kDebugLocation, "changeLocation: new background set");
 
-	_gfx->_proportionalFont = false;
 	_gfx->setFont(kFontMenu);
 
 	uint16 _ax = strlen(_slideText[0]);

Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp	2007-04-23 21:16:13 UTC (rev 26584)
+++ scummvm/trunk/engines/parallaction/menu.cpp	2007-04-23 21:19:09 UTC (rev 26585)
@@ -105,8 +105,6 @@
 
 	_vm->_disk->selectArchive((_vm->getPlatform() == Common::kPlatformPC) ? "disk1" : "disk0");
 
-	_vm->_gfx->_proportionalFont = false;
-
 	_vm->_disk->loadSlide("intro");
 	_vm->_gfx->setPalette(_vm->_gfx->_palette);
 	_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);
@@ -293,7 +291,6 @@
 	_vm->changeCursor(kCursorArrow);
 	_vm->_midiPlayer->stop();
 
-	_vm->_gfx->_proportionalFont = false;
 	_vm->_gfx->setFont(kFontMenu);
 
 	_vm->_disk->selectArchive((_vm->getPlatform() == Common::kPlatformPC) ? "disk1" : "disk0");


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