diff options
| author | Christopher Page | 2008-06-05 21:20:35 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-05 21:20:35 +0000 |
| commit | cae6396ce76991e240b1e23bbcff0b6d6960f9a0 (patch) | |
| tree | 58ea9c6a42d7bf3655e775e3a26f6739e9daffe1 /engines/parallaction/parser_ns.cpp | |
| parent | 18b892e534c9fedf60a57c71e0978965d353fd60 (diff) | |
| parent | 3c7e0f5f8dc39e27619f7d23d060264db8d906d3 (diff) | |
| download | scummvm-rg350-cae6396ce76991e240b1e23bbcff0b6d6960f9a0.tar.gz scummvm-rg350-cae6396ce76991e240b1e23bbcff0b6d6960f9a0.tar.bz2 scummvm-rg350-cae6396ce76991e240b1e23bbcff0b6d6960f9a0.zip | |
Merged revisions 32507-32513,32516,32518,32520-32521,32523-32524,32526-32548,32550-32562 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r32563
Diffstat (limited to 'engines/parallaction/parser_ns.cpp')
| -rw-r--r-- | engines/parallaction/parser_ns.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp index 1b66394abf..c654e3008e 100644 --- a/engines/parallaction/parser_ns.cpp +++ b/engines/parallaction/parser_ns.cpp @@ -308,8 +308,6 @@ void LocationParser_ns::parseAnimation(AnimationList &list, char *name) { void ProgramParser_ns::parseInstruction() { - InstructionPtr inst(new Instruction); - _script->readLineToken(true); if (_tokens[0][1] == '.') { @@ -322,10 +320,13 @@ void ProgramParser_ns::parseInstruction() { } else ctxt.a = _program->_anim; - ctxt.inst = inst; + if (!ctxt.a) { + return; + } + InstructionPtr inst(new Instruction); + ctxt.inst = inst; _parser->parseStatement(); - _program->_instructions.push_back(inst); return; |