diff options
| author | Einar Johan Trøan Sømåen | 2012-07-08 22:37:15 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-08 22:37:15 +0200 |
| commit | 685ee29640e3f778999ece7b903fe56b7d212724 (patch) | |
| tree | deb555f86b5519edbde69eddf0e0188e72be706b | |
| parent | 9542846803c0ec0c78e376c667a26fd578e1cd5d (diff) | |
| download | scummvm-rg350-685ee29640e3f778999ece7b903fe56b7d212724.tar.gz scummvm-rg350-685ee29640e3f778999ece7b903fe56b7d212724.tar.bz2 scummvm-rg350-685ee29640e3f778999ece7b903fe56b7d212724.zip | |
WINTERMUTE: Rename VarName->varName in BTransitionMgr
| -rw-r--r-- | engines/wintermute/Base/BTransitionMgr.cpp | 21 | ||||
| -rw-r--r-- | engines/wintermute/Base/BTransitionMgr.h | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/engines/wintermute/Base/BTransitionMgr.cpp b/engines/wintermute/Base/BTransitionMgr.cpp index 7ddbf21ec9..dd20e6b687 100644 --- a/engines/wintermute/Base/BTransitionMgr.cpp +++ b/engines/wintermute/Base/BTransitionMgr.cpp @@ -97,21 +97,23 @@ HRESULT CBTransitionMgr::update() { case TRANSITION_FADE_OUT: {
uint32 time = CBPlatform::GetTime() - _lastTime;
- int Alpha = (int)(255 - (float)time / (float)FADE_DURATION * 255);
- Alpha = MIN(255, MAX(Alpha, 0));
- Game->_renderer->fade((uint16)Alpha);
+ int alpha = (int)(255 - (float)time / (float)FADE_DURATION * 255);
+ alpha = MIN(255, MAX(alpha, 0));
+ Game->_renderer->fade((uint16)alpha);
- if (time > FADE_DURATION) _state = TRANS_MGR_READY;
+ if (time > FADE_DURATION)
+ _state = TRANS_MGR_READY;
}
break;
case TRANSITION_FADE_IN: {
uint32 time = CBPlatform::GetTime() - _lastTime;
- int Alpha = (int)((float)time / (float)FADE_DURATION * 255);
- Alpha = MIN(255, MAX(Alpha, 0));
- Game->_renderer->fade((uint16)Alpha);
+ int alpha = (int)((float)time / (float)FADE_DURATION * 255);
+ alpha = MIN(255, MAX(alpha, 0));
+ Game->_renderer->fade((uint16)alpha);
- if (time > FADE_DURATION) _state = TRANS_MGR_READY;
+ if (time > FADE_DURATION)
+ _state = TRANS_MGR_READY;
}
break;
default:
@@ -119,7 +121,8 @@ HRESULT CBTransitionMgr::update() { }
if (isReady()) {
- if (_preserveInteractive) Game->_interactive = _origInteractive;
+ if (_preserveInteractive)
+ Game->_interactive = _origInteractive;
}
return S_OK;
}
diff --git a/engines/wintermute/Base/BTransitionMgr.h b/engines/wintermute/Base/BTransitionMgr.h index 402ee32310..11949cf8a3 100644 --- a/engines/wintermute/Base/BTransitionMgr.h +++ b/engines/wintermute/Base/BTransitionMgr.h @@ -40,7 +40,7 @@ public: bool _origInteractive;
bool _preserveInteractive;
HRESULT update();
- HRESULT start(TTransitionType Type, bool NonInteractive = false);
+ HRESULT start(TTransitionType type, bool nonInteractive = false);
bool isReady();
TTransMgrState _state;
CBTransitionMgr(CBGame *inGame);
|