[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.351,2.352 imuse.cpp,2.116,2.117 input.cpp,2.1,2.2 script_v72he.cpp,2.133,2.134 scumm.cpp,1.235,1.236 sound.cpp,1.398,1.399
Max Horn
fingolfin at users.sourceforge.net
Tue Sep 28 13:29:02 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3612/scumm
Modified Files:
gfx.cpp imuse.cpp input.cpp script_v72he.cpp scumm.cpp
sound.cpp
Log Message:
Rename remaining OSystem methods to match our coding guidelines
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.351
retrieving revision 2.352
diff -u -d -r2.351 -r2.352
--- gfx.cpp 28 Sep 2004 16:26:37 -0000 2.351
+++ gfx.cpp 28 Sep 2004 20:19:28 -0000 2.352
@@ -393,10 +393,10 @@
// Handle shaking
if (_shakeEnabled) {
_shakeFrame = (_shakeFrame + 1) % NUM_SHAKE_POSITIONS;
- _system->set_shake_pos(shake_positions[_shakeFrame]);
+ _system->setShakePos(shake_positions[_shakeFrame]);
} else if (!_shakeEnabled &&_shakeFrame != 0) {
_shakeFrame = 0;
- _system->set_shake_pos(0);
+ _system->setShakePos(0);
}
}
@@ -971,7 +971,7 @@
_shakeEnabled = mode != 0;
_shakeFrame = 0;
- _system->set_shake_pos(0);
+ _system->setShakePos(0);
}
#pragma mark -
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.116
retrieving revision 2.117
diff -u -d -r2.116 -r2.117
--- imuse.cpp 28 Feb 2004 12:58:10 -0000 2.116
+++ imuse.cpp 28 Sep 2004 20:19:28 -0000 2.117
@@ -1176,7 +1176,7 @@
// Reset the MT-32
memcpy(&buffer[0], "\x41\x10\x16\x12\x7f\x00\x00\x01\x00", 9);
midi->sysEx(buffer, 9);
- g_system->delay_msecs (100);
+ g_system->delayMillis (100);
// Compute version string (truncated to 20 chars max.)
strcat(info, gScummVMVersion);
@@ -1193,18 +1193,18 @@
checksum -= buffer[i];
buffer[27] = checksum & 0x7F;
midi->sysEx(buffer, 28);
- g_system->delay_msecs (500);
+ g_system->delayMillis (500);
// Setup master tune, reverb mode, reverb time, reverb level,
// channel mapping, partial reserve and master volume
memcpy(&buffer[4], "\x10\x00\x00\x40\x00\x04\x04\x04\x04\x04\x04\x04\x04\x04\x04\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x64\x77", 27);
midi->sysEx(buffer, 31);
- g_system->delay_msecs (250);
+ g_system->delayMillis (250);
// Setup rythm part
memcpy(&buffer[4], "\x03\x01\x10\x40\x64\x07\x00\x4a\x64\x06\x00\x41\x64\x07\x00\x4b\x64\x08\x00\x45\x64\x06\x00\x44\x64\x0b\x00\x51\x64\x05\x00\x43\x64\x08\x00\x50\x64\x07\x00\x42\x64\x03\x00\x4c\x64\x07\x00\x44", 48);
midi->sysEx(buffer, 52);
- g_system->delay_msecs (250);
+ g_system->delayMillis (250);
}
void IMuseInternal::init_queue() {
Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- input.cpp 20 Sep 2004 22:04:05 -0000 2.1
+++ input.cpp 28 Sep 2004 20:19:28 -0000 2.2
@@ -40,7 +40,7 @@
void ScummEngine::parseEvents() {
OSystem::Event event;
- while (_system->poll_event(&event)) {
+ while (_system->pollEvent(event)) {
switch(event.event_code) {
case OSystem::EVENT_KEYDOWN:
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.133
retrieving revision 2.134
diff -u -d -r2.133 -r2.134
--- script_v72he.cpp 28 Sep 2004 19:28:58 -0000 2.133
+++ script_v72he.cpp 28 Sep 2004 20:19:28 -0000 2.134
@@ -770,7 +770,7 @@
if (cmd == 10) {
checkRange(3, 1, timer, "o72_getTimer: Timer %d out of range(%d)");
- int diff = _system->get_msecs() - _timers[timer];
+ int diff = _system->getMillis() - _timers[timer];
push(diff);
} else {
push(0);
@@ -783,7 +783,7 @@
if (cmd == 158) {
checkRange(3, 1, timer, "o72_setTimer: Timer %d out of range(%d)");
- _timers[timer] = _system->get_msecs();
+ _timers[timer] = _system->getMillis();
} else {
error("TIMER command %d?", cmd);
}
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- scumm.cpp 28 Sep 2004 15:59:36 -0000 1.235
+++ scumm.cpp 28 Sep 2004 20:19:29 -0000 1.236
@@ -1272,7 +1272,7 @@
for (i = 0; i < 512; i++)
_keyDownMap[i] = false;
- _lastSaveTime = _system->get_msecs();
+ _lastSaveTime = _system->getMillis();
}
void ScummEngine_v2::scummInit() {
@@ -1382,16 +1382,16 @@
void ScummEngine::mainRun() {
int delta = 0;
- int diff = _system->get_msecs();
+ int diff = _system->getMillis();
while (!_quit) {
updatePalette();
_system->updateScreen();
- diff -= _system->get_msecs();
+ diff -= _system->getMillis();
waitForTimer(delta * 15 + diff);
- diff = _system->get_msecs();
+ diff = _system->getMillis();
delta = scummLoop(delta);
if (delta < 1) // Ensure we don't get into a loop
@@ -1411,15 +1411,15 @@
else if (_fastMode & 1)
msec_delay = 10;
- start_time = _system->get_msecs();
+ start_time = _system->getMillis();
while (!_quit) {
parseEvents();
_sound->updateCD(); // Loop CD Audio if needed
- if (_system->get_msecs() >= start_time + msec_delay)
+ if (_system->getMillis() >= start_time + msec_delay)
break;
- _system->delay_msecs(10);
+ _system->delayMillis(10);
}
}
@@ -1511,7 +1511,7 @@
}
// Trigger autosave all 5 minutes.
- if (!_saveLoadFlag && _system->get_msecs() > _lastSaveTime + 5 * 60 * 1000) {
+ if (!_saveLoadFlag && _system->getMillis() > _lastSaveTime + 5 * 60 * 1000) {
_saveLoadSlot = 0;
sprintf(_saveLoadName, "Autosave %d", _saveLoadSlot);
_saveLoadFlag = 1;
@@ -1562,7 +1562,7 @@
clearClickedStatus();
_saveLoadFlag = 0;
- _lastSaveTime = _system->get_msecs();
+ _lastSaveTime = _system->getMillis();
}
if (_completeScreenRedraw) {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -d -r1.398 -r1.399
--- sound.cpp 28 Sep 2004 19:28:58 -0000 1.398
+++ sound.cpp 28 Sep 2004 20:19:29 -0000 1.399
@@ -1150,7 +1150,7 @@
// Start the timer after starting the track. Starting an MP3 track is
// almost instantaneous, but a CD player may take some time. Hopefully
- // play_cdrom() will block during that delay.
+ // playCD() will block during that delay.
startCDTimer();
}
More information about the Scummvm-git-logs
mailing list