libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 01:08:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,639 Commits 5 Branches 5 Tags 1.8 GiB
2c0967e7bb
Commit Graph

319 Commits

Author SHA1 Message Date
Johannes Schickel
7d0435f23c - adding LPGL headers to adlib sound specific files 
- stating about dual license of adlib sound specific files

svn-id: r23708
 2006-08-15 18:04:01 +00:00
Johannes Schickel
eee50637b8 Little Common::String usage 'fix'. 
svn-id: r23698
 2006-08-08 21:34:19 +00:00
Torbjörn Andersson
44dd6a386e Committed my own patch #1533833 (minus one line that was left over from an 
earlier experimental version) after discussing it with LordHoto. This works
around a bug in the "Pool of Sorrow" Adlib data which caused the channels to
drift more and more out of sync for each time the music looped. The patch
forces the channels involved to jump in sync. As with all such workarounds, it
may cause regressions. But it shouldn't.

svn-id: r23659
 2006-08-03 13:11:16 +00:00
Torbjörn Andersson
e0cd675a47 Since the XMIDI music no longer automatically loops, there's no need to fade it 
out just as it's reaching its most dramatic point.

svn-id: r23657
 2006-08-03 11:13:06 +00:00
Torbjörn Andersson
6a40e7f789 This is a grossly over-simplified, yet hopefully sufficient for Kyrandia, way 
of handling XMIDI loops. If anyone feels like doing it properly in
midiparser_xmidi.cpp, the Exult project probably has one of the better
reference implementations. For now, though, I don't see any real need to, and
this change is clearly flagged as a hack.

svn-id: r23656
 2006-08-03 11:12:05 +00:00
Torbjörn Andersson
7d53480025 Kyra 2 has two types of XMIDI files: XMI and C55. It seems C55 are for the 
General MIDI instrument set, so use them unless we're in MT-32 mode. This makes
the music sound a bit closer (at least to me) to what DOSbox plays.

svn-id: r23653
 2006-08-01 13:42:33 +00:00
Torbjörn Andersson
56c59d1da6 Don't start the Kyra 2 menu music until the first frame has faded up, to better 
match the original behaviour.

svn-id: r23652
 2006-08-01 10:25:10 +00:00
Torbjörn Andersson
afe26b5ea5 Until the native Kyra 2 Adlib music is supported, enable the automagic MIDI-to- 
Adlib converter.

svn-id: r23651
 2006-08-01 07:44:38 +00:00
Torbjörn Andersson
c32c7e00c4 Don't set the MIDI volume to 255 at the end of a fade-out. At least on my 
hardware, that causes an annoying spike in the volume. We already reset the
volume to 255 at the beginning of a new track anyway, as far as I can tell.

svn-id: r23650
 2006-08-01 03:29:32 +00:00
Oystein Eftevaag
ec8f1b092d Committing patch '[ 1531177 ] Kyra2 mock-up' by eriktorbjorn, with the addition of playing the music tracks as well (Only MIDI works for now though) 
svn-id: r23649
 2006-07-31 23:05:01 +00:00
Johannes Schickel
01b3a0b568 Yet more kyra3 init code. 
svn-id: r23648
 2006-07-31 16:37:34 +00:00
Max Horn
4a80db4c7b * Added copyright string to all engine plugins 
* Modified about dialog to list all available plugins with their resp. copyright
* Modified about dialog credits to show the GPL last (like movie end credits do with their legal text, too)

svn-id: r23645
 2006-07-31 13:41:21 +00:00
Max Horn
a1bb64e24b Const correctness 
svn-id: r23644
 2006-07-31 13:37:47 +00:00
Johannes Schickel
64c6399bd7 removing never used buffer. 
svn-id: r23638
 2006-07-30 15:05:36 +00:00
Johannes Schickel
3846565058 Implements item shape loading for kyra3. 
svn-id: r23637
 2006-07-30 14:53:28 +00:00
Torbjörn Andersson
066aa14f97 It's play(), not open(), that encounters the CMDS tag. At least in the intro 
movie, which is the only one we currently play.

svn-id: r23626
 2006-07-30 09:10:54 +00:00
Johannes Schickel
6cc1a57d3b - fixes bug in fileData (introduced with last commit) 
- show mouse cursor in Screen::setMouseCursor if it's allready shown
- a little bit more kyra3 init stuff

svn-id: r23623
 2006-07-30 08:22:39 +00:00
Johannes Schickel
92649de672 - fixes copyright of kyra3.h 
- implements a bit more init functions for kyra3
- removes hacked mouse cursor
- changes Resource::fileData to accept a null pointer for size

svn-id: r23622
 2006-07-30 07:51:11 +00:00
Torbjörn Andersson
f51fc44e66 Added _quitFlag test to Kyra 2 animation and to waitForEvent(). 
svn-id: r23617
 2006-07-29 05:59:44 +00:00
Johannes Schickel
f8d4994dc2 Little cleanup. 
svn-id: r23616
 2006-07-28 17:42:33 +00:00
Oystein Eftevaag
3c4b13ed33 Moves the kyra2 code to kyra2.cpp and kyra2.h, renames WSAMovieV3 to WSAMovie2 (kyra2 uses the same format), renames a define in kyra3.h for consistency, and adds a case for CMDS in the VQA player to avoid the constant warning (the tag is always present and empty). Credit/blame for the last one goes to Clemmy :). Starting kyra2 will now show the title animation. 
svn-id: r23614
 2006-07-28 11:42:53 +00:00
Johannes Schickel
a69ac7717d Oops it should never be renamed to c1_* but to o1_* changing this now. 
svn-id: r23613
 2006-07-27 20:39:52 +00:00
