Commit Graph

79 Commits

Author SHA1 Message Date
Johannes Schickel
82b9cf9575 Cleanup.
svn-id: r40799
2009-05-23 01:15:20 +00:00
Florian Kagerer
16a57f299c LOL: - implemented proper button processing (works exactly as in Kyra 2 and 3, so we do have some code duplication atm, I just fixed right mouse button support for LOL)
- keyboard control now works

svn-id: r38190
2009-02-15 03:36:30 +00:00
Max Horn
ac59693be2 A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines
svn-id: r36127
2009-01-29 05:26:12 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Johannes Schickel
696ed52959 Switched kyra1 to use the same input functionality as kyra2 and kyra3.
svn-id: r35393
2008-12-16 17:40:34 +00:00
Johannes Schickel
36de1204e3 - Implemented Engine::saveGameState for KYRA
- Changed internal save/load API to use slots instead of filename strings
- Changed internal save/load API to use Common::Error

svn-id: r34952
2008-11-09 13:00:40 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
2008-09-30 12:27:38 +00:00
Max Horn
91df44f8f6 Merging more of the GSoC 2008 RTL branch: KYRA
svn-id: r34246
2008-09-01 17:52:50 +00:00
Johannes Schickel
a6c931459b Implemented continous screen updating while waiting for text input in v2 GUI. (based on LoK implementation)
svn-id: r34157
2008-08-25 15:14:29 +00:00
Johannes Schickel
3b90f69a6e Added short delay(Millis) call while waiting for text input, should reduce CPU usage a little bit.
svn-id: r34149
2008-08-25 13:52:10 +00:00
Johannes Schickel
f4fc8c3e4c Committed patch #2050337 "KYRA/SCUMM: Thumbnail support/improvement". (Without Max' compressed backward seeking support for now)
svn-id: r34053
2008-08-20 14:03:34 +00:00
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
2008-08-04 22:34:07 +00:00
Johannes Schickel
0cbaaf736b Proper fix for bug #2035459 "KYRA1: long savegame names cause garbage".
svn-id: r33519
2008-08-02 11:57:06 +00:00
Christopher Page
b8fe71e7a1 Updated KYRA to work with the new GMM implementation
svn-id: r32959
2008-07-08 06:00:39 +00:00
Christopher Page
b97f39019c KYRA works with the new GMM implementation
svn-id: r32957
2008-07-08 05:02:45 +00:00
Christopher Page
6e3474896c Kyra and Lure are now using the new _quit flag
svn-id: r32772
2008-06-25 00:55:18 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Johannes Schickel
35cc3a3d19 Committed slightly modified patch #1961830 "KYRA: Scroll wheel support for Kyra 2 and 3".
svn-id: r32016
2008-05-11 11:35:12 +00:00
Johannes Schickel
9b2c63550f Implemented opcode 106: o2_playFireflyScore.
svn-id: r31980
2008-05-10 18:30:20 +00:00
Johannes Schickel
8d6048a9fa - Added small delay to GUI_v2::getInput
- Prevent kyra3 background music from stopping while menu is open

svn-id: r31979
2008-05-10 18:23:11 +00:00
Johannes Schickel
2976f961fe - Fixed some memory leaks in kyra3
- Fixed valgrind warnings in GUI_v2 code

svn-id: r31902
2008-05-06 16:57:07 +00:00
Johannes Schickel
c26e62e288 - Implemented Kyra3 audio options menu, Helium mode still missing.
- Fixed unitialized variable

svn-id: r31881
2008-05-05 17:56:39 +00:00
Johannes Schickel
f42d222069 Got rid of some code duplication.
svn-id: r31880
2008-05-05 17:18:11 +00:00
Johannes Schickel
2afff04468 - Added support for Kyra3 GUI (audio and game options not working yet)
- Added support for loading directly from command line for Kyra3

