aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui32
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-06 17:45:57 +0000
committerFilippos Karapetis2009-10-06 17:45:57 +0000
commitc17495d8952e03de03288829c487a60014d2656e (patch)
treeae7e256e67214ad505156256182476de7ccea370 /engines/sci/gui32
parentb8f18e8ddd60c9e7cf063f449857f855ba9bd323 (diff)
downloadscummvm-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/gui32')
-rw-r--r--engines/sci/gui32/gui32.cpp6
-rw-r--r--engines/sci/gui32/gui32.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp
index 9e91f2b0c5..6f86f8a309 100644
--- a/engines/sci/gui32/gui32.cpp
+++ b/engines/sci/gui32/gui32.cpp
@@ -79,12 +79,6 @@ void SciGui32::init(bool oldGfxFunctions) {
port_origin_y = 0;
}
-int16 SciGui32::getTimeTicks() {
- uint32 start_time;
- start_time = _system->getMillis() - s->game_start_time;
- return start_time * 60 / 1000;
-}
-
void SciGui32::wait(int16 ticks) {
uint32 time;
diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h
index 38a3feb221..8f6981dd88 100644
--- a/engines/sci/gui32/gui32.h
+++ b/engines/sci/gui32/gui32.h
@@ -40,7 +40,6 @@ public:
void init(bool oldGfxFunctions);
- int16 getTimeTicks();
void wait(int16 ticks);
void setPort(uint16 portPtr);
void setPortPic(Common::Rect rect, int16 picTop, int16 picLeft);