diff options
| author | Strangerke | 2014-02-11 08:00:15 +0100 |
|---|---|---|
| committer | Strangerke | 2014-02-11 08:00:15 +0100 |
| commit | 1ed4ed47afdfeae436391b36a6cb2a3e192f06ae (patch) | |
| tree | 2a7e83a399e9d7b8187e4060962999d318139829 /engines/voyeur/events.cpp | |
| parent | e688cb501534e98a024edc136ca5b833e173944d (diff) | |
| download | scummvm-rg350-1ed4ed47afdfeae436391b36a6cb2a3e192f06ae.tar.gz scummvm-rg350-1ed4ed47afdfeae436391b36a6cb2a3e192f06ae.tar.bz2 scummvm-rg350-1ed4ed47afdfeae436391b36a6cb2a3e192f06ae.zip | |
VOYEUR: Rename some fields related to fading
Diffstat (limited to 'engines/voyeur/events.cpp')
| -rw-r--r-- | engines/voyeur/events.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index 4e6986b803..4a6beb9430 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -505,30 +505,30 @@ void EventsManager::vDoCycleInt() { void EventsManager::fadeIntFunc() { - switch (_vm->_voy._field437E) { + switch (_vm->_voy._fadingType) { case 1: - if (_vm->_voy._field4376 < 63) - _vm->_voy._field4376 += _vm->_voy._field437A; - if (_vm->_voy._field4378 < 63) - _vm->_voy._field4378 += _vm->_voy._field437C; - if (_vm->_voy._field4376 > 63) - _vm->_voy._field4376 = 63; - if (_vm->_voy._field4378 > 63) - _vm->_voy._field4378 = 63; - if ((_vm->_voy._field4376 == 63) && (_vm->_voy._field4378 == 63)) - _vm->_voy._field437E = 0; + if (_vm->_voy._fadingAmount1 < 63) + _vm->_voy._fadingAmount1 += _vm->_voy._fadingStep1; + if (_vm->_voy._fadingAmount2 < 63) + _vm->_voy._fadingAmount2 += _vm->_voy._fadingStep2; + if (_vm->_voy._fadingAmount1 > 63) + _vm->_voy._fadingAmount1 = 63; + if (_vm->_voy._fadingAmount2 > 63) + _vm->_voy._fadingAmount2 = 63; + if ((_vm->_voy._fadingAmount1 == 63) && (_vm->_voy._fadingAmount2 == 63)) + _vm->_voy._fadingType = 0; break; case 2: - if (_vm->_voy._field4376 > 0) - _vm->_voy._field4376 -= _vm->_voy._field437A; - if (_vm->_voy._field4378 > 0) - _vm->_voy._field4378 -= _vm->_voy._field437C; - if (_vm->_voy._field4376 < 0) - _vm->_voy._field4376 = 0; - if (_vm->_voy._field4378 < 0) - _vm->_voy._field4378 = 0; - if ((_vm->_voy._field4376 == 0) && (_vm->_voy._field4378 == 0)) - _vm->_voy._field437E = 0; + if (_vm->_voy._fadingAmount1 > 0) + _vm->_voy._fadingAmount1 -= _vm->_voy._fadingStep1; + if (_vm->_voy._fadingAmount2 > 0) + _vm->_voy._fadingAmount2 -= _vm->_voy._fadingStep2; + if (_vm->_voy._fadingAmount1 < 0) + _vm->_voy._fadingAmount1 = 0; + if (_vm->_voy._fadingAmount2 < 0) + _vm->_voy._fadingAmount2 = 0; + if ((_vm->_voy._fadingAmount1 == 0) && (_vm->_voy._fadingAmount2 == 0)) + _vm->_voy._fadingType = 0; break; default: break; |