Commit Graph

2106 Commits

Author SHA1 Message Date
Johannes Schickel
0d4e110d79 Proper implementation of o1_fadeSpecialPalette for Kyrandia 1 Amiga.
svn-id: r43233
2009-08-10 22:54:25 +00:00
Johannes Schickel
01fcad7517 Fix WSA movies for final sequence of Kyrandia 1 Amiga. (this is just a theoretical fix, the game isn't yet playable till then)
svn-id: r43232
2009-08-10 22:18:47 +00:00
Johannes Schickel
1a4e1ef112 Fix o1_makeAmuletAppear for Kyrandia 1 Amiga.
svn-id: r43231
2009-08-10 22:18:33 +00:00
Johannes Schickel
a8f5f651a5 Cleanup.
svn-id: r43230
2009-08-10 22:18:18 +00:00
Johannes Schickel
a245dc4466 Implement differences for Kyrandia 1 Amiga in o1_setCustomPaletteRange.
svn-id: r43222
2009-08-10 19:10:11 +00:00
Johannes Schickel
a3bbff77e9 Fix incorrect converted colors in Kyra1 Amiga speech text color setup.
svn-id: r43221
2009-08-10 19:09:13 +00:00
Johannes Schickel
cb8b2d7799 - Fix AMIGA to DOS palette conversion
- Amiga version uses 13 instead of 12 palette buffers

svn-id: r43220
2009-08-10 19:08:00 +00:00
Johannes Schickel
066dc92551 Fix GUI menu colors for Kyrandia 1 Amiga.
svn-id: r43215
2009-08-10 18:04:53 +00:00
Johannes Schickel
19d5aa25dc Fix GUI button outline colors in Kyra1 Amiga.
svn-id: r43213
2009-08-10 18:03:37 +00:00
Johannes Schickel
7c6ffa78e0 Fix GUI font colors and text drawing in Kyrandia 1 Amiga.
svn-id: r43212
2009-08-10 18:01:28 +00:00
Johannes Schickel
c4e33211dd Typo.
svn-id: r43211
2009-08-10 17:17:19 +00:00
Johannes Schickel
f9b657c9f4 Implement item to item name list index mapping for Kyrandia 1 Amiga.
svn-id: r43210
2009-08-10 17:14:22 +00:00
Johannes Schickel
8ac9752f8f Fix GUI strings in Kyrandia 1 Amiga.
svn-id: r43209
2009-08-10 17:14:03 +00:00
Johannes Schickel
091ecc8fd0 - Fix extraction of Kyra 1 amiga string tables in kyra.dat
- Fix "taken" string offsets in kyra.dat
- Add temporary workaround for only one "taken" string being present in Kyra 1 amiga.
- Update kyra.dat

svn-id: r43208
2009-08-10 16:42:39 +00:00
Johannes Schickel
fe7453be1c Fix copyright string displaying in Kyra1 amiga. Unlike the DOS version it does not use a second print for creating a shadow look.
svn-id: r43207
2009-08-10 14:35:28 +00:00
Florian Kagerer
44cfd9d615 LOL: fix main menu in floppy version
svn-id: r43202
2009-08-10 10:25:53 +00:00
Johannes Schickel
b63d787caa Fix bug when setting up mouse cursor with inventory palette.
svn-id: r43200
2009-08-10 02:32:19 +00:00
Johannes Schickel
2ccffb9075 Remove dead code.
svn-id: r43199
2009-08-10 01:34:46 +00:00
Johannes Schickel
3ad62ee71b Cleanup.
svn-id: r43198
2009-08-10 01:34:29 +00:00
Johannes Schickel
bee9391d95 Use interface palette for mouse cursor in Kyra1 amiga, when it's enabled.
svn-id: r43197
2009-08-10 01:34:14 +00:00
Johannes Schickel
d68706d8ed Enable interface text fading in Kyra1 amiga again.
svn-id: r43196
2009-08-10 01:33:56 +00:00
Johannes Schickel
e265084bc3 Fix interface text color.
svn-id: r43195
2009-08-10 01:33:36 +00:00
Johannes Schickel
c85c5030df Fix text color in character speeches in Kyra1 amiga.
svn-id: r43194
2009-08-10 01:33:18 +00:00
Johannes Schickel
6c1bd68aed Fix inventory background color.
svn-id: r43193
2009-08-10 01:32:59 +00:00
Johannes Schickel
48e86a9e22 Initial support for correct colors in the interface of Kyra1 AMIGA.
svn-id: r43192
2009-08-10 01:32:39 +00:00
Johannes Schickel
f16ca2ee19 Disable menu text fading in kyra1 amiga for now.
svn-id: r43191
2009-08-10 01:32:22 +00:00
Johannes Schickel
738c51f88f Clear the destination page for bitmap loading, this fixes graphics artifacts in Kyra1 amiga.
svn-id: r43189
2009-08-09 23:32:52 +00:00
Johannes Schickel
5a7f85fbf6 Unbreak basic Kyra1 amiga in game support, by disabling some palette code for the amiga version.
svn-id: r43188
2009-08-09 23:23:48 +00:00
Johannes Schickel
300297d557 Add support for the font format used in Kyrandia 1 Amiga. (font colors are wrong though)
svn-id: r43187
2009-08-09 22:46:43 +00:00
Johannes Schickel
518cb968b2 Create a "Font" interface and create a "DOSFont" implementation for handling DOS version fonts.
svn-id: r43186
2009-08-09 22:46:25 +00:00
Norbert Lange
ab529d8e0c prepare the kyraplayer for reading sfxtables from raw data (instead of static tables)
svn-id: r43184
2009-08-09 20:20:42 +00:00
Johannes Schickel
ad40f3b46e Cleanup AMIGA graphics conversion.
svn-id: r43183
2009-08-09 19:11:10 +00:00
Norbert Lange
b4c689a3c1 fixed up some missing newlines
removed MSVC6 disable pragmas, the warnings are already disabled in the project files

svn-id: r43182
2009-08-09 18:59:22 +00:00
Norbert Lange
d77031e64c added code to support the "finale" section
cleaned up playSoundEffect and playTrack

svn-id: r43149
2009-08-08 21:59:18 +00:00
Norbert Lange
319dfcbcc0 moved table-definition from header to cpp file
svn-id: r43136
2009-08-08 20:00:28 +00:00
Norbert Lange
0350a1598d merge with trunk
svn-id: r43134
2009-08-08 19:09:30 +00:00
Johannes Schickel
df06592be1 Implemented support for Amiga wander score map.
svn-id: r43133
2009-08-08 18:23:14 +00:00
Kostas Nakos
08b650c1a6 show VK in gui_v2 games of kyra
svn-id: r43097
2009-08-07 11:05:58 +00:00
Kostas Nakos
14df573175 hint backend about virtual keyboard on save, in LoK
svn-id: r43095
2009-08-07 10:44:34 +00:00
Norbert Lange
fc8e269c36 cleaned up sound_amiga.cpp a bit, added checks for missing files
svn-id: r43050
2009-08-04 18:24:39 +00:00
Norbert Lange
4c4eb1394c added warning should the sound files not be available (intro will hang if there is no musictimer)
svn-id: r43049
2009-08-04 17:43:56 +00:00
Johannes Schickel
db232750b2 Fix bug which caused the mouse cursor not to update in some cases.
svn-id: r42926
2009-07-30 14:24:23 +00:00
Johannes Schickel
0570280885 Fix a little bug in KyraEngine_MR::showBadConscience, which prevented Gunther's mouse shapes from showing up.
svn-id: r42895
2009-07-29 16:24:07 +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
c6dd192ca6 Fix animation script sound effect opcode implementation in Kyra3.
svn-id: r42890
2009-07-29 14:54:27 +00:00
Willem Jan Palenstijn
ed763cccfe Fix format string issues (and compiler warnings).
Patch by salty-horse.

svn-id: r42842
2009-07-27 16:04:35 +00:00
Johannes Schickel
84c0bf22d2 Simplify KYRA's SJIS font loading code.
svn-id: r42820
2009-07-26 14:18:49 +00:00
Johannes Schickel
cb960ad976 Change the way the font data for SJIS fonts is load.
svn-id: r42815
2009-07-26 14:17:40 +00:00
Johannes Schickel
0a03ae8265 Change KYRA to use our SJIS font, when it's available.
svn-id: r42814
2009-07-26 14:17:21 +00:00
Johannes Schickel
1ebcec73bf Implement missing bits in KyraEngine_HoF::setCauldronState.
svn-id: r42773
2009-07-25 16:37:25 +00:00
Johannes Schickel
495d93de1e Fix palette regression in Kyra2.
svn-id: r42771
2009-07-25 16:34:01 +00:00
Johannes Schickel
581ed45590 Adept savegame name creation code to use Common::String::printf.
svn-id: r42765
2009-07-25 15:31:11 +00:00
Johannes Schickel
7e71865e91 Move the event recorder to its own class (EventRecoder inside common/EventRecorder.[h/cpp]).
svn-id: r42751
2009-07-25 12:59:46 +00:00
Joost Peters
6d1a386471 remove implicit SoundDigital::Sound ctor call, which is redundant because the required initialisation is done below -- this fixes a linker error with mipspro
svn-id: r42748
2009-07-25 12:41:46 +00:00
Johannes Schickel
a7b419149c Use 50Hz ticks in Kyra1 Amiga instead of 60Hz ticks.
svn-id: r42644
2009-07-21 17:00:07 +00:00
Norbert Lange
4ae0b0528b now using tick for fadeout through the nowmal delay function
svn-id: r42622
2009-07-19 19:56:52 +00:00
Norbert Lange
65cf95b98b reverted fadeout to using plain delay as delayWithTicks crashes >(
svn-id: r42621
2009-07-19 16:59:39 +00:00
Norbert Lange
f051e7e9ab use own soundhandle as the ones in Kyra::Sound seem to be used for voices (and might get killed)
svn-id: r42620
2009-07-19 16:11:05 +00:00
Norbert Lange
5952977ed0 use ticks for timing fadeout
svn-id: r42618
2009-07-19 15:36:11 +00:00
Norbert Lange
dbe300fc53 fixed retiring of external Notes
fixed/improved counting DMAs in Paula
added flag for looping songs
rearranged maxtrax.h a bit

svn-id: r42613
2009-07-19 14:02:19 +00:00
Norbert Lange
31b6767666 fixed: intro-music started twice because it was hardcoded in the engine
removed verbose debug-output from maxtrax
 

svn-id: r42604
2009-07-19 01:14:51 +00:00
Norbert Lange
396d6c86aa add support for fadeout
svn-id: r42601
2009-07-19 00:58:01 +00:00
Norbert Lange
22ee23cac7 some more tables included, for tempo and volume values
svn-id: r42600
2009-07-19 00:44:54 +00:00
Norbert Lange
923f9b975b found and use another table, soundeffects in intro are now working
svn-id: r42594
2009-07-18 16:27:33 +00:00
Norbert Lange
9e16e3b3e6 first attempt at enabling soundeffects using an table from the executeable. Doesnt quite work as it should
svn-id: r42575
2009-07-18 00:04:28 +00:00
Norbert Lange
bb64bf008d merge with trunk
svn-id: r42574
2009-07-17 21:23:54 +00:00
Norbert Lange
81ac29ebca added missing file
svn-id: r42568
2009-07-17 16:10:56 +00:00
Norbert Lange
cfe2928d98 added primitive support for Kyrandia`s Intro Music.
svn-id: r42567
2009-07-17 16:07:57 +00:00
Johannes Schickel
53756ef1d0 Cleanup.
svn-id: r42565
2009-07-17 14:05:22 +00:00
Johannes Schickel
c353e5389b - Moved SoundAdlibPC definition to new header file sound_adlib.h
- Made the future versions of sound.h GPL only
- sound_adlib.h is dual licensed under GPL and LGPL (so AdPlug can still benefit from future changes)

svn-id: r42564
2009-07-17 13:50:59 +00:00
Johannes Schickel
799af694f0 Replace LGPL header by GPL header.
svn-id: r42563
2009-07-17 13:35:56 +00:00
Johannes Schickel
572b0e6c03 Fix bug in "KyraEngine_v2::runSceneScript6", fixes text line Zanthia says, when picking up the spellbook page in the town.
svn-id: r42543
2009-07-16 21:47:57 +00:00
Johannes Schickel
6b3c3a8a12 Bugfix: Disallow GMM Save/Load while in kyragem scene.
svn-id: r42507
2009-07-15 15:51:47 +00:00
Johannes Schickel
59b35ff5fb Fix graphics glitch in LoL PC98 intro.
svn-id: r42493
2009-07-14 22:47:33 +00:00
Max Horn
6b98c4c4e7 Got rid of some more ioFailed uses (also fixed a potential leak in graphics/font.cpp, and handle eos correctly in the FLAC code)
svn-id: r42488
2009-07-14 18:24:20 +00:00
Johannes Schickel
43c7f7530a Got rid of Screen_LoL::_paletteConvTable.
svn-id: r42443
2009-07-13 17:48:13 +00:00
Johannes Schickel
c3ce2087bb Add missing quotation mark to error message.
svn-id: r42406
2009-07-12 08:51:57 +00:00
Johannes Schickel
a93008713a Removed the now uneeded "Screen::_disableScreen" flag.
svn-id: r42366
2009-07-11 01:54:42 +00:00
Johannes Schickel
3080cc2905 Fix graphics not updating, when loading a save in Kyra1. This fixes problems when loading saves in rooms like Brynn's temple, which play animations directly on scene enter.
svn-id: r42365
2009-07-11 01:54:27 +00:00
Johannes Schickel
a17333ed1b Cleanup rollDice (the results of the old and the new function are almost identical).
svn-id: r42293
2009-07-09 15:32:25 +00:00
Johannes Schickel
a7c96e1526 Cleanup.
svn-id: r42292
2009-07-09 15:32:06 +00:00
Florian Kagerer
c7eedb573a LOL: cleanup
svn-id: r42271
2009-07-08 21:12:03 +00:00
Florian Kagerer
a212a9da7e LOL: rename new function in last commit according to LordHoto's suggestion
svn-id: r42270
2009-07-08 20:32:34 +00:00
Florian Kagerer
2950bc28c4 LOL: fix long standing bugs in the battle system (hit chance, damage, etc) by adapting original style random number generator
svn-id: r42269
2009-07-08 20:19:23 +00:00
Johannes Schickel
4dc454581c Change all uses of FM-Towns/fm-towns to FM-TOWNS.
svn-id: r42235
2009-07-07 19:18:53 +00:00
Johannes Schickel
e35dd4df1c Change "FM-Towns" to "FM-TOWNS" for consistency.
svn-id: r42232
2009-07-07 19:00:39 +00:00
Johannes Schickel
8c65d4d4a9 - Rename FontSJIS::enableShadow to enableOutline.
- Initialize outline to false by default in FontTowns.

svn-id: r42231
2009-07-07 18:17:30 +00:00
Johannes Schickel
62eebc3e17 - Added support for outlined FM-Towns ROM drawing
- Adapted KYRA to use that

svn-id: r42230
2009-07-07 18:10:35 +00:00
Johannes Schickel
ec2c7cfefa Adapt KYRA to use the new Graphics::FontSJIS code.
svn-id: r42222
2009-07-07 14:22:39 +00:00
Johannes Schickel
c22010b3d2 Fix RTL from Kyra3 main menu. (It now doesn't quit ScummVM anymore)
svn-id: r42180
2009-07-06 16:17:03 +00:00
Florian Kagerer
b43664e368 LOL: cleanup
svn-id: r42141
2009-07-05 16:29:17 +00:00
Florian Kagerer
501df3adf8 LOL: - reduce code duplication
svn-id: r42140
2009-07-05 14:58:22 +00:00
Florian Kagerer
9255bfc907 KYRA: fix minor bug in Screen::drawShape()
svn-id: r42110
2009-07-04 21:18:20 +00:00
Johannes Schickel
eeb5ba9d50 Kyra1 PC-98 never offered English as language settings, thus remove it. (The CD version *does* supply English files, but those will work as FM-Towns version, so this causes no drawback for the user and is faithful to the original)
svn-id: r42106
2009-07-04 18:54:43 +00:00
Max Horn
cbea1a1193 Added more GCC_PRINTF attributes, and fixed resulting warnings in format strings
svn-id: r42054
2009-07-03 10:40:49 +00:00
Max Horn
a6b57dc3a9 - Added GCC_PRINTF attribute to several funcs where it makes sense
- change some constants from double to float, to avoid "loss of precision due to implicit conversion" warnings
- removed duplicate prototypes for some funcs
- fixed some "increases required alignment of target type" warnings

svn-id: r42009
2009-07-01 20:51:04 +00:00
Johannes Schickel
267efdc874 Fix invisible mouse cursor, when picking up items.
svn-id: r41967
2009-06-29 23:14:35 +00:00
Johannes Schickel
18940ffd46 Fix bug in drawShape.
svn-id: r41964
2009-06-29 20:17:10 +00:00
Johannes Schickel
a12b4e7002 Fix LoL cursor in DOS version.
svn-id: r41963
2009-06-29 20:16:59 +00:00
Johannes Schickel
e15502d381 Fix bug in drawShape, which caused invisibility in Kyra1 to be displayed incorrectly.
svn-id: r41962
2009-06-29 19:02:15 +00:00
Johannes Schickel
3919bd2aed Fix palette regression caused by r41949.
svn-id: r41961
2009-06-29 18:49:28 +00:00
Johannes Schickel
cc0b30370e Fix kyra2/kyra3 mouse cursor related regressions, introduced with r41959.
svn-id: r41960
2009-06-29 18:49:17 +00:00
Johannes Schickel
67f69bcaf2 - Get rid of code duplication for mouse cursor setup
- Fix mouse cursor colors in LoL PC98
(This commit might introduce regressions, since it changes the key color the mouse cursor uses)

svn-id: r41959
2009-06-29 18:00:18 +00:00
Johannes Schickel
c810f9645a Removed obsolete TODOs in HoF code.
svn-id: r41958
2009-06-29 17:26:56 +00:00
Johannes Schickel
11dafd2ded Resolved some TODOs in Kyra3 code.
svn-id: r41957
2009-06-29 17:26:43 +00:00
Johannes Schickel
fbefe917f2 Removed more obsolete TODO messages.
svn-id: r41956
2009-06-29 17:06:17 +00:00
Johannes Schickel
c2d13aab2a Update the screen animations while dropping items in Hand of Fate.
svn-id: r41955
2009-06-29 17:06:00 +00:00
Johannes Schickel
31691eb6bf Removed some obsolete TODOs.
svn-id: r41954
2009-06-29 17:05:49 +00:00
Johannes Schickel
179a822b93 Adapted various code parts to use Palette::fill.
svn-id: r41953
2009-06-29 16:49:53 +00:00
Johannes Schickel
07cdbd273d Add a "fill" method to Palette.
svn-id: r41952
2009-06-29 16:49:38 +00:00
Johannes Schickel
bfe8ec6d66 Replaced some raw palette loads.
svn-id: r41951
2009-06-29 16:49:26 +00:00
Johannes Schickel
80a4a2dd8e Cleanup GUI_HoF::setupPalette.
svn-id: r41950
2009-06-29 16:49:14 +00:00
Johannes Schickel
6f46b69236 Cleanup KyraEngine_MR::updateCharPal.
svn-id: r41949
2009-06-29 16:08:39 +00:00
Johannes Schickel
3b7f11d4cc Change LoLEngine::generateFlashPalette to take Palette objects as parameters.
svn-id: r41948
2009-06-29 16:08:28 +00:00
Johannes Schickel
c09985db2c Change Screen_LoL::loadSpecialColors to take an Palette object as parameter.
svn-id: r41947
2009-06-29 16:08:16 +00:00
Johannes Schickel
3bde2647b6 Change raw palette read to Screen::loadPalette call.
svn-id: r41946
2009-06-29 16:08:00 +00:00
Johannes Schickel
0bf94cb194 Chang Palette parameter of LolEngine::setPaletteBrightness to be const.
svn-id: r41945
2009-06-29 16:07:46 +00:00
Johannes Schickel
bf81e432e1 Change LoLEngine::generateBrightnessPalette to take Palette objects as parameters.
svn-id: r41944
2009-06-29 16:06:31 +00:00
Johannes Schickel
f7bbd359bb Changed LoLEngine::setPaletteBrightness to take an Palette object.
svn-id: r41943
2009-06-29 16:06:18 +00:00
Johannes Schickel
c72dac8dd0 Change LoLEngine::processMagicIce to use Palette objects internally.
svn-id: r41942
2009-06-29 16:06:02 +00:00
Johannes Schickel
b12496d1dd Modified Palette::load*Palette definition.
svn-id: r41941
2009-06-29 16:05:50 +00:00
Florian Kagerer
9b27e2b97c LOL: add workaround to fix map text display when the language is set to French
svn-id: r41922
2009-06-27 16:48:47 +00:00
Florian Kagerer
7d876f8a19 LOL: fixed regression
svn-id: r41917
2009-06-27 13:15:47 +00:00
Florian Kagerer
a7cb4362b4 LOL: cleanup
svn-id: r41916
2009-06-27 12:36:12 +00:00
Florian Kagerer
43d61d598a KYRA/LOL: fixed minor bug by adding reset() call to pc98 audio driver destructor
svn-id: r41902
2009-06-26 17:58:27 +00:00
Johannes Schickel
9f5f262561 Implement difference in TIM's displayText code for PC98, this should fix the font color in the intro.
svn-id: r41897
2009-06-26 00:12:19 +00:00
Johannes Schickel
e212c06845 Implement palette difference in Kanji drawing code for PC98.
svn-id: r41896
2009-06-26 00:12:08 +00:00
Johannes Schickel
e45a941f9d Implement PC98 text mode color palette.
svn-id: r41895
2009-06-26 00:11:56 +00:00
Johannes Schickel
2ea9084d64 For now always enable voices in PC98 version of LoL.
svn-id: r41893
2009-06-25 23:04:43 +00:00
Johannes Schickel
44e2f4c929 Only initialize palettes with 16 colors in (real) 16 color games.
svn-id: r41892
2009-06-25 23:04:32 +00:00
Johannes Schickel
7bbad2738a Store palettes in a Common::Array instead of a fixed size array.
svn-id: r41891
2009-06-25 23:04:21 +00:00
Johannes Schickel
fc0d0e2323 Cleanup palette setup.
svn-id: r41890
2009-06-25 23:04:08 +00:00
Johannes Schickel
fb06b92170 Implement difference in PC98 version. (This actually breaks the text colors in the LoL intro for now...)
svn-id: r41889
2009-06-25 23:03:57 +00:00
Florian Kagerer
c358145c72 KYRA/LOL: - support speech/text settings in LOL intro
- fix possible pc98 music issue

svn-id: r41887
2009-06-25 21:17:50 +00:00
Johannes Schickel
f9b075c50a Change Screen_v2::findLeastDifferentColor to take a Palette object as source.
svn-id: r41886
2009-06-25 20:00:52 +00:00
Johannes Schickel
d7d385e756 Change Screen_HoF::generateGrayOverlay to accept a Palette object as source.
svn-id: r41885
2009-06-25 19:59:56 +00:00
Johannes Schickel
5d4e7b540c Change Screen_LoL genereta overlay functionallity to accept a Palette object as source.
svn-id: r41884
2009-06-25 19:59:06 +00:00
Johannes Schickel
2b87ffc31e Change Screen_HoF::generateGrayOverlay to use a Palette object internally.
svn-id: r41883
2009-06-25 19:58:17 +00:00
Johannes Schickel
df307cfdc8 Change Screen_LoL::generateGrayOverlay to use a Palette object internally.
svn-id: r41882
2009-06-25 19:57:35 +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
7a7babad77 Add a const "getData" access method to Palette.
svn-id: r41880
2009-06-25 19:56:02 +00:00
Johannes Schickel
b21dd2cb43 Cleanup VQA player a bit.
svn-id: r41879
2009-06-25 19:55:25 +00:00
Johannes Schickel
c3672f8433 Replace yet another palette from file loading with Screen::loadPalette.
svn-id: r41878
2009-06-25 19:54:41 +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
55cb0c6738 Cleanup.
svn-id: r41876
2009-06-25 19:52:49 +00:00
Johannes Schickel
9b2da1ad0a Cleanup.
svn-id: r41871
2009-06-25 15:53:21 +00:00
Johannes Schickel
c202a119d4 Fix japanese font colors in Kyra 1 PC98 16 color.
svn-id: r41870
2009-06-25 15:53:09 +00:00
Johannes Schickel
0ef8d1ffed Implement proper color index conversion for Lands of Lore PC98. (The intro and menu screen work fine now)
svn-id: r41867
2009-06-25 15:22:08 +00:00
Johannes Schickel
86b63e0e4e Implement proper AMIGA to VGA color conversion.
svn-id: r41852
2009-06-25 02:39:23 +00:00
Johannes Schickel
bd4b5d8336 Implement proper VGA (a color component in [0, 63]) to our palette format (color component in [0, 255]) conversion.
svn-id: r41851
2009-06-25 02:39:00 +00:00
Johannes Schickel
951e82a921 Readd PC98 palette loading for LoL 16 color.
svn-id: r41850
2009-06-25 02:38:19 +00:00
Johannes Schickel
6e299e4777 Strip trailing whitespaces and tabs.
svn-id: r41848
2009-06-25 01:30:12 +00:00
Johannes Schickel
049c9b0c86 Add config option for Kyra1 16 color, it'll only use dithering when "16_color" is set to true.
svn-id: r41847
2009-06-25 01:29:55 +00:00
Johannes Schickel
0ec0b1d498 Implement palette fading for 16 color version of Kyrandia 1.
svn-id: r41846
2009-06-25 01:29:41 +00:00
Johannes Schickel
857ee03c7d Implement properly colored mouse cursors in 16 color version of Kyrandia 1.
svn-id: r41845
2009-06-25 01:29:27 +00:00
Johannes Schickel
004f6900b1 Initial support for Kyrandia 1 PC-9801 Japanese 16 color.
svn-id: r41844
2009-06-25 01:29:14 +00:00
Johannes Schickel
4597178cf9 Fix palette regression in Lands of Lore.
svn-id: r41777
2009-06-22 19:46:08 +00:00
Johannes Schickel
4c01d4a954 Fix memory leak.
svn-id: r41747
2009-06-22 02:41:56 +00:00
Johannes Schickel
5767277d8d - Fixed regression in Screen::fadeToBlack
- Fixed some palette regressions in Kyra1 Amiga (only the intro works currently)

svn-id: r41746
2009-06-22 02:37:57 +00:00
Johannes Schickel
d7432e18ea Changed Screen::loadPalette to take a reference to a Palette object instead of an array.
svn-id: r41745
2009-06-22 02:37:41 +00:00
Johannes Schickel
d2e5166dae Changed Screen::loadBitmap and Movie::open to take an optional Palette pointer instead of an optional array pointer.
svn-id: r41744
2009-06-22 02:37:20 +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
9da52cb282 Got rid of Screen::_currentPalette.
svn-id: r41740
2009-06-22 02:35:04 +00:00
Johannes Schickel
b448d506b8 Start refactoring palette handling into new class "Palette".
svn-id: r41739
2009-06-22 02:34:35 +00:00
Johannes Schickel
3424dfda98 Cleanup.
svn-id: r41736
2009-06-21 21:17:41 +00:00
Florian Kagerer
8e9de2b762 LOL: minor fix for floating cursors
svn-id: r41735
2009-06-21 21:05:06 +00:00
Florian Kagerer
df611a5278 LOL: - implemented support for "floating cursors"
- prevent complete refresh for audio menu whenever a mouse button is pressed

svn-id: r41734
2009-06-21 20:40:31 +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
67119f9c52 Cleanup: Change LoL specific config entries to use underscores instead of whitespaces.
svn-id: r41731
2009-06-21 19:01:04 +00:00
Johannes Schickel
76eee406d6 Cleanup: Change LoL code to use KYRA volume handling.
svn-id: r41730
2009-06-21 19:00:50 +00:00
Florian Kagerer
5b0b0051c1 LOL: - implemented audio menu
- menu settings now get saved
- remove white spaces

svn-id: r41729
2009-06-21 16:59:51 +00:00
Johannes Schickel
0fa9b569bf Cleanup.
svn-id: r41723
2009-06-21 01:22:23 +00:00
Johannes Schickel
ed16d2d63f Fix umlauts for original interpreter saves.
svn-id: r41722
2009-06-21 01:15:47 +00:00
Johannes Schickel
872e925807 Enable proper umlaut handling in kyra 1-3.
svn-id: r41721
2009-06-21 01:15:37 +00:00
Johannes Schickel
db7484b7ba Moved CP850<->ISO-8859-1 conversion to Util.
svn-id: r41720
2009-06-21 01:15:24 +00:00
Johannes Schickel
89607d994b Fix drawing of sharp s.
svn-id: r41719
2009-06-21 01:15:09 +00:00
Johannes Schickel
d4248b10c8 Prevent font code to draw characters not included in the font.
svn-id: r41718
2009-06-21 01:14:57 +00:00
Florian Kagerer
164c4a5177 LOL: minor fix for save menu
svn-id: r41715
2009-06-20 16:36:26 +00:00
Florian Kagerer
cb06b0983e LOL: cleanup
svn-id: r41714
2009-06-20 15:09:55 +00:00
Florian Kagerer
8d26c58372 LOL: implemented save menu
svn-id: r41713
2009-06-20 14:26:01 +00:00
Paul Gilbert
d7e0c52a86 Added explicit casts to _fontConversionTableGerman for systems where char is signed
svn-id: r41699
2009-06-20 06:20:12 +00:00
Florian Kagerer
66445ae515 LOL: - implemented delete menu
- fixed some bugs in the menu code

svn-id: r41683
2009-06-19 18:46:19 +00:00
Johannes Schickel
d4e01e3a1b Fix some warnings.
svn-id: r41679
2009-06-19 17:53:25 +00:00
Florian Kagerer
ec7d86404c LOL: - implemented bezel cup opcode
- implemented font conversion for certain language specific characters in load game dialogue (only german atm)

svn-id: r41677
2009-06-19 17:03:28 +00:00
Johannes Schickel
2e27c7b492 Replaced "getRandomNumberSpecial" be RandomSource usage. (This is needed for proper event recording, also the probability for generated numbers is actually nearly the same)
svn-id: r41646
2009-06-18 21:47:10 +00:00
Florian Kagerer
0b4725d142 LOL: implemented options menu (settings aren't saved yet)
svn-id: r41596
2009-06-16 21:23:26 +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
650f3a50d2 LOL: implemented quit menu
svn-id: r41560
2009-06-15 21:39:43 +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
7c5d739ba7 Cleanup.
svn-id: r41519
2009-06-14 14:24:28 +00:00
Johannes Schickel
b9d42b8741 Got rid of a needless "getEventManager" call. (Using Engine::_eventMan now instead)
svn-id: r41516
2009-06-14 14:05:42 +00:00
Nicola Mettifogo
20d75f6ec7 Added missing return statements.
svn-id: r41473
2009-06-12 10:26:15 +00:00
Nicola Mettifogo
5172c83200 Finally fix build (extra qualifier removed).
svn-id: r41470
2009-06-12 09:56:07 +00:00
Nicola Mettifogo
b2e5905327 * Adapted Kyra to the new IFFParser interface.
* Adapted the new IFFParser to Kyra (slightly).
The Kyra1 demo on the website works.

svn-id: r41468
2009-06-12 09:49:38 +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
7f5b28ee83 - Cleanup
- Fix regression in Kyra1 outro

svn-id: r41384
2009-06-08 20:11:07 +00:00
Johannes Schickel
0f116f1c38 Cleanup.
svn-id: r41381
2009-06-08 18:30:28 +00:00
Johannes Schickel
aef8d2b04b Fix out of bounds memory access in Screen::drawShape.
svn-id: r41379
2009-06-08 17:47:37 +00:00
Johannes Schickel
b85b408838 - Fix Screen_v2::wsaFrameAnimationStep, now the MR album and LoL intro demo WSAs will be correctly played
- Made album page change in MR a bit slower, so it's visible at least

svn-id: r41362
2009-06-08 02:26:33 +00:00
Florian Kagerer
77bcc94f80 LOL: minor bug fix
svn-id: r41358
2009-06-07 22:42:21 +00:00
Johannes Schickel
897c0104c9 Remove unneeded functionality from Screen.
svn-id: r41357
2009-06-07 22:41:38 +00:00
Johannes Schickel
5c233c447b Remove LoLEngine::_gameFlags and convert all Lands of Lore code to use _flagsTable instead.
svn-id: r41351
2009-06-07 20:43:43 +00:00
Johannes Schickel
c7861cb65e Avoid warning about missing SFX file in Lands of Lore (it seems the original misses some datafiles for certain effects).
svn-id: r41350
2009-06-07 19:58:00 +00:00
Florian Kagerer
4dd29a5985 LOL: minor bug fix in battle system
svn-id: r41348
2009-06-07 18:51:03 +00:00
Florian Kagerer
6d59856fe1 LOL: implemented two more opcodes for castle cimmeria
svn-id: r41336
2009-06-07 13:07:16 +00:00
Florian Kagerer
09fe7b3152 LOL: implemented some missing monster animation code
svn-id: r41327
2009-06-07 10:34:01 +00:00
Johannes Schickel
b1041bba7f Add support for "WF_NO_LAST_FRAME" in WSA v1 code too. Since so far every v1 WSA file played fine, it might be unneeded, but better safe than sorry.
svn-id: r41316
2009-06-07 00:58:14 +00:00
Johannes Schickel
6cfb706fae Fix WSA v2 code, now the automap remove WSA file in Lands of Lore plays correctly.
svn-id: r41315
2009-06-07 00:51:19 +00:00
Florian Kagerer
4416881c07 LOL: implemented king richard healing sequence
svn-id: r41314
2009-06-07 00:37:30 +00:00
Johannes Schickel
efc5fc0c8c - Flag Kyra3 detection entries with GUIO_NOMIDI
- Get rid of using directive

svn-id: r41295
2009-06-06 19:10:25 +00:00
Florian Kagerer
b43df63b1c LOL: fix flying item hit processing
svn-id: r41292
2009-06-06 18:46:07 +00:00
Johannes Schickel
f4360dffe3 Flag all games without full voice over with GUIO_NOSPEECH.
svn-id: r41291
2009-06-06 18:41:25 +00:00
Eugene Sandulenko
167874cf1a Added GUI options for newly added games
svn-id: r41285
2009-06-06 18:23:05 +00:00
Eugene Sandulenko
1bd6f6c99f Added game GUI options to advancedDetector and updated all engines
svn-id: r41272
2009-06-06 17:56:41 +00:00
Florian Kagerer
4ee29a020d LOL: fix last commit
svn-id: r41225
2009-06-06 15:32:42 +00:00
Florian Kagerer
2af195482f LOL: fixed level temp data size
svn-id: r41224
2009-06-06 14:42:03 +00:00
Florian Kagerer
ad1b53472b LOL: fixed vaelan's cube
svn-id: r41223
2009-06-06 14:14:07 +00:00
Florian Kagerer
94e9762870 KYRA/LOL: fix input code for japanese game versions
svn-id: r41221
2009-06-06 12:18:39 +00:00
Florian Kagerer
5f005bf930 LOL: minor bug fix
svn-id: r41201
2009-06-05 22:53:36 +00:00
Florian Kagerer
90ee879d89 LOL: implemented another opcode
svn-id: r41199
2009-06-05 21:34:18 +00:00
Florian Kagerer
29cc1efe3c LOL: implemented Vaelan's cube
svn-id: r41179
2009-06-04 22:12:13 +00:00
Johannes Schickel
2dbd81f1f2 Silence some unused variable warnings.
svn-id: r41149
2009-06-03 20:03:08 +00:00
Florian Kagerer
f77142c55c LOL: implemented guardian spell
svn-id: r41148
2009-06-03 19:58:06 +00:00
Florian Kagerer
8c86805415 LOL: implemented opcode required for catwalk caves
svn-id: r41147
2009-06-03 19:11:11 +00:00
Florian Kagerer
0efe78d0f8 LOL: implemented mist of doom spell
svn-id: r41145
2009-06-03 17:35:06 +00:00
Florian Kagerer
2abb8d9ff6 LOL: fixed minor bug in shakeScene() which caused a graphics glitch when dropping into pits
svn-id: r41140
2009-06-03 14:24:00 +00:00
Johannes Schickel
c1d01223aa Fix bug #2799905 "WINCE: Compilation broken".
svn-id: r41124
2009-06-02 11:58:30 +00:00
Florian Kagerer
7b31585e39 LOL: - fixed script bug reported by LordHoto
svn-id: r41122
2009-06-02 06:19:41 +00:00
Johannes Schickel
a4292afcdc Formatting and whitespaces again.
svn-id: r41120
2009-06-02 00:10:13 +00:00
Johannes Schickel
fae4192b37 Remove "_smoothScrollTimer" from LoLEngine, it was only used as local variable anyway.
svn-id: r41119
2009-06-02 00:07:11 +00:00
Johannes Schickel
762f630849 Cleanup.
svn-id: r41118
2009-06-01 23:53:30 +00:00
Johannes Schickel
9a0fff429f - Remove LoLEngine::delayUntil it was identical to KyraEngine_v1 in its functionallity anyway
- Change KyraEngine_v1::delayUntil to a somewhat more LoLEngine::delayUntil like implementation

svn-id: r41117
2009-06-01 23:38:56 +00:00
Johannes Schickel
fb93062def Allow the user to quit ScummVM, when LoL waits via delayUntil.
svn-id: r41116
2009-06-01 23:30:06 +00:00
Johannes Schickel
6fcccb3fcd Slight cleanup in LoLEngine's delay and delayUntil.
svn-id: r41115
2009-06-01 23:29:05 +00:00
Johannes Schickel
6782d3efac Change LoLEngine::delay to be conform with KyraEngine_v1::delay. (remove special iUpdate parameter, just call updateInput, when "doUpdate" is set to false)
svn-id: r41114
2009-06-01 23:25:10 +00:00
Johannes Schickel
f57be08d6d - Add some basic debugger for Lands of Lore.
- Allow the "flags" command in all Kyra games to be working properly with 320x200 GUI.

svn-id: r41113
2009-06-01 22:03:27 +00:00
Johannes Schickel
bdea557d7f - Fix some valgrind warnings
- Fix original bug in the Lands of Lore credits, which messed up some headings (the original didn't display them at all for some reason)

svn-id: r41111
2009-06-01 21:03:44 +00:00
Florian Kagerer
a10287e787 LOL: fix warning
svn-id: r41106
2009-06-01 19:11:56 +00:00
Florian Kagerer
8b59d275ab LOL: add workaround comment (at LordHoto's repeated insistence)
svn-id: r41105
2009-06-01 18:25:43 +00:00
Florian Kagerer
42032cf7ec LOL: - minor fix to the input code
svn-id: r41104
2009-06-01 17:50:30 +00:00
Florian Kagerer
19a6eac4ca LOL: implemented hand of fate spell
svn-id: r41103
2009-06-01 16:29:13 +00:00
Florian Kagerer
660aa71662 LOL: - extended text displayer and added one more opcode
svn-id: r41100
2009-06-01 13:37:51 +00:00
Florian Kagerer
83dbcf8531 LOL: some more opcodes and some minor bug fixes
svn-id: r41092
2009-06-01 01:24:17 +00:00
Florian Kagerer
60d53c3cce LOL: - implemented opcode for white tower basement
svn-id: r41091
2009-06-01 00:42:53 +00:00
Johannes Schickel
ede3dec88a Add support for the Lands of Lore scrolling credits.
svn-id: r41081
2009-05-31 19:31:04 +00:00
Florian Kagerer
dad6073548 LOL: prevent saving/loading in inventory screen
svn-id: r41080
2009-05-31 17:58:19 +00:00
Florian Kagerer
cc8cc6f452 LOL: implemented magic viper attack (used by wraiths in white tower level 3)
svn-id: r41074
2009-05-31 15:42:26 +00:00