Commit Graph

46 Commits

Author SHA1 Message Date
Johannes Schickel
ac8607f433 Fixes save/load of kyra engine.
svn-id: r23287
2006-06-24 12:03:30 +00:00
Johannes Schickel
9dd02260a6 removes _selectedMenuItem again.
svn-id: r22944
2006-06-05 19:43:44 +00:00
Chris Apers
81e0a00966 Fixed PalmOS ARM crashes
svn-id: r22942
2006-06-05 19:33:10 +00:00
Torbjörn Andersson
bc5b877aa9 Got rid of _selectedMenuItem to make LordHoto happier.
svn-id: r22725
2006-05-28 16:29:31 +00:00
Johannes Schickel
d28d6fe4fb cleanup
svn-id: r22717
2006-05-28 12:23:49 +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
727f66de39 Commits Chriliths patch for fixing Kyra on PalmOS.
svn-id: r22708
2006-05-28 11:43:04 +00:00
Johannes Schickel
073f859de9 Fixes bug # 1494945 ("KYRA1: Actor disappearing in an animation").
svn-id: r22707
2006-05-28 11:33:17 +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
Oystein Eftevaag
dbaf5206ae Added speechEnabled() and textEnabled() to simplify the text/speech config checks a bit, and added checks some more places
svn-id: r22703
2006-05-28 06:07:54 +00:00
Torbjörn Andersson
c1c5080fcd Draw the selected menu item (currently always the first one) highlighted, i.e.
white instead of yellow.

svn-id: r22676
2006-05-27 11:59:40 +00:00
Torbjörn Andersson
b2d8f804cd Some minor VQA player fixes:
* The playVQA() function now takes the name of the cutscene, rather than the
  filename. This is so that playVQA("FOO") will be able to play FOO0.VQA,
  FOO1.VQA or FOO2.VQA, depending on which movie size is selected.

* The VQA player centers movies by default, so don't set the position to 0,0.

* Ask the backend for screen dimensions (for centering the movie) rather than
  hard-coding them.

svn-id: r22560
2006-05-21 17:28:03 +00:00
Johannes Schickel
344cc2f475 - allows kyra3 to exit again
- implements language selection for kyra3

svn-id: r22559
2006-05-21 16:06:29 +00:00
Johannes Schickel
ef6645c5ba - reworks quit handling (no _system->quit() anymore)
- fixes some deinitalization problems

svn-id: r22558
2006-05-21 15:41:32 +00:00
Johannes Schickel
3af8e4ea4a Implements kyra3 main menu drawing.
svn-id: r22556
2006-05-21 15:02:12 +00:00
Johannes Schickel
dce7af1f5c makes destructor of KyraEngine virtual
svn-id: r22547
2006-05-20 15:02:39 +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
2531fd5873 Added player for the Kyra 3 VQA cutscenes, based on my earlier prototype. It
could use some cleanup, and there are a couple of TODOs sprinkled throughout
the code, but it seems to work reasonably well. Until the Kyra 3 main menu is
implemented, it won't actually be used though.

It uses the appendable audio stream class, which I have moved out of the SCUMM
engine.

svn-id: r22526
2006-05-18 21:46:07 +00:00
Johannes Schickel
c65d45146c fixes kyra2 gameflag init
svn-id: r22514
2006-05-18 11:36:29 +00:00
Johannes Schickel
f7c29ccc8b - adds AUD file player (has still some problems with playing)
- adds a new sound class SoundDigital (only used for Kyra3) (needs more work though)

svn-id: r22497
2006-05-17 18:07:02 +00:00
Eugene Sandulenko
ba2a6152c7 Set gameflags for kyra3 properly.
svn-id: r22493
2006-05-16 17:38:04 +00:00
Johannes Schickel
3d10ecf1ae Removes ENABLE_KYRA2 and ENABLE_KYRA3.
svn-id: r22492
2006-05-16 16:31:23 +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
Torbjörn Andersson
575eb8b775 Replaced a bunch of delay loops with a new delayUntil() function. Now all of
them will at least sleep if the remaining delay is at least 10 ms. (Personally,
I don't like the idea of busy-waiting even 9 ms, but now that it's in its own
function, it becomes much easier if we want to change that behaviour. There are
still plenty of custom delay loops left, though.)

svn-id: r22393
2006-05-08 15:40:30 +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
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
2006-04-29 22:33:31 +00:00
Oystein Eftevaag
9b589e06cd Adds some code to dynamically resize and readjust the menus if the text strings of the current language are too long, to avoid overlaps etc.
svn-id: r22148
2006-04-25 11:58:21 +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
68cb7f52c8 - Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*
- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places

svn-id: r21916
2006-04-15 20:36:41 +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
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
05ee5cf2bd Extends seq_drinkPotionAnim() so that the color of the flask Brandon
drinks will be correct. Also fixes a bug where an animation
(Brandon ringing the bells) would play too quickly.

svn-id: r21354
2006-03-18 04:41:34 +00:00
Torbjörn Andersson
286434c88d Added mouse wheel scrolling to save/restore dialogs.
svn-id: r21314
2006-03-15 13:32:35 +00:00
Johannes Schickel
c12a5a35be - Deletes wrong spaces in debugC calls in resource.cpp
- Adds support for amiga .pak files (and a filelist)

svn-id: r21299
2006-03-14 19:48:08 +00:00
Johannes Schickel
cd28f28d32 Music in the last two intro scenes plays now again with adlib.
Cleaned up the sound code a bit (removed some unneeded functions).

svn-id: r21234
2006-03-12 14:22:27 +00:00
Johannes Schickel
f0106cd59c - Removes deleted waitTicks prototype in KyraEngine
- Adds sound fading support to the adlib player
- Adds support for stopping running tracks

- Changes baseFreq type back to uint8
- corrects octave handling in updateAndOutput1
(Thanks to eriktorbjorn for doing that)

svn-id: r21185
2006-03-09 20:50:19 +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
Max Horn
4ad0b867b3 Reduced header dependencies
svn-id: r20743
2006-02-17 15:37:25 +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