diff options
| author | Eugene Sandulenko | 2013-09-06 16:17:37 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-09-06 16:17:37 +0300 |
| commit | 6226b5862d2d3800a88985ed83946ea9e941a556 (patch) | |
| tree | 175dd1900db931e3faf99a9fd0c5f11da67e2f1a | |
| parent | af91d2a5ce61f395b207854e589ae917c623818f (diff) | |
| download | scummvm-rg350-6226b5862d2d3800a88985ed83946ea9e941a556.tar.gz scummvm-rg350-6226b5862d2d3800a88985ed83946ea9e941a556.tar.bz2 scummvm-rg350-6226b5862d2d3800a88985ed83946ea9e941a556.zip | |
FULLPIPE: Replace goto usage
| -rw-r--r-- | engines/fullpipe/interaction.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index a5977c04bc..231fe57afa 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -55,19 +55,15 @@ bool CInteractionController::compareInteractions(const void *p1, const void *p2) return true; } if (i2->_objectId3 == -1) - goto LABEL_17; - if (i2->_objectId3 == -2) - goto LABEL_18; - if (i1->_objectId3 != -1 && i1->_objectId3 != -2) { -LABEL_17: - if (i2->_objectId3 != -2) - return true; -LABEL_18: - if (i1->_objectId3 != -1) - return true; - } + return true; + + if (i1->_objectId3 == i2->_objectId3) + return true; - return false; + if (i1->_objectId3 == -1 || i1->_objectId3 == -2) + return false; + + return true; } void CInteractionController::sortInteractions(int sceneId) { |