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

[thebluegr at users.sourceforge.net]

Revision: 47250
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47250&view=rev
Author:   thebluegr
Date:     2010-01-11 12:23:04 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
Moved all the cache limits inside helpers.h and removed an obsolete TODO

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/graphics/cursor.h
    scummvm/trunk/engines/sci/graphics/gfx.h
    scummvm/trunk/engines/sci/graphics/helpers.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-11 11:37:11 UTC (rev 47249)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-11 12:23:04 UTC (rev 47250)
@@ -667,7 +667,6 @@
 
 			s->_gui->portraitShow(resourceName, position, resourceNum, noun, verb, cond, seq);
 			return SIGNAL_REG;
-			// TODO: implement this. Looks to be a modified version of kDoSync
 		} else {
 			warning("kPortrait(show) called with unsupported argc %d", argc);
 		}

Modified: scummvm/trunk/engines/sci/graphics/cursor.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/cursor.h	2010-01-11 11:37:11 UTC (rev 47249)
+++ scummvm/trunk/engines/sci/graphics/cursor.h	2010-01-11 12:23:04 UTC (rev 47250)
@@ -35,8 +35,6 @@
 
 #define SCI_CURSOR_SCI0_TRANSPARENCYCOLOR 1
 
-#define MAX_CACHED_CURSORS 10
-
 class View;
 class SciPalette;
 

Modified: scummvm/trunk/engines/sci/graphics/gfx.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gfx.h	2010-01-11 11:37:11 UTC (rev 47249)
+++ scummvm/trunk/engines/sci/graphics/gfx.h	2010-01-11 12:23:04 UTC (rev 47250)
@@ -36,8 +36,6 @@
 #define SCI_TEXT_ALIGNMENT_CENTER 1
 #define SCI_TEXT_ALIGNMENT_LEFT	0
 
-#define MAX_CACHED_VIEWS 50
-
 class Screen;
 class SciPalette;
 class Font;

Modified: scummvm/trunk/engines/sci/graphics/helpers.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/helpers.h	2010-01-11 11:37:11 UTC (rev 47249)
+++ scummvm/trunk/engines/sci/graphics/helpers.h	2010-01-11 12:23:04 UTC (rev 47250)
@@ -32,6 +32,10 @@
 
 namespace Sci {
 
+// Cache limits
+#define MAX_CACHED_CURSORS 10
+#define MAX_CACHED_VIEWS 50
+
 #define SCI_SHAKE_DIRECTION_VERTICAL 1
 #define SCI_SHAKE_DIRECTION_HORIZONTAL 2
 


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