[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.h,1.31,1.32 saveload.cpp,1.80,1.81 scummvm.cpp,2.186,2.187

Max Horn fingolfin at users.sourceforge.net
Thu May 29 04:49:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24823

Modified Files:
	gfx.h saveload.cpp scummvm.cpp 
Log Message:
removed obsolete

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- gfx.h	28 May 2003 20:01:44 -0000	1.31
+++ gfx.h	29 May 2003 11:48:44 -0000	1.32
@@ -120,11 +120,6 @@
 	ScummVM::Rect _mask;
 
 protected:
-	byte *_readPtr;
-
-	bool _useOrDecompress;
-	byte _cursorActive;
-
 	byte _palette_mod;
 	byte _decomp_shr, _decomp_mask;
 	byte _transparentColor;

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- saveload.cpp	28 May 2003 18:13:30 -0000	1.80
+++ saveload.cpp	29 May 2003 11:48:44 -0000	1.81
@@ -374,7 +374,7 @@
 		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),

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.186
retrieving revision 2.187
diff -u -d -r2.186 -r2.187
--- scummvm.cpp	28 May 2003 21:28:30 -0000	2.186
+++ scummvm.cpp	29 May 2003 11:48:44 -0000	2.187
@@ -1020,7 +1020,6 @@
 	}
 	
 	if (_currentRoom == 0) {
-		gdi._cursorActive = 0;
 		CHARSET_1();
 		drawDirtyScreenParts();
 		_sound->processSoundQues();





More information about the Scummvm-git-logs mailing list