[Scummvm-cvs-logs] SF.net SVN: scummvm:[47267] scummvm/trunk/engines/sci/graphics
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Tue Jan 12 19:24:37 CET 2010
Revision: 47267
http://scummvm.svn.sourceforge.net/scummvm/?rev=47267&view=rev
Author: m_kiewitz
Date: 2010-01-12 18:24:37 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
SCI: View::getCelCount now validates input
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/view.cpp
scummvm/trunk/engines/sci/graphics/view.h
Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp 2010-01-12 17:42:35 UTC (rev 47266)
+++ scummvm/trunk/engines/sci/graphics/view.cpp 2010-01-12 18:24:37 UTC (rev 47267)
@@ -507,6 +507,12 @@
}
}
+uint16 View::getCelCount(int16 loopNo) {
+ if ((loopNo < 0) || (loopNo >= _loopCount))
+ return 0;
+ return _loop[loopNo].celCount;
+}
+
Palette *View::getPalette() {
return _embeddedPal ? &_viewPalette : &_palette->_sysPalette;
}
Modified: scummvm/trunk/engines/sci/graphics/view.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.h 2010-01-12 17:42:35 UTC (rev 47266)
+++ scummvm/trunk/engines/sci/graphics/view.h 2010-01-12 18:24:37 UTC (rev 47267)
@@ -62,7 +62,7 @@
byte *getBitmap(int16 loopNo, int16 celNo);
void draw(Common::Rect rect, Common::Rect clipRect, Common::Rect clipRectTranslated, int16 loopNo, int16 celNo, byte priority, uint16 EGAmappingNr, bool upscaledHires, uint16 scaleX = 128, uint16 scaleY = 128);
uint16 getLoopCount() const { return _loopCount; }
- uint16 getCelCount(int16 loopNo) { return _loop[loopNo].celCount; }
+ uint16 getCelCount(int16 loopNo);
Palette *getPalette();
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list