Commit Graph

798 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Johannes Schickel
20a1e653b8 Typo.
svn-id: r31068
2008-03-08 19:47:14 +00:00
Johannes Schickel
f02ec1d7ea Fix some typos. (and I thought DrMcCoy does this usualy...)
svn-id: r31067
2008-03-08 19:37:43 +00:00
Johannes Schickel
64d2907df5 Cleanup.
svn-id: r31066
2008-03-08 19:30:25 +00:00
Johannes Schickel
4d65d240e4 Fix for bug #1910180 "KYRA1: Screen "flash"".
svn-id: r31065
2008-03-08 19:28:42 +00:00
Johannes Schickel
1ac3a62fc1 Possible fix for bug #1910180 "KYRA: Screen "flash"".
svn-id: r31064
2008-03-08 18:33:59 +00:00
Torbjörn Andersson
939166bbda Indentation. (And another test to see if commit works as intended.)
svn-id: r31053
2008-03-07 00:50:51 +00:00
Torbjörn Andersson
47f3e92bdd Cleanup, and test to see if I can commit.
svn-id: r31049
2008-03-07 00:33:43 +00:00
Johannes Schickel
130cfded75 Implement inventory scrolling for HoF.
svn-id: r31043
2008-03-05 17:38:12 +00:00
Johannes Schickel
4b4e93b190 Fixed some uninitialized variables.
svn-id: r31041
2008-03-03 23:38:22 +00:00
Travis Howell
61390db7f0 Fix compile.
svn-id: r31040
2008-03-03 23:01:59 +00:00
Johannes Schickel
6c41dbdef2 Fixed crash when clicking on empty inventory slot.
svn-id: r31039
2008-03-03 22:51:16 +00:00
Johannes Schickel
b651a74b45 Started to implement GUI code for HoF.
Currently working:
 - _basic_ inventory, this doesn't include scrolling through the inventory

svn-id: r31038
2008-03-03 22:38:31 +00:00
Johannes Schickel
6f2215753c Fix long standing wrong function names in debug prints.
svn-id: r30984
2008-02-27 15:01:33 +00:00
Johannes Schickel
83d2f0c3e7 Oops fix stupid copy&paste error...
svn-id: r30950
2008-02-24 12:33:20 +00:00
Johannes Schickel
cb36b056ba Also add extrapath to default search location for Kyrandia resources.
svn-id: r30949
2008-02-24 12:30:12 +00:00
Florian Kagerer
faeb81fb62 palette bug fix (inventory turned blue when leaving the scene after eating the mushroom)
svn-id: r30915
2008-02-22 07:00:12 +00:00
Florian Kagerer
3969249b93 two more opcodes (Zanthia's random chats and mushroom drug effects) and some cleanup
svn-id: r30914
2008-02-22 00:33:56 +00:00