Commit Graph

6234 Commits

Author SHA1 Message Date
Johannes Schickel
887f7dfb28 Fixed warnings with gcc 3.3.
svn-id: r31359
2008-04-02 02:46:50 +00:00
Johannes Schickel
3b81a73e52 Fixed bug in GUI code, should hopefully fix white boxes appearing around inventory.
svn-id: r31355
2008-04-01 18:35:14 +00:00
Johannes Schickel
7744a3b053 Fixed spellbook graphics in German CD version.
svn-id: r31354
2008-04-01 18:23:54 +00:00
Kari Salminen
bd8df7afee Add detection entry for Serguei's Destiny II Demo v1.3.1 (March 22nd 2008).
svn-id: r31346
2008-04-01 00:23:39 +00:00
Johannes Schickel
bd85909ff9 Don't enter run loop when quit flag is set.
svn-id: r31337
2008-03-30 18:41:55 +00:00
Johannes Schickel
54d2e7128e Implement quit flag handling in Kyra2 GUI code.
svn-id: r31336
2008-03-30 18:41:11 +00:00
Johannes Schickel
4a9891c006 Fixed bug which caused sometimes garbage text to be displayed.
svn-id: r31335
2008-03-30 18:37:27 +00:00
Max Horn
57ad73faee Removed char &operator [] from class String -- it had the potential to wreak havoc when used on shared strings (thanks to tramboi for pointing this out)
svn-id: r31334
2008-03-30 18:37:09 +00:00
Johannes Schickel
a9d256108d Cleanup.
svn-id: r31332
2008-03-30 18:31:30 +00:00
Johannes Schickel
f4e6109b33 - fixed savegame description loading in kyra1
- added Kyra2 load menu, currently just accessable from startup menu though

svn-id: r31331
2008-03-30 18:27:46 +00:00
Johannes Schickel
dc813c1c20 Cleanup.
svn-id: r31319
2008-03-30 03:21:01 +00:00
Johannes Schickel
b7a3dfd9df Always clip rect to copy in Screen::copyRegion now, like the original does.
This fixes bug #1537373 "KYRA1: Crash when meeting Zanthia".

svn-id: r31318
2008-03-30 03:18:16 +00:00
Florian Kagerer
91e30d8e50 - get rid of const_cast
svn-id: r31317
2008-03-30 02:43:22 +00:00
Johannes Schickel
a957b45d5c Cleanup.
svn-id: r31313
2008-03-30 01:35:12 +00:00
Johannes Schickel
b3f858af2b Renamed some functions according to our coding guidelines.
svn-id: r31310
2008-03-30 01:01:12 +00:00
Johannes Schickel
30c513eb2d - fixed formatting
- fixed const correctness (needed a const_cast though :-/)

svn-id: r31309
2008-03-30 00:55:16 +00:00
Florian Kagerer
25b9a8a1cb New drawShape code for Kyra 1 and 2. Scaled sprites no longer appear mutilated. This also fixes bug #1582675 (KYRA1: Brandon standing IN the floor).
This still needs some testing (for both Kyra 1 and Kyra 2).

svn-id: r31306
2008-03-29 23:16:44 +00:00
Travis Howell
7a919a0f4f Add patch #1928643 - Czech fan translation of Simon the Sorcerer 1.
svn-id: r31300
2008-03-29 13:27:25 +00:00
Filippos Karapetis
1e58257791 Oops
svn-id: r31297
2008-03-28 17:46:18 +00:00
Filippos Karapetis
70e4503274 Fixed 2 off-by-one errors (thanks next_ghost for spotting them)
svn-id: r31296
2008-03-28 17:38:45 +00:00
Johannes Schickel
7605a9a517 Changed HoF GUI code to use common GUI code now.
svn-id: r31295
2008-03-28 16:15:00 +00:00
Johannes Schickel
4ac08aa32a - fixed svn properties
- reenabled kyra1 layout calculation

svn-id: r31294
2008-03-28 15:29:39 +00:00
Max Horn
770bc64f21 Added FIXME comment regarding sorting of pred.dic; replaced weird binary search code with simple binary search code ;-)
svn-id: r31291
2008-03-28 09:17:13 +00:00
Johannes Schickel
b910d8d9bb Refactored Kyrandia GUI code a bit.
svn-id: r31290
2008-03-28 09:00:30 +00:00
Max Horn
7f81de6794 cleanup
svn-id: r31289
2008-03-28 08:30:42 +00:00
Johannes Schickel
f2e53b9d22 Oops that shouldn't be committed yet.
svn-id: r31288
2008-03-28 06:06:11 +00:00
Johannes Schickel
e29b4bb0cd Committed shared pointer implementation of patch #1895703 "COMMON: Managed List".
Unlike the patch on the tracker this commit includes documentation for SharedPtr.

