Max Horn
4c14cf6d1a
Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files
...
svn-id: r23974
2006-09-23 00:42:35 +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
Max Horn
a2dc897fe5
Reduce code duplication
...
svn-id: r23888
2006-09-16 15:01:14 +00:00
Johannes Schickel
250133baf0
Simplifies resource handling for the CD version of Kyrandia.
...
(also less file loading at startup, but more on room change)
svn-id: r23887
2006-09-16 14:36:53 +00:00
Johannes Schickel
75fd84e85a
- adds dirty rect handling to the kyra engine (needs some more tests before I commit it to branch though)
...
- initializes an uninitiliazied variable which caused crashes from time to time
svn-id: r23878
2006-09-15 16:04:32 +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
Oystein Eftevaag
3c4b13ed33
Moves the kyra2 code to kyra2.cpp and kyra2.h, renames WSAMovieV3 to WSAMovie2 (kyra2 uses the same format), renames a define in kyra3.h for consistency, and adds a case for CMDS in the VQA player to avoid the constant warning (the tag is always present and empty). Credit/blame for the last one goes to Clemmy :). Starting kyra2 will now show the title animation.
...
svn-id: r23614
2006-07-28 11:42:53 +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
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