Commit Graph

54 Commits

Author SHA1 Message Date
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
9fb92f4b7e KYRA: Fix compilation when LoL is disabled. 2011-04-28 18:16:01 +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
03e2d54ca7 KYRA: Adapt Kyra2+3 to use the newly added item type too.
svn-id: r53697
2010-10-22 02:10:22 +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
Johannes Schickel
2eb1a62a96 Fix saving of item in hand in HoF and MR.
svn-id: r42892
2009-07-29 15:31:23 +00:00
Johannes Schickel
c810f9645a Removed obsolete TODOs in HoF code.
svn-id: r41958
2009-06-29 17:26:56 +00:00
Johannes Schickel
80a4a2dd8e Cleanup GUI_HoF::setupPalette.
svn-id: r41950
2009-06-29 16:49:14 +00:00
Johannes Schickel
6e69a149cd Change Screen_v2::generateOverlay to take a const Palette reference instead of a pointer.
svn-id: r41881
2009-06-25 19:57:06 +00:00
Johannes Schickel
dca6ec2653 Use Screen::loadPalette instead of Resource::loadFileToBuf.
svn-id: r41877
2009-06-25 19:53:55 +00:00
Johannes Schickel
73ea378dee - Changed the following Screen functions to take a reference to a Palette object:
-> setScreenPalette
	-> fadePalette
	-> getFadeParams
	-> fadePalStep
- Fixed initialization of 256 color palettes

svn-id: r41743
2009-06-22 02:36:54 +00:00
Johannes Schickel
4bb392b593 Add wrapper functionality for copying full palettes.
svn-id: r41742
2009-06-22 02:36:16 +00:00
Johannes Schickel
882662977f Changed Screen::getPalette to return a reference to a Palette object.
svn-id: r41741
2009-06-22 02:35:45 +00:00
Johannes Schickel
7eaf539b23 Cleanup.
svn-id: r41733
2009-06-21 20:10:45 +00:00
Johannes Schickel
198e35a79f Fix slider buttons in LoL (and some minor cleanup).
svn-id: r41732
2009-06-21 19:49:20 +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
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
Johannes Schickel
ac46c98fb8 - Moved Screen_v2::copyWsaRect to Screen::copyWsaRect
- Made WSAMovie_v1::displayFrame code match the original
- Changed WSAMovieAmiga::displayFrame to use Screen::copyWsaRect too
- Got rid of '...' parameter usage in all WSA player classes

svn-id: r41398
2009-06-09 11:26:15 +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
Florian Kagerer
dd84aaf648 LOL: - added some spell casting (spark, heal, swarm)
- fixed several bugs (not the one in the fighting system though)
- added several opcodes. there shouldn't be any real show stoppers in the draracle cave now.
- simplified wsa code (which required 4 lines of code for displaying a frame)
- added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file)

svn-id: r40420
2009-05-10 13:40:28 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Johannes Schickel
85c1d35ae3 Error out on savegame load failure (again).
svn-id: r34953
2008-11-09 13:12:38 +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
Johannes Schickel
eddae0e105 Fixed thumbnail creation / loading in kyra.
svn-id: r34527
2008-09-14 16:29:14 +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
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
d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
2008-07-14 00:10:09 +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
12d7a5e679 Cleanup.
svn-id: r32751
2008-06-22 12:36:38 +00:00
Florian Kagerer
3be9449e67 this should fix bug #1997149: KYRA2: no text in spellbook
svn-id: r32750
2008-06-22 12:31:05 +00:00
Florian Kagerer
5968d62d34 cleanup
svn-id: r32253
2008-05-24 18:31:16 +00:00
Florian Kagerer
4641f3fe7b more fixes for spellbook/letter text in Hof (French and German floppy)
svn-id: r32252
2008-05-24 17:56:56 +00:00
Florian Kagerer
d766719a65 fix for missing spellbook and letter text in the floppy versions
svn-id: r32242
2008-05-24 13:51:25 +00:00
Johannes Schickel
13b60eeb32 Don't restart music while changing music volume in Hof and MR.
svn-id: r32069
2008-05-12 19:29:14 +00:00
Johannes Schickel
574af78acb - Moved some opcodes to KyraEngine_v1
- Little variable renaming

svn-id: r32053
2008-05-12 12:42:10 +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
6e0c569966 Consisteny fixes:
- Renamed classes *_v1 -> *_LoK
 - Renamed files *_v1.* -> *_lok.*
 - Renamed WSAMovieV1 -> WSAMovie_v1
 - Renamed WSAMovieV2 -> WSAMovie_v2

svn-id: r32042
2008-05-11 22:32:37 +00:00
Torbjörn Andersson
d7fc8fd7be Use less CPU when reading the spell book.
svn-id: r32009
2008-05-11 10:48:22 +00:00
Johannes Schickel
7c7e9b831f Implemented pausing of timers, this should fix some minor glitches.
svn-id: r31985
2008-05-10 19:20:38 +00:00
Johannes Schickel
3d9ea59616 Changed kyra to use delete[] instead of delete [].
svn-id: r31925
2008-05-07 14:20:37 +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