From beb18533c3bf58b60dac41050b63115a86a474ee Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 4 Dec 2008 21:25:44 +0000
Subject: Cleanup

svn-id: r35246
---
 engines/saga/events.cpp |  3 +--
 engines/saga/events.h   |  1 -
 engines/saga/font.cpp   |  3 +--
 engines/saga/font.h     |  1 -
 engines/saga/render.h   | 27 ++++++++++++++-------------
 5 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'engines/saga')

diff --git a/engines/saga/events.cpp b/engines/saga/events.cpp
index 0baff678fc..368d15f791 100644
--- a/engines/saga/events.cpp
+++ b/engines/saga/events.cpp
@@ -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) {
diff --git a/engines/saga/events.h b/engines/saga/events.h
index 5113136e8f..3ae8551a88 100644
--- a/engines/saga/events.h
+++ b/engines/saga/events.h
@@ -180,7 +180,6 @@ class Events {
 
  private:
 	SagaEngine *_vm;
-	bool _initialized;
 
 	EventList _eventList;
 };
diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp
index b2454a096c..42ae28fdf6 100644
--- a/engines/saga/font.cpp
+++ b/engines/saga/font.cpp
@@ -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 @@ Font::Font(SagaEngine *vm) : _vm(vm), _initialized(false) {
 		loadFont(_vm->getFontDescription(i)->fontResourceId);
 	}
 
-	_initialized = true;
 	_fontMapping = 0;
 }
 
diff --git a/engines/saga/font.h b/engines/saga/font.h
index 76c0f06725..20a34d2aef 100644
--- a/engines/saga/font.h
+++ b/engines/saga/font.h
@@ -200,7 +200,6 @@ class Font {
 	static const int _charMap[128];
 	SagaEngine *_vm;
 
-	bool _initialized;
 	int _fontMapping;
 
 	int _loadedFonts;
diff --git a/engines/saga/render.h b/engines/saga/render.h
index bd7d147132..fe4ce7f890 100644
--- a/engines/saga/render.h
+++ b/engines/saga/render.h
@@ -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),
-#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)
+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
 
 class Render {
 public:
-- 
cgit v1.2.3