Commit Graph

49 Commits

Author SHA1 Message Date
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
b910d8d9bb Refactored Kyrandia GUI code a bit.
svn-id: r31290
2008-03-28 09:00:30 +00:00
Johannes Schickel
bf5bb9280b - Restructure Kyrandia sourcecode (part 1, breaks compiling)
svn-id: r28294
2007-07-29 16:28:25 +00:00
Johannes Schickel
24344fe6ce Should fix gui strings in Italian fan translation.
svn-id: r28028
2007-07-11 13:25:21 +00:00
Johannes Schickel
c6c06a922e Little renaming.
svn-id: r27963
2007-07-08 12:50:24 +00:00
Max Horn
a041ef2317 Slightly updated key handling in BS2, Kyra, and Touche
svn-id: r27637
2007-06-22 23:03:12 +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
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
Gregory Montoir
5aca9dce8c added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
svn-id: r26357
2007-04-01 17:36:13 +00:00
Johannes Schickel
d1645e2fbf Commit of patch #1686414 ("Kyra: FM-Towns music").
svn-id: r26285
2007-03-24 00:04:08 +00:00
Johannes Schickel
661944a0f9 Implemented some palette code differences for Amiga version.
svn-id: r26281
2007-03-23 16:24:28 +00:00
Max Horn
888e68f433 KYRA: Changed to use EventManager::getMousePos (should improve some things: the old code did not properly track the mouse upon click events, and KyraEngine::waitForEvent ignored _flags.useHiResOverlay)
svn-id: r26221
2007-03-18 18:27:52 +00:00
Johannes Schickel
c7c79e33db Fixed various gui strings in German floppy.
svn-id: r26211
2007-03-18 16:15:19 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
2007-03-17 19:02:05 +00:00
Torbjörn Andersson
53624376b4 Applied my re-revised patch #1487149 ("Simplified keyboard repeat"), with
Fingolfin's blessings. Keyboard repeat is now handled by the event manager,
rather than by individual engines.

Since this can cause problems with some engines (see the AGI engine), the extra
"key down" events are marked as "synthetic", so that they can be ignored if
necessary.

svn-id: r26170
2007-03-17 15:44:26 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
2007-03-17 00:53:21 +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
00d4aea7e6 Fixed GUI strings in FM-Towns version.
svn-id: r25425
2007-02-08 09:24:33 +00:00
Johannes Schickel
d3345ea7f1 oops.
svn-id: r25314
2007-01-31 18:38:22 +00:00
Johannes Schickel
d82c67b48c Fix for bug #Fix for bug #1523200 ("KYRA1: Voice-only mode has no lips animation").
svn-id: r25313
2007-01-31 18:35:50 +00:00
Oystein Eftevaag
7a5284922f Some adjustments to the menu code to better suit longer strings in some language versions, should take care of the issues mentioned in bug [ 1493774 ] KYRA1: Overlapping menu text in spanish version
svn-id: r25208
2007-01-26 21:47:42 +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
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
Torbjörn Andersson
6358547a43 More whitespace changes.
svn-id: r23496
2006-07-14 13:33:58 +00:00
Oystein Eftevaag
499b5491eb Makes sure updateScreen() is called once in a while in the menu polling loop, to give backends some drawing time for virtual keyboards etc
svn-id: r23169
2006-06-18 10:39:57 +00:00
Johannes Schickel
6ac60c9c7b Fix for bug # 1497961 ("KYRA1: in-game "Music" option not working").
svn-id: r22844
2006-06-02 22:57:02 +00:00
Torbjörn Andersson
4c9b3ce5e3 Call setWalkspeed() after reading config settings, and after loading savegames,
so that _timers[] is properly synced with _configWalkspeed. Should fix bug
#1498660.

svn-id: r22814
2006-06-01 09:49:56 +00:00
Oystein Eftevaag
a442af2703 Another couple of fixes for the spanish floppy version (menu strings specifically)
svn-id: r22714
2006-05-28 12:10:11 +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
Oystein Eftevaag
3a1dec3ad1 Added checks for sound/text config in Brandons responses to using the amulet
svn-id: r22699
2006-05-28 05:09:09 +00:00
Oystein Eftevaag
76d722d941 Fixes bug [ 1480746 ] KYRA1: menu triggers assertion, and sets the text/speech config options correctly for CD versions
svn-id: r22693
2006-05-28 02:51:03 +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
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
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
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
Eugene Sandulenko
8fa9bd6728 Removed extra exclamation marks in warning() calls as well.
svn-id: r21608
2006-04-04 22:21:10 +00:00
Torbjörn Andersson
c506e452f1 Initialise _haveScrollButtons, since Valgrind complained about it.
svn-id: r21392
2006-03-20 17:33:08 +00:00
Oystein Eftevaag
3e9246331e Makes sure Brandon actually dies when he turns to stone in the kyragem room
svn-id: r21379
2006-03-19 08:35:43 +00:00
Oystein Eftevaag
e636a25a33 Adds button press animations to the menu, and resets the cursor when the Dialog of Death pops up. Also, mouse clicks are now registered on button up instead of button down, as in the original
svn-id: r21377
2006-03-19 05:55:26 +00:00
Oystein Eftevaag
0f21db8c8e Fixes the color of the quitting dialog text after drinking a potion
svn-id: r21358
2006-03-18 11:22:18 +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
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
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