diff options
| author | Paul Gilbert | 2012-05-13 22:34:40 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-05-13 22:34:40 +1000 |
| commit | 546f47ddcee07b5bd7ecad5f25f4bb022944e234 (patch) | |
| tree | f3b6953eaf877174014fc40268ad9084f1e3327b /engines/tony/font.cpp | |
| parent | 35143eae094b713524ef677412befdc4c766df04 (diff) | |
| download | scummvm-rg350-546f47ddcee07b5bd7ecad5f25f4bb022944e234.tar.gz scummvm-rg350-546f47ddcee07b5bd7ecad5f25f4bb022944e234.tar.bz2 scummvm-rg350-546f47ddcee07b5bd7ecad5f25f4bb022944e234.zip | |
TONY: Beginnings of refactoring Globals into their own class
Diffstat (limited to 'engines/tony/font.cpp')
| -rw-r--r-- | engines/tony/font.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp index f7f3fb3f8c..dee3c3228a 100644 --- a/engines/tony/font.cpp +++ b/engines/tony/font.cpp @@ -2003,7 +2003,7 @@ void RMText::WriteText(const RMString &text, RMFontColor *font, int *time) { } if (time != NULL) - *time = 1000 + numchar * (11 - nCfgTextSpeed) * 14; + *time = 1000 + numchar * (11 - GLOBALS.nCfgTextSpeed) * 14; } void RMText::ClipOnScreen(RMGfxPrimitive *prim) { @@ -2128,8 +2128,8 @@ void RMTextDialog::RemoveThis(CORO_PARAM, bool &result) { // Frase NON di background if (m_bSkipStatus) { - if (!(bCfgDubbing && hCustomSkip2 != CORO_INVALID_PID_VALUE)) - if (bCfgTimerizedText) { + if (!(GLOBALS.bCfgDubbing && hCustomSkip2 != CORO_INVALID_PID_VALUE)) + if (GLOBALS.bCfgTimerizedText) { if (!m_bForceNoTime) if (_vm->GetTime() > (uint32)m_time + m_startTime) return; @@ -2146,7 +2146,7 @@ void RMTextDialog::RemoveThis(CORO_PARAM, bool &result) { } // Frase di background else { - if (!(bCfgDubbing && hCustomSkip2 != CORO_INVALID_PID_VALUE)) + if (!(GLOBALS.bCfgDubbing && hCustomSkip2 != CORO_INVALID_PID_VALUE)) if (!m_bForceNoTime) if (_vm->GetTime() > (uint32)m_time + m_startTime) return; @@ -2164,7 +2164,7 @@ void RMTextDialog::RemoveThis(CORO_PARAM, bool &result) { return; } - if (bCfgDubbing && hCustomSkip2 != CORO_INVALID_PID_VALUE) { + if (GLOBALS.bCfgDubbing && hCustomSkip2 != CORO_INVALID_PID_VALUE) { CORO_INVOKE_3(CoroScheduler.waitForSingleObject, hCustomSkip2, 0, &_ctx->expired); // == WAIT_OBJECT_0 if (!_ctx->expired) @@ -2192,7 +2192,7 @@ void RMTextDialog::Draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *p m_startTime = _vm->GetTime(); if (m_bShowed) { - if (bCfgSottotitoli || m_bAlwaysDisplay) { + if (GLOBALS.bCfgSottotitoli || m_bAlwaysDisplay) { prim->Dst().TopLeft() = dst; CORO_INVOKE_2(RMText::Draw, bigBuf, prim); } |