aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir2011-06-08 00:46:36 +0400
committerAlyssa Milburn2011-06-15 17:31:51 +0200
commit27210a70b49567e1307fcf9f43558ef615daa3ac (patch)
tree89f5c38f63eab26a3cedb83d34cc05d78bf1fc41
parent78cc82a18ce8047e703a2fbbdc6a729f760e2905 (diff)
downloadscummvm-rg350-27210a70b49567e1307fcf9f43558ef615daa3ac.tar.gz
scummvm-rg350-27210a70b49567e1307fcf9f43558ef615daa3ac.tar.bz2
scummvm-rg350-27210a70b49567e1307fcf9f43558ef615daa3ac.zip
DREAMWEB: removed useless const methods, fixed mask
-rw-r--r--engines/dreamweb/runtime.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/dreamweb/runtime.h b/engines/dreamweb/runtime.h
index 6b330288b2..b6771dd1d8 100644
--- a/engines/dreamweb/runtime.h
+++ b/engines/dreamweb/runtime.h
@@ -43,7 +43,7 @@ struct RegisterPart {
return *this;
}
inline ~RegisterPart() {
- _reg._value = (_reg._value & Mask) | (_value << Shift);
+ _reg._value = (_reg._value & ~Mask) | (_value << Shift);
}
};
@@ -56,7 +56,6 @@ class WordRef {
uint16 _value;
public:
-
inline WordRef(Common::Array<uint8> &data, unsigned index) : _data(data), _index(index) {
assert(index + 1 < data.size());
_value = _data[index] | (_data[index + 1] << 8);
@@ -72,9 +71,6 @@ public:
return *this;
}
- inline operator uint16() const {
- return _value;
- }
inline operator uint16&() {
return _value;
}
@@ -96,11 +92,6 @@ struct Segment {
return data[index];
}
- inline uint16 word(unsigned index) const {
- assert(index + 1 < data.size());
- return data[index] | (data[index + 1] << 8);
- }
-
inline WordRef word(unsigned index) {
return WordRef(data, index);
}