svn-id: r31287
2008-03-28 06:03:59 +00:00
Johannes Schickel
dc1a7004e9 Fixed showing of cauldron animations processing while the inventory is not shown.
svn-id: r31286
2008-03-28 01:44:49 +00:00
Johannes Schickel
f7d14259c9 Implemented command text fadeout.
svn-id: r31285
2008-03-28 01:28:02 +00:00
Johannes Schickel
5fd6af3071 Finished o2_delay implementation.
svn-id: r31284
2008-03-28 01:10:58 +00:00
Johannes Schickel
615a40d19c Oops fixed wrong o2_delaySecs.
svn-id: r31283
2008-03-28 01:07:16 +00:00
Johannes Schickel
c5929561ba - Clear input queue after loading game via hotkeys.
- Fixed bug which caused the need for clicking twice to change pages in spellbook.

svn-id: r31282
2008-03-28 01:03:54 +00:00
Johannes Schickel
b033c5f605 Implemented savegame loading via command line params -x/--save-slot.
svn-id: r31281
2008-03-28 00:53:54 +00:00
Johannes Schickel
a1ec44cef2 Properly set sfx flag when playing digital SFX.
svn-id: r31280
2008-03-28 00:16:47 +00:00
Johannes Schickel
98f9a47619 Implemented opcodes:
- 38: o2_countItemsInScene
 - 57: o2_setTimerDelay
 - 84: o2_getSceneExitToFacing
 - 137: o2_removeItemFromScene

svn-id: r31279
2008-03-28 00:13:43 +00:00
Florian Kagerer
221e6bb84f - some accuracy changes for KyraEngine_v2::snd_playSoundEffect()
- fix one more skip flag bug in the sequence player
- fix SoundTowns_v2::voicePlay()

svn-id: r31278
2008-03-28 00:07:40 +00:00
Johannes Schickel
72484b204b - Implemented opcodes:
-> 51: o2_getElapsedSecs
  -> 52: o2_getTimerDelay
- Added warnings to o2_delaySecs and o2_delay for unimplemented subfunctions

svn-id: r31277
2008-03-27 23:53:49 +00:00
Johannes Schickel
bf26f82cbb Implemented opcode 74: o2_setSceneAnimPos2.
svn-id: r31276
2008-03-27 23:46:30 +00:00
Johannes Schickel
7a683ae436 Implemented opcodes:
- 164: o2_getSfxDriver
 - 165: o2_getVocSupport
 - 166: o2_getMusicDriver

svn-id: r31275
2008-03-27 23:12:45 +00:00
Johannes Schickel
42ff616533 Oops added missing return, should fix crashed on trying to load non-existant savegames.
svn-id: r31274
2008-03-27 22:34:17 +00:00
Florian Kagerer
c8ddd54039 fix for bug 1922560 (HoF: wheels entrance gfx wrong)
svn-id: r31273
2008-03-27 22:07:57 +00:00
Johannes Schickel
70dfc2baf7 Made some more former kyra1 specific debug commands available for HoF.
svn-id: r31272
2008-03-27 22:05:13 +00:00
Johannes Schickel
c5526604c0 Removed much code duplication in Hand of Fate savefile loading with SeekableSubReadStreamEndian.
svn-id: r31271
2008-03-27 20:54:59 +00:00
Johannes Schickel
639c4597cd Readded warning when loading HoF saves from original interpreter.
svn-id: r31269
2008-03-27 20:24:41 +00:00
Johannes Schickel
3bea667a10 - Implemented support for --list-saves in Kyra engine
- Added support for variable length savegame name field
- Changed savegame identifier
- Increased savegame file version

