Commit Graph

81 Commits

Author SHA1 Message Date
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
84c2a93db5 Replaces all malloc/realloc usages with new.
svn-id: r23886
2006-09-16 13:40:28 +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
11b7cfca10 Stop doing a screen rewrite on each mouse movement event, just schedule a redraw for later instead
svn-id: r23764
2006-08-26 20:05:49 +00:00
Torbjörn Andersson
7d53480025 Kyra 2 has two types of XMIDI files: XMI and C55. It seems C55 are for the
General MIDI instrument set, so use them unless we're in MT-32 mode. This makes
the music sound a bit closer (at least to me) to what DOSbox plays.

svn-id: r23653
2006-08-01 13:42:33 +00:00
Torbjörn Andersson
afe26b5ea5 Until the native Kyra 2 Adlib music is supported, enable the automagic MIDI-to-
Adlib converter.

svn-id: r23651
2006-08-01 07:44:38 +00:00
Torbjörn Andersson
f51fc44e66 Added _quitFlag test to Kyra 2 animation and to waitForEvent().
svn-id: r23617
2006-07-29 05:59:44 +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
37d050e9da Add support for looping the kyra3 main menu.
svn-id: r23593
2006-07-25 15:11:42 +00:00
Torbjörn Andersson
b845eb9b99 Initialise the screen before creating the music driver. The MT-32 driver wants
to draw to the screen.

svn-id: r23574
2006-07-23 07:06:26 +00:00
Johannes Schickel
73869dca9f - don't error on CHAPTER1.VRM miss anymore
- nicer error messages when no font files are found
- implements nicer way to load fonts

svn-id: r23531
2006-07-16 19:44:39 +00:00
Johannes Schickel
db2ffa4285 Changes init error handling of kyra engine (engine fails at Engine_KYRA_create now instead of KyraEngine::init, also adds check for invalid game path like the scumm
engine does).

svn-id: r23426
2006-07-08 14:51:26 +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
Max Horn
ff15667544 These FIXME comments can go, I think :)
svn-id: r23277
2006-06-24 09:34:24 +00:00
Max Horn
ca2a6d7cd1 Fixing a leak in the Kyra engine (the savefile manager allocated by class Engine was never freed)
svn-id: r23276
2006-06-24 09:29:57 +00:00
Chris Apers
81e0a00966 Fixed PalmOS ARM crashes
svn-id: r22942
2006-06-05 19:33:10 +00:00
Johannes Schickel
4a6b2a3276 Fixes visible mouse cursor in the intro with classic theme.
svn-id: r22903
2006-06-03 18:34:57 +00:00
Johannes Schickel
48af506189 Fix for bug # 1497965 ("KYRA1: Skipping dialogue requires two clicks").
svn-id: r22848
2006-06-03 00:30:28 +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
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
f548f97666 Fixes input handling while moving.
svn-id: r22661
2006-05-26 14:21:53 +00:00
Johannes Schickel
259e06a69b - Adds some _quitFlag checks
- deletes Screen::drawPixel

svn-id: r22622
2006-05-25 08:02:17 +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
Torbjörn Andersson
3a028875a1 Using assert(_something->init()) is a bad idea. Assertions can be disabled.
svn-id: r22533
2006-05-19 07:34:24 +00:00
Max Horn
909cd8c93a Added some FIXMEs to the kyra engine
svn-id: r22531
2006-05-19 07:20:27 +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
Torbjörn Andersson
816fd39d58 Added delay() to delayWithTicks() as well. This function is quite similar to
some of the custom delay loops in script_v1.cpp. Could it be used there?

svn-id: r22394
2006-05-08 16:04:08 +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
Torbjörn Andersson
cf42a24833 Cleanup: Use ScummVM indentation style for switch() cases. In some cases, I
have added or removed "break"s, but not in any way which should change the
program's behaviour. I.e. I've added "break" to the final case, and after
calling quitGame(), and I've removed "break" after "return".

svn-id: r22383
2006-05-08 10:16:19 +00:00
Johannes Schickel
6776fb3296 - moves detection code to plugin.cpp.
- splits game table for kyra1 and kyra2.

svn-id: r22309
2006-05-03 14:24: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
Johannes Schickel
73dbd28873 Just add kyra2 to kyra_list if ENABLE_KYRA2 is defined.
svn-id: r22256
2006-05-01 13:05:18 +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
bf73598811 * Changed the createEngine() factory function of our plugins to return an error code (the engine is now passed indirectly via a double pointer)
* Removed Engine_Empty (obsolete now that engines can return actual error codes)

svn-id: r22199
2006-04-29 00:27:20 +00:00
Oystein Eftevaag
47068bde51 Typo
svn-id: r22190
2006-04-27 00:42:12 +00:00
Oystein Eftevaag
9ec94f6fcb Move the detector code out of the constructor and into init() to do error handling (specifically the GUI error message if no game is found in the specified directory), and cleans up the constructor/destructor a bit to allow a clean exit.
svn-id: r22189
2006-04-27 00:39:10 +00:00
Eugene Sandulenko
bf53520130 - Check if path specified for a game in scummvm.ini really exists and complain
if it does not
- Give more understandable feedback to user when SCUMM module can't find
  a game
- Put TODO to kyra engine as their current detection scheme does not let
  easily tell if game data really present in specified directory

svn-id: r22163
2006-04-25 23:07:59 +00:00
Oystein Eftevaag
d5c8a791a6 Fixes some coordinate initialization in the menus, and makes sure the initial savegame is created when kyrandia is started for the first time
svn-id: r22153
2006-04-25 15:42:37 +00:00
Oystein Eftevaag
bdd5a25c16 Implements the end credits, and disables fast forwarding in the intro.
svn-id: r21980
2006-04-17 17:39:08 +00:00
Max Horn
ba1b25305e Removed the directory parameter from md5_file
svn-id: r21937
2006-04-16 12:50:39 +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
Eugene Sandulenko
5a2ad04a9e Introduced language EN_ANY used for general English game entries. EN_USA and
EN_GRB should be used for games which have both variants. Currently it is
MM NES and BASS. All other are switched to EN_ANY.

svn-id: r21702
2006-04-08 23:12:56 +00:00
Max Horn
e7a8bb6abf Modified the REGISTER_PLUGIN macro so that it allows (and requires) a trailing semicolon (this helps certain tools to parse our code better)
svn-id: r21689
2006-04-08 12:06:07 +00:00
Max Horn
8cf8acfd63 Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them)
svn-id: r21686
2006-04-08 11:21:04 +00:00