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

[m_kiewitz at users.sourceforge.net]

Revision: 44772
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44772&view=rev
Author:   m_kiewitz
Date:     2009-10-08 07:58:31 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
SCI/newgui: removed EGAmapping

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_view.cpp
    scummvm/trunk/engines/sci/gui/gui_view.h

Modified: scummvm/trunk/engines/sci/gui/gui_view.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-08 07:57:26 UTC (rev 44771)
+++ scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-08 07:58:31 UTC (rev 44772)
@@ -51,8 +51,6 @@
 	delete[] _loop;
 }
 
-static const byte EGAMappingDefault[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
-
 void SciGuiView::initData(GuiResourceId resourceId) {
 	Resource *viewResource = _resMan->findResource(ResourceId(kResourceTypeView, resourceId), false);
 	if (!viewResource) {
@@ -73,7 +71,6 @@
 	bool IsEGA = false;
 
 	_embeddedPal = false;
-	_EGAMapping = EGAMappingDefault;
 	_loopCount = 0;
 
 	switch (_resMan->getViewType()) {
@@ -253,8 +250,7 @@
 		while (pixelNo < pixelCount) {
 			byte = *literalPtr++;
 			runLength = byte >> 4;
-			byte = _EGAMapping[byte & 0x0F];
-			memset(outPtr + pixelNo, byte, MIN<uint16>(runLength, pixelCount - pixelNo));
+			memset(outPtr + pixelNo, byte & 0x0F, MIN<uint16>(runLength, pixelCount - pixelNo));
 			pixelNo += runLength;
 		}
 		return;

Modified: scummvm/trunk/engines/sci/gui/gui_view.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-08 07:57:26 UTC (rev 44771)
+++ scummvm/trunk/engines/sci/gui/gui_view.h	2009-10-08 07:58:31 UTC (rev 44772)
@@ -60,7 +60,6 @@
 	void draw(Common::Rect rect, Common::Rect clipRect, Common::Rect clipRectTranslated, GuiViewLoopNo loopNo, GuiViewCelNo celNo, byte priority, uint16 paletteNo);
 	uint16 getLoopCount() const { return _loopCount; }
 	GuiPalette *getPalette();
-	const byte *getEgaMapping() const { return _EGAMapping; }
 
 private:
 	void initData(GuiResourceId resourceId);
@@ -77,7 +76,6 @@
 	sciViewLoopInfo *_loop;
 	bool _embeddedPal;
 	GuiPalette _viewPalette;
-	const byte *_EGAMapping; // simple translation map for all 16 colors
 };
 
 } // End of namespace Sci


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