diff options
| author | Johannes Schickel | 2008-09-10 18:01:02 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-09-10 18:01:02 +0000 |
| commit | a54d1dbde66884afc1402809af1e57d1c214d9c7 (patch) | |
| tree | 31aa5d167d1daf4e2ac62b1cc949edeb6006e2ff /engines/kyra/script.cpp | |
| parent | 77cd9d6230f60988c4722625ce3902db2a04b768 (diff) | |
| download | scummvm-rg350-a54d1dbde66884afc1402809af1e57d1c214d9c7.tar.gz scummvm-rg350-a54d1dbde66884afc1402809af1e57d1c214d9c7.tar.bz2 scummvm-rg350-a54d1dbde66884afc1402809af1e57d1c214d9c7.zip | |
Cleanup.
svn-id: r34481
Diffstat (limited to 'engines/kyra/script.cpp')
| -rw-r--r-- | engines/kyra/script.cpp | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index b10a4b32bf..df933c3ed8 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -435,59 +435,35 @@ void EMCInterpreter::cmd_eval(EMCState* script) { switch (_parameter) { case 0: - if (!val2 || !val1) - ret = 0; - else - ret = 1; + ret = (val2 && val1) ? 1 : 0; break; case 1: - if (val2 || val1) - ret = 1; - else - ret = 0; + ret = (val2 || val1) ? 1 : 0; break; case 2: - if (val1 == val2) - ret = 1; - else - ret = 0; + ret = (val1 == val2) ? 1 : 0; break; case 3: - if (val1 != val2) - ret = 1; - else - ret = 0; + ret = (val1 != val2) ? 1 : 0; break; case 4: - if (val1 > val2) - ret = 1; - else - ret = 0; + ret = (val1 > val2) ? 1 : 0; break; case 5: - if (val1 >= val2) - ret = 1; - else - ret = 0; + ret = (val1 >= val2) ? 1 : 0; break; case 6: - if (val1 < val2) - ret = 1; - else - ret = 0; + ret = (val1 < val2) ? 1 : 0; break; case 7: - if (val1 <= val2) - ret = 1; - else - ret = 0; + ret = (val1 <= val2) ? 1 : 0; break; case 8: |