D G Turner
c14f45ee05
TOUCHE: Simplify external digital music support slightly.
...
Checked with valgrind and no leaks are evident.
Thanks to LordHoto for suggesting these changes.
2012-12-16 16:44:34 +00:00
D G Turner
74cd6a4d26
TOUCHE: Fix external music to work with any music format.
...
This also removes the direct dependency on vorbis.
Thanks to [md5] for the majority of this patch.
2012-12-16 16:03:32 +00:00
D G Turner
101d355b4a
TOUCHE: Add commands to play and stop music tracks to engine console.
2012-12-16 13:42:28 +00:00
D G Turner
9986d73e47
Merge branch 'toucheExtMusic'
2012-12-16 13:12:02 +00:00
Bastien Bouclet
fb38d7c04e
MOHAWK: Fix an uninitialized var usage in Mechanical
...
Thanks to digitall for the report
2012-12-16 13:51:21 +01:00
Bastien Bouclet
80a30286a2
MOHAWK: Fix opening the library in Myst Demo
2012-12-16 13:20:50 +01:00
Bastien Bouclet
edb8b6e236
MOHAWK: Add the remaining Myst transition effects
2012-12-16 10:28:23 +01:00
Torbjörn Andersson
af64cad069
JANITORIAL: Replace some spaces with tabs
2012-12-16 09:35:52 +01:00
Bastien Bouclet
611900d3c3
MOHAWK: The cancel button of Myst's dialog was actually saving
2012-12-16 06:55:07 +01:00
Bastien Bouclet
07ee25c87d
MOHAWK: Implement most of Myst's transition system
2012-12-16 06:54:13 +01:00
Bastien Bouclet
0358a44738
MOHAWK: Implement the last two Myst opcodes
2012-12-16 06:51:01 +01:00
Bastien Bouclet
4ae8b3b1e8
MOHAWK: Fix Myst ME's clock tower weight not going back up
2012-12-16 06:51:01 +01:00
Bastien Bouclet
fb02d1decd
MOHAWK: Add a workaround for Myst ME fortress rotation bug
2012-12-16 06:51:01 +01:00
Bastien Bouclet
e0c923fd5a
MOHAWK: Play Stoneship chest valve opening movie backwards
2012-12-16 06:51:01 +01:00
Bastien Bouclet
5d90c93385
MOHAWK: Play Channelwood stairs door closing movie backwards
2012-12-16 06:51:01 +01:00
Bastien Bouclet
bbc760c51c
MOHAWK: Implement Mechanical fortress rotation
...
Both the simulation and the actual rotation.
2012-12-16 06:51:01 +01:00
Bastien Bouclet
adf3a8d7dd
MOHAWK: Play the gear closing movie in Myst
2012-12-16 06:51:01 +01:00
Bastien Bouclet
8050bca8d3
MOHAWK: Implement the Myst boiler movies
2012-12-16 06:51:00 +01:00
Bastien Bouclet
fdad5ec7b4
MOHAWK: Allow changing video rates
...
getVideoDuration now returns an Timestamp
2012-12-16 06:51:00 +01:00
Matthew Hoops
f889457d3d
PEGASUS: Fix segfault when pressing 'i' during the space chase
...
Thanks to digitall for finding this one
2012-12-15 22:19:15 -05:00
D G Turner
2c80977b13
TOUCHE: Fix external digital music support.
...
Thanks to clone2727 for pointing out the issue here.
Tested with Valgrind and no leaks present.
However, the music output is still not correct, when compared to
Midi output. This is due to the track numbering. Either the
external files need renaming or a mapping table will be needed.
2012-12-16 02:34:35 +00:00
Matthew Hoops
bf51a7e6a6
PEGASUS: Fix playback of pressure door levels dropping video
2012-12-15 21:14:39 -05:00
Filippos Karapetis
1214b7a7e4
TINSEL: Enable the detection entries for DW1 Mac (both the demo and the full version)
2012-12-15 21:07:38 +02:00
Filippos Karapetis
6f81d914f2
TINSEL: Fix sprite clipping in DW1 Mac
2012-12-15 19:52:27 +02:00
Filippos Karapetis
96397a5741
TINSEL: Initial version of the graphics drawing function for DW1 Mac
...
Still some graphical glitches remain, as clipping isn't done correctly
2012-12-15 08:14:55 +02:00
Filippos Karapetis
b41d78bdd8
TINSEL: Fix intro scene skipping in DW1 Mac
2012-12-15 08:14:55 +02:00
Filippos Karapetis
1713d7ee3c
TINSEL: Always convert the inventory objects to the native endianess
...
This is needed for DW1 Mac
2012-12-15 08:14:54 +02:00
D G Turner
702aecf125
TOUCHE: Fixes to external digital music support.
...
This removes most of the bad accesses and use of invalid pointers, but
it is still not quite correct. Also, it appears the music id and
external track ids may not be a direct mapping.
2012-12-15 03:14:00 +00:00
Torbjörn Andersson
69cdccd962
SCUMM: Handle double-clicks in Mac Loom (bug #3588164 )
...
Unlike the EGA DOS version, it doesn't seem to be the scripts
that keep track of double-clicks. Instead, the engine sets a
variable to indicate them. Unlike the DOS version, we don't check
that the second click happens close enough on the screen to the
first one. We could, but it seemed needlessly complicated.
2012-12-15 00:35:00 +01:00
D G Turner
de39adfb78
TOUCHE: Fix incorrect handle usage.
2012-12-14 23:28:01 +00:00
Johannes Schickel
9a0e2b7ee7
SCUMM: Fix compilation on AmigaOS4.
2012-12-14 21:18:56 +01:00
Johannes Schickel
97d7bf9b9a
Merge pull request #291 from eriktorbjorn/mac-mi-music-final
...
SCUMM: Add support for Macintosh music in Monkey Island 1 and Loom
2012-12-14 11:57:49 -08:00
clone2727
91317c3630
Merge pull request #293 from clone2727/qtmidi
...
Add support for QuickTime Music playback
2012-12-13 15:49:40 -08:00
Matthew Hoops
a0863dfb3f
TINSEL: Silence gcc warning
2012-12-13 17:46:16 -05:00
Einar Johan Trøan Sømåen
7bbd26c9a8
WINTERMUTE: Fix a memory-leak in the thumb-nail loading.
2012-12-13 23:27:38 +01:00
Einar Johan Trøan Sømåen
d6ec8c1947
WINTERMUTE: Split renderTicket into a separate file.
2012-12-13 23:24:37 +01:00
Einar Johan Trøan Sømåen
61f387190c
WINTERMUTE: Avoid unneccessary alpha-blits when using dirty-rects.
2012-12-13 22:17:36 +01:00
Einar Johan Trøan Sømåen
18a10a7744
WINTERMUTE: Scale thumbs to kThumbNailWidth/kThumbNailHeight
2012-12-13 21:35:37 +01:00
Johannes Schickel
2773f5d7af
COMMON: Forbid symbols for the rest of is* from ctype.h.
...
I also moved the isprint case to the correct position.
This adds a FIXME to our lua code from sword25, which uses iscntrl directly.
2012-12-13 21:08:48 +01:00
Johannes Schickel
b0ba4b01a4
COMMON: Add wrapper for isprint.
...
This is done in the spirit of 658080deed
.
2012-12-13 21:08:47 +01:00
Einar Johan Trøan Sømåen
7319ccd84f
WINTERMUTE: Implement simple sprite-batching to speed up tileImage-drawing.
2012-12-13 21:08:12 +01:00
Einar Johan Trøan Sømåen
9f9b6e2af8
WINTERMUTE: Further optimize drawTicket-checking.
2012-12-13 20:55:49 +01:00
Einar Johan Trøan Sømåen
af857147c2
WINTERMUTE: Privatize members in UITiledImage
2012-12-13 20:55:17 +01:00
Einar Johan Trøan Sømåen
e30271e6f6
WINTERMUTE: Correct the char-code check in BaseKeyboardState
2012-12-13 20:40:40 +01:00
Einar Johan Trøan Sømåen
c785a2bca6
WINTERMUTE: Check renderTicket-owner before anything else.
2012-12-13 20:34:45 +01:00
Einar Johan Trøan Sømåen
aebdeb183f
WINTERMUTE: Use ascii for detecting printable-characters instead of Keycode.
2012-12-13 20:12:08 +01:00
Matthew Hoops
8e2e317294
PEGASUS: Fix invalid use of RipTimer
2012-12-13 00:39:49 -05:00
D G Turner
eb30e5c594
TOUCHE: Add support for external digital music.
...
Detection of the external digital music files works, but they currently
fail to play and cause segfaults if present... Suspected to be related
to premature destruction of audiostream data.
2012-12-13 01:41:54 +00:00
Filippos Karapetis
11b920d8ae
TINSEL: Fix a comment in playDW1MacMusic()
...
Thanks to clone2727 for noticing
2012-12-13 03:41:15 +02:00
Filippos Karapetis
07994fb361
TINSEL: Add support for the digitized music in DW1 Mac
2012-12-13 03:09:41 +02:00