[Scummvm-cvs-logs] scummvm master -> b7884f2fba4b704ecdc76effef4942a309996357

johndoe123 benjamin.haisch at t-online.de
Mon Jun 30 13:11:11 CEST 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b7884f2fba NEVERHOOD: Fix uninitialized variables in Sprite (bug #6663)


Commit: b7884f2fba4b704ecdc76effef4942a309996357
    https://github.com/scummvm/scummvm/commit/b7884f2fba4b704ecdc76effef4942a309996357
Author: johndoe123 (john_doe at techie.com)
Date: 2014-06-30T13:09:59+02:00

Commit Message:
NEVERHOOD: Fix uninitialized variables in Sprite (bug #6663)

Changed paths:
    engines/neverhood/sprite.cpp



diff --git a/engines/neverhood/sprite.cpp b/engines/neverhood/sprite.cpp
index a566b8e..3611ce1 100644
--- a/engines/neverhood/sprite.cpp
+++ b/engines/neverhood/sprite.cpp
@@ -31,8 +31,20 @@ Sprite::Sprite(NeverhoodEngine *vm, int objectPriority)
 	: Entity(vm, objectPriority), _x(0), _y(0), _spriteUpdateCb(NULL), _filterXCb(NULL), _filterYCb(NULL),
 	_dataResource(vm), _doDeltaX(false), _doDeltaY(false), _needRefresh(false), _flags(0), _surface(NULL) {
 
-	SetMessageHandler(&Sprite::handleMessage);
+	_drawOffset.x = 0;
+	_drawOffset.y = 0;
+	_drawOffset.width = 0;
+	_drawOffset.height = 0;
+	_collisionBounds.x1 = 0;
+	_collisionBounds.y1 = 0;
+	_collisionBounds.x2 = 0;
+	_collisionBounds.y2 = 0;
+	_collisionBoundsOffset.x = 0;
+	_collisionBoundsOffset.y = 0;
+	_collisionBoundsOffset.width = 0;
+	_collisionBoundsOffset.height = 0;
 
+	SetMessageHandler(&Sprite::handleMessage);
 }
 
 Sprite::~Sprite() {






More information about the Scummvm-git-logs mailing list