[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.85,1.86 script_v6.cpp,1.118,1.119
Jamieson Christian
jamieson630 at users.sourceforge.net
Mon May 19 08:41:09 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv32119/scummvm/scumm
Modified Files:
script_v5.cpp script_v6.cpp
Log Message:
Fixed VC++ warnings
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- script_v5.cpp 19 May 2003 11:31:35 -0000 1.85
+++ script_v5.cpp 19 May 2003 15:40:34 -0000 1.86
@@ -2080,7 +2080,7 @@
if (op & 0x20)
a = 1;
- runScript(script, a, b, data);
+ runScript(script, a != 0, b != 0, data);
}
void Scumm_v5::o5_stopObjectCode() {
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- script_v6.cpp 19 May 2003 04:29:41 -0000 1.118
+++ script_v6.cpp 19 May 2003 15:40:34 -0000 1.119
@@ -686,7 +686,7 @@
getStackList(args, ARRAYSIZE(args));
script = pop();
flags = pop();
- runScript(script, flags & 1, flags & 2, args);
+ runScript(script, (flags & 1) != 0, (flags & 2) != 0, args);
}
void Scumm_v6::o6_jumpToScript() {
@@ -697,7 +697,7 @@
script = pop();
flags = pop();
stopObjectCode();
- runScript(script, flags & 1, flags & 2, args);
+ runScript(script, (flags & 1) != 0, (flags & 2) != 0, args);
}
void Scumm_v6::o6_startScript() {
@@ -724,7 +724,7 @@
entryp = pop();
script = pop();
flags = pop();
- runVerbCode(script, entryp, flags & 1, flags & 2, args);
+ runVerbCode(script, entryp, (flags & 1) != 0, (flags & 2) != 0, args);
}
void Scumm_v6::o6_startObjectQuick() {
More information about the Scummvm-git-logs
mailing list