diff options
| author | Johannes Schickel | 2012-09-26 04:17:31 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-09-26 04:17:55 +0200 |
| commit | 89abab97e3124fa25eb4c7d3e8b38501747a8d17 (patch) | |
| tree | d60a833c9ed352fbe44c0b9a6b8ff43fcbc29419 /engines/scumm/verbs.cpp | |
| parent | a6c6c74350bb673c178d9756a1625ca128d24f21 (diff) | |
| download | scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.gz scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.bz2 scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.zip | |
JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'engines/scumm/verbs.cpp')
| -rw-r--r-- | engines/scumm/verbs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index 567ca31485..0d0f6cdb95 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -84,7 +84,7 @@ int ScummEngine_v0::verbPrepIdType(int verbid) { switch (verbid) { case kVerbUse: // depends on object1 return kVerbPrepObject; - case kVerbGive: + case kVerbGive: return kVerbPrepTo; case kVerbUnlock: case kVerbFix: return kVerbPrepWith; @@ -693,7 +693,7 @@ void ScummEngine_v0::verbExec() { if (_activeVerb == kVerbWhatIs) return; - + if (!(_activeVerb == kVerbWalkTo && _activeObject == 0)) { doSentence(_activeVerb, _activeObject, _activeObject2); if (_activeVerb != kVerbWalkTo) { |