svn-id: r31268
2008-03-27 18:03:00 +00:00
Johannes Schickel
165c937e20 Enabled gamespeed debug command also for Kyra1.
svn-id: r31267
2008-03-27 16:12:48 +00:00
Johannes Schickel
3e98286af9 Fixed palette loading debug command for amiga version.
svn-id: r31266
2008-03-27 15:32:20 +00:00
Johannes Schickel
4d4fbc9e97 Added debugger command to set screen palette.
svn-id: r31265
2008-03-27 15:27:31 +00:00
Johannes Schickel
9eb279e1b6 Update hack comment in o2_updateSceneAnim.
svn-id: r31263
2008-03-27 14:55:52 +00:00
Johannes Schickel
57b80a79ab Fix for bug #1926838 "HoF: Animation plays too fast".
svn-id: r31262
2008-03-27 14:51:33 +00:00
Travis Howell
4d51eb5fb7 Add work around for script bug in The Feeble Files.
svn-id: r31260
2008-03-27 01:01:52 +00:00
Florian Kagerer
c4f15a7076 this should fix item #1926532 (HoF: ScummVM quits on ESCaping "Virgin" and "Westwood" logo)
svn-id: r31259
2008-03-26 23:42:47 +00:00
Johannes Schickel
a2053c0815 Prevents adding of events to input queue, which will not be processed anyway.
svn-id: r31258
2008-03-26 23:21:44 +00:00
Max Horn
d35020ac17 Init the _fmtownsBuf in the constructor, not in setupScumm() (fixes a leak, and ensure that _fmtownsBuf always is inited)
svn-id: r31256
2008-03-26 22:26:59 +00:00
Torbjörn Andersson
762398376f Fixed GCC warning. It warns about "if (a = b)" unless you put an extra set of
parentheses around the assignment.

svn-id: r31255
2008-03-26 21:58:56 +00:00
Johannes Schickel
bf71af3c91 Fixed typo.
svn-id: r31254
2008-03-26 21:56:20 +00:00
Johannes Schickel
db1b4f0e14 - reworked skip flag handling in some places again
- hopefully fixed tons of warnings related to stackPosString

