[Scummvm-cvs-logs] CVS: residual bitmap.cpp,1.22,1.23 model.cpp,1.15,1.16

[Daniel Schepler]

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

Modified Files:
	bitmap.cpp model.cpp 
Log Message:
Fixed a couple valgrind issues.


Index: bitmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/bitmap.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- bitmap.cpp	24 Mar 2004 12:20:46 -0000	1.22
+++ bitmap.cpp	24 Mar 2004 14:02:47 -0000	1.23
@@ -166,7 +166,7 @@
 	glLoadIdentity();
 	// A lot more may need to be put there : disabling Alpha test, blending, ...
 	// For now, just keep this here :-)
-	if (hasTransparency_) {
+	if (format_ == 1 && hasTransparency_) {
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	}

Index: model.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/model.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- model.cpp	24 Mar 2004 12:20:46 -0000	1.15
+++ model.cpp	24 Mar 2004 14:03:00 -0000	1.16
@@ -243,6 +243,13 @@
 		pitch_ = get_float(data + 124);
 		yaw_ = get_float(data + 128);
 		roll_ = get_float(data + 132);
+		animPos_ = pos_;
+		animPitch_ = pitch_;
+		animYaw_ = yaw_;
+		animRoll_ = roll_;
+		priority_ = -1;
+		totalWeight_ = 1;
+
 		data += 184;
 
 		if (parentPtr != 0) {