Commit Graph

192 Commits

Author SHA1 Message Date
Johannes Schickel
84af9cae9d Added support for quit game button.
svn-id: r31376
2008-04-04 06:45:39 +00:00
Johannes Schickel
3dc6f9000d Added partial support for main menu. Only load, save and resume buttons are working currently
svn-id: r31375
2008-04-04 06:24:49 +00:00
Florian Kagerer
f3b42e3f90 This fixes the menus for fm-towns and floppy versions (only load and death menu atm).
svn-id: r31373
2008-04-04 01:12:35 +00:00
Johannes Schickel
acb4bda9df - Added support for filename length > 64 in static resource code.
- Updated warning when 'INDEX' is not found
- Added filesize check for 'INDEX' file

svn-id: r31368
2008-04-03 19:56:45 +00:00
Johannes Schickel
4fa0740a27 Implemented death menu. This also fixes bug #1926892 "HoF: Odd behaviour when Zanthia gets killed(?)".
svn-id: r31360
2008-04-02 03:16:34 +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
7605a9a517 Changed HoF GUI code to use common GUI code now.
svn-id: r31295
2008-03-28 16:15:00 +00:00
Johannes Schickel
b910d8d9bb Refactored Kyrandia GUI code a bit.
svn-id: r31290
2008-03-28 09:00:30 +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
Florian Kagerer
eceee73424 - fix demo
svn-id: r31151
2008-03-17 00:40:00 +00:00
Florian Kagerer
9cedcd059b animations for inventory items and mouse pointers
svn-id: r31122
2008-03-15 00:16:11 +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
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
130cfded75 Implement inventory scrolling for HoF.
svn-id: r31043
2008-03-05 17:38:12 +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
Florian Kagerer
ab40f56f47 fix memory leak
svn-id: r30902
2008-02-17 23:48:21 +00:00
Florian Kagerer
33e2e1c658 remove ugly const casts in staticres
svn-id: r30901
2008-02-17 23:32:35 +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
Johannes Schickel
b407420ebb Committed patch #1885629 "KYRA: HoF missing talkie credits and demo support".
svn-id: r30845
2008-02-10 18:34:48 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +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
Oystein Eftevaag
2ef04f972c Fixed some warnings
svn-id: r30523
2008-01-16 22:41:48 +00:00
Johannes Schickel
2dd6db4ca5 Commit slighty modified patch #1865509 "KYRA: kyradat support for hof".
svn-id: r30394
2008-01-10 23:25:19 +00:00
Johannes Schickel
9b4fc2f70b Resolve portabillity issues introduced with last commit.
svn-id: r30201
2008-01-03 15:20:33 +00:00
Johannes Schickel
fbcba1a573 - got rid of hardcoding "KYRA.DAT" in all places, where it's used
- now using "kyra.dat" rather than "KYRA.DAT"

svn-id: r30200
2008-01-03 14:53:18 +00:00
Johannes Schickel
58f0d4e632 Committed slightly modified patch #1862758 "KYRA: audio data assignment patch".
svn-id: r30198
2008-01-03 14:42:49 +00:00
Johannes Schickel
6dcbc00b23 debug(C) parameter type fixes.
svn-id: r29864
2007-12-15 21:20:56 +00:00
Filippos Karapetis
ea7429018e Fix warning
svn-id: r29418
2007-11-05 16:33:40 +00:00
Oystein Eftevaag
eb42e8271e Committing '[ 1824376 ] KYRA: more sequence player code' from Florian, with a couple of warnings fixed
svn-id: r29417
2007-11-05 08:23:57 +00:00
Oystein Eftevaag
41d67964b1 Committing [ 1816080 ] KYRA: Intro Patch for HoF, from Florian, with some cleanup and a minor fix
svn-id: r29233
2007-10-19 22:16:00 +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
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
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Johannes Schickel
fd6ca3b7ac - added PC-98 platform entry
- added Kyrandia 1 PC-98 detection entries

