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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Tue Feb 2 15:41:18 CET 2010


Revision: 47813
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47813&view=rev
Author:   m_kiewitz
Date:     2010-02-02 14:41:17 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
SCI: moving structs/enums from helpers to animate/controls

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/animate.h
    scummvm/trunk/engines/sci/graphics/controls.h
    scummvm/trunk/engines/sci/graphics/helpers.h

Modified: scummvm/trunk/engines/sci/graphics/animate.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.h	2010-02-02 13:02:08 UTC (rev 47812)
+++ scummvm/trunk/engines/sci/graphics/animate.h	2010-02-02 14:41:17 UTC (rev 47813)
@@ -56,6 +56,24 @@
 	kScaleSignalUnknown2	= 0x0004 // really unknown
 };
 
+struct AnimateEntry {
+	reg_t object;
+	GuiResourceId viewId;
+	int16 loopNo;
+	int16 celNo;
+	int16 paletteNo;
+	int16 x, y, z;
+	int16 priority;
+	uint16 signal;
+	uint16 scaleSignal;
+	int16 scaleX;
+	int16 scaleY;
+	Common::Rect celRect;
+	bool showBitsFlag;
+	reg_t castHandle;
+};
+typedef Common::List<AnimateEntry *> AnimateList;
+
 class GfxCache;
 class GfxPorts;
 class GfxPaint16;

Modified: scummvm/trunk/engines/sci/graphics/controls.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/controls.h	2010-02-02 13:02:08 UTC (rev 47812)
+++ scummvm/trunk/engines/sci/graphics/controls.h	2010-02-02 14:41:17 UTC (rev 47813)
@@ -28,6 +28,12 @@
 
 namespace Sci {
 
+enum controlStateFlags {
+	kControlStateEnabled      = 0x0001,  ///< 0001 - enabled buttons
+	kControlStateDisabled     = 0x0004,  ///< 0010 - grayed out buttons
+	kControlStateFramed       = 0x0008,  ///< 1000 - widgets surrounded by a frame
+};
+
 class GfxPorts;
 class GfxPaint16;
 class Font;

Modified: scummvm/trunk/engines/sci/graphics/helpers.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/helpers.h	2010-02-02 13:02:08 UTC (rev 47812)
+++ scummvm/trunk/engines/sci/graphics/helpers.h	2010-02-02 14:41:17 UTC (rev 47813)
@@ -79,24 +79,6 @@
 	}
 };
 
-struct AnimateEntry {
-	reg_t object;
-	GuiResourceId viewId;
-	int16 loopNo;
-	int16 celNo;
-	int16 paletteNo;
-	int16 x, y, z;
-	int16 priority;
-	uint16 signal;
-	uint16 scaleSignal;
-	int16 scaleX;
-	int16 scaleY;
-	Common::Rect celRect;
-	bool showBitsFlag;
-	reg_t castHandle;
-};
-typedef Common::List<AnimateEntry *> AnimateList;
-
 struct Color {
 	byte used;
 	byte r, g, b;
@@ -114,14 +96,6 @@
 	uint32 schedule;
 };
 
-/** Button and frame control flags. */
-enum controlStateFlags {
-	kControlStateEnabled      = 0x0001,  ///< 0001 - enabled buttons (used by the interpreter)
-	kControlStateDisabled     = 0x0004,  ///< 0010 - grayed out buttons (used by the interpreter)
-	kControlStateFramed       = 0x0008,  ///< 1000 - widgets surrounded by a frame (used by the interpreter)
-	kControlStateDitherFramed = 0x1000   ///< 0001 0000 0000 0000 - widgets surrounded by a dithered frame (used in kgraphics)
-};
-
 enum ViewType {
 	kViewUnknown,
 	kViewEga,


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