[Scummvm-cvs-logs] SF.net SVN: scummvm:[33474] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 33474
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33474&view=rev
Author:   peres001
Date:     2008-07-31 15:15:42 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
* Removed references to the current _backgroundInfo from parser code.
* Re-enabled masks (in BRA DOS).

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parser.h
    scummvm/trunk/engines/parallaction/parser_br.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2008-07-31 14:20:51 UTC (rev 33473)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2008-07-31 15:15:42 UTC (rev 33474)
@@ -293,7 +293,7 @@
 	_disk->loadScenery(*info, name, mask, path);
 
 	_gfx->setBackground(kBackgroundLocation, info);
-	_pathBuffer = &_gfx->_backgroundInfo->path;
+	_pathBuffer = &info->path;
 
 	return;
 }

Modified: scummvm/trunk/engines/parallaction/parser.h
===================================================================
--- scummvm/trunk/engines/parallaction/parser.h	2008-07-31 14:20:51 UTC (rev 33473)
+++ scummvm/trunk/engines/parallaction/parser.h	2008-07-31 15:15:42 UTC (rev 33474)
@@ -128,6 +128,7 @@
 
 		// BRA specific
 		int numZones;
+		BackgroundInfo	*info;
 		char *bgName;
 		char *maskName;
 		char *pathName;

Modified: scummvm/trunk/engines/parallaction/parser_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_br.cpp	2008-07-31 14:20:51 UTC (rev 33473)
+++ scummvm/trunk/engines/parallaction/parser_br.cpp	2008-07-31 15:15:42 UTC (rev 33474)
@@ -464,9 +464,9 @@
 	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,11 +1175,15 @@
 	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);
 	}


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