diff options
| author | Strangerke | 2012-06-04 23:45:36 +0200 |
|---|---|---|
| committer | Strangerke | 2012-06-04 23:45:36 +0200 |
| commit | a1f6f8ceb19d65619dfd8e2477bffad773ba49ba (patch) | |
| tree | e867c4e4393b2b4a0eb7c151968f648120ae2704 /engines/tony/mpal | |
| parent | c17af63aacda4b18ca6e756fb710cecb3b25fc88 (diff) | |
| download | scummvm-rg350-a1f6f8ceb19d65619dfd8e2477bffad773ba49ba.tar.gz scummvm-rg350-a1f6f8ceb19d65619dfd8e2477bffad773ba49ba.tar.bz2 scummvm-rg350-a1f6f8ceb19d65619dfd8e2477bffad773ba49ba.zip | |
TONY: Rename variables and functions in tony.h
Diffstat (limited to 'engines/tony/mpal')
| -rw-r--r-- | engines/tony/mpal/mpal.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp index 12fc78c60c..16c530206c 100644 --- a/engines/tony/mpal/mpal.cpp +++ b/engines/tony/mpal/mpal.cpp @@ -621,7 +621,7 @@ void ScriptThread(CORO_PARAM, const void *param) { CORO_BEGIN_CODE(_ctx); - _ctx->dwStartTime = _vm->GetTime(); + _ctx->dwStartTime = _vm->getTime(); _ctx->numHandles = 0; // debugC(DEBUG_BASIC, kTonyDebugMPAL, "PlayScript(): Moments: %u\n",s->nMoments); @@ -629,9 +629,9 @@ void ScriptThread(CORO_PARAM, const void *param) { // Sleep for the required time if (s->Moment[_ctx->i].dwTime == -1) { CORO_INVOKE_4(CoroScheduler.waitForMultipleObjects, _ctx->numHandles, cfHandles, true, CORO_INFINITE); - _ctx->dwStartTime = _vm->GetTime(); + _ctx->dwStartTime = _vm->getTime(); } else { - _ctx->dwCurTime = _vm->GetTime(); + _ctx->dwCurTime = _vm->getTime(); if (_ctx->dwCurTime < _ctx->dwStartTime + (s->Moment[_ctx->i].dwTime * 100)) { // debugC(DEBUG_BASIC, kTonyDebugMPAL, "PlayScript(): Sleeping %lums\n",_ctx->dwStartTime+(s->Moment[_ctx->i].dwTime*100)-_ctx->dwCurTime); CORO_INVOKE_1(CoroScheduler.sleep, _ctx->dwStartTime+(s->Moment[_ctx->i].dwTime * 100) - _ctx->dwCurTime); @@ -771,7 +771,7 @@ void ShutUpActionThread(CORO_PARAM, const void *param) { _ctx->slotNumber = _vm->_initialLoadSlotNumber; _vm->_initialLoadSlotNumber = -1; - CORO_INVOKE_1(_vm->LoadState, _ctx->slotNumber); + CORO_INVOKE_1(_vm->loadState, _ctx->slotNumber); } @@ -903,7 +903,7 @@ void LocationPollThread(CORO_PARAM, const void *param) { CopyMemory(_ctx->MyActions[_ctx->k].CmdNum, _ctx->curItem->Action[_ctx->j].CmdNum, MAX_COMMANDS_PER_ACTION * sizeof(uint16)); - _ctx->MyActions[_ctx->k].dwLastTime = _vm->GetTime(); + _ctx->MyActions[_ctx->k].dwLastTime = _vm->getTime(); _ctx->k++; } } @@ -918,7 +918,7 @@ void LocationPollThread(CORO_PARAM, const void *param) { while (1) { /* Cerchiamo tra tutte le idle actions quella a cui manca meno tempo per l'esecuzione */ - _ctx->curTime = _vm->GetTime(); + _ctx->curTime = _vm->getTime(); _ctx->dwSleepTime = (uint32)-1L; for (_ctx->k = 0;_ctx->k<_ctx->nIdleActions;_ctx->k++) @@ -944,7 +944,7 @@ void LocationPollThread(CORO_PARAM, const void *param) { _ctx->MyThreads[_ctx->i].nItem = 0; } - _ctx->curTime = _vm->GetTime(); + _ctx->curTime = _vm->getTime(); /* Loop through all the necessary idle actions */ for (_ctx->k = 0; _ctx->k < _ctx->nIdleActions; _ctx->k++) |