From 696ed52959e7853ff2039fb0ce1063cebb9a1cd2 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 16 Dec 2008 17:40:34 +0000 Subject: Switched kyra1 to use the same input functionality as kyra2 and kyra3. svn-id: r35393 --- engines/kyra/kyra_v2.h | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'engines/kyra/kyra_v2.h') diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index e606bdfc15..2d261d8c7b 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -78,7 +78,6 @@ public: virtual void pauseEngineIntern(bool pause); virtual Screen_v2 *screen_v2() const = 0; - virtual GUI *gui_v2() const = 0; void delay(uint32 time, bool update = false, bool isMainLoop = false); @@ -103,27 +102,6 @@ protected: // Input virtual int inputSceneChange(int x, int y, int unk1, int unk2) = 0; - void updateInput(); - int checkInput(Button *buttonList, bool mainLoop = false); - void removeInputTop(); - - int _mouseX, _mouseY; - - struct Event { - Common::Event event; - bool causedSkip; - - Event() : event(), causedSkip(false) {} - Event(Common::Event e) : event(e), causedSkip(false) {} - Event(Common::Event e, bool skip) : event(e), causedSkip(skip) {} - - operator Common::Event() const { return event; } - }; - Common::List _eventList; - - virtual bool skipFlag() const; - virtual void resetSkipFlag(bool removeEvent = true); - // Animator struct AnimObj { uint16 index; -- cgit v1.2.3