aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-05-29 11:48:44 +0000
committerMax Horn2003-05-29 11:48:44 +0000
commit89a6ebb86773fbbead264c4c452ef36cb28d9f36 (patch)
treea511b6d24e69a0867099cf66bcd6d6a57c998c98
parentb07927da3d49505326383740a7d9095d5a7ac65b (diff)
downloadscummvm-rg350-89a6ebb86773fbbead264c4c452ef36cb28d9f36.tar.gz
scummvm-rg350-89a6ebb86773fbbead264c4c452ef36cb28d9f36.tar.bz2
scummvm-rg350-89a6ebb86773fbbead264c4c452ef36cb28d9f36.zip
removed obsolete
svn-id: r8095
-rw-r--r--scumm/gfx.h5
-rw-r--r--scumm/saveload.cpp2
-rw-r--r--scumm/scummvm.cpp1
3 files changed, 1 insertions, 7 deletions
diff --git a/scumm/gfx.h b/scumm/gfx.h
index edc23ba35d..b2900d3a33 100644
--- a/scumm/gfx.h
+++ b/scumm/gfx.h
@@ -120,11 +120,6 @@ public:
ScummVM::Rect _mask;
protected:
- byte *_readPtr;
-
- bool _useOrDecompress;
- byte _cursorActive;
-
byte _palette_mod;
byte _decomp_shr, _decomp_mask;
byte _transparentColor;
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index a2aeaa61f9..075103c7cb 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -374,7 +374,7 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) {
MKLINE(Scumm, _userPut, sleByte, VER_V8),
MKLINE(Scumm, _userState, sleUint16, VER_V17),
MKLINE(Scumm, _cursor.state, sleByte, VER_V8),
- MKLINE(Scumm, gdi._cursorActive, sleByte, VER_V8),
+ MK_OBSOLETE(Scumm, gdi._cursorActive, sleByte, VER_V8, VER_V20),
MKLINE(Scumm, _currentCursor, sleByte, VER_V8),
MKARRAY(Scumm, _grabbedCursor[0], sleByte, 8192, VER_V20),
MKLINE(Scumm, _cursor.width, sleInt16, VER_V20),
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 159398703e..b79c4175be 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1020,7 +1020,6 @@ load_game:
}
if (_currentRoom == 0) {
- gdi._cursorActive = 0;
CHARSET_1();
drawDirtyScreenParts();
_sound->processSoundQues();