diff options
| author | Einar Johan Trøan Sømåen | 2012-07-26 15:59:26 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-26 15:59:26 +0200 |
| commit | ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d (patch) | |
| tree | 8dfaee0ba16e18a8e3772dd5afc9123d5c4e78d2 /engines/wintermute/base/base_transition_manager.cpp | |
| parent | 38507fa9895620639d8733dbb4e085dfb2282a33 (diff) | |
| download | scummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.tar.gz scummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.tar.bz2 scummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.zip | |
WINTERMUTE: Run Astyle with add-braces to break one-line statements into easier-to-read-code.
Diffstat (limited to 'engines/wintermute/base/base_transition_manager.cpp')
| -rw-r--r-- | engines/wintermute/base/base_transition_manager.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp index eeaacd2063..7a78865552 100644 --- a/engines/wintermute/base/base_transition_manager.cpp +++ b/engines/wintermute/base/base_transition_manager.cpp @@ -57,7 +57,9 @@ bool BaseTransitionMgr::isReady() { //////////////////////////////////////////////////////////////////////////
bool BaseTransitionMgr::start(TTransitionType type, bool nonInteractive) {
- if (_state != TRANS_MGR_READY) return STATUS_OK;
+ if (_state != TRANS_MGR_READY) {
+ return STATUS_OK;
+ }
if (type == TRANSITION_NONE || type >= NUM_TRANSITION_TYPES) {
_state = TRANS_MGR_READY;
@@ -82,7 +84,9 @@ bool BaseTransitionMgr::start(TTransitionType type, bool nonInteractive) { //////////////////////////////////////////////////////////////////////////
bool BaseTransitionMgr::update() {
- if (isReady()) return STATUS_OK;
+ if (isReady()) {
+ return STATUS_OK;
+ }
if (!_started) {
_started = true;
@@ -100,8 +104,9 @@ bool BaseTransitionMgr::update() { alpha = MIN(255, MAX(alpha, 0));
_gameRef->_renderer->fade((uint16)alpha);
- if (time > FADE_DURATION)
+ if (time > FADE_DURATION) {
_state = TRANS_MGR_READY;
+ }
}
break;
@@ -111,8 +116,9 @@ bool BaseTransitionMgr::update() { alpha = MIN(255, MAX(alpha, 0));
_gameRef->_renderer->fade((uint16)alpha);
- if (time > FADE_DURATION)
+ if (time > FADE_DURATION) {
_state = TRANS_MGR_READY;
+ }
}
break;
default:
@@ -120,8 +126,9 @@ bool BaseTransitionMgr::update() { }
if (isReady()) {
- if (_preserveInteractive)
+ if (_preserveInteractive) {
_gameRef->_interactive = _origInteractive;
+ }
}
return STATUS_OK;
}
|