Johannes Schickel
ee5621137f - renaming all opcodes from cmd_* to c1_* 
- changing ScriptHelper functions so it will be useable for kyra2 and kyra3 too
- unbreaking savegames (increasing the VERSION number since the game flags table got resized to be useable for kyra3)

svn-id: r23612
 2006-07-27 20:30:51 +00:00
Johannes Schickel
8a0ec2a3e5 - moving KyraEngine_v3 declaration to newly added kyra3.h 
- implements a little bit init stuff
- implements some music handling

svn-id: r23610
 2006-07-27 18:29:14 +00:00
Johannes Schickel
d9e5134919 Workaround for bug #1498221 ("KYRA1: Glitches when meeting Zanthia"). 
svn-id: r23608
 2006-07-27 00:09:13 +00:00
Johannes Schickel
bcc892ec81 Make the midi player threadsafe (this should fix bug #1506583 "KYRA1: Crash on exceeded polyphony"). 
svn-id: r23605
 2006-07-26 22:24:33 +00:00
Torbjörn Andersson
eb7cda50aa Fade out the music when using the Kyra 3 menu to exit. (The original does, and 
it might make a useful test case for the fade-out code.)

svn-id: r23604
 2006-07-26 20:39:27 +00:00
Torbjörn Andersson
e9f1323221 End the Kyra 3 menu screen if _quitFlag is set. 
svn-id: r23603
 2006-07-26 20:30:57 +00:00
Torbjörn Andersson
ec6a9b0071 Removed unnecessary #include 
svn-id: r23598
 2006-07-26 06:36:58 +00:00
Johannes Schickel
d2befe0c6f Skips scroll down sequence then the user wishes to skip the intro. 
svn-id: r23596
 2006-07-26 05:33:48 +00:00
Johannes Schickel
5ccb436cad Nicer quit handling in the intro sequences. 
svn-id: r23594
 2006-07-26 05:27:34 +00:00
Johannes Schickel
37d050e9da Add support for looping the kyra3 main menu. 
svn-id: r23593
 2006-07-25 15:11:42 +00:00
Max Horn
4fcdbb9349 String class usage cleanup 
svn-id: r23582
 2006-07-23 15:08:48 +00:00
Torbjörn Andersson
b845eb9b99 Initialise the screen before creating the music driver. The MT-32 driver wants 
to draw to the screen.

svn-id: r23574
 2006-07-23 07:06:26 +00:00
Johannes Schickel
4ae5cef491 - let md5_file accept a FilesystemNode too 
- changes some engine detectors to use it

svn-id: r23559
 2006-07-22 14:59:44 +00:00
Johannes Schickel
7caf96af6f Changes usage of FilesystemNode::name to FilesystemNode::displayName in the detector code. 
svn-id: r23554
 2006-07-22 14:28:39 +00:00
Johannes Schickel
eb23d7b9a0 Changing usage of FSNode::displayName to FSNode::path 
svn-id: r23549
 2006-07-22 00:44:56 +00:00
Johannes Schickel
29f99a029e Using path instead of displayName. 
svn-id: r23541
 2006-07-20 21:41:59 +00:00
Johannes Schickel
73869dca9f - don't error on CHAPTER1.VRM miss anymore 
- nicer error messages when no font files are found
- implements nicer way to load fonts

svn-id: r23531
 2006-07-16 19:44:39 +00:00
Johannes Schickel
1a31d7da7e Should fix loading of pakfiles. 
svn-id: r23516
 2006-07-15 21:22:07 +00:00
Johannes Schickel
1ad8d3ee6e Adds filesize check for kyra.dat, this forces to upgrade always to the newest version though. 
svn-id: r23514
 2006-07-15 20:46:27 +00:00
Johannes Schickel
ea0e3a806c Get rid of some asserts and adds error messages instead. 
svn-id: r23513
 2006-07-15 20:37:32 +00:00
Johannes Schickel
d630b3e722 Little cleanup. 
svn-id: r23512
 2006-07-15 20:32:54 +00:00
Johannes Schickel
04503d462d Use the FS Api to load all .PAK and .APK files. (I just made a few quick tests, but before this should be integrated to branch-0-9-0 there should be a test for it on *every* platform, since I'm not quite sure if FilesystemNode::displayName is useable for this...) 
svn-id: r23511
 2006-07-15 20:30:36 +00:00
Johannes Schickel
a8e3e929e8 A little cleanup (merges kyra1_games, kyra2_games, kyra3_games into kyra_games) 
svn-id: r23510
 2006-07-15 20:09:45 +00:00
Johannes Schickel
f5d8055777 Changes names of Kyra2 and Kyra3 detected games. 
svn-id: r23509
 2006-07-15 20:00:08 +00:00
Torbjörn Andersson
6358547a43 More whitespace changes. 
svn-id: r23496
 2006-07-14 13:33:58 +00:00
Johannes Schickel
db2ffa4285 Changes init error handling of kyra engine (engine fails at Engine_KYRA_create now instead of KyraEngine::init, also adds check for invalid game path like the scumm 
engine does).

svn-id: r23426
 2006-07-08 14:51:26 +00:00
Johannes Schickel
abdebd3bfd - fixes some c/p errors from my last commit 
- fixes embedded pak loading

svn-id: r23425
 2006-07-08 14:25:23 +00:00
Johannes Schickel
57621c9245 Implements loading of 'westwood.001' for kyra3 (no need to run the installer anymore). 
(thanks to eriktorbjorn for his code to extract files from westwood.001)

svn-id: r23423
 2006-07-08 13:56:56 +00:00