aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorMax Horn2004-09-28 20:19:37 +0000
committerMax Horn2004-09-28 20:19:37 +0000
commitce8c99bf62838099142aa79f2935e64639aa5571 (patch)
tree5a2ea91139133878cdffab8ed86033fbf5448ea9 /queen
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 'queen')
-rw-r--r--queen/display.cpp2
-rw-r--r--queen/input.cpp8
-rw-r--r--queen/journal.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/queen/display.cpp b/queen/display.cpp
index 00f101d40c..77ec75bec2 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -930,7 +930,7 @@ void Display::drawBox(int16 x1, int16 y1, int16 x2, int16 y2, uint8 col) {
}
void Display::shake(bool reset) {
- _system->set_shake_pos(reset ? 0 : 3);
+ _system->setShakePos(reset ? 0 : 3);
}
void Display::blankScreen() {
diff --git a/queen/input.cpp b/queen/input.cpp
index 1b6c2bdd73..4f2fee40fa 100644
--- a/queen/input.cpp
+++ b/queen/input.cpp
@@ -74,7 +74,7 @@ void Input::delay(uint amount) {
OSystem::Event event;
- uint32 start = _system->get_msecs();
+ uint32 start = _system->getMillis();
uint32 cur = start;
if (_idleTime < DELAY_SCREEN_BLANKER) {
@@ -82,7 +82,7 @@ void Input::delay(uint amount) {
}
do {
- while (_system->poll_event(&event)) {
+ while (_system->pollEvent(event)) {
_idleTime = 0;
switch (event.event_code) {
case OSystem::EVENT_KEYDOWN:
@@ -131,8 +131,8 @@ void Input::delay(uint amount) {
uint this_delay = 20; // 1?
if (this_delay > amount)
this_delay = amount;
- _system->delay_msecs(this_delay);
- cur = _system->get_msecs();
+ _system->delayMillis(this_delay);
+ cur = _system->getMillis();
} while (cur < start + amount);
}
diff --git a/queen/journal.cpp b/queen/journal.cpp
index 16bd854726..b42d858352 100644
--- a/queen/journal.cpp
+++ b/queen/journal.cpp
@@ -62,7 +62,7 @@ void Journal::use() {
OSystem *system = OSystem::instance();
while (!_quit) {
OSystem::Event event;
- while (system->poll_event(&event)) {
+ while (system->pollEvent(event)) {
switch (event.event_code) {
case OSystem::EVENT_KEYDOWN:
handleKeyDown(event.kbd.ascii, event.kbd.keycode);
@@ -83,7 +83,7 @@ void Journal::use() {
break;
}
}
- system->delay_msecs(20);
+ system->delayMillis(20);
system->updateScreen();
}