aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parser_br.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2009-01-03 14:03:12 +0000
committerNicola Mettifogo2009-01-03 14:03:12 +0000
commitb2d7ae871bb82da68caa08a9c8695bcacbc67ce8 (patch)
treeab74222f586877752a2f63a967840ed31b5c2ac5 /engines/parallaction/parser_br.cpp
parentc40b7b184025dfd94962fccce00d8868fdda6662 (diff)
downloadscummvm-rg350-b2d7ae871bb82da68caa08a9c8695bcacbc67ce8.tar.gz
scummvm-rg350-b2d7ae871bb82da68caa08a9c8695bcacbc67ce8.tar.bz2
scummvm-rg350-b2d7ae871bb82da68caa08a9c8695bcacbc67ce8.zip
Dropped the script preprocessor introduced to fix the broken scripts. The parser has evolved in the meantime and can deal with it accordingly.
svn-id: r35700
Diffstat (limited to 'engines/parallaction/parser_br.cpp')
-rw-r--r--engines/parallaction/parser_br.cpp24
1 files changed, 1 insertions, 23 deletions
diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp
index 526cc1397d..8abf8fc4c4 100644
--- a/engines/parallaction/parser_br.cpp
+++ b/engines/parallaction/parser_br.cpp
@@ -1210,32 +1210,12 @@ void ProgramParser_br::init() {
INSTRUCTION_PARSER(endscript);
}
-
-/*
- Ancillary routine to support hooking preprocessor and
- parser.
-*/
-Common::ReadStream *getStream(StatementList &list) {
- Common::String text;
- StatementList::iterator it = list.begin();
- for ( ; it != list.end(); it++) {
- text += (*it)._text;
- }
- return new ReadStringStream(text);
-}
-
void LocationParser_br::parse(Script *script) {
-
- PreProcessor pp;
- StatementList list;
- pp.preprocessScript(*script, list);
- Script *script2 = new Script(getStream(list), true);
-
ctxt.numZones = 0;
ctxt.characterName = 0;
ctxt.info = new BackgroundInfo;
- LocationParser_ns::parse(script2);
+ LocationParser_ns::parse(script);
_vm->_gfx->setBackground(kBackgroundLocation, ctxt.info);
@@ -1250,8 +1230,6 @@ void LocationParser_br::parse(Script *script) {
}
free(ctxt.characterName);
-
- delete script2;
}
} // namespace Parallaction