thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed regression: location comment wasn't shown on every location except the first visited.

Browse source 
svn-id: r26895
This commit is contained in:
Nicola Mettifogo 2007-05-20 20:35:08 +00:00
parent d3f6518f6f
commit cf8dee054d
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/parallaction/location.cpp
View file

@ -122,6 +122,7 @@ void Parallaction::parseLocation(const char *filename) {
} }
if (!scumm_stricmp(_tokens[0], "COMMENT")) { if (!scumm_stricmp(_tokens[0], "COMMENT")) {
_location._comment = parseComment(*_locationScript); _location._comment = parseComment(*_locationScript);
debugC(3, kDebugLocation, "Location comment: '%s'", _location._comment);
} }
if (!scumm_stricmp(_tokens[0], "ENDCOMMENT")) { if (!scumm_stricmp(_tokens[0], "ENDCOMMENT")) {
_location._endComment = parseComment(*_locationScript); _location._endComment = parseComment(*_locationScript);
@ -370,7 +371,11 @@ void Parallaction::changeLocation(char *location) {
runJobs(); runJobs();
_gfx->swapBuffers(); _gfx->swapBuffers();
} }
if (_location._comment) {
doLocationEnterTransition();
}
runJobs(); runJobs();
_gfx->swapBuffers(); _gfx->swapBuffers();
@ -399,9 +404,11 @@ void Parallaction::changeLocation(char *location) {
void Parallaction::doLocationEnterTransition() { void Parallaction::doLocationEnterTransition() {
debugC(1, kDebugLocation, "doLocationEnterTransition"); debugC(1, kDebugLocation, "doLocationEnterTransition");
if (_localFlags[_currentLocationIndex] & kFlagsVisited) if (_localFlags[_currentLocationIndex] & kFlagsVisited) {
return; // visited debugC(3, kDebugLocation, "skipping location transition");
return; // visited
}
byte pal[PALETTE_SIZE]; byte pal[PALETTE_SIZE];
_gfx->buildBWPalette(pal); _gfx->buildBWPalette(pal);
_gfx->setPalette(pal); _gfx->setPalette(pal);