Commit Graph

1446 Commits

Author SHA1 Message Date
Max Horn
531bcf847c Moved FilesystemNode / FSList to namespace Common; also got rid of some 'typedef Common::String String;' name aliases
svn-id: r34302
2008-09-03 11:22:51 +00:00
Florian Kagerer
b7d260330b some minor bug fixes
svn-id: r34288
2008-09-02 21:31:53 +00:00
Johannes Schickel
ced14e186e Cleanup: Remove now unneeded KyraEngine_v1::quitGame.
Peres proposal for this commit log was: 'fixing .... as peres pointed out in his very interesting mail on -devel that everybody should read'.

svn-id: r34282
2008-09-02 14:36:47 +00:00
Florian Kagerer
2f884b4f25 - kyra: fm-towns/pc-98 audio: restructured driver, added rhythm channel data
svn-id: r34259
2008-09-01 20:23:25 +00:00
Johannes Schickel
8c58e27ab1 Cleanup.
svn-id: r34248
2008-09-01 18:14:55 +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
Florian Kagerer
f0ea072df6 KYRA: Towns/PC-98-Audio: fixed bug where notes for which the hold flag was set were turned off nonetheless
svn-id: r34087
2008-08-21 18:24:52 +00:00
Florian Kagerer
513f5ae150 KYRA: Towns/PC-98-Audio: increased precision for envelope generator timing and tempo when using "odd" output rates like 48 kHz or 8 kHz
svn-id: r34079
2008-08-21 12:04:55 +00:00
Florian Kagerer
99790e7915 KYRA: Towns/PC-98-Audio: tempo fix for output rates other than 44100 Hz
svn-id: r34078
2008-08-21 02:17:52 +00:00
Florian Kagerer
1a7d3ef5ee KYRA: Towns/PC-98-Audio: fix bug where pitch wheel is processed twice instead of once
svn-id: r34076
2008-08-20 22:38:36 +00:00
Florian Kagerer
bfd1723998 - add support for Italian floppy version
- more work on fm-towns music tempo

svn-id: r34067
2008-08-20 19:57:57 +00:00
Florian Kagerer
023189d6f1 tempo fix
svn-id: r34064
2008-08-20 16:14:10 +00:00
Kari Salminen
f28b93e7c7 Fix compilation: Changed 'not' to '!'.
svn-id: r34057
2008-08-20 14:56:46 +00:00
Johannes Schickel
430977e438 Committed patch #2055831 "KYRA: ResFileEntry parent cache optimization".
svn-id: r34055
2008-08-20 14:30:40 +00:00
Johannes Schickel
9138128f5c - Committed Max' compressed save backseeking support from patch #2050337 "KYRA/SCUMM: Thumbnail support/improvement"
- Extended SCUMM engine to support savegames without thumbnail header. (Increased savegame version to prevent saves to be loaded from older ScummVM versions)
- Fixed KYRA to properly support savegames without thumbnail header.

svn-id: r34054
2008-08-20 14:24:16 +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
Max Horn
05bac1e74e Fixed GCC warning
svn-id: r34032
2008-08-19 10:52:39 +00:00
Lars Persson
983e07ff6e Use the correct and specified datatype int32 instead of only int.
svn-id: r34027
2008-08-19 09:26:41 +00:00
Florian Kagerer
cb5162fad6 fixed warnings
svn-id: r34019
2008-08-19 06:31:57 +00:00
Florian Kagerer
95745179f5 fixed bug that caused a lockup in certain configurations when the music was fading
svn-id: r34015
2008-08-19 01:00:15 +00:00
Florian Kagerer
92f545ba66 KYRA: FM-Towns/PC-98 Audio:
- adpcm decoding for rhythm channel
- cleanup

svn-id: r33993
2008-08-18 17:42:32 +00:00
Florian Kagerer
87164b6c05 KYRA: FM-Towns/PC-98 Audio:
- improved accuracy
- complete percussion channel support (does not work atm though, since the instrument data is missing)
- some cleanup

