[Scummvm-cvs-logs] SF.net SVN: scummvm:[48616] scummvm/branches/branch-1-1-0/engines/draci

[spalek at users.sourceforge.net]

Revision: 48616
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48616&view=rev
Author:   spalek
Date:     2010-04-11 06:06:45 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
Back-port bugfix 2983187 on continuing palette change

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/engines/draci/game.cpp

Property Changed:
----------------
    scummvm/branches/branch-1-1-0/engines/draci/script.cpp
    scummvm/branches/branch-1-1-0/engines/draci/script.h

Modified: scummvm/branches/branch-1-1-0/engines/draci/game.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/draci/game.cpp	2010-04-11 06:02:41 UTC (rev 48615)
+++ scummvm/branches/branch-1-1-0/engines/draci/game.cpp	2010-04-11 06:06:45 UTC (rev 48616)
@@ -1289,6 +1289,9 @@
 	// cleaned up.  Some rooms (e.g., the map) don't support walking.
 	_walkingState.stopWalking();
 
+	// Stop a possible palette fading.
+	_fadePhases = _fadePhase = 0;
+
 	_currentRoom.load(_newRoom, _vm->_roomsArchive);
 	loadWalkingMap(getMapID());
 	loadRoomObjects();


Property changes on: scummvm/branches/branch-1-1-0/engines/draci/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /scummvm/trunk/engines/draci/script.cpp:48460,48462
   + /scummvm/trunk/engines/draci/script.cpp:48460,48462,48615


Property changes on: scummvm/branches/branch-1-1-0/engines/draci/script.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /scummvm/trunk/engines/draci/script.h:48460,48462
   + /scummvm/trunk/engines/draci/script.h:48460,48462,48615


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.