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

[thebluegr at users.sourceforge.net]

Revision: 47028
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47028&view=rev
Author:   thebluegr
Date:     2010-01-05 14:59:43 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Renamed the version of drawCel() which calls BitsShow() to drawCelAndShow(), to avoid confusion

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

Modified: scummvm/trunk/engines/sci/graphics/gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gfx.cpp	2010-01-05 14:19:53 UTC (rev 47027)
+++ scummvm/trunk/engines/sci/graphics/gfx.cpp	2010-01-05 14:59:43 UTC (rev 47028)
@@ -329,7 +329,7 @@
 }
 
 // This one is the only one that updates screen!
-void Gfx::drawCel(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, int16 origHeight, uint16 scaleX, uint16 scaleY) {
+void Gfx::drawCelAndShow(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, int16 origHeight, uint16 scaleX, uint16 scaleY) {
 	View *view = getView(viewId);
 	Common::Rect rect;
 	

Modified: scummvm/trunk/engines/sci/graphics/gfx.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gfx.h	2010-01-05 14:19:53 UTC (rev 47027)
+++ scummvm/trunk/engines/sci/graphics/gfx.h	2010-01-05 14:59:43 UTC (rev 47028)
@@ -84,7 +84,7 @@
 	void BitsFree(MemoryHandle memoryHandle);
 
 	void drawPicture(GuiResourceId pictureId, int16 animationNr, bool mirroredFlag, bool addToFlag, GuiResourceId paletteId);
-	void drawCel(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, int16 origHeight = -1, uint16 scaleX = 128, uint16 scaleY = 128);
+	void drawCelAndShow(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo, int16 origHeight = -1, uint16 scaleX = 128, uint16 scaleY = 128);
 	void drawCel(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, Common::Rect celRect, byte priority, uint16 paletteNo, int16 origHeight = -1, uint16 scaleX = 128, uint16 scaleY = 128);
 	void drawCel(View *view, LoopNo loopNo, CelNo celNo, Common::Rect celRect, byte priority, uint16 paletteNo, int16 origHeight = -1, uint16 scaleX = 128, uint16 scaleY = 128);
 

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-05 14:19:53 UTC (rev 47027)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-05 14:59:43 UTC (rev 47028)
@@ -352,7 +352,7 @@
 }
 
 void SciGui::drawCel(GuiResourceId viewId, LoopNo loopNo, CelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, int16 origHeight) {
-	_gfx->drawCel(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo, origHeight);
+	_gfx->drawCelAndShow(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo, origHeight);
 	_palette->setOnScreen();
 }
 
@@ -424,7 +424,7 @@
 
 void SciGui::drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, LoopNo loopNo, CelNo celNo, int16 style, bool hilite) {
 	if (!hilite) {
-		_gfx->drawCel(viewId, loopNo, celNo, rect.left, rect.top, 255, 0);
+		_gfx->drawCelAndShow(viewId, loopNo, celNo, rect.left, rect.top, 255, 0);
 		if (style & 0x20) {
 			_gfx->FrameRect(rect);
 		}


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