diff options
| author | Martin Kiewitz | 2009-10-08 07:58:31 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-10-08 07:58:31 +0000 |
| commit | 0120111416a8bb8c9447123a43746d1d61e42a55 (patch) | |
| tree | 5a00897ace71504e33bcc09f16f7443c031a6d2e | |
| parent | 2d98b72858794e5ecf246180bb3cd51334513eae (diff) | |
| download | scummvm-rg350-0120111416a8bb8c9447123a43746d1d61e42a55.tar.gz scummvm-rg350-0120111416a8bb8c9447123a43746d1d61e42a55.tar.bz2 scummvm-rg350-0120111416a8bb8c9447123a43746d1d61e42a55.zip | |
SCI/newgui: removed EGAmapping
svn-id: r44772
| -rw-r--r-- | engines/sci/gui/gui_view.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/gui/gui_view.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/engines/sci/gui/gui_view.cpp b/engines/sci/gui/gui_view.cpp index 31819ca672..ab42154950 100644 --- a/engines/sci/gui/gui_view.cpp +++ b/engines/sci/gui/gui_view.cpp @@ -51,8 +51,6 @@ SciGuiView::~SciGuiView() { 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 @@ void SciGuiView::initData(GuiResourceId resourceId) { bool IsEGA = false; _embeddedPal = false; - _EGAMapping = EGAMappingDefault; _loopCount = 0; switch (_resMan->getViewType()) { @@ -253,8 +250,7 @@ void SciGuiView::unpackCel(GuiViewLoopNo loopNo, GuiViewCelNo celNo, byte *outPt 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; diff --git a/engines/sci/gui/gui_view.h b/engines/sci/gui/gui_view.h index 9f07ee4c49..2d0e4f723d 100644 --- a/engines/sci/gui/gui_view.h +++ b/engines/sci/gui/gui_view.h @@ -60,7 +60,6 @@ public: 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 @@ private: sciViewLoopInfo *_loop; bool _embeddedPal; GuiPalette _viewPalette; - const byte *_EGAMapping; // simple translation map for all 16 colors }; } // End of namespace Sci |