svn-id: r31876
2008-05-05 16:05:56 +00:00
Johannes Schickel
c15ad0e373 Initial common base between kyra2 and kyra3 GUI code.
svn-id: r31867
2008-05-04 15:37:41 +00:00
Johannes Schickel
f71b4afcfa Renamed kyra2 and kyra3 gui files.
svn-id: r31866
2008-05-04 15:18:46 +00:00
Johannes Schickel
7342629944 Cleanup.
svn-id: r31860
2008-05-04 13:11:17 +00:00
Johannes Schickel
4b5f3266cf Started to refactor kyra2/kyra3 code to a common base. (regressions possible, compiling currently broken)
svn-id: r31817
2008-05-02 14:46:30 +00:00
Florian Kagerer
00dde660e3 fix sjis text color (ship scene)
svn-id: r31517
2008-04-16 19:43:56 +00:00
Johannes Schickel
1f91dc0384 - some refactoring for Kyra3
- removed unneeded map code in KyraEngine_v3

svn-id: r31488
2008-04-12 23:17:21 +00:00
Florian Kagerer
1fc3df7905 fix label for first save slot (towns/floppy)
svn-id: r31440
2008-04-06 19:48:47 +00:00
Johannes Schickel
4b58a431da Implemented support for Towns (and hopefully DOS floppy too) menus.
svn-id: r31438
2008-04-06 16:54:51 +00:00
Johannes Schickel
6552193ceb Fixed mouse input handling when entering savefile description.
svn-id: r31436
2008-04-06 15:31:57 +00:00
Johannes Schickel
4f71d3814c Fixed various bugs in GUI_v2::processButtonList.
This fixes bugs:
 - #1935827 "HoF: Buttons pressed state not available"
 - #1935219 "HoF: artefact after loading game"

svn-id: r31422
2008-04-06 13:06:05 +00:00
Johannes Schickel
c826716a91 Don't rename quicksave filenames when deleting files.
svn-id: r31401
2008-04-05 03:13:26 +00:00
Johannes Schickel
b99d5603cf - Changed quicksaves to use slots 990-998.
- Made slots 990-999 not writeable for savegames via menu.
- Temporary save in HoF now uses slot 999.

svn-id: r31400
2008-04-05 03:03:10 +00:00
Johannes Schickel
066a55ef33 Small fix in processButtonList.
svn-id: r31399
2008-04-05 02:50:38 +00:00
Johannes Schickel
dd8676877e - cleanup
- sort savefiles in kyra from newest -> oldest

svn-id: r31397
2008-04-05 02:40:28 +00:00
Johannes Schickel
c1319f8034 Cleanup.
svn-id: r31396
2008-04-05 02:24:43 +00:00
Johannes Schickel
7020627572 - Implemented delete savegame menu
- Reverted hack introduced with last commit

svn-id: r31395
2008-04-05 02:22:11 +00:00
Johannes Schickel
eac671de99 Implemented proper savefile listing, this fixes bug #1479872 "KYRA1: a small menu issue".
svn-id: r31392
2008-04-05 01:49:28 +00:00
Johannes Schickel
b890b33a31 Remove temporary savefile after it was loaded.
svn-id: r31390
2008-04-04 18:41:30 +00:00
Johannes Schickel
35a422f00e Disable buttons properly for non CD version.
svn-id: r31388
2008-04-04 18:26:37 +00:00
Johannes Schickel
cd47709a2a Disabled some more options settings for non talkie versions.
svn-id: r31386
2008-04-04 18:11:44 +00:00
Johannes Schickel
272fa6d578 Implemented audio menu, slider bars not moveable via mouse yet though.
svn-id: r31384
2008-04-04 18:02:50 +00:00
Johannes Schickel
0aecc4fb03 Implemented game options menu.
svn-id: r31378
2008-04-04 08:13:35 +00:00
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
834badfc95 cleanup
svn-id: r31374
2008-04-04 01:43:20 +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