svn-id: r28907
2007-09-15 14:53:21 +00:00
Johannes Schickel
1140fca82e - Kyrandia 1 works again
- Added timer class for timer handling
- Little bit more resturcturing
- A little bit (almost nothing but a start!) Kyrandia 2 support

svn-id: r28297
2007-07-29 16:33:11 +00:00
Johannes Schickel
076d6b1bc1 Restructure Kyrandia sourcecode (part 2, compiling works again)
svn-id: r28296
2007-07-29 16:31:29 +00:00
Johannes Schickel
728fe1ff86 Add md5sum for Italian fan translation of CD version (see fr#1727941 "KYRA: add Italian CD Version to kyra.dat").
svn-id: r28007
2007-07-10 13:25:54 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Johannes Schickel
776423ff82 - started to move v1 specific functions to KyraEngine_v1 (just opcodes yet)
- reworked script opcode handling

svn-id: r26749
2007-05-05 12:18:02 +00:00
Johannes Schickel
edd9b31a48 Cleanup.
svn-id: r26604
2007-04-27 12:15:47 +00:00
Johannes Schickel
21b2c7bceb Formatting/Cleanup.
svn-id: r26511
2007-04-15 16:41:20 +00:00
Johannes Schickel
5e1c6c7907 - Renamed some files for consistency with other engines.
- Kyra2 detector entries update.

svn-id: r26494
2007-04-15 13:39:08 +00:00
Johannes Schickel
397c10f059 made _vm/_engine usage consistent. (_engine -> _vm all over the place now).
svn-id: r26342
2007-04-01 13:10:50 +00:00
Johannes Schickel
661944a0f9 Implemented some palette code differences for Amiga version.
svn-id: r26281
2007-03-23 16:24:28 +00:00
Johannes Schickel
689ea77c0d WIP code for Amiga version:
- Font displaying is not yet supported.
- Intro should be glitch free
- all other things are *untested*

svn-id: r26113
2007-03-12 20:43:56 +00:00
Johannes Schickel
305a1525ed - cleanup
- some diffs for Amiga version

svn-id: r26010
2007-03-07 20:31:19 +00:00
Johannes Schickel
7af17382b5 Support for Japanese FM-Towns version. (code contributed by Florian Kagerer, modified a bit)
svn-id: r25530
2007-02-12 18:01:51 +00:00
Johannes Schickel
6707dcbbb2 Fixed credits in FM-Towns version.
svn-id: r25417
2007-02-07 19:51:19 +00:00
Johannes Schickel
63e3dfb1d1 Support for new kyra.dat, which includes static data from the fm-towns version.
svn-id: r25416
2007-02-07 19:30:49 +00:00
Johannes Schickel
4387a851a2 Replace filesize based kyra.dat check with a md5 based.
svn-id: r25337
2007-02-02 16:02:59 +00:00
Johannes Schickel
1bbad356ef - adds support for FM-Towns SFX (thanks to Florian Kagerer for his source)
- gets rid of GameFlags::hasAudioCD

svn-id: r25258
2007-01-29 18:15:14 +00:00
Johannes Schickel
30b7ac3db5 Adds basic support for the FM Towns version with some restrictions:
- just english playable
 - no audio

svn-id: r25188
2007-01-25 12:52:27 +00:00
Max Horn
30d517613a Fix typos in some warnings
svn-id: r25171
2007-01-25 00:36:48 +00:00
Johannes Schickel
e58da07488 Don't output warning about unsupported language more than one time.
svn-id: r24459
2006-10-22 20:04:45 +00:00
Max Horn
b5cbbd705a Added some more const keywords
svn-id: r24330
2006-10-15 02:15:38 +00:00
Johannes Schickel
f9d1a82cc0 Fixes the Macintosh related problems Krest mentioned on the IRC channel.
(the user has to set the game platform to Macintosh though, since it's
atm detected as DOS version)

svn-id: r23929
2006-09-18 17:30:51 +00:00
Johannes Schickel
b6a8e38726 - removes the kyra specific language flag system, and uses the language enum defined in Common for that now
- also reworks the game flag system in general

svn-id: r23920
2006-09-17 20:21:40 +00:00
Oystein Eftevaag
d11e72a168 Adds voice/chats to the intro, and adds debug strings to the function calls.
svn-id: r23789
2006-08-27 12:30:38 +00:00
Oystein Eftevaag
c47a957fb3 Adds some framework for the Kyra2 intro, expands it a little bit and adds some static resources (strings, etc). Also
adding a modified version of eriktorbjorn's '[1531929] KYRA: Kyra 2 & 3 main menu unification', with added mouse pointer and sundry.

svn-id: r23766
2006-08-26 22:17:30 +00:00
Johannes Schickel
01b3a0b568 Yet more kyra3 init code.
svn-id: r23648
2006-07-31 16:37:34 +00:00
Johannes Schickel
a69ac7717d Oops it should never be renamed to c1_* but to o1_* changing this now.
svn-id: r23613
2006-07-27 20:39:52 +00:00
Johannes Schickel
ee5621137f - renaming all opcodes from cmd_* to c1_*
- changing ScriptHelper functions so it will be useable for kyra2 and kyra3 too
- unbreaking savegames (increasing the VERSION number since the game flags table got resized to be useable for kyra3)

svn-id: r23612
2006-07-27 20:30:51 +00:00
Johannes Schickel
8a0ec2a3e5 - moving KyraEngine_v3 declaration to newly added kyra3.h
- implements a little bit init stuff
- implements some music handling

svn-id: r23610
2006-07-27 18:29:14 +00:00
Johannes Schickel
1ad8d3ee6e Adds filesize check for kyra.dat, this forces to upgrade always to the newest version though.
svn-id: r23514
2006-07-15 20:46:27 +00:00
Torbjörn Andersson
6358547a43 More whitespace changes.
svn-id: r23496
2006-07-14 13:33:58 +00:00
Johannes Schickel
93e9dee0d1 Adds a message dialog if kyra.dat is missing which tells the user to download the kyra.dat file.
svn-id: r23421
2006-07-08 12:23:44 +00:00
Chris Apers
81e0a00966 Fixed PalmOS ARM crashes
svn-id: r22942
2006-06-05 19:33:10 +00:00
Johannes Schickel
1750be5b5a - makes Screen::getPagePtr private
- introduces Screen::getCPagePtr and Screen::getPageRect (which should ease the introduction of dirty rect handling)
- moves KyraEngine::loadBitmap to Screen

svn-id: r22716
2006-05-28 12:19:45 +00:00
Johannes Schickel
a822d8e6e0 adds GF_ITALIAN to the list of language flags.
svn-id: r22713
2006-05-28 11:55:42 +00:00
Johannes Schickel
a02f239659 cleanup
svn-id: r22712
2006-05-28 11:53:20 +00:00
Johannes Schickel
727f66de39 Commits Chriliths patch for fixing Kyra on PalmOS.
svn-id: r22708
2006-05-28 11:43:04 +00:00
Torbjörn Andersson
b17f0e8b6d The Kyra settings are now stored in the config file instead of the savegames.
The settings in older savegames are ignored.

svn-id: r22705
2006-05-28 09:21:32 +00:00
Johannes Schickel
570b9e2c9d - load fonts for kyra3
- adds screen dim tables for kyra3
- adds palette / screen backup for the vqa player
- small changes in the vqa player to use the Kyra::Screen functions
- adds (partially implemented/unimplemented) main menu drawing/handling functions (nothing to see yet)

svn-id: r22528
2006-05-18 22:46:34 +00:00
Torbjörn Andersson
b9206a3e98 Removed leftover printf()
svn-id: r22513
2006-05-18 11:35:08 +00:00
Johannes Schickel
c8aa32d095 - implements kyrandia 3 wsa loader
- fixes initalisation problems
- adds setX, setY, setDrawPage to Kyra::Movie instead of directly accessing _x, _y and _drawPage

svn-id: r22490
2006-05-16 16:04:24 +00:00
Johannes Schickel
a5b4fb7f18 - little cleanups
- adds kyra3 dummies

svn-id: r22425
2006-05-12 23:57:53 +00:00
Johannes Schickel
40189ab7e6 Adds (partial) support for italian floppy. (still hardcoded strings are missing) (Bug # 1409244 ("KYRA: GFX problems with ITALIAN floppy")).
svn-id: r22333
2006-05-04 11:19:48 +00:00
Johannes Schickel
96fd5e1fbc - modifies loadBitmap not to crash if a image isn't found
- starts to clean up the engine initalisation code

svn-id: r22308
2006-05-03 13:40:21 +00:00
Oystein Eftevaag
ff7955f4d3 Adds archive file list, MD5 for my CD version, and a few function stubs for Hand of Fate, to use as a basis for further work
svn-id: r22252
2006-05-01 00:25:41 +00:00
Oystein Eftevaag
f25cb2e735 Uses kyra.dat for GUI strings instead of hardcoding them, which means localized strings are now supported for the menus. Note that the size of the menus are not yet calculated to account for the longer strings in some languages
svn-id: r22105
2006-04-23 14:43:16 +00:00
Max Horn
94e647235f Fix const correctness in Kyra's StaticResource::loadStrings and StaticResource::loadPaletteTable (notice the difference between a pointer pointing to a pointer pointing to const memory, vs. a pointer pointing to a *constant* pointer pointing to const memory)
svn-id: r21708
2006-04-09 00:44:08 +00:00
Max Horn
8cdee5a931 Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling.
svn-id: r21500
2006-03-29 15:59:37 +00:00
Johannes Schickel
f9f2cd2dbe - started to rework static resource loading
- made some function parameters const (to work with new static res code)

svn-id: r21365
2006-03-18 14:43:18 +00:00
Oystein Eftevaag
39c9af43ae Implemented the last menu (the settings screen). Walking speed, text speed,
and speech modes (text only, speech only, speech & text) can now be
configured. Toggling music and sound in general is not enabled yet.
Also formatted the static menu resources a bit differently, made
sure some vars in the menu code always got initalized, and
fixed a slight formatting error :).

svn-id: r21145
2006-03-08 13:15:13 +00:00
Oystein Eftevaag
3f31e1b27d Added the proper death dialog, changed the sequence skipping code a bit to avoid
possible frame losses, and removed a (now) redundant call to showOverlay() in the
debugger.

svn-id: r21125
2006-03-07 14:16:52 +00:00
Johannes Schickel
f3106feaf5 Added WIP Adlib sound playing code to kyra.
It needs some checks since it doesn't work correctly in every case at the moment.

svn-id: r20960
2006-02-27 22:39:55 +00:00
Johannes Schickel
0bea9cf47b Made the kyra debug extensions more generic, i.e. scumm engine could replace
their debugC calls now with the new introduced debugC calls.
(A mail how to use it will follow shortly on -devel)
Also now these special engine debug flags can be specified from the commandline.
Also made the -c & --config parameter check more secure.

svn-id: r20695
2006-02-14 23:31:25 +00:00
Johannes Schickel
93e9639989 Reworked kyra debug output system. Now he have special kyra intern debug levels + the global debug levels, for now I enable all kyra debug levels if the global debug level is not -1. see 'toggle_debug' in the kyra debugger and kyra.h for the different levels. (This is just the beginning of it anyway, for example the sound debug level isn't used for now)
svn-id: r20678
2006-02-14 01:19:30 +00:00
Max Horn
26ee630756 Moved engines to the new engines/ directory
svn-id: r20582
2006-02-11 22:45:04 +00:00