diff options
| author | Tobias Gunkel | 2012-02-04 14:49:44 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:30:02 +0100 |
| commit | e14e4ab3b035012781abfbac500e6de88e0ad60b (patch) | |
| tree | e95fe13af3e829e790e2eaefec7b38d94ce81975 /engines/scumm/script.cpp | |
| parent | 434aaaf0c0cdbcc8a1ebc0e461f1e31582126f92 (diff) | |
| download | scummvm-rg350-e14e4ab3b035012781abfbac500e6de88e0ad60b.tar.gz scummvm-rg350-e14e4ab3b035012781abfbac500e6de88e0ad60b.tar.bz2 scummvm-rg350-e14e4ab3b035012781abfbac500e6de88e0ad60b.zip | |
SCUMM: adjust to coding style-guide
Diffstat (limited to 'engines/scumm/script.cpp')
| -rw-r--r-- | engines/scumm/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index 8880963698..3bd70d0e24 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -1000,7 +1000,7 @@ void ScummEngine::killScriptsAndResources() { for (i = 0; i < _numNewNames; i++) { const int obj = _newNames[i]; if (obj) { - const int owner = getOwner( (_game.version != 0 ? obj : OBJECT_V0_ID(obj) ) ); + const int owner = getOwner((_game.version != 0 ? obj : OBJECT_V0_ID(obj))); // We can delete custom name resources if either the object is // no longer in use (i.e. not owned by anyone anymore); or if // it is an object which is owned by a room. @@ -1234,7 +1234,7 @@ void ScummEngine_v0::checkAndRunSentenceScript() { // If two objects are involved, at least one must be in the actors inventory if (st.objectB && (OBJECT_V0_TYPE(st.objectA) != kObjectV0TypeFG || _objectOwnerTable[st.objectA] != VAR(VAR_EGO)) && - (OBJECT_V0_TYPE(st.objectB) != kObjectV0TypeFG || _objectOwnerTable[st.objectB] != VAR(VAR_EGO))) + (OBJECT_V0_TYPE(st.objectB) != kObjectV0TypeFG || _objectOwnerTable[st.objectB] != VAR(VAR_EGO))) { if (getVerbEntrypoint(st.objectA, kVerbPickUp)) doSentence(kVerbPickUp, st.objectA, 0); |