diff options
| author | Willem Jan Palenstijn | 2009-03-01 22:19:49 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-03-01 22:19:49 +0000 |
| commit | 0e134d5871246a546f49fa3ab0006b2f1fe91e11 (patch) | |
| tree | 5668ab386969179e9b8bb9b63f65e0dfcecf9d5b | |
| parent | c7d7ce88881a3ff66b049b5df785791bc3808402 (diff) | |
| download | scummvm-rg350-0e134d5871246a546f49fa3ab0006b2f1fe91e11.tar.gz scummvm-rg350-0e134d5871246a546f49fa3ab0006b2f1fe91e11.tar.bz2 scummvm-rg350-0e134d5871246a546f49fa3ab0006b2f1fe91e11.zip | |
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.
svn-id: r39060
| -rw-r--r-- | engines/sci/engine/said.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/said.y | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/said.cpp b/engines/sci/engine/said.cpp index 0f3fe9cea4..879cc09829 100644 --- a/engines/sci/engine/said.cpp +++ b/engines/sci/engine/said.cpp @@ -1568,7 +1568,7 @@ yyreduce: 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: diff --git a/engines/sci/engine/said.y b/engines/sci/engine/said.y index e8d0dce84c..b479834bfa 100644 --- a/engines/sci/engine/said.y +++ b/engines/sci/engine/said.y @@ -177,7 +177,7 @@ cwordset : wordset 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 |