svn-id: r33980
2008-08-17 22:49:34 +00:00
Johannes Schickel
08b4cf127b Cleanup.
svn-id: r33948
2008-08-16 21:51:56 +00:00
Florian Kagerer
cc80af1448 KYRA: Fm-Towns Audio: fixed crash
svn-id: r33943
2008-08-16 15:24:52 +00:00
Florian Kagerer
193f52906c KYRA: Fm-Towns Audio: fixed music fading
svn-id: r33942
2008-08-16 14:25:03 +00:00
Florian Kagerer
807bfe5079 - KYRA: FM-Towns/PC-98 Audio: fixed several bugs and got rid of some floating point arithmetic (or at least replaced some doubles with floats)
- Improved support for PC-98 music: HOF tracks seem to be fine, KYRA should be okay, too (I can't compare with an emulator since I am missing the floppy boot disk with the executable)
- There are still tempo issues. Some tracks play way too slow, others way too fast
- PC-98 sound effects in Kyra 1 don't work (I would need the floppy disk with the executable for that)

svn-id: r33938
2008-08-16 12:38:37 +00:00
Christopher Page
909b66ef54 Merged revisions 33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33924
2008-08-16 04:30:01 +00:00
Christopher Page
ec8dac5540 Added a MetaEngineFeature for RTL support, the RTL button is disabled in the GMM if the engine doesn't support it
svn-id: r33921
2008-08-16 02:53:16 +00:00
Christopher Page
9d3cdcb2da Defined some MetaEngineFeatures for the engines, the launcher uses these features to allow/disallow loading and deleting saves
svn-id: r33909
2008-08-15 18:15:14 +00:00
Florian Kagerer
d6ac646d0b lol: new detection entry (german floppy extracted)
svn-id: r33886
2008-08-14 23:46:37 +00:00
Johannes Schickel
7b87867a48 Formatting.
svn-id: r33879
2008-08-14 22:11:56 +00:00
Johannes Schickel
027e6c51a8 Improved version of my resource loading patch from -devel (check also r33876).
svn-id: r33878
2008-08-14 22:09:36 +00:00
Florian Kagerer
3f316681a0 - HOF: forgot french and german entries in last commit
svn-id: r33875
2008-08-14 21:34:29 +00:00
Florian Kagerer
8fe533657c - HOF: another Italian fan translation
svn-id: r33873
2008-08-14 21:21:04 +00:00
Christopher Page
2d31207a81 Fixed some memory leaks
svn-id: r33846
2008-08-13 20:27:39 +00:00
Johannes Schickel
0f95bb9fd5 Added detection entries for kyra3 Mac.
svn-id: r33837
2008-08-13 19:10:31 +00:00
Florian Kagerer
3fdc699411 LOL: add support for floppy installer files
(startup will fail nonethelesse since we have different pak file names)

svn-id: r33777
2008-08-11 14:47:50 +00:00
Christopher Page
fcc00f20b9 Merged revisions 33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33769
2008-08-10 21:58:18 +00:00
Johannes Schickel
f8355abdee Added fallback to text only mode when voice files are not found.
svn-id: r33742
2008-08-10 01:28:00 +00:00
Johannes Schickel
980b3f8af1 Fixed kyra to support properly support restarting of engine (for GSoC RTL, based on a patch from Chris Page).
svn-id: r33736
2008-08-10 00:36:46 +00:00
Johannes Schickel
8268b5c210 Fixed crash in KyraEngine_HoF::pauseEngineIntern.
svn-id: r33733
2008-08-10 00:17:56 +00:00
Christopher Page
ce3d1e1a7d Merged revisions 33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33720
2008-08-09 19:03:29 +00:00
Kostas Nakos
355f100793 fix MR on ce: allocate large buffer on the heap instead and of the stack, and improve the workaround
svn-id: r33714
2008-08-09 18:09:24 +00:00
Torbjörn Andersson
99ade3d25c Initialise the _sound object. Otherwise, ScummVM crashes for me if I use a native
MIDI driver instead of Adlib.

svn-id: r33678
2008-08-07 13:36:02 +00:00
Johannes Schickel
e2e0b1393b Output errors on (some) missing files.
svn-id: r33635
2008-08-05 12:13:01 +00:00
Johannes Schickel
b89c9c9b89 Changed implementation parameters/return values to match definition.
svn-id: r33632
2008-08-05 11:32:16 +00:00
Christopher Page
0725f7ec93 Made changes to keep KYRA and PARA compatible with RTL/GMM
svn-id: r33628
2008-08-05 02:11:00 +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
Max Horn
5f4c9f913f Turned InSaveFile & OutSaveFile into simple typedefs
svn-id: r33606
2008-08-04 11:38:25 +00:00
Florian Kagerer
eec2a0137d fix last commit (invalid kyra.dat game features for HOFCD)
svn-id: r33580
2008-08-03 12:50:56 +00:00
Johannes Schickel
126d4a5ec6 Added detection entries for kyra2 cd italian fan translation (see fr#2003504 "KYRA: add support for Italian version of Kyrandia 2&3"). (totally untested!)
svn-id: r33579
2008-08-03 12:16:53 +00:00
Florian Kagerer
5ae93cb108 add support for HOF Italian fan translation to kyra.dat
svn-id: r33578
2008-08-03 12:09:48 +00:00
Kari Salminen
b76f766888 Shut up MSVC warning about mgY being an unreferenced local variable.
svn-id: r33561
2008-08-03 08:01:11 +00:00
Florian Kagerer
4c74db4463 add non-interactive lol demo
svn-id: r33556
2008-08-02 23:11:31 +00:00
Johannes Schickel
64fe71fed3 Added a member function loadSoundFile to Sound which accepts a filename string instead of a filename list id.
svn-id: r33527
2008-08-02 15:05:19 +00:00
Johannes Schickel
6e9bbd7348 Fixed yet another crash in kyra1 amiga.
svn-id: r33526
2008-08-02 14:42:44 +00:00
Travis Howell
2d647afbbf Detect both HOF non-interactive demos.
svn-id: r33525
2008-08-02 14:37:10 +00:00
Johannes Schickel
2e65c05991 Add warning when a voc file is not found.
svn-id: r33524
2008-08-02 14:35:43 +00:00
Florian Kagerer
b58beb242f HOF: bug fix for FM-Towns music when using output rates other than 22050 khz
svn-id: r33523
2008-08-02 14:35:38 +00:00
Johannes Schickel
a023dba941 Fixed regressions in kyra1 amiga.
svn-id: r33522
2008-08-02 14:32:05 +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
Johannes Schickel
8c5360c833 Fix for bug #2035459 "KYRA1: long savegame names cause garbage".
svn-id: r33518
2008-08-02 11:40:09 +00:00
Johannes Schickel
eb9462c1a0 Removed debugging leftover.
svn-id: r33464
2008-07-31 10:52:29 +00:00
Johannes Schickel
5e0df8ad8e Committed slightly modified patch #2029395 "KYRA: Lands of Lore Intro + Character selection".
svn-id: r33463
2008-07-31 10:47:15 +00:00
Johannes Schickel
7e7468b322 - Fixed fadePalette for HoF and Kyra3
- Fixed bug in wsaFrameAnimationStep

svn-id: r33334
2008-07-27 12:12:40 +00:00
Johannes Schickel
b95c05c384 Fixed typo.
svn-id: r33333
2008-07-27 12:09:10 +00:00
Johannes Schickel
bd5cac4e2e Fixed macro.
svn-id: r33332
2008-07-27 12:05:40 +00:00
Torbjörn Andersson
6b2337740e Make sure _musicVolume and _sfxVolume are clipped to fit in a byte.
svn-id: r33266
2008-07-24 22:12:48 +00:00
Christopher Page
09f4fd946e Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183
2008-07-21 22:46:39 +00:00
Torbjörn Andersson
0b8602f995 Commented out some more PC-98 audio stuff, to avoid warnings.
svn-id: r33146
2008-07-20 19:25:16 +00:00
Florian Kagerer
2354ea80c6 KYRA: disable incomplete PC-98 audio support for 0.12.0 release (use towns audio instead)
svn-id: r33145
2008-07-20 18:00:00 +00:00
Christopher Page
7f480ac571 Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed
svn-id: r33082
2008-07-16 04:22:56 +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
Florian Kagerer
ba5f14692f - fix for bug #2016965: KYRA: does not compile in MSVC71
svn-id: r33030
2008-07-13 12:20:24 +00:00
Torbjörn Andersson
c8488c060c Fixed Kyra 3 detection regression.
svn-id: r32992
2008-07-10 16:19:17 +00:00
Johannes Schickel
985a032871 Typo.
svn-id: r32990
2008-07-10 12:14:00 +00:00
Johannes Schickel
a117024d23 Added filename to unkown command/opcode warnings for TIM scripts.
svn-id: r32989
2008-07-10 12:12:42 +00:00
Johannes Schickel
e1e95f0c0e Added filename to unknown opcode/command warnings of EMC scripts.
svn-id: r32988
2008-07-10 12:05:38 +00:00
Johannes Schickel
9a34ef702d Fixed mem leak in MIDI related code.
svn-id: r32987
2008-07-10 11:28:51 +00:00
Johannes Schickel
092d9f38c5 Workaround for gcc 2.95 compiler bug.
svn-id: r32986
2008-07-10 11:25:43 +00:00
Christopher Page
30b1a62e81 Removed unnecessary #inlcudes
svn-id: r32984
2008-07-10 05:15:19 +00:00
Christopher Page
e808cdf7a0 Reimplemented pushEvent() and artificialEventQueue to work with Events instead of EventTypes. Reimplemented Queue as a List instead of Array. Updated AGOS, AGI, CINE, GOB, and KYRA to work with the current implementation of the GMM
svn-id: r32971
2008-07-09 02:27:05 +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
Johannes Schickel
aee23f36a2 Fix for bug #2012293 "KYRA: Bad Spanish String in menu".
svn-id: r32949
2008-07-07 20:40:35 +00:00
Torbjörn Andersson
1cc9af6b10 Implemented Good Enough(TM) XMIDI looping. This is used by Kyrandia 2 (the
loop hack is no longer needed, and has been removed), and will be used by
Discworld.

svn-id: r32930
2008-07-06 18:37:52 +00:00
Johannes Schickel
056288f87a Added support for Italian fan translation of Kyrandia 3. (see fr#2003504 "KYRA: add support for Italian version of Kyrandia 2&3")
svn-id: r32912
2008-07-05 08:20:10 +00:00
Johannes Schickel
357f0c4e3a Added spanish menu strings for spanish fan translation of Kyrandia 3.
svn-id: r32911
2008-07-05 07:47:27 +00:00
Florian Kagerer
d92085b507 minor fix for Towns/PC98 music
svn-id: r32899
2008-07-03 21:09:07 +00:00
Johannes Schickel
34a49d4a5a Fix game flags for detection entries of installed kyra3 versions.
svn-id: r32859
2008-06-30 23:44:33 +00:00
Johannes Schickel
cef7d68fc5 Added support for Spanish fan translation of kyra3 (See fr #1994040 "KYRA3: Add support for Spanish fan translation").
svn-id: r32858
2008-06-30 23:39:56 +00:00
Florian Kagerer
b07ff57623 - this fixes Hof PC98 music initialization
- music sounds exactly like FM-Towns for now

svn-id: r32854
2008-06-30 21:55:08 +00:00
Florian Kagerer
cbf00ff565 fix warning
svn-id: r32843
2008-06-29 16:07:29 +00:00
Florian Kagerer
f5f97f4245 cleanup
svn-id: r32842
2008-06-29 15:59:35 +00:00
Florian Kagerer
b0e22db7a8 - some more work on the Hof FM-Towns/PC98 music driver
- move channels to a separate class

svn-id: r32841
2008-06-29 15:25:45 +00:00
Torbjörn Andersson
0184a7b0f9 Fixed warning. (Hopefully without breaking anything.)
svn-id: r32830
2008-06-28 16:00:04 +00:00
Florian Kagerer
3f878008da - implement music fading for Hof FM-Towns
svn-id: r32829
2008-06-28 15:36:50 +00:00
Florian Kagerer
09247e7e5a hof: remove debug code
svn-id: r32821
2008-06-28 13:40:03 +00:00
Florian Kagerer
e97dff9f33 - HOF: bug fix for music driver
- KYRA1 PC98: fix music file selection

svn-id: r32819
2008-06-28 13:13:37 +00:00
Florian Kagerer
0bea51974e fix bad const casts
svn-id: r32812
2008-06-26 20:43:23 +00:00
Florian Kagerer
b695cb74ca more cleanup
svn-id: r32811
2008-06-26 20:30:43 +00:00
Florian Kagerer
6cdb04f940 cleanup
svn-id: r32810
2008-06-26 20:13:04 +00:00
Sven Hesse
41dfebc532 Fixing compilation for me. There are still lots of "cast casts away constness" warnings, though
svn-id: r32809
2008-06-26 19:56:18 +00:00
Florian Kagerer
7b30081be2 - improved hof music support for fm-towns (driver for *.twn tracks) (still needs quite some work)
- some PC-98 music support since it uses a very similar driver, but this can't be considered working yet)
- Kyra 1 PC-98 music doen't work at all since I haven't figured out yet how to turn track numbers into the corresponding music file names (might require a hard coded track map)

svn-id: r32807
2008-06-26 19:42:59 +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
df1aa7809a Added const to some static data.
svn-id: r32763
2008-06-24 13:59:48 +00:00
Johannes Schickel
51000de162 Cleanup.
svn-id: r32754
2008-06-22 12:43:32 +00:00
Florian Kagerer
6360c392f2 missed this in last commit (bug fix for #1997149)
svn-id: r32753
2008-06-22 12:41:46 +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
Johannes Schickel
0ee152fbb9 - Fixed a valgrind waring
- Formatting
- Removed an assert

svn-id: r32575
2008-06-06 13:34:34 +00:00
Johannes Schickel
3be34f071f Added support for compressed kyra3 audio files.
svn-id: r32516
2008-06-03 18:12:21 +00:00
Johannes Schickel
0ca4ff8840 Should fix gcc warning
svn-id: r32482
2008-06-01 23:51:41 +00:00
Johannes Schickel
cc2b35ee1f Cleanup
svn-id: r32469
2008-06-01 15:18:58 +00:00
Johannes Schickel
85a3f389ae Some paranoia checks in TIMInterpreter::refreshTimersAfterPause.
svn-id: r32468
2008-06-01 15:15:12 +00:00
Florian Kagerer
0485fbfc5b - fix 'order of evaluation' bug (MSVC release build)
svn-id: r32467
2008-06-01 15:11:08 +00:00
Florian Kagerer
ec93c8957b - fix regression in non-interactive HOF demo
svn-id: r32464
2008-06-01 14:00:43 +00:00
Florian Kagerer
5b3a6fac63 - (hopefully) fix valgrind warning for installer file decompression
- some more pauseEngineIntern code for Hof

svn-id: r32462
2008-06-01 13:19:45 +00:00
Johannes Schickel
7d8a97b0af Added error calls when out of memory while uncompressing HoF installer files.
svn-id: r32449
2008-05-31 23:26:41 +00:00
Johannes Schickel
a47106e77d Cleanup.
svn-id: r32443
2008-05-31 22:18:36 +00:00
Florian Kagerer
7db0b2b5a1 cleanup
svn-id: r32441
2008-05-31 21:48:09 +00:00
Florian Kagerer
a9c9a5404d fix hof installer file loading
svn-id: r32440
2008-05-31 21:15:37 +00:00
Johannes Schickel
4ef680abaf - Fixed possible invalid memory access in Resource::loadFileToBuf
- Reworked compressed installer files handling
- Updated HoF installer file code (thanks to _athrxx for that)

svn-id: r32439
2008-05-31 20:48:41 +00:00
Johannes Schickel
dd79ed1011 Added ADGF_CD to Italian fan translation of kyra1 cd.
svn-id: r32438
2008-05-31 20:18:43 +00:00
Johannes Schickel
691306f0b7 Fixed KyraEngine_v1::snd_stopVoice and KyraEngine_v1::snd_voiceIsPlaying implementations.
svn-id: r32330
2008-05-27 21:04:27 +00:00
Florian Kagerer
1509a17d3a typo
svn-id: r32271
2008-05-25 14:39:59 +00:00
Florian Kagerer
48d3b34a75 - some pauseEngineIntern() code for the HOF sequence player (not tested)
svn-id: r32270
2008-05-25 13:30:18 +00:00
Johannes Schickel
64910f8c5f Little cleanup.
svn-id: r32262
2008-05-24 23:05:01 +00:00
Johannes Schickel
335eb1bf08 Committed my fix for bug #1497437 "KYRA1: Subtitles glitch during 'Speech of the Land'".
svn-id: r32260
2008-05-24 22:47:08 +00:00
Johannes Schickel
6866a4e133 - Cleanup
- Added support for showing kyra.dat error messages in a dialog

svn-id: r32259
2008-05-24 22:44:15 +00:00
Johannes Schickel
0897a3a058 - Fixed mismatching malloc/delete[]
- More formatting fixes

svn-id: r32255
2008-05-24 19:18:17 +00:00
Johannes Schickel
85e6b8bb0f Formatting fixes.
svn-id: r32254
2008-05-24 19:07:44 +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
ec3bc8f84d some cleanup (especially loads of strange casts)
svn-id: r32251
2008-05-24 17:34:20 +00:00
Torbjörn Andersson
398f7be356 Fixed errors, a few of the warnings, and added a FIXME comment about possibly
undefined behaviour.

svn-id: r32250
2008-05-24 17:08:35 +00:00
Florian Kagerer
0efebd9876 - add support for HOF floppy versions
- playing directly from installer files (WESTWOOD.00X) is supported (not recommended for low-end machines and certain ports)

svn-id: r32249
2008-05-24 16:30:18 +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
2b24a659a7 Fixed KyraEngine_v2::pauseEngineIntern.
svn-id: r32235
2008-05-23 22:12:18 +00:00
Johannes Schickel
18b3e3a4ba - Added a simple (but yet better) implementation of pauseEngineIntern for Kyra_v1 and Kyra_v2
- Added comments about what game specific details are missing in the pause implementation

svn-id: r32231
2008-05-23 13:37:56 +00:00
Johannes Schickel
ad6f12683f Added 'enter' command to kyra1 debugger again.
svn-id: r32230
2008-05-23 13:05:53 +00:00
Johannes Schickel
8d3116cf4a Cleanup.
svn-id: r32226
2008-05-23 11:35:05 +00:00
Johannes Schickel
5b5e5bfc62 Fixed bug in KyraEngine_v2::directLinePassable. This should fix some pathfinder issues in HoF and MR.
svn-id: r32190
2008-05-19 23:04:52 +00:00
Johannes Schickel
815ca646e1 - Fixed out of bounds bug in KyraEngine_MR::updateItemAnimations
- Clean up in KyraEngine_HoF::updateItemAnimations

svn-id: r32189
2008-05-19 21:47:42 +00:00
Johannes Schickel
27a9108e36 Fixed max text line length for French version in HoF.
svn-id: r32186
2008-05-19 21:04:49 +00:00
Johannes Schickel
b80d6aaf67 Fixed filename string in KyraEngine_MR::objectChat.
svn-id: r32185
2008-05-19 20:59:51 +00:00
Johannes Schickel
75ee4aabda Added a comment to TextDisplayer_MR::preprocessString.
svn-id: r32184
2008-05-19 20:50:16 +00:00
Johannes Schickel
75fcf38933 Fix for bug #1967311 "KYRA3: Word-wrapping is slightly buggy".
svn-id: r32183
2008-05-19 20:48:31 +00:00
Johannes Schickel
74311906f2 Cleanup.
svn-id: r32176
2008-05-18 21:11:19 +00:00
Florian Kagerer
17874266bd add support for Kyra 1 Italian floppy (this fixes so called bug #1409244 - KYRA1: GFX problems with ITALIAN floppy)
svn-id: r32175
2008-05-18 20:14:28 +00:00
Johannes Schickel
d046175f1f Typos.
svn-id: r32171
2008-05-18 14:50:41 +00:00
Johannes Schickel
fad7e1f3c1 Reverted commit #32166.
svn-id: r32170
2008-05-18 13:22:06 +00:00
Johannes Schickel
c72ac9916c Formatting.
svn-id: r32168
2008-05-18 13:03:03 +00:00
Johannes Schickel
1ea774e95f Fixed fillRect opcode for HoF.
svn-id: r32166
2008-05-18 08:04:12 +00:00
Florian Kagerer
1fc25f9997 fix o1_fillRect()
svn-id: r32160
2008-05-17 21:02:10 +00:00
Johannes Schickel
2e14d05caa Added default search path "hof_cd"/"malcolm" directory for HoF/Kyra3.
svn-id: r32156
2008-05-17 18:24:14 +00:00
Florian Kagerer
bf35e95049 - fixes bug #1962601 at least for intro and outro
- add a mutex lock in sound_towns

svn-id: r32155
2008-05-17 17:44:23 +00:00
Johannes Schickel
56b894bb2d Changed parameter of KyraEngine_LoK::setMouseItem.
svn-id: r32153
2008-05-17 15:20:39 +00:00
Johannes Schickel
8f0703abd2 - Fixed sound channel fadeout on VQA playing
- Minor formatting fixes

svn-id: r32152
2008-05-17 15:12:20 +00:00
Torbjörn Andersson
f4cc7dfa85 Loop the Kyra 3 menu music. (The original does.)
svn-id: r32149
2008-05-17 13:22:12 +00:00
Florian Kagerer
9ce0b62108 cleanup
svn-id: r32144
2008-05-16 20:26:57 +00:00
Florian Kagerer
b8585f5af0 commit eriktorbjorn's patch #1964853 (HoF: Hand of Fate credits cleanup (WIP)) with minor changes (including fix for the glitch mentioned in the tracker item)
svn-id: r32143
2008-05-16 19:20:28 +00:00
Florian Kagerer
f481821eeb fix regression in KyraEngine_LoK::setMouseItem
svn-id: r32128
2008-05-14 21:52:52 +00:00
Johannes Schickel
c834bbba06 Changed kyra3 detection entries, now there are special entries for non installed version checking for WESTWOOD.001 and special entries for installed version checking for AUD.PAK.
svn-id: r32120
2008-05-14 16:59:34 +00:00
Johannes Schickel
05a45b17b8 Just allow animation scripts marked as skipable to be skipped.
svn-id: r32114
2008-05-14 14:07:56 +00:00
Johannes Schickel
0bd8493e7c Formatting.
svn-id: r32113
2008-05-14 13:57:22 +00:00
Johannes Schickel
7fd9e149f9 Possibly fixed bug #1963700 "KYRA2: Nonresponsive clicks".
svn-id: r32112
2008-05-14 13:52:24 +00:00
Torbjörn Andersson
97855800b6 Oops, I definitely meant for that to be '==', not '='. I guess this is what it
should look like, but I can't actually test (or even compile) it right now.

svn-id: r32103
2008-05-14 09:43:41 +00:00
Filippos Karapetis
ec0e836925 Added a FIXME regarding commit #32096
svn-id: r32102
2008-05-14 07:27:31 +00:00
Torbjörn Andersson
6a9429613b Added the animation speed workaround for the sheriff animation as well. (See
bug #1926838, "HoF: Animation plays too fast".)

svn-id: r32096
2008-05-14 03:35:06 +00:00
Florian Kagerer
231ef79de2 fix engine destructor for non interactive hof demo
svn-id: r32093
2008-05-13 21:39:18 +00:00
Johannes Schickel
6f14d88138 More descriptive error message when encountering invalid font data.
svn-id: r32092
2008-05-13 21:17:46 +00:00
Johannes Schickel
e99c9048a8 Formatting.
svn-id: r32078
2008-05-12 22:37:21 +00:00
Florian Kagerer
6b5709be14 remove useless double check on sound list entries
svn-id: r32076
2008-05-12 22:13:33 +00:00
Florian Kagerer
c630fbde6a fix valgrind warning and some cleanup
svn-id: r32075
2008-05-12 21:52:44 +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
08c601ad97 Yet another valgrind warning fixed.
svn-id: r32067
2008-05-12 17:46:15 +00:00
Johannes Schickel
de6e6408b6 Fixed some valgrind warnings.
svn-id: r32065
2008-05-12 17:23:28 +00:00
Johannes Schickel
289f96d37c More naming consistency fixes (fixes old TODO).
svn-id: r32062
2008-05-12 14:52:18 +00:00
Florian Kagerer
bde4fa1e9b fix for kyra 3 sfx (broken by last commit)
svn-id: r32061
2008-05-12 14:22:27 +00:00
Johannes Schickel
0b9a3f2208 Added assert to snd_playSoundEffect.
svn-id: r32060
2008-05-12 13:50:59 +00:00
Florian Kagerer
771854bdd9 move some kyra 3 static resources to kyra.dat
svn-id: r32058
2008-05-12 13:35:58 +00:00
Johannes Schickel
4db0bd9046 Two more KyraEngine_LoK opcodes renamed.
svn-id: r32057
2008-05-12 13:19:11 +00:00
Johannes Schickel
56d2603d4f - Some more opcodes moved to KyraEngine_v1
- Yet more naming consistency fixes

svn-id: r32056
2008-05-12 13:11:42 +00:00
Johannes Schickel
1a52c5283a - Yet more opcodes moved to KyraEngine_v1
- Renamed some opcodes inside KyraEngine_LoK

svn-id: r32055
2008-05-12 12:57:42 +00:00
Johannes Schickel
279987c181 Oops forgot to commit module.mk
svn-id: r32054
2008-05-12 12:43:52 +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
Torbjörn Andersson
65e41486f4 Added do { ... } while (0) to the GUI_V* macros, so that they will work as
expected if, for instance, someone writes "if (...) GUI_V1_MENU_ITEM( ... );"
I don't expect anyone will want to write statements like that, but just to
avoid nasty surprises...

svn-id: r32049
2008-05-12 04:33:30 +00:00
Torbjörn Andersson
3763c2799d Renamed preprocessor constants to match file names.
svn-id: r32047
2008-05-12 04:17:51 +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
Johannes Schickel
1d018f6046 Formatting.
svn-id: r32037
2008-05-11 21:09:16 +00:00
Johannes Schickel
4b21c2958d Implemented helium mode support for Kyra3.
svn-id: r32028
2008-05-11 17:50:13 +00:00
Johannes Schickel
825e3b5136 - Added support for original kyra3 save files
- Added TalkObject::sceneId in savegames

svn-id: r32027
2008-05-11 17:20:23 +00:00
Johannes Schickel
a6ccfa4f09 Added saving of current album page of kyra3 like the original did.
svn-id: r32025
2008-05-11 16:56:19 +00:00
Johannes Schickel
61a105c9ba Updated pathfinder debug output.
svn-id: r32024
2008-05-11 16:48:54 +00:00
Johannes Schickel
35d01db1aa Implemented page switch animation in kyra3 album.
svn-id: r32023
2008-05-11 15:57:50 +00:00
Johannes Schickel
4932660f13 - Implemented kyra3 album (page switch animation not yet implemented)
- Implemented opcode 25: o3_showAlbum

svn-id: r32022
2008-05-11 15:24:25 +00:00