aboutsummaryrefslogtreecommitdiff
path: root/sky/control.cpp
diff options
context:
space:
mode:
authorMax Horn2004-09-28 20:19:37 +0000
committerMax Horn2004-09-28 20:19:37 +0000
commitce8c99bf62838099142aa79f2935e64639aa5571 (patch)
tree5a2ea91139133878cdffab8ed86033fbf5448ea9 /sky/control.cpp
parent6a50ba2308c6a9fc3eb733f310c87ed279b565ed (diff)
downloadscummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.tar.gz
scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.tar.bz2
scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.zip
Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
Diffstat (limited to 'sky/control.cpp')
-rw-r--r--sky/control.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/sky/control.cpp b/sky/control.cpp
index 11992a1114..e1909c079c 100644
--- a/sky/control.cpp
+++ b/sky/control.cpp
@@ -1679,12 +1679,12 @@ void Control::delay(unsigned int amount) {
OSystem::Event event;
- uint32 start = _system->get_msecs();
+ uint32 start = _system->getMillis();
uint32 cur = start;
_keyPressed = 0; //reset
do {
- while (_system->poll_event(&event)) {
+ while (_system->pollEvent(event)) {
switch (event.event_code) {
case OSystem::EVENT_KEYDOWN:
// Make sure backspace works right (this fixes a small issue on OS X)
@@ -1721,9 +1721,9 @@ void Control::delay(unsigned int amount) {
if (this_delay > amount)
this_delay = amount;
- if (this_delay > 0) _system->delay_msecs(this_delay);
+ if (this_delay > 0) _system->delayMillis(this_delay);
- cur = _system->get_msecs();
+ cur = _system->getMillis();
} while (cur < start + amount);
}