diff options
| author | Filippos Karapetis | 2009-10-06 17:45:57 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-06 17:45:57 +0000 |
| commit | c17495d8952e03de03288829c487a60014d2656e (patch) | |
| tree | ae7e256e67214ad505156256182476de7ccea370 /engines/sci/gui/gui.h | |
| parent | b8f18e8ddd60c9e7cf063f449857f855ba9bd323 (diff) | |
| download | scummvm-rg350-c17495d8952e03de03288829c487a60014d2656e.tar.gz scummvm-rg350-c17495d8952e03de03288829c487a60014d2656e.tar.bz2 scummvm-rg350-c17495d8952e03de03288829c487a60014d2656e.zip | |
- Fixed kGetTime() again
- Removed the odd way of calculating elapsed time in SciGui(). We got _system->getMillis() for that purpose
- Replaced the code in SciGui::wait() with the one in SciGui32::wait (which works fine, and is correct). The code in SciGui() was not polling for events while waiting, either
svn-id: r44712
Diffstat (limited to 'engines/sci/gui/gui.h')
| -rw-r--r-- | engines/sci/gui/gui.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h index a6262771a9..cbd1f315ef 100644 --- a/engines/sci/gui/gui.h +++ b/engines/sci/gui/gui.h @@ -46,7 +46,6 @@ public: virtual void init(bool usesOldGfxFunctions); - virtual int16 getTimeTicks(); virtual void wait(int16 ticks); virtual void setPort(uint16 portPtr); virtual void setPortPic(Common::Rect rect, int16 picTop, int16 picLeft); @@ -93,8 +92,6 @@ public: int _picNotValid; // possible values 0, 1 and 2 private: - static void timerHandler(void*ref); - OSystem *_system; EngineState *_s; SciGuiScreen *_screen; @@ -102,8 +99,6 @@ private: SciGuiGfx *_gfx; SciGuiresources *_resources; SciGuiWindowMgr *_windowMgr; - uint32 _sysTicks; - int32 _sysSpeed; // ticker timer in ms }; } // End of namespace Sci |