From 9ea91f5c9c311276339e93ef64eaa53fd4435692 Mon Sep 17 00:00:00 2001
From: richiesams
Date: Tue, 3 Sep 2013 23:44:26 -0500
Subject: ZVISION: Convert ZVision singleton accessors to be inline

---
 engines/zvision/zvision.cpp | 16 ----------------
 engines/zvision/zvision.h   | 10 +++++-----
 2 files changed, 5 insertions(+), 21 deletions(-)

(limited to 'engines/zvision')

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index b5cae8acd3..eb474c75ed 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -164,24 +164,8 @@ void ZVision::pauseEngineIntern(bool pause) {
 	}
 }
 
-ScriptManager *ZVision::getScriptManager() const {
-	return _scriptManager;
 }
 
-RenderManager *ZVision::getRenderManager() const {
-	return _renderManager;
-}
-
-CursorManager *ZVision::getCursorManager() const {
-	return _cursorManager;
-}
-
-Common::RandomSource *ZVision::getRandomSource() const {
-	return _rnd;
-}
-
-ZVisionGameId ZVision::getGameId() const {
-	return _gameDescription->gameId;
 }
 
 void ZVision::cycleThroughCursors() {
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index f961f1fda9..331fa2a9f8 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -108,11 +108,11 @@ public:
 	Common::Error run();
 	void pauseEngineIntern(bool pause);
 
-	ScriptManager *getScriptManager() const;
-	RenderManager *getRenderManager() const;
-	CursorManager *getCursorManager() const;
-	Common::RandomSource *getRandomSource() const;
-	ZVisionGameId getGameId() const;
+	ScriptManager *getScriptManager() const { return _scriptManager; }
+	RenderManager *getRenderManager() const { return _renderManager; }
+	CursorManager *getCursorManager() const { return _cursorManager; }
+	Common::RandomSource *getRandomSource() const { return _rnd; }
+	ZVisionGameId getGameId() const { return _gameDescription->gameId; }
 
 	/**
 	 * Play a video until it is finished. This is a blocking call. It will call
-- 
cgit v1.2.3