From feff6fecdffa16a541f9658ad611745188596692 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 24 Aug 2010 13:41:24 +0000
Subject: KYRA: Cleanup.

svn-id: r52340
---
 engines/kyra/screen.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/kyra/screen.cpp')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index ade9886c2e..e09cc8123c 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -40,7 +40,7 @@ namespace Kyra {
 
 Screen::Screen(KyraEngine_v1 *vm, OSystem *system)
 	: _system(system), _vm(vm), _sjisInvisibleColor(0),
-	_cursorColorKey((vm->gameFlags().gameID == GI_KYRA1) ? 0xFF : 0x00) {
+	_cursorColorKey((vm->game() == GI_KYRA1) ? 0xFF : 0x00) {
 	_debugEnabled = false;
 	_maskMinY = _maskMaxY = -1;
 
@@ -86,7 +86,7 @@ bool Screen::init() {
 	if (_vm->gameFlags().useHiResOverlay) {
 		_useOverlays = true;
 		_useSJIS = (_vm->gameFlags().lang == Common::JA_JPN);
-		_sjisInvisibleColor = (_vm->gameFlags().gameID == GI_KYRA1) ? 0x80 : 0xF6;
+		_sjisInvisibleColor = (_vm->game() == GI_KYRA1) ? 0x80 : 0xF6;
 
 		for (int i = 0; i < SCREEN_OVLS_NUM; ++i) {
 			if (!_sjisOverlayPtrs[i]) {
@@ -1300,7 +1300,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 		_dsScaleH = 0x100;
 	}
 
-	if ((flags & 0x2000) && _vm->gameFlags().gameID != GI_KYRA1)
+	if ((flags & 0x2000) && _vm->game() != GI_KYRA1)
 		_dsTable5 = va_arg(args, uint8 *);
 
 	static const DsMarginSkipFunc dsMarginFunc[] = {
@@ -1436,7 +1436,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 
 	uint16 frameSize = READ_LE_UINT16(src); src += 2;
 
-	int colorTableColors = ((_vm->gameFlags().gameID != GI_KYRA1) && (shapeFlags & 4)) ? *src++ : 16;
+	int colorTableColors = ((_vm->game() != GI_KYRA1) && (shapeFlags & 4)) ? *src++ : 16;
 
 	if (!(flags & 0x8000) && (shapeFlags & 1))
 		_dsTable2 = src;
@@ -3016,10 +3016,10 @@ byte *Screen::getOverlayPtr(int page) {
 	else if (page == 2 || page == 3)
 		return _sjisOverlayPtrs[2];
 
-	if (_vm->gameFlags().gameID == GI_KYRA2) {
+	if (_vm->game() == GI_KYRA2) {
 		if (page == 12 || page == 13)
 			return _sjisOverlayPtrs[3];
-	} else if (_vm->gameFlags().gameID == GI_LOL) {
+	} else if (_vm->game() == GI_LOL) {
 		if (page == 4 || page == 5)
 			return _sjisOverlayPtrs[3];
 		if (page == 6 || page == 7)
-- 
cgit v1.2.3


From c91a07229a8bd841e6b6e77d977254c388a2e407 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 18 Sep 2010 10:55:16 +0000
Subject: JANITORIAL: Removed most punctuation at end of warning() and error()

Our warning() and error() functions always add an exclamation mark
to the end of the message anyway.

svn-id: r52791
---
 engines/kyra/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/kyra/screen.cpp')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index e09cc8123c..7ca3ae89d5 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -1084,7 +1084,7 @@ void Screen::setTextColor(const uint8 *cmap, int a, int b) {
 
 bool Screen::loadFont(FontId fontId, const char *filename) {
 	if (fontId == FID_SJIS_FNT) {
-		warning("Trying to replace system SJIS font.");
+		warning("Trying to replace system SJIS font");
 		return true;
 	}
 
-- 
cgit v1.2.3


From 54b2a8c98df204dfe64a27fc830936ec62e3f9ed Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 12 Oct 2010 04:19:58 +0000
Subject: JANITORIAL: Cleanup (mostly whitespace)

svn-id: r53161
---
 engines/kyra/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/kyra/screen.cpp')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 7ca3ae89d5..b7e01f31aa 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -787,7 +787,7 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag
 	}
 
 	if (y2 < 0) {
-		if (y2 <= -h )
+		if (y2 <= -h)
 			return;
 		h += y2;
 		y1 -= y2;
-- 
cgit v1.2.3