diff options
| author | Nicola Mettifogo | 2008-07-31 15:15:42 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2008-07-31 15:15:42 +0000 |
| commit | f5b7004faed0d64bf24e0080d7312eeb40c16a10 (patch) | |
| tree | f5ce9bbe39c79fc7345a01965dfbe5bb8bbf4ee5 /engines/parallaction/parser_br.cpp | |
| parent | 0679889d98ef00275c7c726147b3bc54cbefdca6 (diff) | |
| download | scummvm-rg350-f5b7004faed0d64bf24e0080d7312eeb40c16a10.tar.gz scummvm-rg350-f5b7004faed0d64bf24e0080d7312eeb40c16a10.tar.bz2 scummvm-rg350-f5b7004faed0d64bf24e0080d7312eeb40c16a10.zip | |
* Removed references to the current _backgroundInfo from parser code.
* Re-enabled masks (in BRA DOS).
svn-id: r33474
Diffstat (limited to 'engines/parallaction/parser_br.cpp')
| -rw-r--r-- | engines/parallaction/parser_br.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp index ff7a34f95f..3b446805d7 100644 --- a/engines/parallaction/parser_br.cpp +++ b/engines/parallaction/parser_br.cpp @@ -464,9 +464,9 @@ DECLARE_LOCATION_PARSER(mask) { debugC(7, kDebugParser, "LOCATION_PARSER(mask) "); ctxt.maskName = strdup(_tokens[1]); - _vm->_gfx->_backgroundInfo->layers[0] = atoi(_tokens[2]); - _vm->_gfx->_backgroundInfo->layers[1] = atoi(_tokens[3]); - _vm->_gfx->_backgroundInfo->layers[2] = atoi(_tokens[4]); + ctxt.info->layers[0] = atoi(_tokens[2]); + ctxt.info->layers[1] = atoi(_tokens[3]); + ctxt.info->layers[2] = atoi(_tokens[4]); } @@ -1175,10 +1175,14 @@ void LocationParser_br::parse(Script *script) { ctxt.maskName = 0; ctxt.pathName = 0; ctxt.characterName = 0; + ctxt.info = new BackgroundInfo; LocationParser_ns::parse(script); - _vm->setBackground(ctxt.bgName, ctxt.maskName, ctxt.pathName); + _vm->_disk->loadScenery(*ctxt.info, ctxt.bgName, ctxt.maskName, ctxt.pathName); + _vm->_gfx->setBackground(kBackgroundLocation, ctxt.info); + _vm->_pathBuffer = &ctxt.info->path; + if (ctxt.characterName) { _vm->changeCharacter(ctxt.characterName); |