Commit Graph

99 Commits

Author SHA1 Message Date
athrxx
f80b2383e7 KYRA: cleanup last commit 2011-07-04 20:22:16 +02:00
athrxx
38d18a6e78 KYRA: fix ingame menu save slots
- long GMM save descriptions will be trimmed to fit the ingame menu save slots
- prevent writing beyond the right margin in Kyra 1 save slots
2011-07-04 19:52:11 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
7d03da14cb KYRA: Clean up of header includes. 2011-04-28 15:39:57 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Johannes Schickel
32338876f8 KYRA: Rename KyraEngine::saveGameState to KyraEngine::saveGameStateIntern.
This is to avoid name similarity between KyraEngine::saveGameState(Intern)
and Engine::saveGameState.

svn-id: r53912
2010-10-28 23:57:24 +00:00
Johannes Schickel
bf17cc1053 In the help of making the new C++ standard a better one, we will now no longer rely on using parent class names in friend classes of a subclass.
svn-id: r50952
2010-07-16 23:30:29 +00:00
Johannes Schickel
7da8c8949b Replace KYRA's strncpy and strncat usages by strlcpy/strlcat.
svn-id: r48954
2010-05-05 17:53:30 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Johannes Schickel
f4288516e8 Revert commits r44912 and r44905, seems like the original FM-Towns/PC98 games did only allow ASCII input, thus they didn't use the SJIS font in the save/load menus.
svn-id: r44916
2009-10-11 12:51:13 +00:00
Johannes Schickel
8f6e9f0bf2 Fix FM-Towns/PC98 menu code.
svn-id: r44905
2009-10-11 11:29:34 +00:00
Florian Kagerer
45fda46cf3 KYRA/LOL: - get rid of ascii/sjis detection which could cause problems when typing savegame names
- fixed some minor bugs

svn-id: r44709
2009-10-06 17:22:40 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Kostas Nakos
08b650c1a6 show VK in gui_v2 games of kyra
svn-id: r43097
2009-08-07 11:05:58 +00:00
Johannes Schickel
872e925807 Enable proper umlaut handling in kyra 1-3.
svn-id: r41721
2009-06-21 01:15:37 +00:00
Florian Kagerer
475c967d0d KYRA: fixed regression (broken menu slide bars in HOF/MR)
svn-id: r41576
2009-06-15 23:22:31 +00:00
Florian Kagerer
583a89be62 LOL: - started on the ingame menu code (death menu, load menu and main menu)
- fixed regression in kyra gui code (broken menu highlighting)
- fixed minor bug in animation code

svn-id: r41557
2009-06-15 20:52:09 +00:00
Max Horn
fb79b18571 Changed SaveFileManager methods to take Common::String params (instead of char pointers)
svn-id: r41000
2009-05-29 14:38:22 +00:00
Johannes Schickel
c7ee0a7ec8 More formatting.
svn-id: r40994
2009-05-29 13:09:26 +00:00
Johannes Schickel
64e6c596c7 Formatting.
svn-id: r40991
2009-05-29 12:52:03 +00:00
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