svn-id: r31253
2008-03-26 21:52:28 +00:00
Johannes Schickel
f919b26875 - fixed multiple voices playing at once (see bug #1926547 "HoF: Right mouse button messes up gameplay").
- fixed crash while uninitializing AdLib driver

svn-id: r31252
2008-03-26 21:39:44 +00:00
Johannes Schickel
e962640411 Set delay time for the hack in o2_updateSceneAnim to the value Raziel^ suggests.
svn-id: r31251
2008-03-26 21:28:26 +00:00
Johannes Schickel
c9b9398561 Possible fix for part 1 of bug #1926547 "HoF: Right mouse button messes up gameplay".
svn-id: r31250
2008-03-26 21:24:22 +00:00
Johannes Schickel
7c33605761 Added support for HoF savefile from the original interpreter.
svn-id: r31249
2008-03-26 21:17:07 +00:00
Johannes Schickel
4b0bdc7a08 Extended savegame type checks.
svn-id: r31246
2008-03-26 20:28:31 +00:00
Johannes Schickel
c2df92a9b5 Added a simple hack which adds delay between animation frames of some scene animations, this prevents some animations from running too fast. See for example bug #1923638 "HoF: Marco missing animation frames".
svn-id: r31245
2008-03-26 19:58:33 +00:00
Max Horn
b0c6a12c81 Modified Patch #1925352: Memory leak fixes
svn-id: r31244
2008-03-26 19:29:33 +00:00
Johannes Schickel
afed582280 Fix bug #1923638 "HoF: Marco missing animation frames".
svn-id: r31243
2008-03-26 16:11:47 +00:00
Travis Howell
52930616c6 And don't attempt to play sound, when the sound file isn't loaded in The Feeble Files.
svn-id: r31240
2008-03-26 04:07:32 +00:00
Travis Howell
44200b4ac6 Remove error for missing sound files in The Feeble Files, due to fault in French version.
svn-id: r31239
2008-03-26 04:04:14 +00:00
Travis Howell
10be4b2a6d Move code to ignore invalid characters.
svn-id: r31238
2008-03-26 03:10:40 +00:00
Travis Howell
eeb4c75244 Ooops, correct error in conversion of The Feeble Files font data.
svn-id: r31237
2008-03-26 02:11:22 +00:00
Travis Howell
defe50eada Always ignore invalid characters, when using charset data.
svn-id: r31236
2008-03-26 01:57:26 +00:00
Travis Howell
171a4d1bdb Switch all font data to hexadecimal and sort by language name.
svn-id: r31235
2008-03-26 01:50:59 +00:00
Travis Howell
48fac2f9dc Fix palette glitches in Amiga OCS version of Simon the Sorcerer 1.
svn-id: r31233
2008-03-25 08:03:32 +00:00
Florian Kagerer
1bb41bf225 fixed skip flag reset for sequence player
svn-id: r31232
2008-03-24 23:01:51 +00:00
Florian Kagerer
6dafd78b56 improved skip flag handling for intro and outro (see tracker item #1922556)
svn-id: r31231
2008-03-24 14:21:06 +00:00
Travis Howell
59b0bf8fa1 Correct background color when displaying saved game list in Amiga versions of Simon the Sorcerer 1.
svn-id: r31230
2008-03-24 06:48:09 +00:00
Travis Howell
47ad2487b4 Fix name locking in Waxworks, and cleanup.
svn-id: r31229
2008-03-23 23:18:43 +00:00
Johannes Schickel
00033ff747 Respect text/voice settings in Kyrandia 1 Intro/Outro.
svn-id: r31228
2008-03-23 20:55:42 +00:00
Travis Howell
7047e5e974 Remove left over debug code.
svn-id: r31225
2008-03-23 00:36:41 +00:00
Travis Howell
56711f1489 Add comments about unknown cases and remove unused cases in parseNextEvent().
svn-id: r31224
2008-03-23 00:34:39 +00:00
Sven Hesse
c5d48856a3 Added the MD5 for a non-interactive demo of Lost in Time
svn-id: r31223
2008-03-23 00:24:58 +00:00
Johannes Schickel
46376d38a9 - fixed bug in Sound::voiceIsPlaying
- fixed speech animation duration in Kyra1

svn-id: r31221
2008-03-22 14:29:30 +00:00
Johannes Schickel
df78d4d484 Fix for bug #1922514 "HoF: palette artifacts when abom. snowman".
svn-id: r31220
2008-03-22 12:43:23 +00:00
Travis Howell
63b1de5628 Add support for room states in Waxworks (DOS).
svn-id: r31218
2008-03-22 09:46:25 +00:00
Johannes Schickel
07bb52b78e Fix for bug #1922521 "HoF: mountaineer sprite vanishes".
svn-id: r31217
2008-03-22 00:33:05 +00:00
Johannes Schickel
7c57c127ea Oops removing debug output.
svn-id: r31216
2008-03-21 23:57:05 +00:00
Johannes Schickel
5107404089 - improved timer information output in debugger
- fixed timer data loading

svn-id: r31215
2008-03-21 23:54:47 +00:00
Johannes Schickel
2a4aa9c379 Removed some unneeded waiting for voice to finish.
svn-id: r31212
2008-03-21 17:09:45 +00:00
Johannes Schickel
dea50612cb - disabled some old warnings
- removed waiting for voice to finish in o1_restoreCustomPrintBackground

svn-id: r31211
2008-03-21 16:54:08 +00:00
Johannes Schickel
b615eb177b Cleanup.
svn-id: r31210
2008-03-21 16:21:27 +00:00
Johannes Schickel
a169619526 - Implemented opcode 97: o2_isAnySoundPlaying
- reworked sound channel handling in HoF
  => fixed some voice related bugs

svn-id: r31209
2008-03-21 16:18:27 +00:00
Johannes Schickel
88069c943a Proper fix for bug #1920869 "HoF: palette artifacts in inventory".
svn-id: r31208
2008-03-21 12:51:03 +00:00
Florian Kagerer
2f7b59d3e2 - fix skip flags for non-playable demo
svn-id: r31207
2008-03-20 20:36:36 +00:00
Johannes Schickel
cb22a83034 - made Screen_v2::applyOverlay support dirty rect handling
- fixed copyRegion flags in KyraEngine_v2::scrollInventoryWheel

svn-id: r31206
2008-03-20 12:29:35 +00:00
Travis Howell
91a33d4d63 Add HoF CD demo.
svn-id: r31205
2008-03-20 12:10:30 +00:00
Johannes Schickel
558625ff45 Fixed bug #1920869 "HoF: palette artifacts in inventory".
svn-id: r31204
2008-03-20 12:07:06 +00:00
Torbjörn Andersson
4669f2a659 Fixed compilation.
svn-id: r31203
2008-03-20 11:58:18 +00:00
Johannes Schickel
e69532bff2 Fixed loading of 'filedata.fdt' in HoF demo from Malcolm's Revenge CD.
svn-id: r31202
2008-03-20 11:55:52 +00:00
Johannes Schickel
e70790c610 Enabled some cursor related commented out code.
svn-id: r31201
2008-03-20 11:42:02 +00:00
Johannes Schickel
01a24e5a6f Supply correct flags to copyRegion when displaying spellbook pages.
svn-id: r31200
2008-03-20 11:37:10 +00:00
Johannes Schickel
cc3b30d1cd Possible fix for graphics glitches when showing letters.
svn-id: r31199
2008-03-20 11:32:06 +00:00
Johannes Schickel
6d1cf23322 Made sure mouse is visible after savegame loading.
svn-id: r31198
2008-03-20 10:27:39 +00:00
Johannes Schickel
93a10bd0bd Fixed cauldron/spellbook graphics on savegame load.
svn-id: r31197
2008-03-20 10:11:57 +00:00
Johannes Schickel
24fe9e42d7 - fixed numerous graphics glitches
-> fixed bug in o2_stopSceneAnimation
 -> fixed bug in KyraEngine_v2::freeSceneAnims

svn-id: r31196
2008-03-19 17:13:31 +00:00
Paul Gilbert
74e5ef5c56 Commit of Hans de Goede's patches to the sound handling code
svn-id: r31194
2008-03-19 10:37:33 +00:00
Max Horn
63c09d5a40 Removed some unportable and unused code ;-)
svn-id: r31193
2008-03-19 10:18:05 +00:00
Max Horn
98a851d25e cleanup
svn-id: r31192
2008-03-19 10:17:29 +00:00
Travis Howell
2d33f965a5 Correct extra field for Amiga floppy versions of Simon the Sorcerer 1.
svn-id: r31190
2008-03-19 01:22:28 +00:00
Johannes Schickel
48dc290b6c Bugfix for dropping items off scene.
svn-id: r31189
2008-03-18 19:32:00 +00:00
Torbjörn Andersson
12bfc644f4 Fixed some warnings, so that I too may bask in the glory of Kyrandia 2.
svn-id: r31188
2008-03-18 19:31:38 +00:00
Johannes Schickel
f1b11fdff9 - started to add debugC calls to methods
- implemented some missing bits in itemDropDown

svn-id: r31187
2008-03-18 19:27:21 +00:00
Johannes Schickel
cbc4c789da Implemented showing of credits after completing game.
svn-id: r31186
2008-03-18 19:06:53 +00:00
Johannes Schickel
80a73d4ae6 Renamed opcode 95 to o2_showItemString.
svn-id: r31185
2008-03-18 18:20:13 +00:00
Johannes Schickel
9dc4bcb407 - Impelemented opcodes:
-> 95: o2_showPickUpString
  -> 107: o2_waitForConfirmationClick
  -> 161: o2_getRainbowRoomData
  -> 162: o2_drawSceneShapeEx
- Did I mention that HoF is completable now?

svn-id: r31184
2008-03-18 18:07:05 +00:00
Johannes Schickel
83390027c2 - Implemented opcodes:
-> 12: o2_setCharacterFacing
  -> 14: o2_moveCharacter
  -> 61: o2_loadZShapes
  -> 83: o2_setPathfinderFlag
  -> 90: o2_setSceneAnimPos
  -> 160: o2_updateTwoSceneAnims
- Implemented dino riding sequence
- Fixed bug in KyraEngine_v2::initSceneScreen which caused some gfx glitches

svn-id: r31183
2008-03-18 17:00:26 +00:00
Johannes Schickel
2af4fc1034 - Implemented opcodes:
-> 21: o2_backUpScreen
  -> 22: o2_restoreScreen
  -> 28: o2_addItemToInventory
  -> 50: o2_wipeDownMouseItem
  -> 67: o2_loadPalette384
  -> 68: o2_setPalette384
  -> 165: o2_disableTimer
  -> 166: o2_enableTimer
  -> 167: o2_setTimerCountdown
- renamed some timer functions

svn-id: r31182
2008-03-18 15:50:43 +00:00
Johannes Schickel
8e98e35b56 Fixed bug in o2_setupSceneAnimation. (should fix some lockups)
svn-id: r31181
2008-03-18 14:27:22 +00:00
Johannes Schickel
d4daa244d8 Fixed bug, which caused displaying wrong string to be shown then combining items in HoF.
svn-id: r31180
2008-03-18 13:51:16 +00:00
Johannes Schickel
4c880c77a4 Fixed pathfinder post processing in HoF, this should smooth walk paths a lot.
svn-id: r31179
2008-03-18 13:29:12 +00:00
Johannes Schickel
caf1cc60de Completed implementation of KyraEngine_v2::inputSceneChange.
svn-id: r31178
2008-03-18 13:01:33 +00:00
Johannes Schickel
b03c23ce57 Fixed input bug causing Zanthia not to move sometimes.
svn-id: r31177
2008-03-18 12:55:41 +00:00
Travis Howell
04083cff88 List CUP videos as previews, rather than demos.
svn-id: r31175
2008-03-18 12:51:16 +00:00
Johannes Schickel
5df3a2e130 Fixed bug preventing movement.
svn-id: r31172
2008-03-18 00:04:34 +00:00
Florian Kagerer
68a603139d -missed animator_v2.cpp in last commit
svn-id: r31171
2008-03-17 23:45:33 +00:00
Florian Kagerer
760b44da10 - implement opcode 29: o2_drawShape
svn-id: r31170
2008-03-17 23:32:26 +00:00
Johannes Schickel
a917a88504 Oops forgot to enable some code.
svn-id: r31169
2008-03-17 23:29:25 +00:00
Johannes Schickel
845d65d8b7 Implemented opcode 98: o2_setDeathHandlerFlag
svn-id: r31168
2008-03-17 23:27:33 +00:00
Johannes Schickel
1042c6dccf Implemented opcodes:
- 70: o2_backUpInventoryGfx
 - 71: o2_disableSceneAnim
 - 72: o2_enableSceneAnim
 - 73: o2_restoreInventoryGfx

svn-id: r31167
2008-03-17 23:01:50 +00:00
Johannes Schickel
8752939fe4 Implemented opcodes:
- 91: o2_blockInRegion
 - 92: o2_blockOutRegion

svn-id: r31166
2008-03-17 22:42:12 +00:00
Johannes Schickel
f6f61a5bc3 - Fixed opcode 115 (fixed dragon scene)
- renamed opcode 155 to o2_addToSceneAnimPosAndUpdate

svn-id: r31165
2008-03-17 22:32:30 +00:00
Johannes Schickel
0a0576d060 Fix kyra save file naming scheme.
svn-id: r31164
2008-03-17 21:56:37 +00:00
Florian Kagerer
d71523ae15 remove unnecessary code duplication
svn-id: r31163
2008-03-17 21:15:24 +00:00
Johannes Schickel
136040b869 Cleanup.
svn-id: r31162
2008-03-17 20:36:58 +00:00
Johannes Schickel
fc47cbe629 Probably fixing string issues in menu.
svn-id: r31161
2008-03-17 20:34:46 +00:00
Johannes Schickel
97c0909349 Remove unsued variables.
svn-id: r31160
2008-03-17 20:30:09 +00:00
Johannes Schickel
80b0fd190d Removed some unneeded and bug causing code.
svn-id: r31159
2008-03-17 20:19:47 +00:00
Johannes Schickel
431181cffc Fix typo.
svn-id: r31158
2008-03-17 20:06:50 +00:00
Torbjörn Andersson
b01e550183 Removed unused variable.
svn-id: r31157
2008-03-17 18:44:29 +00:00
Johannes Schickel
6ebfeb5a05 Also allow '.' and Escape as keys for skipping sequences in HoF.
svn-id: r31156
2008-03-17 18:19:01 +00:00
Johannes Schickel
c7ede8337e Let Kyra1 and Kyra2 use a common savegame version number. (cleanup)
svn-id: r31155
2008-03-17 18:13:28 +00:00
Johannes Schickel
91a800cf02 Implemented quick (via hotkeys) save/load suppot for HoF.
svn-id: r31154
2008-03-17 18:10:52 +00:00
Johannes Schickel
4e88124361 Fixed KyraEngine_v2::initSceneScreen
svn-id: r31153
2008-03-17 12:43:09 +00:00
Florian Kagerer
b9339221e4 - implement debugger commands: gamespeed and pass_codes
- implement opcode 151: meanWhileScene()
- fix dragon flight scene: this is still totally messed up, but at least the screen doesn't stay blank any more

svn-id: r31152
2008-03-17 01:34:24 +00:00
Florian Kagerer
eceee73424 - fix demo
svn-id: r31151
2008-03-17 00:40:00 +00:00
Johannes Schickel
6c672d92f0 Changed Kyra2 script debug printfs to be consistent with Kyra1 ones.
svn-id: r31150
2008-03-16 18:42:29 +00:00
Johannes Schickel
18fa238cd3 - implemented skip flag handling in wsa related opcodes
- implemented skip flag handling in o2_isVoicePlaying
- fixed skip flag handling when making the cauldron appear.

svn-id: r31149
2008-03-16 18:24:45 +00:00
Florian Kagerer
6444a3c3d8 fix typo
svn-id: r31148
2008-03-16 17:43:41 +00:00
Florian Kagerer
04a2ac1485 - implement zanthIdleChat()
- bug fix for zanthRandomChat()

svn-id: r31147
2008-03-16 17:16:17 +00:00
Johannes Schickel
79cc924d0e Implemented opcode 16: o2_soundFadeOut
svn-id: r31146
2008-03-16 15:35:12 +00:00
Johannes Schickel
042666ca04 Implemented opcode 34: o2_removeItemSlotFromInventory
svn-id: r31145
2008-03-16 15:30:57 +00:00
Johannes Schickel
2bbaadbf95 Implemented opcodes:
- 15: o2_customCharacterChat
 - 18: o2_restoreTalkTextMessageBkgd
 - 94: o2_setCauldronState
 - 154: o2_setupSceneAnimation

svn-id: r31144
2008-03-16 15:28:05 +00:00
Johannes Schickel
f0d54b4513 Reworked skipFlag handling.
svn-id: r31143
2008-03-16 14:32:49 +00:00
Johannes Schickel
c7175fac8d - moved KyraEngine_v1::setupOpcodeTable from kyra_v1.cpp to kyra_v2.cpp
- some more work in KyraEngine_v2::showIdleAnim

svn-id: r31142
2008-03-16 13:52:08 +00:00
Johannes Schickel
ef72d8e7bf Moved KyraEngine_v2::setupOpcodeTable from kyra_v2.cpp to script_v2.cpp
svn-id: r31141
2008-03-16 13:40:54 +00:00
Johannes Schickel
3bfa70bc3e Implemented opcode 30: o2_addItemToCurScene
svn-id: r31140
2008-03-16 13:39:40 +00:00
Johannes Schickel
2a95c653eb - Impelemented opcode 155: o2_stopSceneAnimation
- fixed crash while switching chapters

svn-id: r31139
2008-03-16 13:31:18 +00:00
Florian Kagerer
bbecd439c1 - fix mouse cursor hotspot for sjis mode
svn-id: r31138
2008-03-16 12:51:59 +00:00
Johannes Schickel
7a690dae10 - fixed mouse position in Kyra1 after savegame loading
- enabled some code in KyraEngine_v2::enterNewScene

svn-id: r31137
2008-03-16 12:34:23 +00:00
Florian Kagerer
b75c790c7a - add opcode 146 - resetInputColorCode()
- add updateWaterFlasks()
- some fixes for mouse pointer positioning in sjis mode
- bug fix for tim player

svn-id: r31136
2008-03-16 02:00:14 +00:00
Torbjörn Andersson
7074132276 Fixed warning about unused variable.
svn-id: r31135
2008-03-15 21:33:01 +00:00
Johannes Schickel
3da00ccc79 - cleanup
- enabled some chat related code in KyraEngine_v2::runLoop and KyraEngine_v2::handleInputUnkSub

svn-id: r31134
2008-03-15 21:11:22 +00:00
Johannes Schickel
db3e317ab3 Implemented opcodes:
- 27: o2_displayWsaSequence
 - 99: o2_setDrawNoShapeFlag
 - 129: o2_chapterChange
 - 159: o2_processPaletteIndex

svn-id: r31133
2008-03-15 21:03:35 +00:00
Florian Kagerer
fd7ed046bb - some more opcodes for wsa and tim sequences
- adding some code to inputSceneChange

svn-id: r31132
2008-03-15 20:24:26 +00:00
Johannes Schickel
f88a2923cd Implemented opcodes:
- 36: o2_removeItemFromInventory
 - 64: o2_disableAnimObject
 - 65: o2_enableAnimObject
 - 101: o2_showLetter
 - 115: o2_setSceneAnimPosAndUpdate

svn-id: r31131
2008-03-15 19:55:05 +00:00
Max Horn
05dd6cee3a Got rid of EncapsulatedADGameDesc
svn-id: r31130
2008-03-15 15:25:49 +00:00
Florian Kagerer
dc319c719f - implement opcode 127 (entering the color code for the skull in the rat cave now works)
- minor bug fix for mouse cursor (which sometimes would show when it shouldn't)

svn-id: r31129
2008-03-15 14:40:00 +00:00
Johannes Schickel
9ff187ad63 Fixed another valgrind warning.
svn-id: r31128
2008-03-15 11:44:36 +00:00
Johannes Schickel
be9f33c3be Fixed some valgrind warnings.
svn-id: r31127
2008-03-15 11:39:19 +00:00
Johannes Schickel
850868536b Fixed bug in o2_countItemInInventory.
svn-id: r31126
2008-03-15 10:55:32 +00:00
Johannes Schickel
91adba9842 Implement opcodes:
-   7: o2_getCharacterScene
 -  54: o2_delaySecs
 - 103: o2_fillRect

svn-id: r31125
2008-03-15 09:57:41 +00:00
Florian Kagerer
9cedcd059b animations for inventory items and mouse pointers
svn-id: r31122
2008-03-15 00:16:11 +00:00
Max Horn
6547ef6e12 Started to get rid of Common::EncapsulatedADGameDesc (using plain Common::ADGameDescription instead)
svn-id: r31121
2008-03-14 17:31:04 +00:00
Max Horn
8a9a14002e Advanced Detector: Changed fallback detector from a callback function pointer to an overrideable method of AdvancedMetaEngine
svn-id: r31119
2008-03-14 13:59:31 +00:00
Max Horn
1e6f59e2dc const const const
svn-id: r31118
2008-03-14 13:35:47 +00:00
Max Horn
7288b92d0d SCUMM: Improved detector to properly distinguish MM v1 and v2 demos (fixes detection of fan translations of the demos) (didn't update the website MD5 table on purpose)
svn-id: r31111
2008-03-12 16:36:49 +00:00
Travis Howell
884276e22e Fix bug #1911558 - FF: Inventory doesn't scroll to the end.
svn-id: r31110
2008-03-12 00:22:30 +00:00
Torbjörn Andersson
890da04bc4 Cleanup.
svn-id: r31108
2008-03-11 19:25:53 +00:00
Paweł Kołodziejski
b1f1447234 engine as now as reference for future changes.
ignore char ' for now as i can't find proper font char.

svn-id: r31098
2008-03-09 21:07:02 +00:00
Paweł Kołodziejski
bfe006b9cf ops
svn-id: r31097
2008-03-09 19:48:00 +00:00
Paweł Kołodziejski
41d4104e3c fix regression
svn-id: r31096
2008-03-09 19:14:37 +00:00
Paweł Kołodziejski
7f2c632860 fix regression
svn-id: r31095
2008-03-09 17:51:27 +00:00
Paweł Kołodziejski
efbe28e9e3 fix regression
svn-id: r31094
2008-03-09 17:39:54 +00:00
Paweł Kołodziejski
6861c02d47 next fixes after merge regressions
svn-id: r31093
2008-03-09 17:10:19 +00:00
Paweł Kołodziejski
f42daf54d1 next fixes after merge regressions
svn-id: r31092
2008-03-09 16:10:18 +00:00
Florian Kagerer
9ebc676241 sjis bug fix
svn-id: r31091
2008-03-09 15:52:44 +00:00
Torbjörn Andersson
e3b17dbf6b Added missing line and renamed a variable to fix warnings.
svn-id: r31090
2008-03-09 15:34:58 +00:00
Florian Kagerer
4712089f18 floppy/fm-towns implementation for spell book
svn-id: r31089
2008-03-09 15:26:06 +00:00
Johannes Schickel
d2bbfbcc35 - fixed little glitch when putting items in cauldron
- implemented listing of items in cauldron

svn-id: r31088
2008-03-09 15:24:47 +00:00
Johannes Schickel
05f68b17d4 - implemented cauldron handling for HoF (needs some more testing though)
- fixed bug in updateCharFacing
- added 'give' command to HoF debugger, which allows setting the hand item to a specified item

svn-id: r31087
2008-03-09 14:46:24 +00:00
Torbjörn Andersson
95c5a48853 Fixed warning.
svn-id: r31086
2008-03-09 12:25:48 +00:00
Travis Howell
24b04c6f51 Fix compile.
svn-id: r31085
2008-03-09 12:19:42 +00:00
Johannes Schickel
9b6be10181 Implemented spellbook in HoF.
svn-id: r31084
2008-03-09 11:28:51 +00:00
Paweł Kołodziejski
413afbfdd6 next fixes after merge regressions
svn-id: r31083
2008-03-09 11:13:20 +00:00
Paweł Kołodziejski
4ad14b6016 next fixes after merge regressions
svn-id: r31082
2008-03-09 10:16:27 +00:00
Johannes Schickel
3a83cf654e Fixed access of inventory in HoF while cursor is not visible.
svn-id: r31081
2008-03-09 09:58:05 +00:00
Travis Howell
353e5a7896 Add hack to skip the faulty credits script in Russian HE99 version of Freddi Fish 3.
svn-id: r31080
2008-03-09 09:28:10 +00:00
Paweł Kołodziejski
179ff6bcc2 next fixes after merge regressions
svn-id: r31079
2008-03-09 09:20:16 +00:00
Paweł Kołodziejski
9d948f92a0 fixed after merge regression
svn-id: r31078
2008-03-09 09:08:10 +00:00
Paweł Kołodziejski
5bf23671e5 fixes to diffrent parts of game
svn-id: r31077
2008-03-09 08:52:52 +00:00
Paweł Kołodziejski
aceaabc5d2 ident
svn-id: r31076
2008-03-09 08:31:16 +00:00
Paweł Kołodziejski
28a87c9775 changed moment of increasing num_ejec
svn-id: r31075
2008-03-09 08:30:24 +00:00