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

[m_kiewitz at users.sourceforge.net]

Revision: 50535
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50535&view=rev
Author:   m_kiewitz
Date:     2010-06-30 15:26:45 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
SCI: remove some duplicate code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/view.cpp

Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp	2010-06-30 14:39:03 UTC (rev 50534)
+++ scummvm/trunk/engines/sci/graphics/view.cpp	2010-06-30 15:26:45 UTC (rev 50535)
@@ -265,15 +265,11 @@
 }
 
 int16 GfxView::getWidth(int16 loopNo, int16 celNo) const {
-	loopNo = CLIP<int16>(loopNo, 0, _loopCount - 1);
-	celNo = CLIP<int16>(celNo, 0, _loop[loopNo].celCount - 1);
-	return _loopCount ? _loop[loopNo].cel[celNo].width : 0;
+	return _loopCount ? getCelInfo(loopNo, celNo)->width : 0;
 }
 
 int16 GfxView::getHeight(int16 loopNo, int16 celNo) const {
-	loopNo = CLIP<int16>(loopNo, 0, _loopCount - 1);
-	celNo = CLIP<int16>(celNo, 0, _loop[loopNo].celCount - 1);
-	return _loopCount ? _loop[loopNo].cel[celNo].height : 0;
+	return _loopCount ? getCelInfo(loopNo, celNo)->height : 0;
 }
 
 const CelInfo *GfxView::getCelInfo(int16 loopNo, int16 celNo) const {


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