thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ZVISION: Fix code style

Browse source
This commit is contained in:
Marisa-Chan 2014-10-10 16:50:59 +07:00
parent ac74070af1
commit a65ec38f8d
6 changed files with 49 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

36
engines/zvision/scripting/script_manager.cpp
View file

@ -160,28 +160,28 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
Common::Event _event = _controlEvents.front();
Common::Point imageCoord;
switch (_event.type) {
case Common::EVENT_LBUTTONDOWN:
imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
onMouseDown(_event.mouse, imageCoord);
break;
case Common::EVENT_LBUTTONUP:
imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
onMouseUp(_event.mouse, imageCoord);
break;
case Common::EVENT_KEYDOWN:
onKeyDown(_event.kbd);
break;
case Common::EVENT_KEYUP:
onKeyUp(_event.kbd);
break;
default:
break;
case Common::EVENT_LBUTTONDOWN:
imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
onMouseDown(_event.mouse, imageCoord);
break;
case Common::EVENT_LBUTTONUP:
imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
onMouseUp(_event.mouse, imageCoord);
break;
case Common::EVENT_KEYDOWN:
onKeyDown(_event.kbd);
break;
case Common::EVENT_KEYUP:
onKeyUp(_event.kbd);
break;
default:
break;
}
_controlEvents.pop_front();
}
for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); iter++)
if ( (*iter)->process(deltaTimeMillis) )
if ((*iter)->process(deltaTimeMillis))
break;
}
@ -540,7 +540,7 @@ void ScriptManager::do_changeLocation() {
if (_nextLocation.world == 'g' && _nextLocation.room == 'j') {
if (_nextLocation.node == 's' && _nextLocation.view == 'e' &&
_currentLocation.world != 'g' && _currentLocation.room != 'j')
_currentLocation.world != 'g' && _currentLocation.room != 'j')
_engine->getSaveManager()->prepareSaveBuffer();
} else {
if (_currentLocation.world == 'g' && _currentLocation.room == 'j')