diff options
-rw-r--r-- | engines/gnap/character.h | 3 | ||||
-rw-r--r-- | engines/gnap/scenes/group0.h | 18 | ||||
-rw-r--r-- | engines/gnap/scenes/group1.h | 18 | ||||
-rw-r--r-- | engines/gnap/scenes/group2.h | 20 | ||||
-rw-r--r-- | engines/gnap/scenes/group3.h | 12 | ||||
-rw-r--r-- | engines/gnap/scenes/group4.h | 14 | ||||
-rw-r--r-- | engines/gnap/scenes/group5.h | 2 | ||||
-rw-r--r-- | engines/gnap/scenes/groupcs.h | 22 | ||||
-rw-r--r-- | engines/gnap/scenes/intro.h | 2 | ||||
-rw-r--r-- | engines/gnap/scenes/scenecore.h | 4 |
10 files changed, 58 insertions, 57 deletions
diff --git a/engines/gnap/character.h b/engines/gnap/character.h index 554e980dbb..0a00fe0cad 100644 --- a/engines/gnap/character.h +++ b/engines/gnap/character.h @@ -48,7 +48,7 @@ const int kMaxGridStructs = 30; class Character { public: Character(GnapEngine *vm); - ~Character(); + virtual ~Character(); void walkStep(); @@ -124,6 +124,7 @@ private: class PlayerPlat : public Character { public: PlayerPlat(GnapEngine *vm); + virtual ~PlayerPlat() {} virtual int getSequenceId(int kind = 0, Common::Point gridPos = Common::Point(0, 0)); virtual void initPos(int gridX, int gridY, Facing facing); virtual void playSequence(int sequenceId); diff --git a/engines/gnap/scenes/group0.h b/engines/gnap/scenes/group0.h index 38ded681af..e06380926d 100644 --- a/engines/gnap/scenes/group0.h +++ b/engines/gnap/scenes/group0.h @@ -251,7 +251,7 @@ class CutScene; class Scene01: public Scene { public: Scene01(GnapEngine *vm); - ~Scene01(); + virtual ~Scene01(); virtual int init(); virtual void updateHotspots(); @@ -268,7 +268,7 @@ private: class Scene02: public Scene { public: Scene02(GnapEngine *vm); - ~Scene02() {} + virtual ~Scene02() {} virtual int init(); virtual void updateHotspots(); @@ -286,7 +286,7 @@ private: class Scene03: public Scene { public: Scene03(GnapEngine *vm); - ~Scene03() {} + virtual ~Scene03() {} virtual int init(); virtual void updateHotspots(); @@ -305,7 +305,7 @@ private: class Scene04: public Scene { public: Scene04(GnapEngine *vm); - ~Scene04() {} + virtual ~Scene04() {} virtual int init(); virtual void updateHotspots(); @@ -323,7 +323,7 @@ private: class Scene05: public Scene { public: Scene05(GnapEngine *vm); - ~Scene05() {} + virtual ~Scene05() {} virtual int init(); virtual void updateHotspots(); @@ -339,7 +339,7 @@ private: class Scene06: public Scene { public: Scene06(GnapEngine *vm); - ~Scene06() {} + virtual ~Scene06() {} virtual int init(); virtual void updateHotspots(); @@ -357,7 +357,7 @@ private: class Scene07: public Scene { public: Scene07(GnapEngine *vm); - ~Scene07() {} + virtual ~Scene07() {} virtual int init(); virtual void updateHotspots(); @@ -369,7 +369,7 @@ public: class Scene08: public Scene { public: Scene08(GnapEngine *vm); - ~Scene08() {} + virtual ~Scene08() {} virtual int init(); virtual void updateHotspots(); @@ -387,7 +387,7 @@ private: class Scene09: public Scene { public: Scene09(GnapEngine *vm); - ~Scene09() {} + virtual ~Scene09() {} virtual int init(); virtual void updateHotspots(); diff --git a/engines/gnap/scenes/group1.h b/engines/gnap/scenes/group1.h index 568099d535..30771d017a 100644 --- a/engines/gnap/scenes/group1.h +++ b/engines/gnap/scenes/group1.h @@ -273,7 +273,7 @@ class CutScene; class Scene10: public Scene { public: Scene10(GnapEngine *vm); - ~Scene10() {} + virtual ~Scene10() {} virtual int init(); virtual void updateHotspots(); @@ -289,7 +289,7 @@ private: class Scene11: public Scene { public: Scene11(GnapEngine *vm); - ~Scene11() {} + virtual ~Scene11() {} virtual int init(); virtual void updateHotspots(); @@ -308,7 +308,7 @@ private: class Scene12: public Scene { public: Scene12(GnapEngine *vm); - ~Scene12() {} + virtual ~Scene12() {} virtual int init(); virtual void updateHotspots(); @@ -328,7 +328,7 @@ private: class Scene13: public Scene { public: Scene13(GnapEngine *vm); - ~Scene13() {} + virtual ~Scene13() {} virtual int init(); virtual void updateHotspots(); @@ -345,7 +345,7 @@ private: class Scene14: public Scene { public: Scene14(GnapEngine *vm); - ~Scene14() {} + virtual ~Scene14() {} virtual int init(); virtual void updateHotspots(); @@ -357,7 +357,7 @@ public: class Scene15: public Scene { public: Scene15(GnapEngine *vm); - ~Scene15() {} + virtual ~Scene15() {} virtual int init(); virtual void updateHotspots(); @@ -379,7 +379,7 @@ private: class Scene17: public Scene { public: Scene17(GnapEngine *vm); - ~Scene17() {} + virtual ~Scene17() {} virtual int init(); virtual void updateHotspots(); @@ -406,7 +406,7 @@ private: class Scene18: public Scene { public: Scene18(GnapEngine *vm); - ~Scene18(); + virtual ~Scene18(); virtual int init(); virtual void updateHotspots(); @@ -432,7 +432,7 @@ private: class Scene19: public Scene { public: Scene19(GnapEngine *vm); - ~Scene19(); + virtual ~Scene19(); virtual int init(); virtual void updateHotspots(); diff --git a/engines/gnap/scenes/group2.h b/engines/gnap/scenes/group2.h index da4ff70407..8f56594f16 100644 --- a/engines/gnap/scenes/group2.h +++ b/engines/gnap/scenes/group2.h @@ -229,7 +229,7 @@ class CutScene; class Scene20: public Scene { public: Scene20(GnapEngine *vm); - ~Scene20() {} + virtual ~Scene20() {} virtual int init(); virtual void updateHotspots(); @@ -252,7 +252,7 @@ private: class Scene21: public Scene { public: Scene21(GnapEngine *vm); - ~Scene21() {} + virtual ~Scene21() {} virtual int init(); virtual void updateHotspots(); @@ -268,7 +268,7 @@ private: class Scene22: public Scene { public: Scene22(GnapEngine *vm); - ~Scene22() {} + virtual ~Scene22() {} virtual int init(); virtual void updateHotspots(); @@ -286,7 +286,7 @@ private: class Scene23: public Scene { public: Scene23(GnapEngine *vm); - ~Scene23() {} + virtual ~Scene23() {} virtual int init(); virtual void updateHotspots(); @@ -302,7 +302,7 @@ private: class Scene24: public Scene { public: Scene24(GnapEngine *vm); - ~Scene24() {} + virtual ~Scene24() {} virtual int init(); virtual void updateHotspots(); @@ -320,7 +320,7 @@ private: class Scene25: public Scene { public: Scene25(GnapEngine *vm); - ~Scene25() {} + virtual ~Scene25() {} virtual int init(); virtual void updateHotspots(); @@ -338,7 +338,7 @@ private: class Scene26: public Scene { public: Scene26(GnapEngine *vm); - ~Scene26() {} + virtual ~Scene26() {} virtual int init(); virtual void updateHotspots(); @@ -354,7 +354,7 @@ private: class Scene27: public Scene { public: Scene27(GnapEngine *vm); - ~Scene27() {} + virtual ~Scene27() {} virtual int init(); virtual void updateHotspots(); @@ -370,7 +370,7 @@ private: class Scene28: public Scene { public: Scene28(GnapEngine *vm); - ~Scene28() {} + virtual ~Scene28() {} virtual int init(); virtual void updateHotspots(); @@ -387,7 +387,7 @@ private: class Scene29: public Scene { public: Scene29(GnapEngine *vm); - ~Scene29() {} + virtual ~Scene29() {} virtual int init(); virtual void updateHotspots(); diff --git a/engines/gnap/scenes/group3.h b/engines/gnap/scenes/group3.h index e80debb149..6fbbdd79aa 100644 --- a/engines/gnap/scenes/group3.h +++ b/engines/gnap/scenes/group3.h @@ -148,7 +148,7 @@ class CutScene; class Scene30: public Scene { public: Scene30(GnapEngine *vm); - ~Scene30() {} + virtual ~Scene30() {} virtual int init(); virtual void updateHotspots(); @@ -163,7 +163,7 @@ private: class Scene31: public Scene { public: Scene31(GnapEngine *vm); - ~Scene31() {} + virtual ~Scene31() {} virtual int init(); virtual void updateHotspots(); @@ -182,7 +182,7 @@ private: class Scene32: public Scene { public: Scene32(GnapEngine *vm); - ~Scene32() {} + virtual ~Scene32() {} virtual int init(); virtual void updateHotspots(); @@ -194,7 +194,7 @@ public: class Scene33: public Scene { public: Scene33(GnapEngine *vm); - ~Scene33() {} + virtual ~Scene33() {} virtual int init(); virtual void updateHotspots(); @@ -210,7 +210,7 @@ private: class Scene38: public Scene { public: Scene38(GnapEngine *vm); - ~Scene38() {} + virtual ~Scene38() {} virtual int init(); virtual void updateHotspots(); @@ -222,7 +222,7 @@ public: class Scene39: public Scene { public: Scene39(GnapEngine *vm); - ~Scene39() {} + virtual ~Scene39() {} virtual int init(); virtual void updateHotspots(); diff --git a/engines/gnap/scenes/group4.h b/engines/gnap/scenes/group4.h index 542834de7d..afcd62e9e7 100644 --- a/engines/gnap/scenes/group4.h +++ b/engines/gnap/scenes/group4.h @@ -183,7 +183,7 @@ class CutScene; class Scene40: public Scene { public: Scene40(GnapEngine *vm); - ~Scene40() {} + virtual ~Scene40() {} virtual int init(); virtual void updateHotspots(); @@ -195,7 +195,7 @@ public: class Scene41: public Scene { public: Scene41(GnapEngine *vm); - ~Scene41() {} + virtual ~Scene41() {} virtual int init(); virtual void updateHotspots(); @@ -213,7 +213,7 @@ private: class Scene42: public Scene { public: Scene42(GnapEngine *vm); - ~Scene42() {} + virtual ~Scene42() {} virtual int init(); virtual void updateHotspots(); @@ -229,7 +229,7 @@ private: class Scene43: public Scene { public: Scene43(GnapEngine *vm); - ~Scene43() {} + virtual ~Scene43() {} virtual int init(); virtual void updateHotspots(); @@ -245,7 +245,7 @@ private: class Scene44: public Scene { public: Scene44(GnapEngine *vm); - ~Scene44() {} + virtual ~Scene44() {} virtual int init(); virtual void updateHotspots(); @@ -263,7 +263,7 @@ private: class Scene45: public Scene { public: Scene45(GnapEngine *vm); - ~Scene45() {} + virtual ~Scene45() {} virtual int init(); virtual void updateHotspots(); @@ -278,7 +278,7 @@ private: class Scene46: public Scene { public: Scene46(GnapEngine *vm); - ~Scene46() {} + virtual ~Scene46() {} virtual int init(); virtual void updateHotspots(); diff --git a/engines/gnap/scenes/group5.h b/engines/gnap/scenes/group5.h index c7d209b6b3..dd238ec65c 100644 --- a/engines/gnap/scenes/group5.h +++ b/engines/gnap/scenes/group5.h @@ -53,7 +53,7 @@ class GnapEngine; class Scene53: public Scene { public: Scene53(GnapEngine *vm); - ~Scene53() {} + virtual ~Scene53() {} virtual int init(); virtual void updateHotspots(); diff --git a/engines/gnap/scenes/groupcs.h b/engines/gnap/scenes/groupcs.h index 26f51abb0b..58033564ce 100644 --- a/engines/gnap/scenes/groupcs.h +++ b/engines/gnap/scenes/groupcs.h @@ -33,7 +33,7 @@ class CutScene; class Scene16: public CutScene { public: Scene16(GnapEngine *vm); - ~Scene16() {} + virtual ~Scene16() {} virtual int init(); }; @@ -41,7 +41,7 @@ public: class Scene471: public CutScene { public: Scene471(GnapEngine *vm); - ~Scene471() {} + virtual ~Scene471() {} virtual int init(); }; @@ -49,7 +49,7 @@ public: class Scene472: public CutScene { public: Scene472(GnapEngine *vm); - ~Scene472() {} + virtual ~Scene472() {} virtual int init(); }; @@ -57,7 +57,7 @@ public: class Scene473: public CutScene { public: Scene473(GnapEngine *vm); - ~Scene473() {} + virtual ~Scene473() {} virtual int init(); }; @@ -65,7 +65,7 @@ public: class Scene474: public CutScene { public: Scene474(GnapEngine *vm); - ~Scene474() {} + virtual ~Scene474() {} virtual int init(); }; @@ -73,7 +73,7 @@ public: class Scene475: public CutScene { public: Scene475(GnapEngine *vm); - ~Scene475() {} + virtual ~Scene475() {} virtual int init(); }; @@ -81,7 +81,7 @@ public: class Scene476: public CutScene { public: Scene476(GnapEngine *vm); - ~Scene476() {} + virtual ~Scene476() {} virtual int init(); }; @@ -89,7 +89,7 @@ public: class Scene477: public CutScene { public: Scene477(GnapEngine *vm); - ~Scene477() {} + virtual ~Scene477() {} virtual int init(); }; @@ -97,7 +97,7 @@ public: class Scene48: public CutScene { public: Scene48(GnapEngine *vm); - ~Scene48() {} + virtual ~Scene48() {} virtual int init(); }; @@ -105,7 +105,7 @@ public: class Scene541: public CutScene { public: Scene541(GnapEngine *vm); - ~Scene541() {} + virtual ~Scene541() {} virtual int init(); }; @@ -113,7 +113,7 @@ public: class Scene542: public CutScene { public: Scene542(GnapEngine *vm); - ~Scene542() {} + virtual ~Scene542() {} virtual int init(); }; diff --git a/engines/gnap/scenes/intro.h b/engines/gnap/scenes/intro.h index c744999a69..15aedfc4fc 100644 --- a/engines/gnap/scenes/intro.h +++ b/engines/gnap/scenes/intro.h @@ -33,7 +33,7 @@ class GnapEngine; class SceneIntro: public Scene { public: SceneIntro(GnapEngine *vm); - ~SceneIntro() {} + virtual ~SceneIntro() {} virtual int init(); virtual void updateHotspots() {} diff --git a/engines/gnap/scenes/scenecore.h b/engines/gnap/scenes/scenecore.h index 209f07a162..5bfc80d185 100644 --- a/engines/gnap/scenes/scenecore.h +++ b/engines/gnap/scenes/scenecore.h @@ -32,7 +32,7 @@ class GnapEngine; class Scene { public: Scene(GnapEngine *vm) : _vm(vm) {}; - ~Scene() {}; + virtual ~Scene() {}; void playRandomSound(int timerIndex); bool clearKeyStatus(); @@ -50,7 +50,7 @@ protected: class CutScene : public Scene { public: CutScene(GnapEngine *vm) : Scene(vm) {}; - ~CutScene() {}; + virtual ~CutScene() {}; virtual int init() = 0; void updateHotspots() {} |