diff options
author | Eugene Sandulenko | 2016-10-09 14:59:58 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-10-09 14:59:58 +0200 |
commit | dead4aa01446da2bf711e64a4e681be460fa1202 (patch) | |
tree | 149648f240e839900e18af10953c4408da1e9464 /engines/mads | |
parent | c5efd9f7487f4f51316d9ae6e6cbef3d35dd7b51 (diff) | |
download | scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.gz scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.bz2 scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.zip |
JANITORIAL: Remove trailing spaces
Diffstat (limited to 'engines/mads')
-rw-r--r-- | engines/mads/camera.cpp | 2 | ||||
-rw-r--r-- | engines/mads/conversations.cpp | 10 | ||||
-rw-r--r-- | engines/mads/conversations.h | 8 | ||||
-rw-r--r-- | engines/mads/nebular/menu_nebular.h | 2 | ||||
-rw-r--r-- | engines/mads/nebular/sound_nebular.cpp | 2 | ||||
-rw-r--r-- | engines/mads/player.cpp | 4 | ||||
-rw-r--r-- | engines/mads/screen.h | 2 | ||||
-rw-r--r-- | engines/mads/user_interface.cpp | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/engines/mads/camera.cpp b/engines/mads/camera.cpp index c9b2f1429e..eb5942842a 100644 --- a/engines/mads/camera.cpp +++ b/engines/mads/camera.cpp @@ -148,7 +148,7 @@ bool Camera::camPan(int16 *picture_view, int16 *player_loc, int display_size, in if (_direction < 0) newTarget -= _distOffCenter; - else + else newTarget += _distOffCenter; newTarget = MAX(0, newTarget); diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp index 469aaedb81..e5c90768da 100644 --- a/engines/mads/conversations.cpp +++ b/engines/mads/conversations.cpp @@ -72,7 +72,7 @@ void GameConversations::load(int id) { _conversations[slotIndex]._convId = id; // Load the conversation data - Common::String cnvFilename = Common::String::format("CONV%03d.CNV", id); + Common::String cnvFilename = Common::String::format("CONV%03d.CNV", id); _conversations[slotIndex]._data.load(cnvFilename); // Load the conversation's CND data @@ -371,7 +371,7 @@ void GameConversations::update(bool flag) { _personSpeaking = 0; executeEntry(_verbId); generateMessage(_runningConv->_cnd._messageList1, _runningConv->_cnd._messageList3); - + if (_heroTrigger && _popupVisible) { _vm->_game->_scene._action._activeAction._verbId = _verbId; _vm->_game->_trigger = _heroTrigger; @@ -438,7 +438,7 @@ void GameConversations::generateMessage(Common::Array<int> &messageList, Common: // Create the new text dialog _dialog = new TextDialog(_vm, FONT_INTERFACE, - Common::Point(_popupX[_personSpeaking], _popupY[_personSpeaking]), + Common::Point(_popupX[_personSpeaking], _popupY[_personSpeaking]), portrait, _popupMaxLen[_personSpeaking]); // Add in the lines @@ -785,7 +785,7 @@ void ConversationConditionals::load(const Common::String &filename) { // **** Section: Imports ************************************************* int streamNum = 1; - + _importVariables.resize(importsCount); if (importsCount > 0) { convFile = convFileUnpacked.getItemStream(streamNum++); @@ -848,7 +848,7 @@ void DialogScript::load(Common::SeekableReadStream &s, uint startingOffset) { instructionOffsets[startingOffset + s.pos()] = size(); push_back(ScriptEntry()); ScriptEntry &se = (*this)[size() - 1]; - + // Load the instruction se.load(s); } diff --git a/engines/mads/conversations.h b/engines/mads/conversations.h index 7b7d3485ef..57e89964a5 100644 --- a/engines/mads/conversations.h +++ b/engines/mads/conversations.h @@ -172,7 +172,7 @@ struct ScriptEntry { DialogCommand _command; Conditional _conditionals[3]; - + // Extra parameters for different opcodes int _index; Common::Array<int> _entries; @@ -338,7 +338,7 @@ private: int _personSpeaking; TextDialog *_dialog; bool _dialogAltFlag; - + /** * Returns the record for the specified conversation, if it's loaded */ @@ -435,7 +435,7 @@ public: * Set the hero trigger */ void setHeroTrigger(int val); - + /** * Set the interlocutor trigger */ @@ -473,7 +473,7 @@ public: void exportValue(int val); void reset(int id); - + /** * Handles updating the conversation display */ diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h index 8a0cc3575d..d44b5f2022 100644 --- a/engines/mads/nebular/menu_nebular.h +++ b/engines/mads/nebular/menu_nebular.h @@ -35,7 +35,7 @@ class MADSEngine; namespace Nebular { -enum MADSGameAction { +enum MADSGameAction { START_GAME, RESUME_GAME, SHOW_INTRO, CREDITS, QUOTES, EXIT, SETS, EVOLVE }; diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp index 5f71c99a94..15dd44a4af 100644 --- a/engines/mads/nebular/sound_nebular.cpp +++ b/engines/mads/nebular/sound_nebular.cpp @@ -194,7 +194,7 @@ ASound::ASound(Audio::Mixer *mixer, OPL::OPL *opl, const Common::String &filenam _channelData[i]._freqBase = 0; _channelData[i]._field6 = 0; } - + for (int i = 0; i < ADLIB_CHANNEL_COUNT; ++i) _channels[i]._owner = this; diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp index 0940e79562..f1fe7eaf59 100644 --- a/engines/mads/player.cpp +++ b/engines/mads/player.cpp @@ -320,11 +320,11 @@ void Player::activateTrigger() { _commandsAllowed |= _enableAtTarget; _enableAtTarget = false; - + if (_walkTrigger) { game._trigger = _walkTrigger; game._triggerMode = SEQUENCE_TRIGGER_DAEMON; - + if (game._triggerMode != SEQUENCE_TRIGGER_DAEMON) { action._activeAction = _walkTriggerAction; } diff --git a/engines/mads/screen.h b/engines/mads/screen.h index eeb15453f8..15436942fe 100644 --- a/engines/mads/screen.h +++ b/engines/mads/screen.h @@ -254,7 +254,7 @@ public: /** * Return the current drawing/clip area */ - const Common::Rect getClipBounds() const { + const Common::Rect getClipBounds() const { const Common::Point pt = getOffsetFromOwner(); return Common::Rect(pt.x, pt.y, pt.x + this->w, pt.y + this->h); } diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp index 204f71fe43..adde5fc67c 100644 --- a/engines/mads/user_interface.cpp +++ b/engines/mads/user_interface.cpp @@ -339,7 +339,7 @@ UserInterface::UserInterface(MADSEngine *vm) : _vm(vm), _dirtyAreas(vm), Common::fill(&_categoryIndexes[0], &_categoryIndexes[7], 0); // Map the user interface to the bottom of the game's screen surface - create(*_vm->_screen, Common::Rect(0, MADS_SCENE_HEIGHT, MADS_SCREEN_WIDTH, + create(*_vm->_screen, Common::Rect(0, MADS_SCENE_HEIGHT, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT)); _surface.create(MADS_SCREEN_WIDTH, MADS_INTERFACE_HEIGHT); |