diff options
| author | Willem Jan Palenstijn | 2011-12-06 19:23:38 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-12-06 20:57:09 +0100 |
| commit | 1193792310815b5f83fcf4fa5f018c4a41f4131a (patch) | |
| tree | 8ccb1d4cd41ecae50d238f4a902163db90b66c5c | |
| parent | be47635ef9ef639e7aa2500ffa8d4edd121393ac (diff) | |
| download | scummvm-rg350-1193792310815b5f83fcf4fa5f018c4a41f4131a.tar.gz scummvm-rg350-1193792310815b5f83fcf4fa5f018c4a41f4131a.tar.bz2 scummvm-rg350-1193792310815b5f83fcf4fa5f018c4a41f4131a.zip | |
DREAMWEB: Fix regressions in 'monks2text'
| -rw-r--r-- | engines/dreamweb/sprite.cpp | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index a7497a7fd0..978c05dc4b 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -781,34 +781,31 @@ void DreamGenContext::monks2text() { setupTimedTemp(9, 82, 36, 160, 120, 1); else if (data.byte(kIntrocount) == (isGermanCD ? 9 : 7)) setupTimedTemp(10, 82, 36, 160, 120, 1); - else if (data.byte(kIntrocount) == (isGermanCD ? 13 : 10)) { - data.byte(kIntrocount) = isCD() ? 14 : 12; + else if (data.byte(kIntrocount) == 10 && !isGermanCD) { + if (isCD()) + data.byte(kIntrocount) = 12; setupTimedTemp(11, 82, 0, 105, 120, 1); - } else if (data.byte(kIntrocount) == 19 && isGermanCD) - setupTimedTemp(14, 82, 36, 120, 120, 1); - else if (data.byte(kIntrocount) == 23 && isGermanCD) - setupTimedTemp(15, 82, 36, 120, 120, 1); - else if (data.byte(kIntrocount) == 27 && isGermanCD) - setupTimedTemp(16, 82, 36, 120, 120, 1); - else if (data.byte(kIntrocount) == 30 && isGermanCD) - setupTimedTemp(17, 82, 36, 120, 120, 1); - else if (data.byte(kIntrocount) == 35 && isGermanCD) - setupTimedTemp(18, 82, 36, 120, 120, 1); - else if (data.byte(kIntrocount) == 13 && !isGermanCD) { + } else if (data.byte(kIntrocount) == 13 && isGermanCD) { + data.byte(kIntrocount) = 14; + setupTimedTemp(11, 82, 0, 105, 120, 1); + } else if (data.byte(kIntrocount) == 13 && !isGermanCD) { if (isCD()) data.byte(kIntrocount) = 17; - setupTimedTemp(12, 82, 0, 120, 120, 1); - } else if (data.byte(kIntrocount) == 16) + else + setupTimedTemp(12, 82, 0, 120, 120, 1); + } else if (data.byte(kIntrocount) == 16 && !isGermanCD) setupTimedTemp(13, 82, 0, 135, 120, 1); else if (data.byte(kIntrocount) == 19) - setupTimedTemp(14, 82, 36, 160, 120, 1); - else if (data.byte(kIntrocount) == 22) + setupTimedTemp(14, 82, 36, 160, 100, 1); + else if (data.byte(kIntrocount) == (isGermanCD ? 23 : 22)) setupTimedTemp(15, 82, 36, 160, 120, 1); - else if (data.byte(kIntrocount) == 25) + else if (data.byte(kIntrocount) == (isGermanCD ? 27 : 25)) setupTimedTemp(16, 82, 36, 160, 120, 1); - else if (data.byte(kIntrocount) == (isCD() ? 27 : 28)) + else if (data.byte(kIntrocount) == (isCD() ? 27 : 28) && !isGermanCD) + setupTimedTemp(17, 82, 36, 160, 120, 1); + else if (data.byte(kIntrocount) == 30 && isGermanCD) setupTimedTemp(17, 82, 36, 160, 120, 1); - else if (data.byte(kIntrocount) == 31) + else if (data.byte(kIntrocount) == (isGermanCD ? 35 : 31)) setupTimedTemp(18, 82, 36, 160, 120, 1); } |