TOON: Made all ToonEngine functions non-virtual

svn-id: r53134

1 files changed, 93 insertions, 93 deletions

diff --git a/engines/toon/toon.h b/engines/toon/toon.h
index dd2235ebcd..2d6b315bca 100644
--- a/engines/toon/toon.h
+++ b/engines/toon/toon.h
@@ -90,101 +90,101 @@ public:
 	char **_locationDirVisited;
 	char **_specialInfoLine;
 
-	virtual Common::Error run();
-	virtual bool showMainmenu(bool &loadedGame);
-	virtual void init();
+	Common::Error run();
+	bool showMainmenu(bool &loadedGame);
+	void init();
 	bool loadToonDat();
 	char **loadTextsVariante(Common::File &in);
-	virtual void setPaletteEntries(uint8 *palette, int32 offset, int32 num);
-	virtual void fixPaletteEntries(uint8 *palette, int num);
-	virtual void flushPalette();
-	virtual void parseInput();
-	virtual void initChapter();
-	virtual void initFonts();
-	virtual void loadScene(int32 SceneId, bool forGameLoad = false);
-	virtual void exitScene();
-	virtual void loadCursor();
-	virtual void setCursor(int32 type, bool inventory = false, int32 offsetX = 0, int offsetY = 0);
-	virtual void loadAdditionalPalette(Common::String fileName, int32 mode);
-	virtual void setupGeneralPalette();
-	virtual void render();
-	virtual void update(int32 timeIncrement);
-	virtual void doFrame();
-	virtual void updateAnimationSceneScripts(int32 timeElapsed);
-	virtual void updateCharacters(int32 timeElapsed);
-	virtual void setSceneAnimationScriptUpdate(bool enable);
-	virtual bool isUpdatingSceneAnimation();
-	virtual int32 getCurrentUpdatingSceneAnimation();
-	virtual int32 randRange(int32 minStart, int32 maxStart);
-	virtual void selectHotspot();
-	virtual void clickEvent();
-	virtual int32 runEventScript(int32 x, int32 y, int32 mode, int32 id, int32 scriptId);
-	virtual void flipScreens();
-	virtual void drawInfoLine();
-	virtual void drawConversationLine();
-	virtual const char *getLocationString(int32 locationId, bool alreadyVisited);
-	virtual int32 getScaleAtPoint(int32 x, int32 y);
-	virtual int32 getZAtPoint(int32 x, int32 y);
-	virtual int32 getLayerAtPoint(int32 x, int32 y);
-	virtual int32 characterTalk(int32 dialogid, bool blocking = true);
-	virtual int32 simpleCharacterTalk(int32 dialogid);
-	virtual void sayLines(int numLines, int dialogId);
-	virtual void haveAConversation(int32 convId);
-	virtual void processConversationClick(Conversation *conv, int32 status);
-	virtual int32 runConversationCommand(int16 **command);
-	virtual void prepareConversations();
-	virtual void drawConversationIcons();
-	virtual void simpleUpdate();
-	virtual int32 waitTicks(int32 numTicks, bool breakOnMouseClick);
-	virtual void copyToVirtualScreen(bool updateScreen = true);
-	virtual void getMouseEvent();
-	virtual int32 showInventory();
-	virtual void drawSack();
-	virtual void addItemToInventory(int32 item);
-	virtual void deleteItemFromInventory(int32 item);
-	virtual void replaceItemFromInventory(int32 item, int32 destItem);
-	virtual void rearrangeInventory();
-	virtual void createMouseItem(int32 item);
-	virtual void deleteMouseItem();
-	virtual void showCutaway(Common::String cutawayPicture);
-	virtual void hideCutaway();
-	virtual void drawPalette();
-	virtual void newGame();
-	virtual void playSoundWrong();
-	virtual void playSFX(int32 id, int32 volume);
-	virtual void storeRifFlags(int32 location);
-	virtual void restoreRifFlags(int32 location);
-	virtual void getTextPosition(int32 characterId, int32 *retX, int32 *retY);
-	virtual int32 getConversationFlag(int32 locationId, int32 param);
-	virtual int32 getSpecialInventoryItem(int32 item);
-	virtual Character *getCharacterById(int32 charId);
-	virtual Common::String getSavegameName(int nr);
-	virtual bool loadGame(int32 slot);
-	virtual bool saveGame(int32 slot);
-	virtual void fadeIn(int32 numFrames) ;
-	virtual void fadeOut(int32 numFrames) ;
-	virtual void initCharacter(int32 characterId, int32 animScriptId, int32 animToPlayId, int32 sceneAnimationId);
-	virtual int32 handleInventoryOnFlux(int32 itemId);
-	virtual int32 handleInventoryOnInventory(int32 itemDest, int32 itemSrc);
-	virtual int32 handleInventoryOnDrew(int32 itemId);
-	virtual int32 pauseSceneAnimationScript(int32 animScriptId, int32 tickToWait);
-	virtual void updateTimer(int32 timeIncrement);
-	virtual Common::String createRoomFilename(Common::String name);
-	virtual void createShadowLUT();
-	virtual void playTalkAnimOnCharacter(int32 animID, int32 characterId, bool talker);
-	virtual void updateScrolling(bool force, int32 timeIncrement);
-	virtual void enableTimer(int32 timerId);
-	virtual void setTimer(int32 timerId, int32 timerWait);
-	virtual void disableTimer(int32 timerId);
-	virtual void updateTimers();
-	virtual void makeLineNonWalkable(int32 x, int32 y, int32 x2, int32 y2);
-	virtual void makeLineWalkable(int32 x, int32 y, int32 x2, int32 y2);
-	virtual void renderInventory();
-	virtual void viewInventoryItem(Common::String str, int32 lineId, int32 itemDest);
-	virtual void storePalette();
-	virtual void restorePalette();
-	virtual const char *getSpecialConversationMusic(int32 locationId); 
-	virtual void playRoomMusic();
+	void setPaletteEntries(uint8 *palette, int32 offset, int32 num);
+	void fixPaletteEntries(uint8 *palette, int num);
+	void flushPalette();
+	void parseInput();
+	void initChapter();
+	void initFonts();
+	void loadScene(int32 SceneId, bool forGameLoad = false);
+	void exitScene();
+	void loadCursor();
+	void setCursor(int32 type, bool inventory = false, int32 offsetX = 0, int offsetY = 0);
+	void loadAdditionalPalette(Common::String fileName, int32 mode);
+	void setupGeneralPalette();
+	void render();
+	void update(int32 timeIncrement);
+	void doFrame();
+	void updateAnimationSceneScripts(int32 timeElapsed);
+	void updateCharacters(int32 timeElapsed);
+	void setSceneAnimationScriptUpdate(bool enable);
+	bool isUpdatingSceneAnimation();
+	int32 getCurrentUpdatingSceneAnimation();
+	int32 randRange(int32 minStart, int32 maxStart);
+	void selectHotspot();
+	void clickEvent();
+	int32 runEventScript(int32 x, int32 y, int32 mode, int32 id, int32 scriptId);
+	void flipScreens();
+	void drawInfoLine();
+	void drawConversationLine();
+	const char *getLocationString(int32 locationId, bool alreadyVisited);
+	int32 getScaleAtPoint(int32 x, int32 y);
+	int32 getZAtPoint(int32 x, int32 y);
+	int32 getLayerAtPoint(int32 x, int32 y);
+	int32 characterTalk(int32 dialogid, bool blocking = true);
+	int32 simpleCharacterTalk(int32 dialogid);
+	void sayLines(int numLines, int dialogId);
+	void haveAConversation(int32 convId);
+	void processConversationClick(Conversation *conv, int32 status);
+	int32 runConversationCommand(int16 **command);
+	void prepareConversations();
+	void drawConversationIcons();
+	void simpleUpdate();
+	int32 waitTicks(int32 numTicks, bool breakOnMouseClick);
+	void copyToVirtualScreen(bool updateScreen = true);
+	void getMouseEvent();
+	int32 showInventory();
+	void drawSack();
+	void addItemToInventory(int32 item);
+	void deleteItemFromInventory(int32 item);
+	void replaceItemFromInventory(int32 item, int32 destItem);
+	void rearrangeInventory();
+	void createMouseItem(int32 item);
+	void deleteMouseItem();
+	void showCutaway(Common::String cutawayPicture);
+	void hideCutaway();
+	void drawPalette();
+	void newGame();
+	void playSoundWrong();
+	void playSFX(int32 id, int32 volume);
+	void storeRifFlags(int32 location);
+	void restoreRifFlags(int32 location);
+	void getTextPosition(int32 characterId, int32 *retX, int32 *retY);
+	int32 getConversationFlag(int32 locationId, int32 param);
+	int32 getSpecialInventoryItem(int32 item);
+	Character *getCharacterById(int32 charId);
+	Common::String getSavegameName(int nr);
+	bool loadGame(int32 slot);
+	bool saveGame(int32 slot);
+	void fadeIn(int32 numFrames) ;
+	void fadeOut(int32 numFrames) ;
+	void initCharacter(int32 characterId, int32 animScriptId, int32 animToPlayId, int32 sceneAnimationId);
+	int32 handleInventoryOnFlux(int32 itemId);
+	int32 handleInventoryOnInventory(int32 itemDest, int32 itemSrc);
+	int32 handleInventoryOnDrew(int32 itemId);
+	int32 pauseSceneAnimationScript(int32 animScriptId, int32 tickToWait);
+	void updateTimer(int32 timeIncrement);
+	Common::String createRoomFilename(Common::String name);
+	void createShadowLUT();
+	void playTalkAnimOnCharacter(int32 animID, int32 characterId, bool talker);
+	void updateScrolling(bool force, int32 timeIncrement);
+	void enableTimer(int32 timerId);
+	void setTimer(int32 timerId, int32 timerWait);
+	void disableTimer(int32 timerId);
+	void updateTimers();
+	void makeLineNonWalkable(int32 x, int32 y, int32 x2, int32 y2);
+	void makeLineWalkable(int32 x, int32 y, int32 x2, int32 y2);
+	void renderInventory();
+	void viewInventoryItem(Common::String str, int32 lineId, int32 itemDest);
+	void storePalette();
+	void restorePalette();
+	const char *getSpecialConversationMusic(int32 locationId); 
+	void playRoomMusic();
 
 	Resources *resources() {
 		return _resources;