[Scummvm-cvs-logs] SF.net SVN: scummvm:[47554] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 47554
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47554&view=rev
Author:   m_kiewitz
Date:     2010-01-25 12:34:40 +0000 (Mon, 25 Jan 2010)

Log Message:
-----------
SCI: created isAmiga32color(), using this method instead of comparing against viewType

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/gui.cpp
    scummvm/trunk/engines/sci/graphics/palette.cpp
    scummvm/trunk/engines/sci/graphics/picture.cpp
    scummvm/trunk/engines/sci/graphics/screen.cpp
    scummvm/trunk/engines/sci/graphics/view.cpp
    scummvm/trunk/engines/sci/resource.h

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-25 11:26:32 UTC (rev 47553)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-25 12:34:40 UTC (rev 47554)
@@ -176,7 +176,7 @@
 reg_t SciGui::newWindow(Common::Rect dims, Common::Rect restoreRect, uint16 style, int16 priority, int16 colorPen, int16 colorBack, const char *title) {
 	Window *wnd = NULL;
 
-	if (_s->resMan->getViewType() == kViewAmiga) {
+	if (_s->resMan->isAmiga32color()) {
 		colorPen = _palette->mapAmigaColor(colorPen);
 		colorBack = _palette->mapAmigaColor(colorBack);
 	}
@@ -237,14 +237,14 @@
 			break;
 		case SCI_DISPLAY_SETPENCOLOR:
 			colorPen = argv[0].toUint16();
-			if (_s->resMan->getViewType() == kViewAmiga)
+			if (_s->resMan->isAmiga32color())
 				colorPen = _palette->mapAmigaColor(colorPen);
 			_gfx->PenColor(colorPen);
 			argc--; argv++;
 			break;
 		case SCI_DISPLAY_SETBACKGROUNDCOLOR:
 			colorBack = argv[0].toUint16();
-			if (_s->resMan->getViewType() == kViewAmiga)
+			if (_s->resMan->isAmiga32color())
 				colorBack = _palette->mapAmigaColor(colorBack);
 			argc--; argv++;
 			break;
@@ -324,7 +324,7 @@
 void SciGui::drawStatus(const char *text, int16 colorPen, int16 colorBack) {
 	Port *oldPort = _gfx->SetPort(_gfx->_menuPort);
 
-	if (_s->resMan->getViewType() == kViewAmiga) {
+	if (_s->resMan->isAmiga32color()) {
 		colorPen = _palette->mapAmigaColor(colorPen);
 		colorBack = _palette->mapAmigaColor(colorBack);
 	}
@@ -506,14 +506,14 @@
 }
 
 void SciGui::graphFillBox(Common::Rect rect, uint16 colorMask, int16 color, int16 priority, int16 control) {
-	if (_s->resMan->getViewType() == kViewAmiga)
+	if (_s->resMan->isAmiga32color())
 		color = _palette->mapAmigaColor(color);
 	_gfx->FillRect(rect, colorMask, color, priority, control);
 }
 
 void SciGui::graphFrameBox(Common::Rect rect, int16 color) {
 	int16 oldColor = _gfx->GetPort()->penClr;
-	if (_s->resMan->getViewType() == kViewAmiga)
+	if (_s->resMan->isAmiga32color())
 		color = _palette->mapAmigaColor(color);
 	_gfx->PenColor(color);
 	_gfx->FrameRect(rect);
@@ -521,7 +521,7 @@
 }
 
 void SciGui::graphDrawLine(Common::Point startPoint, Common::Point endPoint, int16 color, int16 priority, int16 control) {
-	if (_s->resMan->getViewType() == kViewAmiga)
+	if (_s->resMan->isAmiga32color())
 		color = _palette->mapAmigaColor(color);
 	_gfx->OffsetLine(startPoint, endPoint);
 	_screen->drawLine(startPoint.x, startPoint.y, endPoint.x, endPoint.y, color, priority, control);

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-25 11:26:32 UTC (rev 47553)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-25 12:34:40 UTC (rev 47554)
@@ -58,7 +58,7 @@
 	if (autoSetPalette) {
 		if (_resMan->getViewType() == kViewEga)
 			setEGA();
-		else if (_resMan->getViewType() == kViewAmiga)
+		else if (_resMan->isAmiga32color())
 			setAmiga();
 		else
 			setFromResource(999, 2);
@@ -311,7 +311,7 @@
 //	if (pal != &_sysPalette)
 //		memcpy(&_sysPalette,pal,sizeof(Palette));
 	// We dont change palette at all times for amiga
-	if (_resMan->getViewType() == kViewAmiga)
+	if (_resMan->isAmiga32color())
 		return;
 	_screen->setPalette(&_sysPalette);
 }

Modified: scummvm/trunk/engines/sci/graphics/picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/picture.cpp	2010-01-25 11:26:32 UTC (rev 47553)
+++ scummvm/trunk/engines/sci/graphics/picture.cpp	2010-01-25 12:34:40 UTC (rev 47554)
@@ -555,7 +555,7 @@
 					}
 					break;
 				case PIC_OPX_VGA_SET_PALETTE:
-					if (_resMan->getViewType() == kViewAmiga) {
+					if (_resMan->isAmiga32color()) {
 						if ((data[curPos] == 0x00) && (data[curPos + 1] == 0x01) && ((data[curPos + 32] & 0xF0) != 0xF0)) {
 							// Left-Over VGA palette, we simply ignore it
 							curPos += 256 + 4 + 768;

Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp	2010-01-25 11:26:32 UTC (rev 47553)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp	2010-01-25 12:34:40 UTC (rev 47554)
@@ -58,9 +58,8 @@
 	_picNotValidSci11 = 0;
 	_unditherState = true;
 
-	if (_resMan->isVGA() || (_resMan->getViewType() == kViewAmiga)) {
-		// It's not 100% accurate to set white to be 255 for amiga games
-		//  The problem is: there are 16-color and 32-color amiga games, so we would need to jump around
+	if (_resMan->isVGA() || (_resMan->isAmiga32color())) {
+		// It's not 100% accurate to set white to be 255 for amiga 32-color games
 		//  255 is defined as white in our sci at all times, so it doesnt matter
 		_colorWhite = 255;
 		if (getSciVersion() >= SCI_VERSION_1_1)

Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp	2010-01-25 11:26:32 UTC (rev 47553)
+++ scummvm/trunk/engines/sci/graphics/view.cpp	2010-01-25 12:34:40 UTC (rev 47554)
@@ -307,7 +307,7 @@
 
 	rlePtr = _resourceData + celInfo->offsetRLE;
 	if (!celInfo->offsetLiteral) { // no additional literal data
-		if (_resMan->getViewType() == kViewAmiga) {
+		if (_resMan->isAmiga32color()) {
 			// decompression for amiga views
 			while (pixelNo < pixelCount) {
 				pixel = *rlePtr++;

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-01-25 11:26:32 UTC (rev 47553)
+++ scummvm/trunk/engines/sci/resource.h	2010-01-25 12:34:40 UTC (rev 47554)
@@ -271,6 +271,7 @@
 
 	void setAudioLanguage(int language);
 	bool isVGA() const { return (_viewType == kViewVga) || (_viewType == kViewVga11); }
+	bool isAmiga32color() const { return _viewType == kViewAmiga; }
 	ViewType getViewType() const { return _viewType; }
 	const char *getMapVersionDesc() const { return versionDescription(_mapVersion); }
 	const char *getVolVersionDesc() const { return versionDescription(_volVersion); }


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