aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/game.h
diff options
context:
space:
mode:
authorSven Hesse2009-07-05 11:29:13 +0000
committerSven Hesse2009-07-05 11:29:13 +0000
commit7be3530ffbc0485d56564e8ff015b4979d90b7ad (patch)
treeef8525c401318f97530429b8bc62c5978bcec734 /engines/gob/game.h
parent4e70129d6033f2d9e4c7ec3d6806de66a61ad5c1 (diff)
downloadscummvm-rg350-7be3530ffbc0485d56564e8ff015b4979d90b7ad.tar.gz
scummvm-rg350-7be3530ffbc0485d56564e8ff015b4979d90b7ad.tar.bz2
scummvm-rg350-7be3530ffbc0485d56564e8ff015b4979d90b7ad.zip
Merging Game's and Game_v6's totSub()
svn-id: r42128
Diffstat (limited to 'engines/gob/game.h')
-rw-r--r--engines/gob/game.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/gob/game.h b/engines/gob/game.h
index 2c2c89a490..7f4f9e2cd2 100644
--- a/engines/gob/game.h
+++ b/engines/gob/game.h
@@ -105,8 +105,8 @@ public:
MouseButtons *pButtons = 0, char handleMouse = 0);
void start(void);
- virtual void totSub(int8 flags, const char *newTotFile);
- virtual void switchTotSub(int16 index, int16 skipPlay);
+ void totSub(int8 flags, const char *newTotFile);
+ void switchTotSub(int16 index, int16 skipPlay);
virtual void playTot(int16 skipPlay) = 0;
@@ -150,8 +150,6 @@ public:
Game_v6(GobEngine *vm);
virtual ~Game_v6() {}
- virtual void totSub(int8 flags, const char *newTotFile);
-
virtual void prepareStart(void);
};