aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/scene.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2014-05-08 11:43:23 +0300
committerFilippos Karapetis2014-05-08 11:43:23 +0300
commitb7dd01fdefd910c3c0f6291145ceab4060ae1a70 (patch)
tree12e16d4a4362011d5954e6020d85a9bdb0cd5e31 /engines/mads/scene.cpp
parent2502bd89966f8b6398be4fc0428aaba1831ad530 (diff)
downloadscummvm-rg350-b7dd01fdefd910c3c0f6291145ceab4060ae1a70.tar.gz
scummvm-rg350-b7dd01fdefd910c3c0f6291145ceab4060ae1a70.tar.bz2
scummvm-rg350-b7dd01fdefd910c3c0f6291145ceab4060ae1a70.zip
MADS: Remove trailing whitespace
Diffstat (limited to 'engines/mads/scene.cpp')
-rw-r--r--engines/mads/scene.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 609e2335e4..32956e6484 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -32,7 +32,7 @@ namespace MADS {
Scene::Scene(MADSEngine *vm): _vm(vm), _action(_vm), _depthSurface(vm),
_dirtyAreas(_vm), _dynamicHotspots(vm), _hotspots(vm),
- _kernelMessages(vm), _sequences(vm), _sprites(vm), _spriteSlots(vm),
+ _kernelMessages(vm), _sequences(vm), _sprites(vm), _spriteSlots(vm),
_textDisplay(vm), _userInterface(vm) {
_priorSceneId = 0;
_nextSceneId = 0;
@@ -169,11 +169,11 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
flags |= ANIMFLAG_DITHER;
if (_vm->_textWindowStill)
flags |= ANIMFLAG_LOAD_BACKGROUND_ONLY;
-
+
_animationData = Animation::init(_vm, this);
MSurface depthSurface;
_animationData->load(_userInterface, depthSurface, prefix, flags, nullptr, nullptr);
-
+
_vm->_palette->_paletteUsage.load(&_scenePaletteUsage);
_bandsRange = _sceneInfo->_yBandsEnd - _sceneInfo->_yBandsStart;
@@ -184,7 +184,7 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
_spritesCount = _sprites.size();
_userInterface.setup(_vm->_game->_screenObjects._inputMode);
-
+
_vm->_game->_screenObjects._category = CAT_NONE;
_vm->_events->showCursor();
@@ -386,7 +386,7 @@ void Scene::doFrame() {
_frameStartTime = _vm->_events->getFrameCounter();
// Handle parser actions as well as game triggers
- if ((_action._inProgress && !player._moving && !player._needToWalk &&
+ if ((_action._inProgress && !player._moving && !player._needToWalk &&
(player._facing == player._turnToFacing) && !_vm->_game->_trigger) ||
(_vm->_game->_trigger && (_vm->_game->_triggerMode == SEQUENCE_TRIGGER_PARSER))) {
doAction();
@@ -420,7 +420,7 @@ void Scene::doFrame() {
if (_vm->_debugger->_showMousePos) {
Common::Point pt = _vm->_events->mousePos();
Common::String msg = Common::String::format("(%d,%d)", pt.x, pt.y);
- mouseTextIndex = _kernelMessages.add(Common::Point(5, 5),
+ mouseTextIndex = _kernelMessages.add(Common::Point(5, 5),
0x203, 0, 0, 1, msg);
}
@@ -504,7 +504,7 @@ void Scene::drawElements(ScreenTransition transitionType, bool surfaceFlag) {
}
void Scene::doPreactions() {
- if (_vm->_game->_screenObjects._inputMode == kInputBuildingSentences ||
+ if (_vm->_game->_screenObjects._inputMode == kInputBuildingSentences ||
_vm->_game->_screenObjects._inputMode == kInputLimitedSentences) {
_vm->_game->_triggerSetupMode = SEQUENCE_TRIGGER_PREPARE;
_action.checkAction();
@@ -533,7 +533,7 @@ void Scene::doAction() {
flag = !_action._inProgress;
}
- if ((_action._inProgress || _vm->_game->_trigger) &&
+ if ((_action._inProgress || _vm->_game->_trigger) &&
(!flag || _action._savedFields._commandError == flag)) {
_vm->_game->doObjectAction();
}
@@ -589,7 +589,7 @@ void Scene::loadAnimation(const Common::String &resName, int trigger) {
UserInterface interfaceSurface(_vm);
_activeAnimation = Animation::init(_vm, this);
- _activeAnimation->load(interfaceSurface, depthSurface, resName,
+ _activeAnimation->load(interfaceSurface, depthSurface, resName,
_vm->_dithering ? ANIMFLAG_DITHER : 0, nullptr, nullptr);
_activeAnimation->startAnimation(trigger);
}