diff options
| author | Adrian Frühwirth | 2018-05-07 13:00:15 +0200 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-05-07 20:06:29 +0200 |
| commit | 4bf0eac94d65b5f5fd11c54d6c29dac058097dd7 (patch) | |
| tree | 7b760cac12210d2de65a68b7cd8d954f2a2b6054 /engines/toon/toon.cpp | |
| parent | 8885b37abb842af63e0836263b0db245530fef03 (diff) | |
| download | scummvm-rg350-4bf0eac94d65b5f5fd11c54d6c29dac058097dd7.tar.gz scummvm-rg350-4bf0eac94d65b5f5fd11c54d6c29dac058097dd7.tar.bz2 scummvm-rg350-4bf0eac94d65b5f5fd11c54d6c29dac058097dd7.zip | |
TOON: Enforce code formatting guidelines
Diffstat (limited to 'engines/toon/toon.cpp')
| -rw-r--r-- | engines/toon/toon.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 05192ae65e..248057d539 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -1559,9 +1559,9 @@ void ToonEngine::loadScene(int32 SceneId, bool forGameLoad) { if (state()->_locations[SceneId]._flags & 0x40) { Common::String cutaway = state()->_locations[SceneId]._cutaway; - _hotspots->LoadRif(locationName + ".RIC", cutaway + ".RIC"); + _hotspots->loadRif(locationName + ".RIC", cutaway + ".RIC"); } else { - _hotspots->LoadRif(locationName + ".RIC", ""); + _hotspots->loadRif(locationName + ".RIC", ""); } restoreRifFlags(_gameState->_currentScene); @@ -1837,10 +1837,10 @@ void ToonEngine::clickEvent() { } // find hotspot - int32 hot = _hotspots->Find(mouseX + state()->_currentScrollValue , _mouseY); + int32 hot = _hotspots->find(mouseX + state()->_currentScrollValue , _mouseY); HotspotData *currentHot = 0; if (hot > -1) { - currentHot = _hotspots->Get(hot); + currentHot = _hotspots->get(hot); } if (_currentHotspotItem == -3) { @@ -2012,9 +2012,9 @@ void ToonEngine::selectHotspot() { } } - int32 hot = _hotspots->Find(mouseX + state()->_currentScrollValue, _mouseY); + int32 hot = _hotspots->find(mouseX + state()->_currentScrollValue, _mouseY); if (hot != -1) { - HotspotData *hotspot = _hotspots->Get(hot); + HotspotData *hotspot = _hotspots->get(hot); int32 item = hotspot->getData(14); if (hotspot->getType() == 3) item += 2000; @@ -2271,8 +2271,8 @@ void ToonEngine::storeRifFlags(int32 location) { } for (int32 i = 0; i < _hotspots->getCount(); i++) { - _gameState->_locations[location]._rifBoxesFlags[i * 2 + 0] = _hotspots->Get(i)->getData(4); - _gameState->_locations[location]._rifBoxesFlags[i * 2 + 1] = _hotspots->Get(i)->getData(7); + _gameState->_locations[location]._rifBoxesFlags[i * 2 + 0] = _hotspots->get(i)->getData(4); + _gameState->_locations[location]._rifBoxesFlags[i * 2 + 1] = _hotspots->get(i)->getData(7); } } @@ -2280,8 +2280,8 @@ void ToonEngine::restoreRifFlags(int32 location) { if (_hotspots) { if (!_gameState->_locations[location]._visited) { for (int32 i = 0; i < _hotspots->getCount(); i++) { - _gameState->_locations[location]._rifBoxesFlags[i * 2 + 0] = _hotspots->Get(i)->getData(4); - _gameState->_locations[location]._rifBoxesFlags[i * 2 + 1] = _hotspots->Get(i)->getData(7); + _gameState->_locations[location]._rifBoxesFlags[i * 2 + 0] = _hotspots->get(i)->getData(4); + _gameState->_locations[location]._rifBoxesFlags[i * 2 + 1] = _hotspots->get(i)->getData(7); } _gameState->_locations[location]._numRifBoxes = _hotspots->getCount(); } else { @@ -2289,8 +2289,8 @@ void ToonEngine::restoreRifFlags(int32 location) { return; for (int32 i = 0; i < _hotspots->getCount(); i++) { - _hotspots->Get(i)->setData(4, _gameState->_locations[location]._rifBoxesFlags[i * 2 + 0]); - _hotspots->Get(i)->setData(7, _gameState->_locations[location]._rifBoxesFlags[i * 2 + 1]); + _hotspots->get(i)->setData(4, _gameState->_locations[location]._rifBoxesFlags[i * 2 + 0]); + _hotspots->get(i)->setData(7, _gameState->_locations[location]._rifBoxesFlags[i * 2 + 1]); } } } |