aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorNicola Mettifogo2007-04-23 21:19:09 +0000
committerNicola Mettifogo2007-04-23 21:19:09 +0000
commit0782fc544859fc7cbd9e6326687c7673aca61806 (patch)
tree73fcc55f145fca712bef0cfedfce572dd5082eb4 /engines
parentfd08c7278dfeb2365ec13cfbd4a4f652563c0b56 (diff)
downloadscummvm-rg350-0782fc544859fc7cbd9e6326687c7673aca61806.tar.gz
scummvm-rg350-0782fc544859fc7cbd9e6326687c7673aca61806.tar.bz2
scummvm-rg350-0782fc544859fc7cbd9e6326687c7673aca61806.zip
Fonts have been taking care of them being proportional for some time now, so it's time to remove old flags.
svn-id: r26585
Diffstat (limited to 'engines')
-rw-r--r--engines/parallaction/callables.cpp3
-rw-r--r--engines/parallaction/graphics.cpp4
-rw-r--r--engines/parallaction/graphics.h1
-rw-r--r--engines/parallaction/intro.cpp1
-rw-r--r--engines/parallaction/location.cpp2
-rw-r--r--engines/parallaction/menu.cpp3
6 files changed, 0 insertions, 14 deletions
diff --git a/engines/parallaction/callables.cpp b/engines/parallaction/callables.cpp
index ddb81ba4c1..0f1bc00518 100644
--- a/engines/parallaction/callables.cpp
+++ b/engines/parallaction/callables.cpp
@@ -366,7 +366,6 @@ void _c_finito(void *parm) {
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 @@ void _c_finito(void *parm) {
_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 @@ void _c_testResult(void *parm) {
_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]);
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index b63f75c5b8..073e05dbcd 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -49,7 +49,6 @@ const byte _glyphWidths[126] = {
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 Gfx::displayWrappedString(char *text, uint16 x, uint16 y, uint16 maxwidth,
bool rv = false;
uint16 linewidth = 0;
- _proportionalFont = true;
uint16 rx = x + 10;
uint16 ry = y + 4;
@@ -664,8 +662,6 @@ void Gfx::getStringExtent(char *text, uint16 maxwidth, int16* width, int16* heig
uint16 w = 0;
*width = 0;
- _proportionalFont = true;
-
char token[40];
while (strlen(text) != 0) {
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 956ecb26a6..424a6d98dc 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -223,7 +223,6 @@ public:
public:
Common::Point _labelPosition[2];
- static bool _proportionalFont;
uint16 _bgLayers[4];
PaletteFxRange _palettefx[6];
Palette _palette;
diff --git a/engines/parallaction/intro.cpp b/engines/parallaction/intro.cpp
index e0573e804c..6e1ec7ca47 100644
--- a/engines/parallaction/intro.cpp
+++ b/engines/parallaction/intro.cpp
@@ -135,7 +135,6 @@ void _c_startIntro(void *parm) {
void _c_endIntro(void *parm) {
_vm->_gfx->setFont(kFontMenu);
- _vm->_gfx->_proportionalFont = false;
uint16 _di;
for (uint16 _si = 0; _si < 7; _si++) {
diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp
index d23be6117b..8de66e5cda 100644
--- a/engines/parallaction/location.cpp
+++ b/engines/parallaction/location.cpp
@@ -43,7 +43,6 @@ void Parallaction::parseLocation(const char *filename) {
debugC(1, kDebugLocation, "parseLocation('%s')", filename);
uint16 _si = 1;
- _gfx->_proportionalFont = false;
_gfx->setFont(kFontLabel);
Script *_locationScript = _disk->loadLocation(filename);
@@ -272,7 +271,6 @@ void Parallaction::showSlide(const char *name) {
debugC(1, kDebugLocation, "changeLocation: new background set");
- _gfx->_proportionalFont = false;
_gfx->setFont(kFontMenu);
uint16 _ax = strlen(_slideText[0]);
diff --git a/engines/parallaction/menu.cpp b/engines/parallaction/menu.cpp
index 31afcaab0d..843d959706 100644
--- a/engines/parallaction/menu.cpp
+++ b/engines/parallaction/menu.cpp
@@ -105,8 +105,6 @@ void Menu::start() {
_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 @@ void Menu::selectCharacter() {
_vm->changeCursor(kCursorArrow);
_vm->_midiPlayer->stop();
- _vm->_gfx->_proportionalFont = false;
_vm->_gfx->setFont(kFontMenu);
_vm->_disk->selectArchive((_vm->getPlatform() == Common::kPlatformPC) ? "disk1" : "disk0");