[Scummvm-cvs-logs] SF.net SVN: scummvm:[34481] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Sep 10 20:01:03 CEST 2008
Revision: 34481
http://scummvm.svn.sourceforge.net/scummvm/?rev=34481&view=rev
Author: lordhoto
Date: 2008-09-10 18:01:02 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
Cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/script.cpp
scummvm/trunk/engines/kyra/script.h
Modified: scummvm/trunk/engines/kyra/script.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script.cpp 2008-09-10 13:06:40 UTC (rev 34480)
+++ scummvm/trunk/engines/kyra/script.cpp 2008-09-10 18:01:02 UTC (rev 34481)
@@ -435,59 +435,35 @@
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:
Modified: scummvm/trunk/engines/kyra/script.h
===================================================================
--- scummvm/trunk/engines/kyra/script.h 2008-09-10 13:06:40 UTC (rev 34480)
+++ scummvm/trunk/engines/kyra/script.h 2008-09-10 18:01:02 UTC (rev 34481)
@@ -47,7 +47,7 @@
};
struct EMCState {
- uint16 *ip;
+ const uint16 *ip;
const EMCData *dataPtr;
int16 retValue;
uint16 bp;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list