[Scummvm-cvs-logs] SF.net SVN: scummvm: [24779] scummvm/trunk/engines/touche/resource.cpp
cyx at users.sourceforge.net
cyx at users.sourceforge.net
Fri Nov 24 01:00:27 CET 2006
Revision: 24779
http://svn.sourceforge.net/scummvm/?rev=24779&view=rev
Author: cyx
Date: 2006-11-23 16:00:27 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
fixed bug #1602037 - TOUCHE: Map not shown correctly in Intro.
Modified Paths:
--------------
scummvm/trunk/engines/touche/resource.cpp
Modified: scummvm/trunk/engines/touche/resource.cpp
===================================================================
--- scummvm/trunk/engines/touche/resource.cpp 2006-11-23 22:55:05 UTC (rev 24778)
+++ scummvm/trunk/engines/touche/resource.cpp 2006-11-24 00:00:27 UTC (rev 24779)
@@ -414,9 +414,6 @@
void ToucheEngine::res_loadRoom(int num) {
debugC(9, kDebugResource, "ToucheEngine::res_loadRoom() num=%d flag115=%d", num, _flagsTable[115]);
- _currentRoomNum = num;
- _updatedRoomAreasTable[0] = 1;
-
debug(0, "Setting up room %d", num);
const uint32 offsInfo = res_getDataOffset(kResourceTypeRoomInfo, num);
@@ -438,7 +435,8 @@
// Workaround to what appears to be a scripting bug. Scripts 27 and 100 triggers
// a palette fading just after loading a room. Catch this, so that only *one*
// palette refresh occurs.
- if ((_currentEpisodeNum == 27 && num == 34) || (_currentEpisodeNum == 100 && num == 1)) {
+ if ((_currentEpisodeNum == 27 && _currentRoomNum == 56 && num == 34) ||
+ (_currentEpisodeNum == 100 && _currentRoomNum == 2 && num == 1)) {
updateScreenPalette = false;
}
@@ -448,6 +446,9 @@
setPalette(0, 255, 0, 0, 0);
}
+ _currentRoomNum = num;
+ _updatedRoomAreasTable[0] = 1;
+
_fullRedrawCounter = 1;
_roomNeedRedraw = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list