[Scummvm-cvs-logs] SF.net SVN: scummvm:[35246] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 35246
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35246&view=rev
Author:   thebluegr
Date:     2008-12-04 21:25:44 +0000 (Thu, 04 Dec 2008)

Log Message:
-----------
Cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/saga/events.cpp
    scummvm/trunk/engines/saga/events.h
    scummvm/trunk/engines/saga/font.cpp
    scummvm/trunk/engines/saga/font.h
    scummvm/trunk/engines/saga/render.h

Modified: scummvm/trunk/engines/saga/events.cpp
===================================================================
--- scummvm/trunk/engines/saga/events.cpp	2008-12-04 21:09:24 UTC (rev 35245)
+++ scummvm/trunk/engines/saga/events.cpp	2008-12-04 21:25:44 UTC (rev 35246)
@@ -43,9 +43,8 @@
 
 namespace Saga {
 
-Events::Events(SagaEngine *vm) : _vm(vm), _initialized(false) {
+Events::Events(SagaEngine *vm) : _vm(vm) {
 	debug(8, "Initializing event subsystem...");
-	_initialized = true;
 }
 
 Events::~Events(void) {

Modified: scummvm/trunk/engines/saga/events.h
===================================================================
--- scummvm/trunk/engines/saga/events.h	2008-12-04 21:09:24 UTC (rev 35245)
+++ scummvm/trunk/engines/saga/events.h	2008-12-04 21:25:44 UTC (rev 35246)
@@ -180,7 +180,6 @@
 
  private:
 	SagaEngine *_vm;
-	bool _initialized;
 
 	EventList _eventList;
 };

Modified: scummvm/trunk/engines/saga/font.cpp
===================================================================
--- scummvm/trunk/engines/saga/font.cpp	2008-12-04 21:09:24 UTC (rev 35245)
+++ scummvm/trunk/engines/saga/font.cpp	2008-12-04 21:25:44 UTC (rev 35246)
@@ -33,7 +33,7 @@
 
 namespace Saga {
 
-Font::Font(SagaEngine *vm) : _vm(vm), _initialized(false) {
+Font::Font(SagaEngine *vm) : _vm(vm) {
 	int i;
 
 	// Load font module resource context
@@ -47,7 +47,6 @@
 		loadFont(_vm->getFontDescription(i)->fontResourceId);
 	}
 
-	_initialized = true;
 	_fontMapping = 0;
 }
 

Modified: scummvm/trunk/engines/saga/font.h
===================================================================
--- scummvm/trunk/engines/saga/font.h	2008-12-04 21:09:24 UTC (rev 35245)
+++ scummvm/trunk/engines/saga/font.h	2008-12-04 21:25:44 UTC (rev 35246)
@@ -200,7 +200,6 @@
 	static const int _charMap[128];
 	SagaEngine *_vm;
 
-	bool _initialized;
 	int _fontMapping;
 
 	int _loadedFonts;

Modified: scummvm/trunk/engines/saga/render.h
===================================================================
--- scummvm/trunk/engines/saga/render.h	2008-12-04 21:09:24 UTC (rev 35245)
+++ scummvm/trunk/engines/saga/render.h	2008-12-04 21:25:44 UTC (rev 35246)
@@ -33,21 +33,22 @@
 namespace Saga {
 
 enum RENDER_FLAGS {
+	RF_RENDERPAUSE      = (1 << 0),
+	RF_MAP              = (1 << 1),
+	RF_DISABLE_ACTORS   = (1 << 2),
+	RF_DEMO_SUBST       = (1 << 3)
+};
+
+// Extra render flags used for debugging
 #ifdef SAGA_DEBUG
-	RF_SHOW_FPS = (1 << 0),
-	RF_PALETTE_TEST = (1 << 1),
-	RF_TEXT_TEST = (1 << 2),
-	RF_OBJECTMAP_TEST = (1 << 3),
+enum RENDER_DEBUG_FLAGS {
+	RF_SHOW_FPS         = (1 << 4),
+	RF_PALETTE_TEST     = (1 << 5),
+	RF_TEXT_TEST        = (1 << 6),
+	RF_OBJECTMAP_TEST   = (1 << 7),
+	RF_ACTOR_PATH_TEST  = (1 << 8)
+};
 #endif
-	RF_RENDERPAUSE = (1 << 4),
-	RF_GAMEPAUSE = (1 << 5),
-#ifdef SAGA_DEBUG
-	RF_ACTOR_PATH_TEST = (1 << 6),
-#endif
-	RF_MAP = (1 << 7),
-	RF_DISABLE_ACTORS = (1 << 8),
-	RF_DEMO_SUBST = (1 << 9)
-};
 
 class Render {
 public:


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