Commit Graph

40089 Commits

Author SHA1 Message Date
Paul Gilbert
f5a1b626b7 SHERLOCK: Move Scalpel map code to ScalpelMap 2015-06-08 08:31:51 -04:00
Martin Kiewitz
ae64cca8f0 SHERLOCK: bit of work on 3DO graphic resources 2015-06-08 12:47:38 +02:00
Torbjörn Andersson
26ed7954c3 SHERLOCK: Fix comment typo 2015-06-08 08:20:28 +02:00
Paul Gilbert
cffa31c72e SHERLOCK: Beginnings of Map descendent classes 2015-06-07 23:29:36 -04:00
Paul Gilbert
62aad480ef SHERLOCK: Move Scalpel scene enum to scalpel_scene.h 2015-06-07 23:07:21 -04:00
Paul Gilbert
d171d07e2f SHERLOCK: Fix loadWalk checks against WALK_LIB_NAMES 2015-06-07 20:34:18 -04:00
Paul Gilbert
bfdedb68ec SHERLOCK: Fix cmdSetNPCInfoLine 2015-06-07 20:19:41 -04:00
Paul Gilbert
e336317ea7 SHERLOCK: Fix cmdWalkToCoords 2015-06-07 20:13:03 -04:00
Paul Gilbert
af2a1a3351 SHERLOCK: Refactoring, cleanup, and fixes for savegame code 2015-06-07 19:18:14 -04:00
Torbjörn Andersson
19448b2fdb SHERLOCK: Silence GCC warning 2015-06-08 00:31:22 +02:00
Paul Gilbert
e90c04b14f SHERLOCK: Fix Scalpel bug when picking up paper 2015-06-07 18:24:43 -04:00
Filippos Karapetis
e3d6b25d57 SHERLOCK: Add missing check for the rightmost limit in adjustSprite 2015-06-08 01:23:23 +03:00
Paul Gilbert
eb5579df54 SHERLOCK: Fix loading of character walk sequence data 2015-06-07 17:27:43 -04:00
Filippos Karapetis
d8e9482480 SHERLOCK: More differences implemented for RT's loadJournalFile 2015-06-08 00:10:52 +03:00
Paul Gilbert
9ce6dc72d3 SHERLOCK: Add missing OP_END_TEXT_WINDOW opcode 2015-06-07 16:59:56 -04:00
Paul Gilbert
a066d27aee SHERLOCK: Fix mistakes in opcode lists 2015-06-07 16:55:21 -04:00
Torbjörn Andersson
359d4cdb24 SHERLOCK: Clean up EA logo animation
Since I don't know the TsAGE engine, it's possible that this could
be done in some better way, but I think it's still an improvement
over the old code.
2015-06-07 22:01:50 +02:00
Torbjörn Andersson
247f6d43f8 SHERLOCK: Fix animation speed in EA logo
The slowness of the animation was caused by a misunderstanding of
_counter vs frame counter. The nextFrame() function is called every
two frames, so when the cases were set up five frames apart, they
were actually advancing the animation once every ten frames.
2015-06-07 22:01:50 +02:00
Filippos Karapetis
6a60653304 SHERLOCK: Implement more differences in loadJournalFile for Rose Tattoo 2015-06-07 22:41:53 +03:00
Filippos Karapetis
2b543b0662 SHERLOCK: Implement some differences in loadJournalFile for Rose Tattoo 2015-06-07 22:19:57 +03:00
Paul Gilbert
9b837c308f SHERLOCK: Fix for switching speakers 2015-06-07 14:26:57 -04:00
Filippos Karapetis
be46bfd1f9 SHERLOCK: Adapt more code to use FIXED_INT_MULTIPLIER 2015-06-07 21:07:00 +03:00
Filippos Karapetis
dc43979a9c SHERLOCK: Split cmdGotoScene and add the Rose Tattoo implementation
This also adds some code missing from the Serrated Scalpel implementation
2015-06-07 20:51:45 +03:00
Filippos Karapetis
0f8f40c111 SHERLOCK: Implement the "dumpfile" debugger command
This can help us debug resources bundled within LIB files
2015-06-07 20:51:44 +03:00
Torbjörn Andersson
47d905486c SHERLOCK: Initialize _midiParser. Fixes crash on exit in 3DO version. 2015-06-07 19:35:24 +02:00
Martin Kiewitz
f2a25013f1 SHERLOCK: 3DO intro: audio implemented 2015-06-07 19:19:04 +02:00
Torbjörn Andersson
a07cfe1eb0 SHERLOCK: Fix animation/growing rate of EA logo 2015-06-07 18:47:28 +02:00
Filippos Karapetis
38b3ab4bc0 SHERLOCK: Add walk.lib to cache for Rose Tattoo 2015-06-07 19:07:09 +03:00
Paul Gilbert
02ff4ce495 SHERLOCK: Implemented talk/listen sequence methods 2015-06-07 11:37:15 -04:00
Torbjörn Andersson
6cc469dc5c SHERLOCK: Fix GCC compilation 2015-06-07 17:19:05 +02:00
Martin Kiewitz
4c9e67ccfa SHERLOCK: 3DO animation support 2015-06-07 17:05:26 +02:00
Paul Gilbert
ef06a86ac8 SHERLOCK: Fix compiler warning 2015-06-07 09:46:24 -04:00
Filippos Karapetis
99ee0ecc4a SHERLOCK: Add initial handling of journal talk and location data for RT 2015-06-07 10:14:14 +03:00
Paul Gilbert
261e418b5f SHERLOCK: Move Scalpel specific talk window drawing into ScalpelTalk 2015-06-06 23:37:55 -04:00
Paul Gilbert
63174de3a6 SHERLOCK: Remove comma from end of ScalpelSequences enum 2015-06-06 22:52:18 -04:00
Paul Gilbert
933e675194 SHERLOCK: Setting up game specific People descendant classes 2015-06-06 22:40:29 -04:00
Paul Gilbert
3511f30a26 SHERLOCK: Created common base class for Sprite and Object 2015-06-06 21:31:48 -04:00
Filippos Karapetis
75610e7119 SHERLOCK: Implement some more Rose Tattoo script opcodes
These are cmdSetNPCInfoLine, cmdSetNPCVerb, cmdSetNPCVerbCAnimation,
cmdSetNPCVerbScript and cmdSetNPCVerbTarget
2015-06-07 03:38:51 +03:00
Paul Gilbert
c95783172b SHERLOCK: Remove unused variables 2015-06-06 18:07:40 -04:00
Paul Gilbert
ca07e8faf2 SHERLOCK: Add initialization of RT character portraits and names 2015-06-06 17:50:57 -04:00
Filippos Karapetis
28c054d1e2 SHERLOCK: cmdTalkInterruptsDisable & cmdTalkInterruptsEnable are dummy 2015-06-07 00:27:08 +03:00
Matthew Hoops
b6fdc7be88 AUDIO: Make makeAIFFStream return a RewindableAudioStream
All callers requiring SeekableAudioStream have been adapted by using dynamic_cast
2015-06-06 17:20:41 -04:00
Filippos Karapetis
fb37bdc6cf SHERLOCK: Fix whitespace 2015-06-07 00:07:14 +03:00
Filippos Karapetis
b249241920 SHERLOCK: Implement cmdSetNPCPosition opcode 2015-06-07 00:04:30 +03:00
Martin Kiewitz
97813f89ec SHERLOCK: rework 3DO audio, add AIFC file support
- rework 3DO audio decoders to decode into buffer only
- 3DO audio decoders also use streams without separate size arg now
- add support for ADP4 + SDX2 inside AIFC files
- add debug command "3do_playaudio" to play AIFC files
- remove audio flags and replace with stereo bool
2015-06-06 22:50:36 +02:00
Paul Gilbert
2ac05321aa SHERLOCK: Reverse scaling factor in transBlitFrom to match original
Original uses scale amounts > 256 for image reduction, and values
less than that for image expansion
2015-06-06 15:36:23 -04:00
Paul Gilbert
e28aa3af79 SHERLOCK: Properly handle horizontal flipping in transBlitFrom 2015-06-06 14:31:19 -04:00
Paul Gilbert
3fda42fbff SHERLOCK: Initiial handling of scaling in transBlitFrom 2015-06-06 14:25:09 -04:00
Paul Gilbert
57017e4bc1 SHERLOCK: Increase size of RT _talkHistory 2015-06-06 12:03:54 -04:00
Paul Gilbert
e48d6aecae SHERLOCK: Implement setupBGArea 2015-06-06 11:37:00 -04:00
Paul Gilbert
fda0d009ae SHERLOCK: Implement cmdSetNPCOn and cmdSetNPCOff script commands 2015-06-06 11:03:21 -04:00
Paul Gilbert
1b81ea16f0 LURE: Remove unused function prototype 2015-06-06 06:59:52 -04:00
Paul Gilbert
566d4805ef SHERLOCK: Move the Talk descendant classes into their own files 2015-06-05 23:05:22 -04:00
Paul Gilbert
389d453f0e SHERLOCK: Implement cmdMouseOnOff opcode 2015-06-05 22:52:26 -04:00
Paul Gilbert
5e3b9c8f69 SHERLOCK: Don't reset map position when changing RT scene 2015-06-05 22:43:54 -04:00
Paul Gilbert
71604c3a46 SHERLOCK: Fix initialization and syncing of map _overPos
This won't affect existing savegames, since we don't allow saving when
the map is active anyway. This is just in case we ever allow it.
2015-06-05 22:41:53 -04:00
Paul Gilbert
993b7af355 SHERLOCK: Fix movement in adjustObject 2015-06-05 22:27:54 -04:00
Paul Gilbert
97f7839f71 SHERLOCK: Handle difference in RT SOUND_CODE range 2015-06-05 22:17:30 -04:00
Paul Gilbert
384dad6729 SHERLOCK: Fixes for RT object sequence handling 2015-06-05 21:16:52 -04:00
Paul Gilbert
9ada143d14 SHERLOCK: Further FIXED_INT_MULTIPLIER refactoring
Also converted multiplier factor from 100 to 1000, which will be
needed for Rose Tattoo
2015-06-05 21:13:48 -04:00
Paul Gilbert
cf76576035 SHERLOCK: Removed unused _savedStats 2015-06-05 21:10:07 -04:00
Paul Gilbert
8ede67cd94 SHERLOCK: Fix map player icon jerking when reaching destination 2015-06-05 21:07:14 -04:00
Torbjörn Andersson
003afa45a3 SHERLOCK: "Fix" corruption in Rose Tatto intro
It still looks bad, but given the comments it makes more sense to
copy from _backBuffer2 than trying to copy an invalid portion of
the frame.
2015-06-05 23:55:33 +02:00
Torbjörn Andersson
766b4fdde6 SHERLOCK: Scalpel and Rose Tattoo have different SCENE_COUNT
Though at the moment, the SCENE_COUNT for Rose Tattoo is just a
guess.
2015-06-05 08:17:47 +02:00
Paul Gilbert
fb8e745e11 SHERLOCK: Simplify decompressFrame, and fix RT transparencies 2015-06-04 22:06:05 -04:00
Paul Gilbert
f2d3d5f160 SHERLOCK: Add another use of FIXED_INT_MULTIPLIER 2015-06-04 20:04:28 -04:00
Paul Gilbert
26bbfec729 SHERLOCK: Fix setting up default RT player position 2015-06-04 19:55:32 -04:00
Matthew Hoops
c76e30d01c SCI: Only use makeAIFFStream instead of loading the sound twice 2015-06-04 19:47:23 -04:00
Paul Gilbert
49295c5b8b SHERLOCK: Add RT post-processing for loadScene 2015-06-04 19:37:59 -04:00
Paul Gilbert
fd6da47906 SHERLOCK: Implemented remaining new sequence opcodes in checkObject 2015-06-04 19:21:48 -04:00
Torbjörn Andersson
69f389cc15 SHERLOCK: Use standard WAV decoder for The Case of the Rose Tattoo
This allows the intro to run a tiny bit further, before crashing.
2015-06-05 00:48:02 +02:00
Martin Kiewitz
30d3cc541a SHERLOCK: 3DO changes
- journal.txt is actually missing
- chess.txt is the same as on PC
- information about 3DA/3DX files
2015-06-05 00:18:39 +02:00
Martin Kiewitz
74d3121f9d SHERLOCK: add comments about 3DO resources 2015-06-04 22:29:29 +02:00
Martin Kiewitz
16d124b231 SHERLOCK: tiny bit of work on 3DO 2015-06-04 20:51:27 +02:00
Martin Kiewitz
37cc8df5a5 SHERLOCK: 3DO movie player improvements
- allow DACQ and JOIN chunks (skip them)
- improve unknown chunk tag error messages
2015-06-04 17:54:13 +02:00
Martin Kiewitz
7de11f1362 SHERLOCK: 3DO movie player unsupported codec msg 2015-06-04 16:57:33 +02:00
Martin Kiewitz
45c5898230 SHERLOCK: 3DO movie player comments 2015-06-04 16:01:43 +02:00
Martin Kiewitz
4dec07bf2d SHERLOCK: improve 3DO movie player, add SDX2 codec
- queue up to 0.5 seconds of audio to avoid buffer underruns
- support for SDX2 codec
- put both audio codecs into audio/decoders/3do.cpp
- made movie player capable of playing EA logo movie
2015-06-04 15:53:54 +02:00
Paul Gilbert
9d67c95359 SHERLOCK: Fix gcc warnings 2015-06-03 22:05:52 -04:00
Paul Gilbert
ff28b217b3 SHERLOCK: Implemented checkWalkGraphics 2015-06-03 21:51:46 -04:00
Paul Gilbert
60378fe228 SHERLOCK: Implemented setObjTalkSequence methods 2015-06-03 21:03:44 -04:00
Paul Gilbert
bc7127c522 SHERLOCK: Fix resetting cursor when leaving the map 2015-06-03 19:10:33 -04:00
Paul Gilbert
dce570c7e9 SHERLOCK: Fix resetting cursor when resetting UI 2015-06-03 19:06:14 -04:00
Paul Gilbert
3dac0c6646 SHERLOCK: Implement changes for checkObject 2015-06-03 18:42:32 -04:00
Paul Gilbert
2cec902479 SHERLOCK: Fix issues with drawAllShapes 2015-06-03 18:37:54 -04:00
Torbjörn Andersson
12e4152429 SHERLOCK: Clarify "song" command usage
Though now that I've realized that loadMusic() takes a room number,
I see there seems to be at least one song that can't be played
this way...
2015-06-03 22:33:12 +02:00
Torbjörn Andersson
405914d655 SHERLOCK: Add "song" debugger command
It could be more user-friendly, but should work well enough for now.
2015-06-03 22:12:53 +02:00
Martin Kiewitz
7b9455c242 SHERLOCK: unpause engine, when exiting the console 2015-06-03 22:12:02 +02:00
Martin Kiewitz
626244394a SHERLOCK: 3do movie player non-FFR thx clone2727
sherlock seems to only use a fixed frame rate
but we now support dynamic frame rate timing
2015-06-03 19:47:01 +02:00
Torbjörn Andersson
08b81e38f3 SHERLOCK: Add hotspot to magnifying glass cursor
I am not sure exactly what the original did, but this seems to match
the behaviour I've observed in DOSBox.
2015-06-03 19:19:05 +02:00
Torbjörn Andersson
420e13a579 SHERLOCK: Remove Subversion keywords from file header. 2015-06-03 19:01:50 +02:00
Martin Kiewitz
a33717f92e SHERLOCK: add 3DO movie player to module.mk 2015-06-03 13:31:13 +02:00
Martin Kiewitz
b7506019a6 SHERLOCK: 3DO movie player,thx clone2727 for video 2015-06-03 13:11:09 +02:00
Paul Gilbert
3bee3e78cd SHERLOCK: Make some fields of CAnimStream private 2015-06-02 21:37:51 -04:00
Paul Gilbert
b5a2b55096 SHERLOCK: Implement getScaleVal 2015-06-02 21:34:40 -04:00
Paul Gilbert
1f9d1e9c16 SHERLOCK: Implement RT drawAllShapes and support methods 2015-06-02 21:26:42 -04:00
Torbjörn Andersson
fdd220e9f7 SHERLOCK: Fix Scalpel cursor regressions
There was no magnifying glass cursor, and the hourglass cursor
wasn't animated.
2015-06-02 19:08:40 +02:00
Martin Kiewitz
1968528a1f SHERLOCK: start of street intro quitable now 2015-06-02 18:33:50 +02:00
Martin Kiewitz
4cf16a905b SHERLOCK: hopefully fix crash on exit/Music class 2015-06-02 18:17:25 +02:00
Martin Kiewitz
100dd52a8e SHERLOCK: rename MT32 driver, fix SysExPos 2015-06-02 17:36:22 +02:00