Commit Graph

52 Commits

Author SHA1 Message Date
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
7d03da14cb KYRA: Clean up of header includes. 2011-04-28 15:39:57 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Johannes Schickel
93f591580a KYRA: Get rid of non-const static variable in Kyra2 code. 2011-04-11 00:34:16 +02:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Johannes Schickel
572b0e6c03 Fix bug in "KyraEngine_v2::runSceneScript6", fixes text line Zanthia says, when picking up the spellbook page in the town.
svn-id: r42543
2009-07-16 21:47:57 +00:00
Johannes Schickel
783fb058b0 Formatting.
svn-id: r40717
2009-05-19 01:39:18 +00:00
Johannes Schickel
7561bd9dfb Remov lots of superfluous debug output.
svn-id: r40715
2009-05-19 01:13:29 +00:00
Johannes Schickel
5b5e5bfc62 Fixed bug in KyraEngine_v2::directLinePassable. This should fix some pathfinder issues in HoF and MR.
svn-id: r32190
2008-05-19 23:04:52 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Johannes Schickel
d5545bd8c5 - Moved newShape/temporaryScript code to KyraEngine_v2.
- Renamed newShape/temporaryScript code to animationScript.

svn-id: r31841
2008-05-03 19:23:45 +00:00
Johannes Schickel
8b899207d2 Moved runSceneScript6 to KyraEngine_v2.
svn-id: r31823
2008-05-02 15:48:30 +00:00
Johannes Schickel
52003bc195 Added missing files, compiling should work again.
svn-id: r31818
2008-05-02 14:48:19 +00:00
Johannes Schickel
4b5f3266cf Started to refactor kyra2/kyra3 code to a common base. (regressions possible, compiling currently broken)
svn-id: r31817
2008-05-02 14:46:30 +00:00
Johannes Schickel
ec9a03964c - Renamed ScriptInterpreter -> EMCInterpreter
- Renamed ScriptState -> EMCState, ScriptData -> EMCData
- Removed 'Script' from function names inside EMCInterpreter
- Fixed KyraEngine::readSettings and KyraEngine::writeSettings for kyra3

svn-id: r31773
2008-04-29 15:12:09 +00:00
Johannes Schickel
7e12a50bed - some minor renaming in TIM code
- added exists function to Resource
- started to add checks via exists to assure that important files are present

svn-id: r31572
2008-04-19 14:31:10 +00:00
Johannes Schickel
a05b085a21 Fixed potentional crash.
svn-id: r31432
2008-04-06 14:58:02 +00:00
Johannes Schickel
a2e355d671 Implemented fadeout waiting in KyraEngine_v2::enterNewScene for AdLib.
svn-id: r31424
2008-04-06 13:57:28 +00:00
Johannes Schickel
21a66f12ba - Fixed HACKs in o2_getMusicDriver and o2_getSfxDriver
- Implemented missing bits in KyraEngine_v2::enterNewScene for MIDI (AdLib code still missing)
- Added music/sfx type to Sound class

svn-id: r31423
2008-04-06 13:32:41 +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
afed582280 Fix bug #1923638 "HoF: Marco missing animation frames".
svn-id: r31243
2008-03-26 16:11:47 +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
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
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
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
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
04a2ac1485 - implement zanthIdleChat()
- bug fix for zanthRandomChat()

svn-id: r31147
2008-03-16 17:16:17 +00:00
Johannes Schickel
f0d54b4513 Reworked skipFlag handling.
svn-id: r31143
2008-03-16 14:32:49 +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
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
Florian Kagerer
bcdfe6ade0 some more opcodes (the fly tree is now operational) and some bug fixes
svn-id: r30903
2008-02-18 23:04:37 +00:00
Johannes Schickel
377912a3a3 Added newline at end of file again (fixes compiling with -Werror for me).
svn-id: r30888
2008-02-17 02:08:30 +00:00
Florian Kagerer
753536fa61 committing patch 1891492 : dialogue (dlg/tim) support for HoF
- talking to NPCs is now possible.
- Zanthia's talks when entering a new scene for the first time now work
- using items on Zanthia is now possible.

svn-id: r30886
2008-02-17 02:06:04 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Johannes Schickel
33a90c1e00 Commit patch #1869752 "KYRA: HoF startup patch for towns and floppy". (Slightly modified)
svn-id: r30645
2008-01-27 02:05:37 +00:00
Johannes Schickel
28a57c434a Cleanup(/formatting).
svn-id: r29983
2007-12-24 22:27:30 +00:00
Johannes Schickel
b29486e3de Implemented idle script handling.
svn-id: r29460
2007-11-09 16:52:39 +00:00
Johannes Schickel
da9479dfb8 - moved some voice functionallity from KyraEngine_v1 to KyraEngine
HoF:
- added voice support
- implemented opcodes
  -> o2_setVocHigh 167
  -> o2_getVocHigh 168
  -> o2_isVoiceEnabled 170
  -> o2_isVoicePlaying 171
  -> o2_stopVoicePlaying 172
  -> o2_getGameLanguage 173

svn-id: r29201
2007-10-13 06:57:47 +00:00
Johannes Schickel
d1a3af446a HoF:
- added some _skipFlag and _quitFlag handling
- extended Screen::fadePal to take an functor for update purposes
- changed KyraEngine_v2::fadeScenePal to use Screen::fadePal with a functor

svn-id: r29188
2007-10-12 01:26:27 +00:00
Johannes Schickel
d896894631 - Made some sound functions a bit more generic for use with Kyra1 and Kyra2
HoF:
- Added sound support (sfx sound wrong currently though)
- Implemented opcodes:
  -> o2_loadMusicTrack
  -> o2_playWanderScoreViaMap
  -> o2_playSoundEffect
  -> o2t_playSoundEffect

svn-id: r29183
2007-10-10 09:06:15 +00:00
Johannes Schickel
99efa084fe HoF
- fixed o2_runTemporaryScript
- fixed trySceneChange, now stopping movement should work correctly

svn-id: r29179
2007-10-09 09:03:57 +00:00
Johannes Schickel
dd1b43a5a9 HoF:
- More input handling (should be rather complete now, not finished but nearlly)
- Implemented the following opcodes:
  -> o2_trySceneChange 0x0d
  -> o2_setHandItem 0x2a
  -> o2_handItemSet 0x2c
  -> o2_setCharPalEntry 0x3c
  -> o2_drawSceneShape 0x3e
  -> o2_update 0x4b
  -> o2_fadeScenePal 0x4d
  -> o2_enterNewSceneEx 0x50
  -> o2_setZanthiaPos 0x56
  -> o2_runTemporaryScript 0x6e
  -> o2t_defineNewShape 0x00
  -> o2t_setCurrentFrame 0x01
  -> o2t_setShapeFlag 0x04

svn-id: r29178
2007-10-09 08:44:45 +00:00
Johannes Schickel
cf3fd283bb HoF:
- added support for dropping items into scenes
- added const to some static data
- implemented opcode 0x55 o2_setLayerFlag
- fixed a bug in Screen_v2::drawShape

svn-id: r29175
2007-10-09 04:47:41 +00:00
Johannes Schickel
5ad7870775 - little bit more input handling
- implemented item pickup

svn-id: r29160
2007-10-07 00:35:22 +00:00
Johannes Schickel
a03c829ace - added a new generic debugger command 'facings'
- added a few new kyra2 specific debugger commands

svn-id: r29094
2007-09-24 21:58:11 +00:00
Johannes Schickel
d65140d6b5 - reworked input handling
- implement changing movement destination while moving

svn-id: r29093
2007-09-24 20:26:27 +00:00