aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir2011-06-09 01:23:37 +0400
committerAlyssa Milburn2011-06-15 17:33:19 +0200
commite0eac547cb0c008fd6893a87f331f9498e55e0c1 (patch)
treeb60c3387a3f24a3d8b259049643934296e9d64a5
parent797127cb65e2fd26ab5875b6bc64ad16f5439fc5 (diff)
downloadscummvm-rg350-e0eac547cb0c008fd6893a87f331f9498e55e0c1.tar.gz
scummvm-rg350-e0eac547cb0c008fd6893a87f331f9498e55e0c1.tar.bz2
scummvm-rg350-e0eac547cb0c008fd6893a87f331f9498e55e0c1.zip
DREAMWEB: fixed g/l/ge/le flags
-rw-r--r--engines/dreamweb/runtime.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/dreamweb/runtime.h b/engines/dreamweb/runtime.h
index f904497bb4..388fc751fc 100644
--- a/engines/dreamweb/runtime.h
+++ b/engines/dreamweb/runtime.h
@@ -153,14 +153,14 @@ struct Flags {
bool _z, _c, _s, _o;
inline Flags(): _z(true), _c(false), _s(false), _o(false) {}
- inline bool z() const { return _z; }
- inline bool c() const { return _c; }
- inline bool s() const { return _s; }
+ inline bool z() const { return _z; }
+ inline bool c() const { return _c; }
+ inline bool s() const { return _s; }
//complex flags:
- inline bool g() const { return !_z && _s == _o; }
- inline bool ge() const { return _z || _s == _o; }
- inline bool l() const { return !_z && _s != _o; }
- inline bool le() const { return _z || _s != _o; }
+ inline bool g() const { return !_z && _s == _o; }
+ inline bool ge() const { return _s == _o; }
+ inline bool l() const { return _s != _o; }
+ inline bool le() const { return _z || _s != _o; }
inline void update(uint8 v) {
bool new_s = v & 0x80;
@@ -378,8 +378,8 @@ public:
inline void _neg(uint16 &src) {
src = ~src;
- flags._c = false;
flags.update(src);
+ flags._c = flags._o = false;
}
inline void _movsb() {