Commit Graph

528 Commits

Author SHA1 Message Date
Filippos Karapetis
f3158075bb The sprite set by sfSetObjImage is assigned correctly now for IHNM. This fixes several cases where objects with more than one frame were incorrectly displayed
svn-id: r28571
2007-08-13 01:20:42 +00:00
Filippos Karapetis
742d503b92 Removed an obsolete TODO
svn-id: r28570
2007-08-13 01:09:48 +00:00
David Corrales
6856535010 Merged fsnode with trunk: r27971:28460
svn-id: r28462
2007-08-05 19:34:20 +00:00
Filippos Karapetis
1c26274061 Undefined character 9 is no longer printed in the IHNM demo help screen
svn-id: r28409
2007-08-02 15:29:50 +00:00
Filippos Karapetis
ccc9359181 Text is cleared correctly in the IHNM demo help screen, when waiting for the game to change the page automatically
svn-id: r28407
2007-08-02 14:57:18 +00:00
Filippos Karapetis
3e9c4be280 The help screen in the IHNM demo is shown correctly now
svn-id: r28406
2007-08-02 14:43:10 +00:00
Filippos Karapetis
ec4a240b50 The help screens in the IHNM demo are shown a bit more correctly now, though they're still buggy
svn-id: r28399
2007-08-02 01:56:45 +00:00
Filippos Karapetis
63f3d5b253 Partially implemented opcodes 87, 88 and 89, used in the help system of the IHNM demo. It's still buggy, though
svn-id: r28398
2007-08-02 01:04:44 +00:00
Filippos Karapetis
6a82a3fbfc The text of the psychic profile in IHNM is shown correctly now
svn-id: r28397
2007-08-01 23:38:31 +00:00
Filippos Karapetis
617a500ef2 IHNM and ITE: ScummVM will no longer crash when loading games from the command line
svn-id: r28394
2007-08-01 21:47:17 +00:00
Filippos Karapetis
e5bd393a89 Compressed sounds now work in IHNM
svn-id: r28384
2007-08-01 14:19:55 +00:00
Filippos Karapetis
5d7daad632 Re-enabled the problematic older ITE demos (with notes on their current problems)
svn-id: r28382
2007-08-01 09:08:27 +00:00
Filippos Karapetis
e68624e789 Patch files are no longer left open the whole time, but are only opened when needed. This fixes the strange bug where BBM files didn't appear in the ITE demos that have substitute scenes when using MSVC compiled executables, as too many files were open at the same time
svn-id: r28381
2007-08-01 09:02:28 +00:00
Filippos Karapetis
b58d259f7e The psychic profile background is displayed correctly again
svn-id: r28380
2007-08-01 02:37:29 +00:00
Filippos Karapetis
4abcd58c76 Updated the ITE demo versions
svn-id: r28379
2007-08-01 02:19:05 +00:00
Travis Howell
d5e10d1d56 Fix compiler warnings.
svn-id: r28378
2007-08-01 01:21:03 +00:00
Travis Howell
c4829fe340 Fix compiler warning.
svn-id: r28376
2007-08-01 00:57:51 +00:00
Filippos Karapetis
e416cd0d83 Fix for the non-loading BBM files in the ITE demos with substitute scenes. This is a very strange bug, and it seems to be directly related to an issue with the Common::File class
svn-id: r28375
2007-08-01 00:38:28 +00:00
Filippos Karapetis
6b590bf4d1 Fixed incorrect file assignment for the ITE Windows demo
svn-id: r28372
2007-07-31 21:57:32 +00:00
Filippos Karapetis
cd20f09a9d Cleanup: removed dead code, fixed some comments and did some layout changes
svn-id: r28362
2007-07-31 18:08:40 +00:00
Filippos Karapetis
03d7990a34 Some updates to the psychic profile in IHNM. sfPsychicProfileOff has been enabled again
svn-id: r28361
2007-07-31 17:41:10 +00:00
Filippos Karapetis
c596fba864 sfPsychicProfileOff is not used, therefore disable it to prevent it from trying to clear the psychic profile again
svn-id: r28359
2007-07-31 15:40:08 +00:00
Filippos Karapetis
89451cfa43 It's now possible to return to the chapter selection screen correctly in IHNM
svn-id: r28358
2007-07-31 15:36:38 +00:00
Filippos Karapetis
165f7fcf73 Implement some differences to the actor walking code in IHNM
svn-id: r28352
2007-07-31 04:19:23 +00:00
Filippos Karapetis
32d0070868 Play MIDI music at the volume specified in the options screen
svn-id: r28348
2007-07-31 01:21:25 +00:00
Filippos Karapetis
2707e3a7e8 Music should not be played after changing scene if it's disabled from the options
svn-id: r28347
2007-07-31 00:52:00 +00:00
Filippos Karapetis
9a125828b9 The mouse works correctly now in the options dialog when it's opened in the non-interactive part of the IHNM demo
svn-id: r28346
2007-07-31 00:18:45 +00:00
Filippos Karapetis
3ee5ee2c06 Loading saved games in the demo version of IHNM should work now
svn-id: r28345
2007-07-31 00:06:57 +00:00
Filippos Karapetis
889d1a4aee The interactive part of the IHNM demo fully works now. Also, made the options screen work in the non-interactive part of the demo
svn-id: r28344
2007-07-30 23:37:18 +00:00
Filippos Karapetis
a09a95c99a sf92 is not null in the demo version of IHNM
svn-id: r28343
2007-07-30 23:30:08 +00:00
Filippos Karapetis
6f1baac2cd The interactive part of the IHNM demo loads music normally, like the full version, so only load music manually when songTableID is 0
svn-id: r28341
2007-07-30 21:17:15 +00:00
Filippos Karapetis
91c2aefc2a Fixed some resources of the IHNM demo
svn-id: r28340
2007-07-30 21:14:57 +00:00
Filippos Karapetis
1856a0f11b Correct the object sprites only in Ted's part of the IHNM demo
svn-id: r28339
2007-07-30 21:13:51 +00:00
Filippos Karapetis
2b2af8ab5e Music works now in the IHNM demo
svn-id: r28332
2007-07-30 18:26:56 +00:00
Filippos Karapetis
60b41486ac The disk icon is now shown in the IHNM demo (though it's not functional yet)
svn-id: r28329
2007-07-30 16:16:22 +00:00
Filippos Karapetis
78e8dadbe3 Verified some resources of the IHNM demo
svn-id: r28328
2007-07-30 16:12:40 +00:00
Filippos Karapetis
c8aae376a9 Process only mouse clicks in the psychic profile, not mouse movement
svn-id: r28326
2007-07-30 14:35:26 +00:00
Filippos Karapetis
7498c6b43e It's now possible to exit from the psychic profile screen in IHNM
svn-id: r28325
2007-07-30 14:22:53 +00:00
Filippos Karapetis
ba44fcbf6b Some corrections for the psychic profile screen in IHNM. The psychic profile background drawing has been turned into an event, so actors and animations will no longer be incorrectly shown. Also, the incorrect text color has been fixed. The text position is still wrong, though, and it's currently not possible to exit the psychic profile screen
svn-id: r28324
2007-07-30 13:19:46 +00:00
Filippos Karapetis
653cf4c971 Initial support of the psychic profile in IHNM (still buggy)
svn-id: r28323
2007-07-30 11:55:11 +00:00
Filippos Karapetis
36496dd467 The actors at the end of Benny's part in the IHNM demo are no longer incorrectly shown
svn-id: r28322
2007-07-30 10:33:17 +00:00
Filippos Karapetis
b888c08581 The credits of the IHNM demo are displayed correctly now
svn-id: r28320
2007-07-30 09:14:15 +00:00
Filippos Karapetis
976d39e2aa Changed some comments so that they follow the same commenting style
svn-id: r28319
2007-07-29 22:47:06 +00:00
Filippos Karapetis
bb22e22050 Inventory icons in the IHNM demo are displayed correctly now
svn-id: r28313
2007-07-29 19:06:17 +00:00
Filippos Karapetis
2c40b302ab The palette in Benny's part in the IHNM demo is correct now
svn-id: r28266
2007-07-28 13:28:25 +00:00
Filippos Karapetis
8c1fcc3c08 The main panel is now correctly shown in the IHNM demo. Some inventory items are still wrong, though
svn-id: r28264
2007-07-28 12:26:40 +00:00
Filippos Karapetis
3d434b1233 Fixed one of the incorrectly loaded palettes in Benny's part in the IHNM demo
svn-id: r28255
2007-07-28 02:25:09 +00:00
Filippos Karapetis
125872c90d The demo version of IHNM has no options panel, therefore the options icon and the options panel shortcuts have been disabled for the IHNM demo
svn-id: r28254
2007-07-28 01:04:59 +00:00
Filippos Karapetis
6c108f552c The IHNM demo uses the NULL panel
svn-id: r28253
2007-07-28 01:03:54 +00:00
Filippos Karapetis
cd9ade4af4 The mouse cursor is no longer incorrectly shown in the IHNM demo
svn-id: r28252
2007-07-28 00:40:04 +00:00
Filippos Karapetis
ac101f0d6a Disable the status text in the IHNM demo
svn-id: r28251
2007-07-28 00:33:09 +00:00
Filippos Karapetis
ee485afa89 Don't allow setCursor to change the cursor to an hourglass in the IHNM demo. The IHNM demo no longer crashes now
svn-id: r28250
2007-07-28 00:20:26 +00:00
Filippos Karapetis
a32b81d126 Do not try to load music if the music resource id is 0. Also, the voice LUT resource ID and the voice bank are now set correctly for the IHNM demo.
The IHNM demo starts now, showing some scenes, but the main panel is not loaded correctly, the status line is shown incorrectly and the demo crashes after a cutaway is shown

svn-id: r28245
2007-07-27 18:36:50 +00:00
Filippos Karapetis
f9b66f8816 The IHNM demo only has one mouse cursor
svn-id: r28244
2007-07-27 18:32:00 +00:00
Filippos Karapetis
a0d956221c Defined the starting scene for the IHNM demo
svn-id: r28239
2007-07-27 16:39:21 +00:00
Filippos Karapetis
178bf76aae The p2_a.iaf file should now be played correctly with the English DOS CD and Floppy versions of ITE. Should fix bug #1751344 - "ITE: p2_a.iaf not played correctly"
svn-id: r28229
2007-07-27 01:59:23 +00:00
Filippos Karapetis
f04c56fb69 The meta resource table is now properly initialized for the IHNM demo. The starting chapter is also set correctly
svn-id: r28222
2007-07-27 00:11:36 +00:00
Filippos Karapetis
75517ae813 Only queue the IHNM company and title videos in the full version of IHNM, not the demo
svn-id: r28217
2007-07-26 17:13:29 +00:00
Filippos Karapetis
da7d87e410 The demo version of IHNM has 3 font types (like ITE), not 6 (like the full version of IHNM)
svn-id: r28215
2007-07-26 14:39:05 +00:00
Filippos Karapetis
4785ae9cfc Removed some unnecessary file existence checks
svn-id: r28214
2007-07-26 13:26:34 +00:00
Filippos Karapetis
a50b03a9fc Some small updates on the IHNM demo
svn-id: r28146
2007-07-19 10:24:34 +00:00
Filippos Karapetis
3ffd5dea2a Some more resource mappings for the IHNM demo
svn-id: r28144
2007-07-19 02:51:36 +00:00
Filippos Karapetis
470dac5f8b IHNM: Correct mapping of the arrow and save reminder sprites for the IHNM demo
svn-id: r28143
2007-07-19 01:28:41 +00:00
Filippos Karapetis
d9932d110a Fix for bug #1754613 - ITE: crashes using compressed audio. The digital music information was missing from the ITE versions that did not originally include digital music
svn-id: r28141
2007-07-19 00:40:11 +00:00
Filippos Karapetis
32c87556de The SFX resource for the IHNM demo is different
svn-id: r28138
2007-07-18 16:14:40 +00:00
Filippos Karapetis
332f74486e Possible fix for bug 1754613, part 2: changed the way compressed digital music is detected
svn-id: r28127
2007-07-17 18:18:50 +00:00
Filippos Karapetis
5b7df04da9 Possible fix for bug 1754613. It's now possible to have an uncompressed music.rsc file when the rest of the data files are compressed
svn-id: r28126
2007-07-17 18:04:30 +00:00
Max Horn
f4c0b853cc Fixed sound factory messup caused by my previous commit
svn-id: r28111
2007-07-15 19:24:00 +00:00
Filippos Karapetis
4594202aaf To loop a music track forever, the number of loops is set to 0
svn-id: r28105
2007-07-15 15:27:42 +00:00
Filippos Karapetis
5fc39e7a30 ITE: looping of compressed digital music is now done by the respective compressed streams themselves
svn-id: r28104
2007-07-15 15:12:24 +00:00
Filippos Karapetis
198b6ac8e6 ITE: Music looping works now with compressed digital music. However, there's still a small pause when a track restarts
svn-id: r28082
2007-07-15 03:13:15 +00:00
Torbjörn Andersson
af21e132a2 Fixed compilation.
svn-id: r28078
2007-07-14 18:26:43 +00:00
Filippos Karapetis
5aba81d3e7 ITE: Fixed some more incorrect dots on dialog buttons
svn-id: r28077
2007-07-14 18:11:14 +00:00
Filippos Karapetis
a7adb5888c ITE: Fixed some of the incorrectly drawn dots of the menu buttons
svn-id: r28076
2007-07-14 17:39:47 +00:00
Filippos Karapetis
c8a8d806e2 Renamed a variable, so that it makes more sense
svn-id: r28072
2007-07-14 15:09:30 +00:00
Filippos Karapetis
ba3c55cd13 Some more updates for looping of compressed digital music. It's still not working, though
svn-id: r28071
2007-07-14 15:06:06 +00:00
Filippos Karapetis
101dc5cb20 Improved check for the patched sound file used in ITE intro
svn-id: r28070
2007-07-14 14:18:45 +00:00
Filippos Karapetis
009b100094 Cleanup of the digital music code. Now all kinds of music (uncompressed and compressed) are handled by the same class, DigitalMusicInputStream
svn-id: r28069
2007-07-14 13:41:03 +00:00
Filippos Karapetis
9efa640f9c Fix graphics glitch in the rat caves in ITE. Closes bug #1735437 - "ITE: Sprite priority in rat caves"
svn-id: r28064
2007-07-14 03:44:47 +00:00
Filippos Karapetis
355ac5db2f Oops, deactivated the actor debug flag again, which was incorrectly activated in commit #28058
svn-id: r28059
2007-07-13 16:45:11 +00:00
Filippos Karapetis
eedec897f8 Rewrote and greatly simplified the SAGA detector, removing many duplicate and unneeded entries
- Digital music will now always be enabled for all versions if the digital music file is present. The duplicate game entries with and without this file have been removed
- Changed the way compressed sound files are detected. All the duplicate compressed sound entries have been removed
- The Wyrmkeep Windows CD version is now properly distinguished from the DOS CD version
- Unified all the different patch file entries (apart from the Mac patch file entries, which are of a different type). If a patch file is not found, it's ignored

svn-id: r28058
2007-07-13 16:37:37 +00:00
Filippos Karapetis
52f4d0b7d9 Add TODO: music looping does not work with compressed digital music
svn-id: r28056
2007-07-13 16:20:32 +00:00
David Corrales
720c974faf Changed SaveFileManager::listSavegames() function to be engine agnostic. It now returns a list will the full paths of existing files that match a given regex.
Additionally, modified the 5 engines which use the default manager (Agos, Queen, Saga, Scumm and Touche) to parse the filename list and mark the available saves bool array correctly.

svn-id: r28046
2007-07-12 17:58:15 +00:00
Filippos Karapetis
17a4539a65 Renamed a variable, so that it makes more sense
svn-id: r28042
2007-07-12 08:52:07 +00:00
Filippos Karapetis
994a191858 IHNM: Narrowed down the places where the actors stop being drawn when changing scenes
svn-id: r28022
2007-07-11 03:21:29 +00:00
Filippos Karapetis
0ed332acba Fix for bug #1751344 - "ITE: p2_a.iaf not played correctly"
svn-id: r28018
2007-07-10 23:22:44 +00:00
Filippos Karapetis
697f945e00 Reverted commit 27948. Cutaways in sfScriptGotoScene are cleared by calling clearcutaway directly again, as calling it using an event does not clear the cutaway when it should (which caused problems in the character selection screen)
svn-id: r27976
2007-07-08 20:46:21 +00:00
David Corrales
9bfe5d5354 Merged the FSNode branch with trunk r27681:27969
svn-id: r27970
2007-07-08 16:58:54 +00:00
Filippos Karapetis
a43eb567cc Clear the cutaway via an event in sfScriptGotoScene, instead of calling the function directly
svn-id: r27948
2007-07-07 01:11:43 +00:00
Filippos Karapetis
c72633b539 IHNM: Benny will no longer start walking backwards for a bit after talking with the child via the monitor. This glitch occurs with the original interpreter as well
svn-id: r27947
2007-07-07 00:53:16 +00:00
Filippos Karapetis
737216e52e When loading a scene, start showing actors only after the scene background has been shown. This prevents some cases where some actors are shown prematurely before the next scene is loaded (e.g. in IHNM, when entering a chapter, after AM finishes his speech)
svn-id: r27946
2007-07-07 00:36:10 +00:00
Filippos Karapetis
3efcdd7a43 Modified ticksToMSec in IHNM, so that it waits for the correct amount of time. Many animations which were not displayed quite right are fixed now, including some small syncing issues with video and sound in some places
svn-id: r27939
2007-07-06 13:21:43 +00:00
Filippos Karapetis
38f3b09e58 IHNM: sf103 is sfQueueMusic. Now, when doing a good/bad deed in IHNM, the music changes correctly
svn-id: r27936
2007-07-06 12:39:00 +00:00
Filippos Karapetis
51458026fe The prisoners at the entrance of the prison in Nimdok's chapter are displayed correctly now
svn-id: r27931
2007-07-05 21:19:47 +00:00
Filippos Karapetis
8d81d720d3 Implemented the rest of the differences of the sfScriptGotoScene opcode in IHNM
svn-id: r27916
2007-07-05 03:37:23 +00:00
Filippos Karapetis
7782ac40b8 Renamed a variable, to avoid confusing it with another variable with the same name
svn-id: r27853
2007-07-02 13:44:29 +00:00
Max Horn
e1bcd70436 Re-added __attribute__(packed)
svn-id: r27830
2007-07-01 18:18:43 +00:00
Filippos Karapetis
7a709b3c79 Added a workaround to prevent the making fire animation from breaking at the beehive scene in ITE
svn-id: r27756
2007-06-28 06:55:00 +00:00
Filippos Karapetis
535f08e022 Added a debug message for game loading
svn-id: r27755
2007-06-28 05:37:55 +00:00
Travis Howell
b939c15f9d Fix compiler warning.
svn-id: r27739
2007-06-27 02:24:19 +00:00
Filippos Karapetis
137862b00b Add support for compressed digital music in ITE
svn-id: r27734
2007-06-26 23:40:22 +00:00
Filippos Karapetis
9263d7cd6c Remove some unneeded includes
svn-id: r27733
2007-06-26 23:38:21 +00:00
Filippos Karapetis
bf24bff17e Move to the correct file offset when using compressed sounds in ITE
svn-id: r27729
2007-06-26 13:38:24 +00:00
Filippos Karapetis
2c3cbf444a Improvements to the SAGA compressed sound support
svn-id: r27717
2007-06-25 20:20:59 +00:00
Filippos Karapetis
78addd0d66 Put a comment in its correct location
svn-id: r27716
2007-06-25 19:10:50 +00:00
Filippos Karapetis
23c8240048 Add support for compressed sound effects, digital music and speech to the SAGA engine
svn-id: r27713
2007-06-25 18:23:01 +00:00
Filippos Karapetis
057d26e2f3 Added entries for ITE compressed files to the detector. IHNM is not added yet, as it needs more testing
svn-id: r27712
2007-06-25 18:21:40 +00:00
David Corrales
cacd7a28fd Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
2007-06-23 18:51:33 +00:00
Filippos Karapetis
b85320fa69 Fix MSVC8 warning
svn-id: r27633
2007-06-22 22:14:35 +00:00
Torbjörn Andersson
b61738b270 Use KEYCODE constants. (Except for '~' which doesn't seem to have one.)
svn-id: r27595
2007-06-21 19:55:22 +00:00
Filippos Karapetis
5624ba23d0 Added a workaround in IHNM for the compact disk in Ellen's chapter
svn-id: r27557
2007-06-20 16:36:29 +00:00
Filippos Karapetis
6689a6607b Fix crashes with some savegames in IHNM
svn-id: r27553
2007-06-20 01:45:38 +00:00
Filippos Karapetis
aeb9668d66 When loading a game from the same chapter as the current chapter in IHNM, the game will now be loaded correctly
svn-id: r27546
2007-06-19 11:41:06 +00:00
Filippos Karapetis
4ffd38a199 When saving the game in IHNM after a chapter point change, the chapter point change music will no longer be incorrectly saved, and the normal chapter music will be saved instead
svn-id: r27545
2007-06-19 11:23:20 +00:00
Filippos Karapetis
e654381717 IHNM: In chained cutaways, clear the previous cutaway immediately
svn-id: r27543
2007-06-19 10:13:41 +00:00
Filippos Karapetis
8bc226b0e5 The correct music track is now played when loading a game in IHNM. The save/load mechanism in IHNM seems to be working correctly now (although it needs testing), however there are still some graphical glitches with the save/load dialogs. Also, moved some unfinished code for returning to the chapter selection screen to a more appropriate place
svn-id: r27542
2007-06-19 02:42:59 +00:00
Filippos Karapetis
3c424d98cd Removed obsolete comment
svn-id: r27541
2007-06-19 01:41:10 +00:00
Filippos Karapetis
153f325004 More updates for the save/load system in IHNM
svn-id: r27540
2007-06-19 01:37:48 +00:00
Filippos Karapetis
3f5202ea38 Change some regular integers to short integers
svn-id: r27538
2007-06-18 19:56:36 +00:00
Eugene Sandulenko
e477ca37b3 Normalize event names.
svn-id: r27513
2007-06-17 16:21:05 +00:00
Filippos Karapetis
6dc0a1b234 Some more updates for saving/loading in IHNM
svn-id: r27512
2007-06-17 15:45:09 +00:00
Filippos Karapetis
65a39ab0d0 Some updates on the save/load system in IHNM. It still needs work, though
svn-id: r27505
2007-06-17 02:59:56 +00:00
Filippos Karapetis
3c24b118b4 Fixed the remaining glitch with fading after a cutaway is shown
svn-id: r27504
2007-06-17 01:50:49 +00:00
Eugene Sandulenko
f7b28b95ad More efforts to implement proper fade after cutaway. One little glitch is left.
svn-id: r27502
2007-06-17 01:00:06 +00:00
Filippos Karapetis
e080f49397 Options button is now working in the character selection screen in IHNM
svn-id: r27480
2007-06-16 19:11:55 +00:00
Eugene Sandulenko
d9abc85fbd An attempt to fix restoring from cutaway. Still not perfect.
svn-id: r27465
2007-06-16 14:06:17 +00:00
Filippos Karapetis
332a2e23d8 IHNM: Implemented cutaway fadeout
svn-id: r27445
2007-06-16 08:53:46 +00:00
Filippos Karapetis
fb1a6fcbc2 Enable the options panel during chapter selection in IHNM. The icon is not yet functional during chapter selection, but the keyboard shortcuts work
svn-id: r27443
2007-06-16 08:27:53 +00:00
Filippos Karapetis
ce8a015c1c Rewrote the cutaway initialization part
svn-id: r27440
2007-06-16 02:38:17 +00:00
Filippos Karapetis
edce894414 Fixed chained cutaways in IHNM. Ben's chapter is completable now
svn-id: r27439
2007-06-16 01:59:04 +00:00
Filippos Karapetis
b37161bafd IHNM: Added a temporary workaround for the nightfall scene in Ben's chapter
svn-id: r27438
2007-06-16 01:58:03 +00:00
Filippos Karapetis
5e587fde8e Clear the forced text flag if it's set when a speech with forced text finishes. Now, ScummVM won't wait forever when talking to an actor after using the computer screen in the elder's screen at Ben's chapter in IHNM
svn-id: r27428
2007-06-15 18:28:44 +00:00
Filippos Karapetis
e6fe560ad1 IHNM no longer crashes during character selection if the mouse cursor is over a character before AM finishes his speech
svn-id: r27418
2007-06-15 16:26:14 +00:00
Filippos Karapetis
4f8f854ee6 Forced text is now handled correctly. It's now possible to interact with the video screen in the elder's cave
svn-id: r27410
2007-06-15 03:58:21 +00:00
Filippos Karapetis
3b78d79ec0 The frame count should be updated when the background frame is shown in a cutaway
svn-id: r27409
2007-06-15 03:16:06 +00:00
Filippos Karapetis
cb15724147 It's normal for cutaways to only have 1 frame
svn-id: r27408
2007-06-15 02:29:08 +00:00
Filippos Karapetis
708e006059 Added another console command for IHNM
svn-id: r27405
2007-06-14 23:42:39 +00:00
Filippos Karapetis
16a6dc45c0 Added several console commands for SAGA. Also, fixed a regression in the IHNM introduction caused by commit #27357. Finally, animation IDs are checked for validity now, so ScummVM won't try to play invalid animations
svn-id: r27404
2007-06-14 23:28:30 +00:00
Filippos Karapetis
585e0781dd SAGA: Added sanity checks for speech box coordinates, like the original. Now, there won't be missing subtitles in certain scenes
svn-id: r27397
2007-06-14 04:22:23 +00:00
Filippos Karapetis
99c65ce24d IHNM: Button texts are read from the game data files, instead of the hardcoded ITE strings. The IHNM-specific strings have been removed from the ITE hardcoded strings. Also did some cleanup
svn-id: r27396
2007-06-13 22:23:12 +00:00
Filippos Karapetis
5b395c7397 Moved a check for game type after engine initialization
svn-id: r27390
2007-06-13 20:13:06 +00:00
Filippos Karapetis
0d4a3c28d9 IHNM: Button textures are loaded correctly now for buttons in the option and quit panel. Also, implemented the voices/subtitles toggle functionality and fixed widget placement a bit
svn-id: r27388
2007-06-13 19:41:27 +00:00
Filippos Karapetis
7af7e3f192 Fix the quit panel in IHNM
svn-id: r27387
2007-06-13 15:31:45 +00:00
Filippos Karapetis
8565809552 IHNM: Fixed sfSetSpeechBox, now the dialog of Nimdok and Mengele will show up correctly. Also, done some preliminary work on sfScriptGotoScene and changeScene to return to the character selection screen, but it's not right yet
svn-id: r27385
2007-06-13 13:00:25 +00:00
Filippos Karapetis
ee78a7427b Fixed several colors and fonts in IHNM
svn-id: r27382
2007-06-12 22:47:12 +00:00
Filippos Karapetis
5db4ab48bc Corrected actor walk speed when exiting from zones in IHNM
svn-id: r27379
2007-06-12 20:36:08 +00:00
Filippos Karapetis
110db592c0 Make keys 5-9 work during dialogs in IHNM
svn-id: r27378
2007-06-12 19:45:39 +00:00
Eugene Sandulenko
6e5b70f5e9 Patch #1733764: "Fallback detection patch". GSoC student.
svn-id: r27375
2007-06-12 12:22:25 +00:00
Filippos Karapetis
9c07235a93 Auto-use no-walk hitzones in IHNM, like the original. This fixes the pathfinding problems in Benny's chapter
svn-id: r27370
2007-06-12 01:30:15 +00:00
Filippos Karapetis
5e49fb7bc7 Make sure the waiting thread stops waiting after an animation in IHNM. Ellen's path is completable now
svn-id: r27358
2007-06-11 12:39:44 +00:00
Filippos Karapetis
daff536420 The waiting thread will no longer wait forever for some videos to finish in IHNM
svn-id: r27357
2007-06-11 12:14:06 +00:00
Filippos Karapetis
2084bd4610 When using some items in IHNM, it was possible that the verb would incorrectly change from "use" to "use with" (e.g. the jukebox in the honky-tonk). This has been fixed
svn-id: r27356
2007-06-11 12:12:59 +00:00
Filippos Karapetis
7ab15fa3c9 Implemented Scene::RestoreScene and fixed some animation bugs. Animations and videos in IHNM should display correctly now
svn-id: r27338
2007-06-11 02:30:04 +00:00
Filippos Karapetis
7522d4ea51 Fix for stacked objects in IHNM. It is now possible to interact with the chalk in Ted's chapter
svn-id: r27337
2007-06-11 01:22:45 +00:00
Filippos Karapetis
0da6062bb2 Remove obsolete testing code
svn-id: r27306
2007-06-10 11:51:33 +00:00
Filippos Karapetis
a121e4ce05 Fixed an incorrect check in Script::finishDialog
svn-id: r27274
2007-06-10 03:21:16 +00:00
Filippos Karapetis
3fd5347421 Fixed conversations in IHNM. Now, when a dialog option is selected, the protagonist will say it out properly before we hear the other character's reply. Also, added some more code for sfScriptFade and made it a stub for now, as it still needs work
svn-id: r27264
2007-06-10 00:36:01 +00:00
Andrew Kurushin
86f6aaf206 fix IHNM protagonist state loading routine. now Ellen's animations are showing well
svn-id: r27263
2007-06-09 22:45:03 +00:00
Filippos Karapetis
4ae78ea22d Silence some unneeded warnings, remove some unneeded test code from Actor::getActorFrameRange, as the function is the same in both ITE and IHNM
svn-id: r27226
2007-06-09 01:33:58 +00:00
Andrew Kurushin
78cf024351 fix IHNM pathfinding engine. now TED(Chapter 5) interacts with the books properly
svn-id: r27225
2007-06-08 23:33:35 +00:00
Filippos Karapetis
1255681d0d IHNM never sets scriptModuleNumber to 0 in Script::doVerb(). Now, all items will have the correct script assigned to them (e.g. the fruit at the fruit tree screen in Benny's chapter, the icon in the chapel in Ted's chapter etc)
svn-id: r27203
2007-06-08 14:45:25 +00:00
Filippos Karapetis
a9b81750cf Also include this file for the last commit
svn-id: r27180
2007-06-07 23:39:31 +00:00
Filippos Karapetis
90d840de45 Implement more Actor::calcScreenPosition differences for IHNM
svn-id: r27179
2007-06-07 23:37:32 +00:00
Filippos Karapetis
d52cb6c62b Fixed video display and removed a hack for it
svn-id: r27173
2007-06-07 15:49:12 +00:00
Filippos Karapetis
ed8bd9494a Fixed regression: panel mode should be set to video at the beginning of IHNM
svn-id: r27172
2007-06-07 15:47:47 +00:00
Filippos Karapetis
7e29cf35de Limited frame count hack to apply to videos only
svn-id: r27167
2007-06-07 12:39:38 +00:00
Filippos Karapetis
7bd240ea8f Implemented video playing for IHNM (still needs work). Also, updated a comment regarding the intro
svn-id: r27166
2007-06-07 12:11:33 +00:00
Filippos Karapetis
9b14f5faed Implemented the sfGetMouseClicks and sfResetMouseClicks opcodes and created the skeleton for sfScriptStartVideo, sfScriptReturnFromVideo and sfScriptEndVideo opcodes
svn-id: r27145
2007-06-06 19:46:10 +00:00
Filippos Karapetis
5d46606bb0 Fixed the parameter order in sfScriptFade
svn-id: r27143
2007-06-06 18:09:52 +00:00
Filippos Karapetis
00dac8c10f Implemented the sfScriptFade opcode
svn-id: r27142
2007-06-06 18:04:25 +00:00
Filippos Karapetis
a6c476b292 Added palette fading in playCutaway()
svn-id: r27141
2007-06-06 18:02:33 +00:00
Filippos Karapetis
a265844351 Added sanity checks for hitzones in SAGA, after discussing with h00ligan and sev. Removed a hack for IHNM which is not needed anymore and removed a redundant check for zero object types
svn-id: r27140
2007-06-06 16:37:10 +00:00
Filippos Karapetis
735530bdc8 Implemented differences in Actor::calcScreenPosition for IHNM. Now the stitching on the second floor of the zeppelin and the whiskey in the honky-tonk are shown correctly
svn-id: r27124
2007-06-06 00:56:29 +00:00
Filippos Karapetis
b82e88638b Properly implemented the converse panel in IHNM (though the colors are still wrong)
svn-id: r27123
2007-06-06 00:52:46 +00:00
Filippos Karapetis
55607e9c99 Fix regression caused by commit #27108
svn-id: r27122
2007-06-06 00:51:07 +00:00
Travis Howell
248d527a56 Avoid compiler warnings.
svn-id: r27118
2007-06-05 22:38:43 +00:00
Filippos Karapetis
ab6fb8e9c3 Filtering specific verbs is used in ITE, but not in IHNM. It's now possible to use the jukebox in the honky-tonk in IHNM
svn-id: r27110
2007-06-05 16:31:58 +00:00
Filippos Karapetis
158193fe51 Add the hack for the staircase in the zeppelin in IHNM once more, apparently the cause for it is different than what I thought
svn-id: r27109
2007-06-05 16:29:15 +00:00
Filippos Karapetis
2f033e7a4c Check if a zone type is NULL for both ITE and IHNM, as it's done in the original. This fixes the crash in IHNM when entering the second floor of the zeppelin and the crash in ITE when interacting with the bowl in the tunnel, outside the prison. Removed the two relevant hacks
svn-id: r27108
2007-06-05 15:04:25 +00:00
Filippos Karapetis
95821c97ee Inventory and conversation arrows are working correctly now in IHNM
svn-id: r27107
2007-06-05 13:19:47 +00:00
Filippos Karapetis
2b593f30a1 IHNM: Add a temporary hack for the crash that occurs when climbing the staircase to the second floor of the zeppelin in chapter 1
svn-id: r27094
2007-06-04 23:10:59 +00:00
Filippos Karapetis
abc879f2d8 Fixed incorrect placing of converse information for IHNM. Dialog options should work in IHNM now, although they're still not placed properly
svn-id: r27084
2007-06-04 19:29:28 +00:00
Filippos Karapetis
1fe7b427dd Properly define max text width in IHNM
svn-id: r27082
2007-06-04 18:08:44 +00:00
Filippos Karapetis
f6b8c98c13 SAGA: When trying to access a wrong hitzone, adjust it to a valid one and continue with a warning instead of exiting with an error . We don't normally get invalid hitzones in ITE, but we do in IHNM, so this is used for now to bypass the places where IHNM crashes. It's now possible to climb the steps to the second floor of the zeppelin with Gorrister
svn-id: r27072
2007-06-03 22:00:18 +00:00
Filippos Karapetis
7201437206 The animation frame counter is updated correctly now, so all animations in IHNM where the engine is waiting are displayed fully. Big thanks to sev, once again :)
svn-id: r27070
2007-06-03 19:15:59 +00:00
Filippos Karapetis
66f9032d01 Simplified check for scene height in IHNM
svn-id: r27067
2007-06-03 16:14:57 +00:00
Filippos Karapetis
89b80a3f8b Opcode 11 is sfLockUser. Also updated Scene::getHeight() for this change. Now, the interface is locked when the scripts lock it. This prevents erroneous actor movement when skipping speech by left clicking, and other incorrect behavior. Special thanks to h00ligan for all his help
svn-id: r27064
2007-06-03 15:50:25 +00:00
Filippos Karapetis
3ba184b21f Moved the updating of framecount to a more appropriate place
svn-id: r27060
2007-06-03 02:39:44 +00:00
Filippos Karapetis
f4299e81c1 Implemented the sfWaitFrames script function for IHNM. Many animations should display more correctly now (e.g. actor "zapping" animations, Ben falling off the stairs). They're still not correct, as frameCount is not updated properly
svn-id: r27055
2007-06-02 15:26:05 +00:00
Filippos Karapetis
9896ce253e Moved a sanity check before some relevant asserts
svn-id: r27054
2007-06-02 15:21:42 +00:00
David Corrales
0cab5b7791 Merged the fs branch with trunk. r26949:27031
svn-id: r27032
2007-05-31 23:44:43 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Filippos Karapetis
c739b43bc7 Color 0 should always be black in IHNM. The panel backgrounds don't erroneously change color now when moving between rooms
svn-id: r27004
2007-05-29 16:21:09 +00:00
Filippos Karapetis
438ba78387 Corrected actor walk speed in IHNM
svn-id: r27003
2007-05-29 12:55:17 +00:00
Eugene Sandulenko
baea10979c Partial fix for walking speed in IHNM.
svn-id: r26999
2007-05-28 16:36:18 +00:00
Filippos Karapetis
572a4b3191 Changed the frameOffset sanity check in Script::sfPlaceActor to throw a warning instead of an error. In IHNM, it's now possible to use the knife with the rats when playing with Garrister
svn-id: r26985
2007-05-28 00:36:11 +00:00
Filippos Karapetis
233971ed31 Made verbs "push" and "swallow" work in IHNM. It's now possible to choose a monitor with Ted
svn-id: r26983
2007-05-27 23:30:21 +00:00
Filippos Karapetis
13541d3e96 Verb actions are working correctly now in IHNM. Some verbs are still non-functional
svn-id: r26970
2007-05-27 11:49:08 +00:00
Filippos Karapetis
ff7d48f582 Changed the check for the status bar in IHNM to match the original, removed a relevant hack
svn-id: r26802
2007-05-11 13:10:13 +00:00
Filippos Karapetis
1880c8739b Disable the status text in IHNM when the main panel is not shown. Fixes a crash when hovering over a character in the character selection screen
svn-id: r26801
2007-05-11 10:35:12 +00:00
Torbjörn Andersson
a6095b93d9 Removed unused variable.
svn-id: r26797
2007-05-10 03:02:00 +00:00
Andrew Kurushin
85082dc8a0 speedup SAGA::Actor::pathLine & SAGA::Actor::scanPathLine calculation
svn-id: r26791
2007-05-09 13:25:14 +00:00
Filippos Karapetis
a8ab2c7cff Moved functions getDoorState, setDoorState, getBGMaskType and validBGMaskPoint to scene.h and disabled some sanity checks to improve the speed of the pathfinding algorithm, after discussing with h00ligan
svn-id: r26789
2007-05-08 17:32:31 +00:00
Andrew Kurushin
21412b821c small pathfind speedup: validate coords only with debug definition
svn-id: r26788
2007-05-08 16:09:47 +00:00
Eugene Sandulenko
22e022cdcb Simplify cursor events management.
svn-id: r26772
2007-05-07 06:18:08 +00:00
Filippos Karapetis
c4c9ff5533 The cursor in IHNM changes to an hourglass now while loading scenes, like in the original interpreter
svn-id: r26768
2007-05-06 22:18:31 +00:00
Filippos Karapetis
b9cdca27ee Added (non-functional) save and load buttons in the options panel of IHNM
svn-id: r26767
2007-05-06 17:18:11 +00:00
Filippos Karapetis
463c5fcec8 More IHNM options panel improvements: added text and working widgets for read speed, music and sound, matched the font and the coordinates of the options panel and the widgets with the ones of the original interpreter
svn-id: r26738
2007-05-02 23:27:25 +00:00
Filippos Karapetis
7e16ca13c6 SAGA: Modified a workaround made for ITE to work in ITE only
svn-id: r26737
2007-05-02 21:39:56 +00:00
Filippos Karapetis
74f839d6c8 IHNM: Added the options dialog and quit dialog with very basic functionality (continue and exit game).
The buttons are still wrong and not all the options are implemented yet, but at least the game doesn't freeze when the user tries to open the options dialog and it's now possible to exit normally

svn-id: r26735
2007-05-02 17:12:30 +00:00
Filippos Karapetis
6ca558f0ff Fix for verbs in IHNM
svn-id: r26732
2007-05-01 21:48:18 +00:00
Filippos Karapetis
d08eeff700 Renamed decodeILBM to decodePBM, removed a TODO
svn-id: r26731
2007-05-01 21:40:56 +00:00
Nicola Mettifogo
008042ac25 Implemented a IFF (Interchange File Format) parser and added subclasses to parse graphics (ILBM, PBM) and audio (8SVX), thus replacing old decoding routines. SAGA and Parallaction have been adjusted to work with the new code.
svn-id: r26719
2007-05-01 15:39:40 +00:00
Max Horn
60aec5b9f1 SAGA: Moved displayinfo stuff into its own header file
svn-id: r26635
2007-04-27 23:11:12 +00:00
Max Horn
030cd2c02a Some tweaks to saga/detection_tables.h
svn-id: r26633
2007-04-27 22:39:31 +00:00
Max Horn
3924a2587f Renamed sagagame.cpp -> detection_tables.h; merged sagagame.h into saga.h
svn-id: r26632
2007-04-27 22:35:05 +00:00
Max Horn
fbc2f89b08 Renamed some game.cpp files to detection.cpp
svn-id: r26623
2007-04-27 20:26:54 +00:00
Eugene Sandulenko
28e721836a Slighty modified patch #1704979: "Fix for #1690045: ITE: Item description missing"
svn-id: r26558
2007-04-21 21:29:52 +00:00
Eugene Sandulenko
b1e79b9253 More meaningful error message
svn-id: r26557
2007-04-21 21:23:26 +00:00
Max Horn
624b57db3a oops, openStreamFile of course uses milliseconds, not frames, for the playback offsets/durations
svn-id: r26475
2007-04-14 18:44:15 +00:00
Max Horn
22f325af94 Removed some leftovers
svn-id: r26474
2007-04-14 17:42:51 +00:00
Max Horn
943656ab63 Replaced the use of DigitalTrackInfo objects (which were being leaked, BTW) with a call to openStreamFile (code completely *untested*, so it might not work properly yet). Note the new FIXME comment regarding the playback duration
svn-id: r26473
2007-04-14 17:35:28 +00:00
Gregory Montoir
5aca9dce8c added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
svn-id: r26357
2007-04-01 17:36:13 +00:00
Max Horn
94739cdbca SAGA: Make use of EventManager::getMousePos
svn-id: r26223
2007-03-18 18:45:36 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
2007-03-17 19:02:05 +00:00
Torbjörn Andersson
53624376b4 Applied my re-revised patch #1487149 ("Simplified keyboard repeat"), with
Fingolfin's blessings. Keyboard repeat is now handled by the event manager,
rather than by individual engines.

Since this can cause problems with some engines (see the AGI engine), the extra
"key down" events are marked as "synthetic", so that they can be ignored if
necessary.

svn-id: r26170
2007-03-17 15:44:26 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
2007-03-17 00:53:21 +00:00
Eugene Sandulenko
11aafd1685 Fix looping for enchanced soundtracks.
svn-id: r25855
2007-02-25 14:34:21 +00:00
Max Horn
65b30d84a8 Added numLoops parameter to DigitalTrackInfo::play
svn-id: r25836
2007-02-24 23:19:53 +00:00
Torbjörn Andersson
09ad4f1a87 Renamed SAGA_xxx_H_ to SAGA_xxx_H for consistency.
svn-id: r25726
2007-02-19 17:30:43 +00:00
Max Horn
b8aeefaffb Added finalize() method to Common::OutSaveFile (which by default just flushes the stream), changed engines to call that before deleting OutSaveFile instances (instead of just flushing)
svn-id: r25660
2007-02-17 18:55:51 +00:00
Max Horn
7572d2b4f2 Changed detectBestMatchingGame to return a pointer to a ADGameDescription (or a subclass of it); added a (currently fake) fallback callback entry in ADParams
svn-id: r25574
2007-02-13 23:37:44 +00:00
Max Horn
4968e912ce AdvancedDetector changes:
* Renamed genGameList to gameIDList to make it match the corresponding
  plugin API function name
* removed the detectFunc param from detectGameForEngineCreation,
  as it *always* pointed to a straight wrapper around AdvancedDetector::detectAllGames
* as a consequence, removed the various GAME_detectGames functions from the
  engines, and removed the detectFunc param from ADVANCED_DETECTOR_DEFINE_PLUGIN

svn-id: r25547
2007-02-13 14:55:11 +00:00
Eugene Sandulenko
da7d8c9f35 Rename Common::GF_XXX to Common::ADGF_XXX
svn-id: r25545
2007-02-13 13:42:28 +00:00
Max Horn
2afe07992f Renamed kADFlagComplexID to kADFlagAugmentPreferredTarget, document it, and add it for AGOS, too
svn-id: r25543
2007-02-13 13:17:46 +00:00
Max Horn
55adc889e7 (re)added flags field to ADGameDescription, with currently only one value (GF_DEMO) -- this flag value is not yet used by anything (also, GF_DEMO hasn't been correctly set for AGI games yet)
svn-id: r25539
2007-02-13 01:28:18 +00:00
Eugene Sandulenko
7b6bdd231d AdvancedDetector now has built-in fallback detection based on file lists.
Currently only gob engine benefits from it.

svn-id: r25374
2007-02-04 03:10:27 +00:00
Max Horn
cb49cbdd45 * Reimplemented Mixer::pauseAll to simply invoke pause on all channels
(implying change of semantics)
* Reordered the params of Mixer::playRaw (the SoundType now comes first, not last)
* Removed Mixer::isPaused
* Removed Mixer::getSoundElapsedTimeOfSoundID
* Added some doxygen comments to the Mixer

svn-id: r25356
2007-02-03 19:05:53 +00:00
Gregory Montoir
7e5a0b05b5 warnings
svn-id: r25284
2007-01-30 20:20:05 +00:00
Eugene Sandulenko
adcfd2cc5f Now AdvancedDetector could use single ID per engine. Also it can suggest
more complex game IDs with platform and language specified.

AGI engine benefits most from that.
Also turned Cine, Parallaction and SAGA to single ID, autoupgrading old ID.

svn-id: r25269
2007-01-29 23:25:51 +00:00
Eugene Sandulenko
93687d376b Add more paramteres to AdvancedDetector. Not used yet.
svn-id: r25241
2007-01-28 07:31:26 +00:00
Max Horn
d70c83bd4b Lots of cleanup in the AdvancedDetector
svn-id: r25194
2007-01-25 21:16:57 +00:00
Eugene Sandulenko
bb3cc79bc6 Reduce #include dependencies
svn-id: r25178
2007-01-25 01:05:25 +00:00
Eugene Sandulenko
6eb9f41e68 Use file sizes in detection too.
svn-id: r25172
2007-01-25 00:37:12 +00:00
Eugene Sandulenko
3d8e290f3c Sync with last AdvancedDetector changes
svn-id: r25167
2007-01-24 23:13:00 +00:00
Eugene Sandulenko
318210ad96 Add optional size parameter to ADGameFileDescription. Not used now.
svn-id: r25164
2007-01-24 22:42:44 +00:00
Eugene Sandulenko
d3b0ff8ade Reduce dependency from common/advancedDetector.h
svn-id: r25156
2007-01-21 20:24:38 +00:00
Eugene Sandulenko
cd8a5f3a98 First phase of detection-related plugins interface improvements. Now plugins
return StringMap instead of fixed list of parameters. This adds great
flexibility.

Current patch should not alter any functionality, i.e. if there are regressions,
submit a report. Phase 2 will benefit from these changes and will come later.

svn-id: r25134
2007-01-20 21:27:57 +00:00
Eugene Sandulenko
c01839bbe9 Make ADGameFileDescription is built in directly into ADGameDescription.
svn-id: r24947
2006-12-29 00:03:03 +00:00
Max Horn
559f2b62eb Renamed real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION to ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION, and real_ADVANCED_DETECTOR_DETECT_INIT_GAME to ADVANCED_DETECTOR_DETECT_INIT_GAME
svn-id: r24896
2006-12-19 23:57:04 +00:00