diff options
author | Travis Howell | 2009-08-13 00:32:15 +0000 |
---|---|---|
committer | Travis Howell | 2009-08-13 00:32:15 +0000 |
commit | 7d9890ff2efb7547a4e141ccb7885f8b0b96f4c9 (patch) | |
tree | 4b62364de318b3ac68885cc26160d4dcdebbde28 /engines/scumm/he | |
parent | 77594f46b1db7ed6bde4413f74d12a48e720cbfa (diff) | |
parent | 57566ad337415f639cfedbc38a668d75f8272135 (diff) | |
download | scummvm-rg350-7d9890ff2efb7547a4e141ccb7885f8b0b96f4c9.tar.gz scummvm-rg350-7d9890ff2efb7547a4e141ccb7885f8b0b96f4c9.tar.bz2 scummvm-rg350-7d9890ff2efb7547a4e141ccb7885f8b0b96f4c9.zip |
Merged revisions 43245-43249,43251-43252,43257,43260,43262-43264,43266,43268-43270,43272-43280,43282-43285,43287,43289-43290,43292,43294,43299,43301,43303-43304,43307,43314,43318,43320-43326,43329,43332 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
........
r43245 | lordhoto | 2009-08-11 11:24:15 +1000 (Tue, 11 Aug 2009) | 1 line
Some fixes for the Kyrandia 1 Amiga outro.
........
r43246 | lordhoto | 2009-08-11 11:24:40 +1000 (Tue, 11 Aug 2009) | 1 line
Finally fixed the string extraction for Kyrandia 1 Amiga. This should make the intro/outro strings work fine again.
........
r43247 | lordhoto | 2009-08-11 11:24:56 +1000 (Tue, 11 Aug 2009) | 1 line
Some changes to get the Kyrandia 1 Amiga credits to show up at least.
........
r43248 | lordhoto | 2009-08-11 11:31:34 +1000 (Tue, 11 Aug 2009) | 1 line
Fix in-game GUI text input field colors for Kyrandia 1 Amiga.
........
r43249 | lordhoto | 2009-08-11 11:47:29 +1000 (Tue, 11 Aug 2009) | 1 line
Fix crash when using Will-O-Wisp in the grotto.
........
r43251 | lordhoto | 2009-08-11 12:12:09 +1000 (Tue, 11 Aug 2009) | 1 line
Disable "Screen_LoK::fadeSpecialPalette" for Kyrandia 1 Amiga, like the original does.
........
r43252 | lordhoto | 2009-08-11 12:12:24 +1000 (Tue, 11 Aug 2009) | 1 line
Implement palette differences for seq_playDrinkPotionAnim.
........
r43257 | anotherguest | 2009-08-11 17:52:59 +1000 (Tue, 11 Aug 2009) | 1 line
Updated with m4.dat file
........
r43260 | anotherguest | 2009-08-11 18:01:41 +1000 (Tue, 11 Aug 2009) | 1 line
Updated actions to support tinsel and made (from CE version)
........
r43262 | anotherguest | 2009-08-11 19:57:44 +1000 (Tue, 11 Aug 2009) | 1 line
Enable virtual keyboard support, since qvga gfx is now supported.
........
r43263 | anotherguest | 2009-08-11 20:18:10 +1000 (Tue, 11 Aug 2009) | 1 line
Include vkeybd default pack into installation file
........
r43264 | Hkz | 2009-08-11 20:28:15 +1000 (Tue, 11 Aug 2009) | 1 line
Maniac Mansion NES: added workaround to fix dirty screen when loading a narrow room from a full width room
........
r43266 | Hkz | 2009-08-11 20:51:49 +1000 (Tue, 11 Aug 2009) | 1 line
code formatting fixes
........
r43268 | waltervn | 2009-08-11 22:57:51 +1000 (Tue, 11 Aug 2009) | 2 lines
SCI: Turn off logging in debugger.
........
r43269 | athrxx | 2009-08-12 00:34:33 +1000 (Wed, 12 Aug 2009) | 1 line
LOL: some minor fixes
........
r43270 | Kirben | 2009-08-12 00:42:44 +1000 (Wed, 12 Aug 2009) | 1 line
Add option to disable later games (Feeble Files, Puzzle Pack) in AGOS game engine, which require higher resolution.
........
r43272 | lordhoto | 2009-08-12 01:34:13 +1000 (Wed, 12 Aug 2009) | 1 line
Fix Kallak's note displaying in Kyrandia 1 Amiga and Kyrandia 1 DOS CD.
........
r43273 | lordhoto | 2009-08-12 01:34:28 +1000 (Wed, 12 Aug 2009) | 1 line
Implement differences in seq_winterScroll1 for Kyrandia 1 Amiga.
........
r43274 | lordhoto | 2009-08-12 01:34:55 +1000 (Wed, 12 Aug 2009) | 3 lines
- Yet another minor difference in seq_winterScroll2
- Fix wrong offsets of flasks strings for Kyrandia 1 Amiga in kyra.dat
- Increase kyra.dat version
........
r43275 | lordhoto | 2009-08-12 01:35:13 +1000 (Wed, 12 Aug 2009) | 1 line
Fix bug in Amiga specific bits of o1_fadeSpecialPalette, this should make the cauldron water change color correctly.
........
r43276 | lordhoto | 2009-08-12 01:35:30 +1000 (Wed, 12 Aug 2009) | 1 line
Fix AGOS compilation.
........
r43277 | lordhoto | 2009-08-12 02:18:01 +1000 (Wed, 12 Aug 2009) | 1 line
Fix graphics glitch in Darm's abode in Kyrandia 1 Amiga.
........
r43278 | lordhoto | 2009-08-12 02:18:43 +1000 (Wed, 12 Aug 2009) | 1 line
Fix thumbnails for savegames made via the in-game GUI of Kyrandia 1 Amiga.
........
r43279 | lordhoto | 2009-08-12 02:46:20 +1000 (Wed, 12 Aug 2009) | 1 line
Cleanup.
........
r43280 | lordhoto | 2009-08-12 02:46:38 +1000 (Wed, 12 Aug 2009) | 1 line
Enable dirty rect handling for the Amiga version again.
........
r43282 | buddha_ | 2009-08-12 03:44:06 +1000 (Wed, 12 Aug 2009) | 1 line
Fix compilation on MSVC8/9 after r43270: Add ENABLE_AGOS2 and ENABLE_PN to global Visual Studio properties.
........
r43283 | lordhoto | 2009-08-12 04:16:21 +1000 (Wed, 12 Aug 2009) | 1 line
Don't allow menu / inventory usage in o1_waitForConfirmationMouseClick, just like the original does. This prevents creating bad saves like in bug #2835715 "KYRA: GFX glitch in Amiga version at the bridge".
........
r43284 | lordhoto | 2009-08-12 04:17:07 +1000 (Wed, 12 Aug 2009) | 1 line
Fix for bug #2835715 "KYRA: GFX glitch in Amiga version at the bridge", which was caused by featuring restoring of Brandon's position on save load, which the original did not support.
........
r43285 | lordhoto | 2009-08-12 04:17:53 +1000 (Wed, 12 Aug 2009) | 1 line
Fix graphical glitches when loading saves where Brandon is in Will-O-Wisp form.
........
r43287 | dhewg | 2009-08-12 05:11:26 +1000 (Wed, 12 Aug 2009) | 1 line
Fixed an endian bug in the ADPCM decoder (#2211901).
........
r43289 | waltervn | 2009-08-12 06:18:15 +1000 (Wed, 12 Aug 2009) | 2 lines
SCI: Added a crude speed throttler.
........
r43290 | lordhoto | 2009-08-12 07:53:06 +1000 (Wed, 12 Aug 2009) | 1 line
Mention support for Kyrandia 1 Amiga in 1.1.0.
........
r43292 | Kirben | 2009-08-12 09:40:07 +1000 (Wed, 12 Aug 2009) | 1 line
vc22_setPaletteOld was renamed to vc22_setPalette, since function was virtualized.
........
r43294 | Kirben | 2009-08-12 10:53:35 +1000 (Wed, 12 Aug 2009) | 1 line
Fix building with specific games disabled in MSVC.
........
r43299 | Kirben | 2009-08-12 11:21:25 +1000 (Wed, 12 Aug 2009) | 1 line
Fix bug #2835822 - SSPP: Sounds from DIMP appearing randomly in other games.
........
r43301 | Kirben | 2009-08-12 11:35:42 +1000 (Wed, 12 Aug 2009) | 1 line
Update status of Amiga version of The Legend of Kyrandia.
........
r43303 | Kirben | 2009-08-12 11:44:17 +1000 (Wed, 12 Aug 2009) | 1 line
Update status of The Legend of Kyrandia.
........
r43304 | Kirben | 2009-08-12 12:24:03 +1000 (Wed, 12 Aug 2009) | 1 line
Enable Personal Nightmare by default.
........
r43307 | sev | 2009-08-12 14:36:01 +1000 (Wed, 12 Aug 2009) | 2 lines
Fix formatting
........
r43314 | dhewg | 2009-08-12 17:37:45 +1000 (Wed, 12 Aug 2009) | 1 line
Removed duplicated functions.
........
r43318 | lordhoto | 2009-08-13 00:02:18 +1000 (Thu, 13 Aug 2009) | 1 line
Change SJIS code guard to also check whether dynamic plugins are enabled.
........
r43320 | lordhoto | 2009-08-13 03:10:47 +1000 (Thu, 13 Aug 2009) | 1 line
Implement difference for the Kyrandia 1 Amiga version in TextDisplayer::printCharacterText.
........
r43321 | lordhoto | 2009-08-13 03:11:04 +1000 (Thu, 13 Aug 2009) | 1 line
Cleanup.
........
r43322 | lordhoto | 2009-08-13 03:13:46 +1000 (Thu, 13 Aug 2009) | 1 line
Oops forgot a "{".
........
r43323 | lordhoto | 2009-08-13 04:05:41 +1000 (Thu, 13 Aug 2009) | 1 line
Further cleaning up credits player code for Kyra1.
........
r43324 | lordhoto | 2009-08-13 04:06:32 +1000 (Thu, 13 Aug 2009) | 1 line
Fix graphics glitch in credits of Kyrandia 1 German.
........
r43325 | lordhoto | 2009-08-13 04:07:27 +1000 (Thu, 13 Aug 2009) | 1 line
Add a slight paranoia check to drawCharANSI.
........
r43326 | lordhoto | 2009-08-13 04:08:01 +1000 (Thu, 13 Aug 2009) | 1 line
Put some more IHNM / SAGA2 specific code into compile guards.
........
r43329 | lordhoto | 2009-08-13 08:05:09 +1000 (Thu, 13 Aug 2009) | 1 line
Implement special Kyrandia 1 Amiga credits text scroller.
........
r43332 | lordhoto | 2009-08-13 09:16:35 +1000 (Thu, 13 Aug 2009) | 1 line
Properly respect users sfx/music config settings for MIDI output.
........
svn-id: r43343
Diffstat (limited to 'engines/scumm/he')
-rw-r--r-- | engines/scumm/he/animation_he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/animation_he.h | 2 | ||||
-rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 3 | ||||
-rw-r--r-- | engines/scumm/he/floodfill_he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/logic_he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/logic_he.h | 2 | ||||
-rw-r--r-- | engines/scumm/he/palette_he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/script_v100he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/script_v71he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/script_v72he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/script_v80he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/script_v90he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/sound_he.cpp | 1 | ||||
-rw-r--r-- | engines/scumm/he/sprite_he.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/wiz_he.cpp | 4 |
15 files changed, 43 insertions, 9 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 92b72bd9be..47b25c57d1 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "scumm/he/animation_he.h" #include "scumm/he/intern_he.h" @@ -129,3 +129,5 @@ void MoviePlayer::setPalette(byte *pal) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index e2fc1d04b7..0adba35d53 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -23,7 +23,7 @@ * */ -#ifndef SCUMM_HE_ANIMATION_H +#if !defined(SCUMM_HE_ANIMATION_H) && defined(ENABLE_HE) #define SCUMM_HE_ANIMATION_H #include "common/file.h" diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 39615edb6a..a284632fb1 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -23,6 +23,7 @@ * */ +#ifdef ENABLE_HE #include "common/system.h" #include "sound/audiostream.h" @@ -521,3 +522,5 @@ void CUP_Player::handleTOIL(Common::SeekableReadStream &dataStream, uint32 dataS } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp index d3578e2189..491b91c17e 100644 --- a/engines/scumm/he/floodfill_he.cpp +++ b/engines/scumm/he/floodfill_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "scumm/he/floodfill_he.h" #include "scumm/he/intern_he.h" @@ -293,3 +293,5 @@ void Wiz::fillWizFlood(const WizParameters *params) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp index a24f4d4665..b7d2c9264c 100644 --- a/engines/scumm/he/logic_he.cpp +++ b/engines/scumm/he/logic_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "scumm/he/intern_he.h" #include "scumm/he/logic_he.h" @@ -1058,3 +1058,5 @@ int LogicHEmoonbase::versionID() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h index 29304b7468..f5ecdd429a 100644 --- a/engines/scumm/he/logic_he.h +++ b/engines/scumm/he/logic_he.h @@ -26,8 +26,6 @@ #if !defined(SCUMM_HE_LOGIC_HE_H) && defined(ENABLE_HE) #define SCUMM_HE_LOGIC_HE_H - - namespace Scumm { class ScummEngine_v90he; diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp index 812c39d173..02f3f3fc5c 100644 --- a/engines/scumm/he/palette_he.cpp +++ b/engines/scumm/he/palette_he.cpp @@ -8,6 +8,7 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -22,6 +23,7 @@ * */ +#ifdef ENABLE_HE #include "common/system.h" #include "scumm/scumm.h" @@ -420,3 +422,5 @@ void ScummEngine_v99he::updatePalette() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 2748633bdc..49e490a8ec 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "common/system.h" #include "scumm/actor.h" @@ -3028,3 +3030,5 @@ void ScummEngine_v100he::decodeParseString(int m, int n) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v71he.cpp b/engines/scumm/he/script_v71he.cpp index c832d64316..46a8868949 100644 --- a/engines/scumm/he/script_v71he.cpp +++ b/engines/scumm/he/script_v71he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "scumm/actor.h" #include "scumm/he/intern_he.h" #include "scumm/scumm.h" @@ -446,3 +448,5 @@ void ScummEngine_v71he::o71_polygonHit() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index c6489004d7..0c2c01d419 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" @@ -2048,3 +2050,5 @@ void ScummEngine_v72he::decodeParseString(int m, int n) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index fb63568e9f..dd44180fa0 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "common/config-file.h" #include "common/config-manager.h" #include "common/savefile.h" @@ -529,3 +531,5 @@ void ScummEngine_v80he::o80_pickVarRandom() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index 8c50dfecc3..e302af1144 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -23,6 +23,8 @@ * */ +#ifdef ENABLE_HE + #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/he/animation_he.h" @@ -2365,3 +2367,5 @@ void ScummEngine_v90he::o90_kernelSetFunctions() { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 67248f4c22..01f29d5db9 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -23,7 +23,6 @@ * */ - #include "scumm/actor.h" #include "scumm/file.h" #include "scumm/imuse/imuse.h" diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp index aed03f746b..5f751d8285 100644 --- a/engines/scumm/he/sprite_he.cpp +++ b/engines/scumm/he/sprite_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "scumm/he/intern_he.h" #include "scumm/resource.h" @@ -1442,3 +1442,5 @@ void Sprite::saveOrLoadSpriteData(Serializer *s) { } } // End of namespace Scumm + +#endif // ENABLE_HE diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index b79c35740e..b00294cb96 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -23,7 +23,7 @@ * */ - +#ifdef ENABLE_HE #include "common/system.h" #include "graphics/cursorman.h" @@ -2679,3 +2679,5 @@ int ScummEngine_v90he::computeWizHistogram(int resNum, int state, int x, int y, } } // End of namespace Scumm + +#endif // ENABLE_HE |