[Scummvm-cvs-logs] scummvm master -> 472e325bc49ad207604b18b2c22285368a6534d6

[Kirben]

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:
472e325bc4 SCUMM: Fix regression in updated Russian version of Freddi Fish 1.


Commit: 472e325bc49ad207604b18b2c22285368a6534d6
    https://github.com/scummvm/scummvm/commit/472e325bc49ad207604b18b2c22285368a6534d6
Author: Kirben (kirben at optusnet.com.au)
Date: 2014-09-10T23:05:29+10:00

Commit Message:
SCUMM: Fix regression in updated Russian version of Freddi Fish 1.

Changed paths:
    engines/scumm/object.cpp



diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 7919075..db83646 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -1013,7 +1013,6 @@ void ScummEngine::resetRoomObject(ObjectData *od, const byte *room, const byte *
 		od->actordir = (byte)READ_LE_UINT16(&imhd->v7.actordir);
 
 	} else if (_game.version == 6) {
-		assert(imhd);
 		od->obj_nr = READ_LE_UINT16(&(cdhd->v6.obj_id));
 
 		od->width = READ_LE_UINT16(&cdhd->v6.w);