[Scummvm-cvs-logs] CVS: residual costume.cpp,1.41,1.42 costume.h,1.21,1.22

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Jan 7 04:38:05 CET 2006


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23265

Modified Files:
	costume.cpp costume.h 
Log Message:
fix warnings and compilation

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/costume.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- costume.cpp	6 Jan 2006 06:33:28 -0000	1.41
+++ costume.cpp	7 Jan 2006 12:37:03 -0000	1.42
@@ -640,7 +640,7 @@
 		ts.scanString(" %d '%c%c%c%c'", 5, &which, &t[0], &t[1], &t[2], &t[3]);
 		// Force characters to upper case
 		for (int j = 0; j < 4; j++)
-			t[j] = std::toupper(t[j]);
+			t[j] = toupper(t[j]);
 		std::memcpy(&tags[which], t, sizeof(tag32));
 	}
 
@@ -720,7 +720,7 @@
 }
 
 Costume::Component::Component(Component *parent, int parentID, tag32 tag) {
-	_visible = -1;
+	_visible = true;
 	_previousCmap = NULL;
 	_cmap = NULL;
 	_cost = NULL;
@@ -740,7 +740,7 @@
 }
 
 bool Costume::Component::visible() {
-	if (_visible == -1 && _parent != NULL)
+	if (_visible && _parent != NULL)
 		return _parent->visible();
 	return _visible;
 }

Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/residual/costume.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- costume.h	5 Jan 2006 02:40:26 -0000	1.21
+++ costume.h	7 Jan 2006 12:37:03 -0000	1.22
@@ -78,7 +78,8 @@
 	protected:
 		ResPtr<CMap> _cmap, _previousCmap;
 		tag32 _tag;
-		int _parentID, _visible;
+		int _parentID;
+		bool _visible;
 		Component *_parent, *_child, *_sibling;
 		Matrix4 _matrix;
 		Costume *_cost;





More information about the Scummvm-git-logs mailing list