From 14172febf717702421332dc599e4970a578336cb Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 5 Jul 2009 11:29:30 +0000
Subject: Merging playTot()

svn-id: r42129
---
 engines/gob/game.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'engines/gob/game.h')

diff --git a/engines/gob/game.h b/engines/gob/game.h
index 7f4f9e2cd2..4a8008a504 100644
--- a/engines/gob/game.h
+++ b/engines/gob/game.h
@@ -94,6 +94,8 @@ public:
 
 	virtual void prepareStart();
 
+	void playTot(int16 skipPlay);
+
 	void capturePush(int16 left, int16 top, int16 width, int16 height);
 	void capturePop(char doDraw);
 
@@ -103,13 +105,11 @@ public:
 
 	int16 checkKeys(int16 *pMousex = 0, int16 *pMouseY = 0,
 			MouseButtons *pButtons = 0, char handleMouse = 0);
-	void start(void);
+	void start();
 
 	void totSub(int8 flags, const char *newTotFile);
 	void switchTotSub(int16 index, int16 skipPlay);
 
-	virtual void playTot(int16 skipPlay) = 0;
-
 protected:
 	uint32 _menuLevel;
 
@@ -133,16 +133,12 @@ class Game_v1 : public Game {
 public:
 	Game_v1(GobEngine *vm);
 	virtual ~Game_v1() {}
-
-	virtual void playTot(int16 skipPlay);
 };
 
 class Game_v2 : public Game_v1 {
 public:
 	Game_v2(GobEngine *vm);
 	virtual ~Game_v2() {}
-
-	virtual void playTot(int16 skipPlay);
 };
 
 class Game_v6 : public Game_v2 {
@@ -150,7 +146,7 @@ public:
 	Game_v6(GobEngine *vm);
 	virtual ~Game_v6() {}
 
-	virtual void prepareStart(void);
+	virtual void prepareStart();
 };
 
 } // End of namespace Gob
-- 
cgit v1.2.3