[Scummvm-cvs-logs] SF.net SVN: scummvm:[39060] scummvm/trunk/engines/sci/engine

[wjpalenstijn at users.sourceforge.net]

Revision: 39060
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39060&view=rev
Author:   wjpalenstijn
Date:     2009-03-01 22:19:49 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
Partial revert of "Fix handling of parentheses in said specs" (20080705)

This fixes, among other things, "get up" followed by "get shirt"
at the start of Iceman.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/said.cpp
    scummvm/trunk/engines/sci/engine/said.y

Modified: scummvm/trunk/engines/sci/engine/said.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/said.cpp	2009-03-01 22:13:48 UTC (rev 39059)
+++ scummvm/trunk/engines/sci/engine/said.cpp	2009-03-01 22:19:49 UTC (rev 39060)
@@ -1568,7 +1568,7 @@
 
   case 19:
 #line 180 "said.y"
-    { (yyval) = (yyvsp[(2) - (3)]); ;}
+    { (yyval) = said_aug_branch(0x141, 0x14c, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL); ;}
     break;
 
   case 20:

Modified: scummvm/trunk/engines/sci/engine/said.y
===================================================================
--- scummvm/trunk/engines/sci/engine/said.y	2009-03-01 22:13:48 UTC (rev 39059)
+++ scummvm/trunk/engines/sci/engine/said.y	2009-03-01 22:19:49 UTC (rev 39060)
@@ -177,7 +177,7 @@
 wordset :	 word
 			{ $$ = $1; }
 		| YY_PARENO expr YY_PARENC
-			{ $$ = $2; }
+			{ $$ = said_aug_branch(0x141, 0x14c, $2, SAID_BRANCH_NULL); }
 		| wordset YY_COMMA wordset
 			{ $$ = said_attach_branch($1, $3); }
 		| wordset YY_BRACKETSO_LT wordrefset YY_BRACKETSC


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