libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 08:48:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
52,056 Commits 5 Branches 5 Tags 1.8 GiB
a54dfa4845
Commit Graph

26106 Commits

Author SHA1 Message Date
Paul Gilbert
21d570af83 TSAGE: Bugfixes for startup sequence in R2R Scene 180 2012-02-29 21:39:48 +11:00
Paul Gilbert
b60a2f012a TSAGE: Slow down the animation player to match the original game 2012-02-29 21:22:08 +11:00
Filippos Karapetis
a20de36b26 ENGINES: Adjust the description of _singleId 2012-02-29 11:59:33 +02:00
Filippos Karapetis
65c60ef027 ENGINES: Add a thorough explanation of the ugliness caused by _singleId 2012-02-28 11:13:40 +02:00
Filippos Karapetis
170f9f7040 Revert "SCI: Do not set _singleId in SciMetaEngine" 
This reverts commit 8248944f1e.
 2012-02-28 11:08:46 +02:00
Filippos Karapetis
8248944f1e SCI: Do not set _singleId in SciMetaEngine 
This allows the engine to set the correct game ID to each entry. With
_singleId set, all the IDs in the game entries are set to "sci"
 2012-02-28 10:38:44 +02:00
Filippos Karapetis
f4bf93fd67 ENGINES: Properly explain the usage of _singleId 2012-02-28 10:38:42 +02:00
Paul Gilbert
46c590940a TSAGE: Renamed many of the unknown fields in the R2R Animation Player 2012-02-27 22:29:16 +11:00
Paul Gilbert
1e8b286c84 TSAGE: Bugfixes for R2R animation player 2012-02-27 20:45:55 +11:00
Travis Howell
7db3be8b4f AGOS: Add font data for French, German and Italian versions of Simon the Sorcerer 1 (Amiga). 
Thanks to digitall for converting the font data from original.
 2012-02-27 09:28:11 +01:00
Eugene Sandulenko
2a1f0a2176 Merge pull request #191 from BenCastricum/master 
SCUMM: More HE Games Detection
 2012-02-26 07:22:13 -08:00
Max Horn
367131ef0e COMMON: Move Language and Platform functionality into separate files 2012-02-26 15:21:36 +01:00
Max Horn
215b41b244 COMMON: Move RenderMode and GUIOptions functionality into separate files 2012-02-26 15:19:31 +01:00
Johannes Schickel
d3c4243ab5 SCUMM: Fix utilization of ARM assembly routines. This fixes bug #3494448. 
The bug in question is: "SCUMM: Loom PCE Japanese broken on ARM".

Thanks to fuzzie and wjp for this patch. If anything is broken after this I
take no blame.
 2012-02-26 13:01:23 +01:00
Paul Gilbert
44e3d324fa TSAGE: Implemented some of the remaining R2R Animation Player support methods 2012-02-26 22:54:25 +11:00
Paul Gilbert
b341ff04fa TSAGE: Implement R2R Animation Player drawing code 2012-02-26 21:34:38 +11:00
Paul Gilbert
d5127d49ee TSAGE: Implemented the initial loading logic for R2R animation player 2012-02-26 17:29:45 +11:00
Johannes Schickel
273df3c075 KYRA: Remove obsolete registering of 16_color config file entry. 2012-02-25 19:03:38 +01:00
Strangerke
9279b25694 TSAGE: JANITORIAL: Remove trailing spaces 2012-02-25 12:44:37 +01:00
Strangerke
3a3c1eec53 TSAGE: R2R - Fix bug #3492133, error in palette index used 2012-02-25 10:21:40 +01:00
D G Turner
4e68b06fed DREAMWEB: Remove uneeded Common::String construction. 2012-02-24 19:43:49 +00:00
David Turner
62b01525f0 Merge pull request #200 from digitall/dreamwebDatafilePrefix 
DREAMWEB: Addition of Shared Datafile Prefix String to Engine
 2012-02-24 09:59:27 -08:00
athrxx
30fa5e1663 KYRA: (EOB) - fix save file thumbnail generation in CGA/EGA mode 2012-02-24 18:09:39 +01:00
athrxx
3b574466fa COMMON: distinguish between 256 colors and 16 colors PC-98 rendering modes 
KYRA 1 PC-98 supports both modes in the same target. The desired mode can now be selected in the rendering options. We did have good support for the 16 colors mode of KYRA 1 already. This mode could not really be selected though (except by manually modifying the config file or the code).
 2012-02-24 18:09:38 +01:00
athrxx
ecd1a9f943 KYRA: (EOB) - cleanup CGA/EGA code a bit 2012-02-24 18:09:37 +01:00
D G Turner
966210b56d DREAMWEB: Migrate remaining minor functions to using datafile prefix variable. 
Currently, the usages associated with savegames have been omitted.
These will probably need a different prefix constant as it is likely
foreign variants still use "DREAMWEB.*" for savegames, while using
a different prefix for the datafiles. We may even migrate away from
this naming convention as this causes savegame collisions when multiple
language variants are present, which could cause issues.

The usages in the Room members of the constant g_roomData structure have
also been omitted, as the members are copied into the savegame format,
thus replacing these and fixing other accesses is not trivial.
 2012-02-24 15:04:16 +00:00
D G Turner
a397748ace DREAMWEB: Migrate loadTextFile() to using datafile prefix variable. 2012-02-24 15:04:15 +00:00
D G Turner
bca22d4bee DREAMWEB: Migrate loadGraphicsFile() to using datafile prefix variable. 2012-02-24 15:04:13 +00:00
D G Turner
e3c5f9180c DREAMWEB: Migrate loadSounds() to using datafile prefix variable. 2012-02-24 15:04:12 +00:00
D G Turner
31bf535a83 DREAMWEB: Migrate loadTempText() to using datafile prefix variable. 2012-02-24 15:04:10 +00:00
D G Turner
542014c309 DREAMWEB: Add datafile name prefix to engine and modify showPCX() to it. 
This new variable removes the need for duplicates strings of the form
"DREAMWEB.*" spread throughout the dreamweb engine, replacing them with
a common const string on the engine holding the datafile name prefix.

This will reduce binary size and it should also simplify adding support
for foreign language variants, where the datafile name prefix is
changed.

To demostrate usage and prove this, showPCX() is migrated to using this.
 2012-02-24 15:04:09 +00:00
Ben Castricum
44c5e48bd3 SCUMM: Add 2 not yet recognized MD5s from Dutch Putt-Putt 3 in 1 CD 2012-02-24 13:01:51 +01:00
Ben Castricum
7e7cb21531 SCUMM: Add windows platform detection for several HES games/demos 2012-02-24 13:01:51 +01:00
Alyssa Milburn
050902756e CGE: Use WRITE_LE_UINT16 for unaligned writes. 2012-02-24 19:46:47 +11:00
Paul Gilbert
eba87458d3 TSAGE: More properly implemented resource streaming for R2R animation player 2012-02-24 19:38:46 +11:00
Eugene Sandulenko
54c87f20e3 Merge pull request #189 from fingolfin/cleanup 
ALL: Cleanup
 2012-02-23 23:55:45 -08:00
Willem Jan Palenstijn
4637d55337 Merge pull request #171 from clone2727/psx-stream-2 
This is a manual merge based on clone2727's merge of his branch
with the sword1 subtitle changes on master.
 2012-02-23 22:49:59 +01:00
Matthew Hoops
7a3e0ea453 SWORD1: Add some TODO's for PSX stream subtitles 
And some other minor cleanup
 2012-02-23 22:48:19 +01:00
Matthew Hoops
a352c3cc00 SWORD1: Add support for the PSX demo videos 2012-02-23 22:48:18 +01:00
Matthew Hoops
66cd8bdd68 VIDEO: Make PSX streams calculate frame timing solely from CD speed 
BS2 videos now play at the proper rate and BS1 videos have improved a/v sync.
 2012-02-23 22:48:18 +01:00
Matthew Hoops
8812f885bc SWORD2: Add support for PSX stream playback 2012-02-23 22:48:18 +01:00
Matthew Hoops
df21e72fe2 SWORD1: Add support for PSX stream playback 2012-02-23 22:48:17 +01:00
Alyssa Milburn
6e70f77289 DREAMWEB: Dynamically allocate GraphicsFile::_frames. 
This avoids extra memory usage due to the previous commit.
 2012-02-23 22:37:21 +01:00
Alyssa Milburn
256d160679 DREAMWEB: Remove shared temp graphics variables. 
Instead, have a different variable for each use.
 2012-02-23 22:34:22 +01:00
Alyssa Milburn
be35baddc7 TINSEL: Rename globals to add g_ prefix. 2012-02-22 23:14:29 +01:00
Johannes Schickel
442bcb7d3e ALL: Fix some signed/unsigned comparison warnings. 2012-02-22 20:20:55 +01:00
Max Horn
9628913cdc GOB: Fix type conversion warning 2012-02-22 18:26:38 +01:00
Max Horn
37216ab381 DREAMWEB: Avoid including advancedDetector.h from dreamweb.h 2012-02-22 18:25:37 +01:00
Max Horn
4202d45fce CGE: Avoid including advancedDetector.h from cge.h 2012-02-22 18:25:37 +01:00
D G Turner
aa26d5def4 ENGINES: Add error handling for GMM Gamestate Load/Save Usage. 
As indicated by wjp, the Global Main Menu (GMM) did not check or report
on the returned error state from saveGameState() and loadGameState() usage.
This corrects this and adds a MessageDialog report of any failure.
 2012-02-21 22:30:29 +00:00
athrxx
7986f1709d KYRA: (EOB) - make detection entries for EOB I more unique (bug #3488973) 
This makes sure that non English versions don't get detected as English.
 2012-02-21 21:48:48 +01:00
athrxx
66da4777d4 KYRA: (EOB) - implement EGA mode (hi res dithering) for EOB II 
(also fix various thing connected to CGA/EGA modes)
 2012-02-21 21:48:46 +01:00
athrxx
3c1e2686b8 KYRA: (EOB) - fix minor sprite drawing glitch in EOB1 
(some sprites were drawn one pixel too far to the right)
 2012-02-21 21:48:45 +01:00
athrxx
930bcbf2dc KYRA: (EOB) - fix minor text displayer glitch 2012-02-21 21:48:44 +01:00
athrxx
df9b1bd2e4 KYRA: (EOB) - implement EGA graphics mode for EOB1 2012-02-21 21:48:43 +01:00
athrxx
a4223e9c2b KYRA: (EOB) - fix EOB1 door clipping 
(this was done in the same way as in EOB2 and LOL, but it has to be slightly different)
 2012-02-21 21:48:42 +01:00
athrxx
151d314912 KYRA: (EOB) - complete CGA graphics mode implementation 2012-02-21 21:48:41 +01:00
athrxx
86a817beb5 KYRA: (EOB) - start work on CGA and EGA graphics modes 2012-02-21 21:48:39 +01:00
athrxx
66ba934398 KYRA: (EOB) - fix minor glitch in hp and food bar graphs 2012-02-21 21:48:38 +01:00
athrxx
d192fed3b5 KYRA: (EOB) - fix character hand icons 
(upper thumbs should point to the right, lower thumb to the left)
 2012-02-21 21:48:37 +01:00
athrxx
47005de313 KYRA: (EOB) - fix minor bug (wrongly initialized value) and some renaming 2012-02-21 21:48:37 +01:00
athrxx
70cfbcd046 KYRA: add new rendering mode gui options 
(EOB should support EGA and CGA mode, but this isn't implemented yet)
 2012-02-21 21:48:36 +01:00
athrxx
ab5c3e2dad KYRA: (EOB) - move EOB 1 intro code into separate class 2012-02-21 21:48:33 +01:00
Willem Jan Palenstijn
9ffe3e11d9 Merge pull request #182 from fingolfin/forbid-ctype 
ALL: Avoid using is* macros from ctype.h
 2012-02-21 11:33:32 -08:00
Max Horn
4f8665fc83 COMMON: Move isFoo functions to namespace Common, add doxygen comments 2012-02-20 16:18:27 +01:00
Paul Gilbert
7a54ba86a0 TSAGE: Starting to implement animation player needed for R2R Title Screen 2012-02-20 22:31:58 +11:00
Paul Gilbert
0f3614b043 TSAGE: Implemented method for getting a resource section entry 
This will be needed for streaming data directly from the resource file without fully loading the resource.
 2012-02-20 22:30:46 +11:00
Willem Jan Palenstijn
fd40d1b192 DREAMWEB: Revert "Fix the detection entries for the French and Spanish CD versions" 
This reverts commit 0ff60284ce.

We do not want to encourage people to rename all files in their games.
Instead, we should properly support the foreign versions.
 2012-02-18 14:25:35 +01:00
Paul Gilbert
975801b670 TSAGE: Disable right click in R2R Scene 1330 2012-02-18 15:26:05 +11:00
Filippos Karapetis
0ff60284ce DREAMWEB: Fix the detection entries for the French and Spanish CD versions 2012-02-18 01:47:10 +02:00
Paul Gilbert
423d41dfc1 TSAGE: Disabled Spanish Blue Force detection entry 2012-02-18 10:19:51 +11:00
Filippos Karapetis
c87657f066 SCI: Added some sanity checks by digitall 
- Limit the LB1 cursor workaround to LB1 only (so that fanmade games
aren't affected)
- Error our when bad cursor hotspots are found
 2012-02-17 21:54:50 +02:00
Filippos Karapetis
b21f956790 SCI: Fix and cleanup the monochrome cursor code 
This makes the code like FreeSCI again, which is the correct way to fix
bug #3487088.
 2012-02-17 21:09:59 +02:00
Filippos Karapetis
c48ad37244 SCI: Fix bug #3487088 - "SCI: LB1: Missing Wait cursor" 2012-02-17 10:53:42 +02:00
D G Turner
8c5f988a00 MOHAWK: Correct detection md5sum for Tortoise and the Hare Hebrew. 
md5sum was for datafiles modified by bug submitter to access hidden
content. New md5sum is for unmodified standard release.
 2012-02-16 20:57:52 +00:00
Strangerke
856aa5119b TSAGE: R2R - Fix various warnings 
Thanks Digitall for reporting those
 2012-02-16 18:32:04 +01:00
Max Horn
46321aacd8 AGOS: Cleanup 2012-02-16 11:12:35 +01:00
Max Horn
08223e9746 CGE: Change detector singleid to be all lowercase 2012-02-16 11:12:24 +01:00
Max Horn
5d88e67cfd TSAGE: Remove superfluous md5 bytes setting 2012-02-16 11:11:55 +01:00
Max Horn
dcbf77cc92 DREAMWEB: Document some locations 2012-02-16 11:11:45 +01:00
D G Turner
910e93db40 MOHAWK: Add Detection Entry for "Tortoise and the Hare" Hebrew Variant. 
Parameter from bug #3441928 - "MOHAWK: Hebrew Tortoise and Hare not
detected".
 2012-02-16 00:57:18 +00:00
Strangerke
66aff9c4d8 TSAGE: R2R - Implement scene 1850 2012-02-15 23:56:15 +01:00
Strangerke
ffd5326ca1 TSAGE: R2R - Scene 1337: rename a variable 2012-02-15 23:54:38 +01:00
Strangerke
f9ae92186e TSAGE: R2R - Rename inventory enums, fix isInventoryIcon() 2012-02-15 19:37:20 +01:00
D G Turner
8103d57d37 MOHAWK: Add Detection Entries For 3 LB Mac Games. 
Parameters taken from bug #3461368 - "MOHAWK: Living Books Mac
Versions Not Recognized".
 2012-02-15 17:36:58 +00:00
D G Turner
160fd3a179 COMPOSER: Add Detection Entries for 3 V1 Magic Tales Mac Variants. 
Parameters given in bug #3466402 - "COMPOSER: Multiple Mac games not
detected".
 2012-02-15 17:06:16 +00:00
D G Turner
ad78ea6b50 COMPOSER: Add Detection Entry for Liam Finds a Story Mac. 
Parameters from bug #3463201 - "COMPOSER: Liam Finds a Story (Mac) Not
Detected".
 2012-02-15 16:29:03 +00:00
Tarek Soliman
a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast 
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
 2012-02-15 10:07:10 -06:00
Tarek Soliman
921f602ab8 JANITORIAL: Fix whitespace in pointer template arg 2012-02-15 10:07:08 -06:00
D G Turner
1e2019d208 COMPOSER: Add Detection Entry for Princess and the Crab Mac. 
Parameters taken from bug #3461984 - "COMPOSER: Mac Princess and the
Crab Not Detected".
 2012-02-15 16:00:53 +00:00
Max Horn
658080deed ALL: Avoid using is* macros from ctype.h 
On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
 2012-02-15 16:51:37 +01:00
D G Turner
b66b7f8ec8 COMPOSER: Add Detection Entry for Sleeping Cub Mac. 
Parameters from bug #3461369 - "COMPOSER: Mac Sleeping Cub Not
Detected".
 2012-02-15 14:43:27 +00:00
D G Turner
8c0e361582 COMPOSER: Add detection entries for 3 V1 Magic Tales games. 
These are listed in bug #3485018 - "COMPOSER: v1 undetected MD5's"
 2012-02-15 14:17:09 +00:00
Strangerke
8faf016478 TSAGE: R2R - Scene 1337: Fix a shadowed variable 2012-02-15 01:48:58 +01:00
Strangerke
dc229b893e TSAGE: R2R - Scene 1337: rename previously committed function 2012-02-14 22:26:12 +01:00
Strangerke
a64dc10b40 TSAGE: R2R - Scene 1337: Implement another AI related function 2012-02-14 22:21:25 +01:00
Strangerke
949c8e97f5 TSAGE: R2R - Scene 1337: Implement another large AI function (subCF979) 2012-02-14 20:10:21 +01:00
Strangerke
f380d3ded2 TSAGE: R2R - Scene 1337: Implement one more large AI function (subCDB90) 2012-02-14 20:10:20 +01:00
Strangerke
1dcc8402b8 TSAGE: R2R - Scene 1337: Implement on more AI function 2012-02-14 20:10:18 +01:00
Strangerke
654016c927 TSAGE: R2R - Scene 1337: Implement AI function subC2C2F 2012-02-14 20:10:17 +01:00
Paul Gilbert
ffd59d1c21 TSAGE: Correctly hide the user interface in R2R Output Alpha scene 2012-02-14 22:46:25 +11:00
Paul Gilbert
b6a0d8052b TSAGE: Replace previously unknown value _v58ec2 with _uiElements._active 2012-02-14 22:43:46 +11:00
Paul Gilbert
f6720ee139 TSAGE: R2R bugfix for selecting Output Alpha in the console screen 2012-02-14 22:33:50 +11:00
Paul Gilbert
fc1d93ee1b TSAGE: Implemented missing R2R method SceneHandler::setupPaletteMaps 2012-02-14 21:07:12 +11:00
Tarek Soliman
5cf932198e KEYMAPPER: Fix Action ctor args in most keymaps 2012-02-13 23:24:59 -06:00
Johannes Schickel
ad9fdfd390 KYRA: Silence some icpc warnings by making a member array of KyraRpgGUISettings non-const. 
All instances are const anyway, thus this should be a safe way to silence
the warning.
 2012-02-13 23:42:25 +01:00
Strangerke
29919077cd TSAGE: R2R - Scene 1337: Implement 10 more AI functions 2012-02-13 23:39:13 +01:00
Strangerke
a5b0267777 TSAGE: R2R - Scene 1337: Implement subD02CA() plus a couple of little functions used by AI 2012-02-13 22:11:18 +01:00
Willem Jan Palenstijn
54ede63fcc BASS: Reduce code duplication in autosave code 2012-02-13 21:31:41 +01:00
Willem Jan Palenstijn
87e85e17cb BASS: Fix savegame corruption 
When using the GMM or autosaves, _savedMouse and _savedCharSet were
never set. See bug #3487117.
 2012-02-13 21:28:32 +01:00
Willem Jan Palenstijn
c7a5d31f05 BASS: Report savegame errors when saving by pressing enter 
This makes error handling consistent between mouse and keyboard.
 2012-02-13 21:21:42 +01:00
Willem Jan Palenstijn
3f5aaa0ca5 SCUMM: Clean up resetSentence 2012-02-13 20:26:43 +01:00
Filippos Karapetis
7da29858e7 SCI: Fix the order of diagonal roll transitions in the old lookup table 
This fixes several inverted transitions (like in SQ3, ICEMAN, Hoyle 1 etc) - bug #3485194
 2012-02-13 12:06:35 +02:00
Travis Howell
7a030fcdcd SCUMM: Fix compiler warning. 2012-02-13 13:38:25 +11:00
Filippos Karapetis
fbb51fcd88 SCI: Fix bug #3487092: "SCI: LB1: Magnifying glass cursor is grey" 2012-02-13 04:03:05 +02:00
Filippos Karapetis
51ef8a78cc SWORD1: Silence some MSVC warnings (conversion from double to float) 2012-02-13 02:30:05 +02:00
Willem Jan Palenstijn
143363d5b6 DREAMWEB: Improve subtitle durations in madman scene 2012-02-12 23:57:25 +01:00
Willem Jan Palenstijn
3fc8b7227b DREAMWEB: Fix missing subtitle lines in speech+subtitle mode 
This is done by adding a (very ugly) way to force the previous timed-temp
line off screen, so the next one can be shown.
 2012-02-12 23:57:09 +01:00
Willem Jan Palenstijn
3abb3ad757 DREAMWEB: Fix duplicate line in monk end sequence 2012-02-12 23:56:37 +01:00
sylvaintv
24e50eb218 TOON: Fix bug #3467139 with russian version crash 
Bug #3467139: "TOON: Russian Version Crashes"
A frame is corrupted in an localized animation
Moved the check before the Rect creation.
 2012-02-12 23:18:40 +01:00
sylvaintv
8b39b0b0fa TOON: Add russian version detection 2012-02-12 23:16:54 +01:00
Strangerke
0ba3335674 TSAGE: R2R - Scene 1337: Implement 2 functions used by AI 2012-02-12 16:14:25 +01:00
Willem Jan Palenstijn
15bbe3bff1 SCI: Expand adjustGraphColor to work for older EGA games too 
See bug #3486899.
 2012-02-12 13:32:22 +01:00
Strangerke
93619b96d3 TSAGE: R2R - Scene 1337: Implement 7 functions used by AI 2012-02-12 13:09:07 +01:00
Strangerke
7760f8358a TSAGE: R2R - Scene 1337: Implement main AI function, with all sub-functions stubbed 2012-02-12 11:33:06 +01:00
Willem Jan Palenstijn
07904c881b MOHAWK: Avoid warning 2012-02-11 23:05:43 +01:00
Strangerke
056fc6250c TSAGE: R2R - Scene 1337: Implement shuffleCards() 
Game is now starting
 2012-02-11 12:35:53 +01:00
Paul Gilbert
5ce622c1b6 TINSEL: Added extra fields to the savegame header for SCN/GRA usage and language 
New savegames that are created will no longer appear in the savegame list for different data versions or languages.
 2012-02-11 21:45:16 +11:00
Strangerke
928fd72a35 TSAGE: R2R - scene 1337: Implement some missing functions 2012-02-11 11:10:21 +01:00
Willem Jan Palenstijn
784472a669 Revert "SCUMM: revert savegame version to 89" 
This reverts commit 65fc7225bb.

Increasing the savegame version on a branch and then decreasing it again
leads to problems with loading current savegames in old commits during
a bisect.
 2012-02-11 10:55:55 +01:00
Tobias Gunkel
65fc7225bb SCUMM: revert savegame version to 89 
Previous versions 89-92 are merged into version 89.
 2012-02-11 08:36:38 +01:00
Tobias Gunkel
0d5b03d8da SCUMM: remove unnecessary cast to Actor_v0 2012-02-11 08:36:37 +01:00
Tobias Gunkel
67d67ec4f6 SCUMM: replaced A with a0 to avoid upper-case local vars 2012-02-11 08:36:35 +01:00
Tobias Gunkel
4922055063 SCUMM: cleanup and separation of objIsActor()/objToActor()/actorToObj() for v0 and other engines 2012-02-11 08:36:27 +01:00
Tobias Gunkel
0aabf95cb8 SCUMM: match style-guide, add missing spaces between some "if ()", "for ()" 2012-02-11 08:30:15 +01:00
Tobias Gunkel
ef56bd6de2 SCUMM: add support for diagonal walking between boxes (e.g. used for meteor opening scene) 2012-02-11 08:30:14 +01:00
Robert Crossfield
6c40b3f36f SCUMM: Remove old code 2012-02-11 08:30:12 +01:00
Robert Crossfield
163f698cf0 SCUMM: Few changes for animations, dont move while turning & not necessary to call animateactor during startanimactor 2012-02-11 08:30:10 +01:00
Tobias Gunkel
9dd6105ce6 SCUMM: replace "c64" with "v0" when it applies to both C64 and AppleII v0 versions 
In addition some routines (e.g. the gfx ones) that are even used in v1.
 2012-02-11 08:30:08 +01:00
Tobias Gunkel
8d3b272939 SCUMM: save complete v0 state and initialize actors correctly 2012-02-11 08:30:07 +01:00
Tobias Gunkel
5d3e1dd0dc SCUMM: remove the temporary variable _limb_current 2012-02-11 08:30:05 +01:00
Tobias Gunkel
daff6f36ae SCUMM: _currentLights is v0 only 2012-02-11 08:30:03 +01:00
Tobias Gunkel
e14e4ab3b0 SCUMM: adjust to coding style-guide 2012-02-11 08:30:02 +01:00
Tobias Gunkel
434aaaf0c0 SCUMM: fix gcc compiler warnings 2012-02-11 08:30:00 +01:00
Robert Crossfield
a8008e0a71 SCUMM: Fix if there is no costume set 2012-02-11 08:29:59 +01:00
Robert Crossfield
92908bfc4b SCUMM: Fix ActorStop, V0 needs to set the stop direction 2012-02-11 08:29:57 +01:00
Tobias Gunkel
2b657283d7 SCUMM: forward savegame version is needed due to previous savegame changes) 2012-02-11 08:29:55 +01:00
Tobias Gunkel
91bdf9a3f5 SCUMM: fix cutscenes by reintroduction of freeze modes 2012-02-11 08:29:54 +01:00
Tobias Gunkel
984c2a05e4 SCUMM: replace o_beginOverride() with o2_beginOverride() 
In contrast to the comment in o_beginOverride() VAR(VAR_OVERRIDE) is not set in the disassembly. In addition the cutscene stack-pointer is always 0 as this feature is not used in v0. This makes o_beginOverride() work the same way o2_beginOverride() and so it is not needed anymore.

Note that fetchScriptWord() was changed to ScummEngine::fetchScriptWord() in o2_beginOverride() as ScummEngine_v0::fetchScriptWord() only fetches a byte.
As we need two bytes here we have to use ScummEngine::fetchScriptWord().
 2012-02-11 08:29:52 +01:00
Tobias Gunkel
d4ddd2ca84 SCUMM: introduce constants for _userState for cleaner and easier to understand code 2012-02-11 08:29:51 +01:00
Tobias Gunkel
f5faa4554d SCUMM: isPlayer() is not supported by engine v0 2012-02-11 08:29:49 +01:00
Tobias Gunkel
e33d41035c SCUMM: scumm_vars 14 to 16 are not handled specially in v0 
Reading the manuscript will be fixed by this.
 2012-02-11 08:29:47 +01:00
Tobias Gunkel
cc68a59856 SCUMM: fix diagonal walking in at least MM v0 
The comparison "ABS((int)(deltaXFactor >> 16)) > _speedx)" does not work as "deltaXFactor >> 16" will clear the fractional part of deltaXFactor. As a result the deltaXFactor might be bigger than (_speedx<<16) and the actor moves faster than he should.
 2012-02-11 08:29:46 +01:00
Tobias Gunkel
7d409dd15f SCUMM: in v0 do not allow an inventory item as 2nd object of a give-to command 2012-02-11 08:29:44 +01:00
Tobias Gunkel
08e1e127e9 SCUMM: handle v0 distance check in checkPendingWalkAction() correctly 2012-02-11 08:29:43 +01:00
Robert Crossfield
c6688cf0d5 SCUMM: Remove unused variable, remove old comment 2012-02-11 08:29:41 +01:00
Robert Crossfield
9ba01d020b SCUMM: Fix V0 Sound, and a direction issue (affected walking down the ladder) 2012-02-11 08:29:40 +01:00
Robert Crossfield
1ca0b84b01 SCUMM: Improve comments 2012-02-11 08:29:38 +01:00
Robert Crossfield
fb3e431ec6 SCUMM: V0 always turns actor towards camera when entering room, remove unnecessary loadcostume 2012-02-11 08:29:37 +01:00
Robert Crossfield
5accf01881 SCUMM: Remove unnecessary calls to animateActor 2012-02-11 08:29:35 +01:00
Robert Crossfield
f299fc295e SCUMM: Fix for V0 objects 2012-02-11 08:29:34 +01:00
Robert Crossfield
1e8d0664ac SCUMM: Fix Tentacle issue, and possibly some other animation issues 2012-02-11 08:29:32 +01:00
Tobias Gunkel
ddd65dfc22 SCUMM: fix actor climbing on plant or swimming pool ladder 
Before, the actor will descend the ladder of the pool and maybe even into the the pool. Another issue fixed by this is the actor climbing onto the plant pot if you give something to it.
 2012-02-11 08:29:30 +01:00
Tobias Gunkel
f99dab78e4 SCUMM: fix for old savegames 2012-02-11 08:29:29 +01:00
Robert Crossfield
cf292001d3 SCUMM: Animations fix again, no need for the hack now 2012-02-11 08:29:27 +01:00
Robert Crossfield
5b4b606a58 SCUMM: Remove the setCmdFromDirection function 2012-02-11 08:29:26 +01:00
Robert Crossfield
08e3866395 SCUMM: Animation Fixes 2012-02-11 08:29:24 +01:00
Robert Crossfield
65fb1f9a09 SCUMM: Fix the animation system, rename the Limb Frame Repeat variable 2012-02-11 08:29:22 +01:00
Tobias Gunkel
e3f9a09d49 SCUMM: keep track of the number of nested script calls for a sentence 
command in v0

If for instance an object necessary for the sentence command is not reachable or pickupable (try to use faucet (object 55) with jar with water in microwave (object 50), the pick-up script of the jar will tell the actor to pickup object 99 (jar not in microwave)) the actor will try to pick-up the jar infinitely.
This is fixed by counting the amount of nested scripts the sentence command has called (directly or indirectly) so far and aborts it if there have been too many.
 2012-02-11 08:29:21 +01:00
Tobias Gunkel
fb68456541 SCUMM: complete handling of pending walkTo actions for sentence commands 
in v0
 2012-02-11 08:29:19 +01:00
Tobias Gunkel
1da715719c SCUMM: handle actor freeze in walkToActorOrObject() 2012-02-11 08:29:18 +01:00
Tobias Gunkel
b0201a8df2 SCUMM: fix o_setObjectName() 
The parameter can either be a FG or BG object depending on the opcode.
 2012-02-11 08:29:16 +01:00
Tobias Gunkel
b31157cee3 SCUMM: delete some obsolete v0 TODOs 2012-02-11 08:29:14 +01:00
Tobias Gunkel
96f8fc6ca9 SCUMM: Fix actor ID handling in v0 
Some object functions allow actor IDs and object IDs as parameters. They are easily distinguishable in engines > 0 as actor IDs are < _numActors and object IDs are bigger. In v0 this is not the case as there are objects with IDs like 3 and 5 (e.g. the hamster). So object ID handling was unified for v0 and the other engines by introducing objIsActor(), objToActor() and ActorToObj().
 2012-02-11 08:29:13 +01:00
Tobias Gunkel
fd4a3501ed SCUMM: fix saving of array _byte_FCE2 2012-02-11 08:29:11 +01:00
Tobias Gunkel
7d4ffb1ec0 SCUMM: fix resetAllSounds() in player_sid 
It actually was stopMusic() before and so stopped only the music and not all sounds.
The former implementation is for the o_stopMusic opcode which is not supported directly by ScummVM (it always stops all sounds). It is kept as stopMusic_intern() but is not used anymore.
 2012-02-11 08:29:10 +01:00
Tobias Gunkel
00dcc63e8f SCUMM: remove unimplemented und unused method startMusic() in pce and apple2 players 2012-02-11 08:29:08 +01:00
Tobias Gunkel
124e8926ba SCUMM: do not convert a savegame twice 2012-02-11 08:29:07 +01:00
Tobias Gunkel
f22bbc47b4 SCUMM: fix v0 mode handling and actor switching 
- handle mode switching correctly
  - do not freeze scripts in cutscene mode (mode 0), as some scripts are freezed in mode 0 that should not be freezed
  - kModeNoNewKid (mode 2) needs the same userState as mode 3
- rename o_cursorCommand to o_setMode as it is not really cursor specific
- handle actorHiding correctly (do not set costume to 0 as the previous costume cannot be reverted after hiding)
- add drawSentence
- document meanings for actor misc flags
- fix actor names for "new kid" if the radiation suit is used (all kids are set to 0 then with actor 0 name " ")
- cleanup actor switching routine
- _userPut is not used anymore in v0
 2012-02-11 08:29:05 +01:00
Tobias Gunkel
2f1336cdf0 SCUMM: fix blank sentence line in v0 after cutscenes and remove unused parameter of resetSentence() 2012-02-11 08:29:03 +01:00
segrax
a999aa39ba SCUMM: Re-arrange some things to make it closer to the original 2012-02-11 08:29:02 +01:00
segrax
e331421eae SCUMM: Save the new variables, move the setting of the unknown variable to after the setDirection call 2012-02-11 08:29:00 +01:00
segrax
e2d45467bb SCUMM: improve unknown variable support, add case 0xff to the animateactor opcode 2012-02-11 08:28:59 +01:00
Tobias Gunkel
f2c3675ed1 SCUMM: v0 opcode review 
- o_setObjectName has a default value
- o_putActorAtObject can either operate on a fg or bg object

Note: neither the default value nor the bg object opcode (4E) seem to be ever used by any script. So this commit is rather for completeness than for bug-fixing.
 2012-02-11 08:28:57 +01:00
Tobias Gunkel
6d4b710c54 SCUMM: fix opcode walkToObject in v0 
Before Michael did not develop the film correctly
 2012-02-11 08:28:56 +01:00
Tobias Gunkel
0bae642453 SCUMM: 2nd try to fix dungeon door timing 
Shorten the timer delay does not work as escaping with a second kid is not possible too. Instead decrease engine speed during script execution.
 2012-02-11 08:28:54 +01:00
Tobias Gunkel
4519e56e5c SCUMM: shorten delay for dungeon door closing action 
Escaping with only one kid should not be possible anymore.
 2012-02-11 08:28:52 +01:00
segrax
cbae5c79b7 SCUMM: Change vars to ints, remove unused variable for now 2012-02-11 08:28:51 +01:00
Tobias Gunkel
347035385e SCUMM: merge object v0 id and type into one object var 2012-02-11 08:28:49 +01:00
Tobias Gunkel
8141511e2f SCUMM: fix ScummEngine_v0::ifEqualActiveObject2Common() parameter name 2012-02-11 08:28:48 +01:00
Tobias Gunkel
c138ef6709 SCUMM: merge _activeObjectNr/_activeObjectType and _cmdObjectNr/_cmdObjectType 2012-02-11 08:28:46 +01:00
Tobias Gunkel
f2309998ff SCUMM: fix debugger for v0 2012-02-11 08:28:44 +01:00
Tobias Gunkel
6ca91a2be5 SCUMM: Fix actor behind man-eating plant issue in v0. 
Thanks segra for finding how it works in the original interpreter. The plant is handled specially and 0 is used instead of its y-position.
 2012-02-11 08:28:43 +01:00
segrax
b999fe9e26 SCUMM: Add in support in v0 for the unknown variable to o_animateActor 2012-02-11 08:28:41 +01:00
Tobias Gunkel
621017ce65 SCUMM: remove some NOTEs/TODOs 
- o5_breakHere() seems to be still needed. For example edna does not manage to walk up the ladder if this is not enabled.
- numLocalObjects seems to be big enough so that < instead of <= can be used. The original interpreter only uses the local ids 0 .. 44 whereas scummvm has _numLocalObjects set to 200.
 2012-02-11 08:28:40 +01:00
Tobias Gunkel
ffcd600461 SCUMM: make what-is verb work in v0 again 2012-02-11 08:28:38 +01:00
Tobias Gunkel
4bc726b995 SCUMM: reset object2 in v0 correctly 
This fixes the issue that a kid will not enter the front door after opening it with the key.
 2012-02-11 08:28:36 +01:00
Tobias Gunkel
e89dd623ef SCUMM: pop stack in v0 if command's object1 and 2 are the same 
Otherwise the command will never be removed and the stack overflows
 2012-02-11 08:28:35 +01:00
Tobias Gunkel
e14bc5fd6d SCUMM: improve verb and sentence handling 
- execute sentence if verb was clicked twice
- reuse the first object if a new verb is selected (but no preposition is used yet)
 2012-02-11 08:28:33 +01:00
Tobias Gunkel
8392d23e6b SCUMM: reset sentence line in v0 if sentence executed 2012-02-11 08:28:32 +01:00
Tobias Gunkel
df07d2db29 SCUMM: fix a regression in v0 
Found by segra.
 2012-02-11 08:28:30 +01:00
Tobias Gunkel
c010da00a4 SCUMM: click into sentence line in v0 now performs the action 2012-02-11 08:28:29 +01:00
Tobias Gunkel
32945904d5 SCUMM: fix kid selection in v0 
The kid names are now displayed in the sentence line (instead of the verb area) as it is done in the original.
 2012-02-11 08:28:27 +01:00
Tobias Gunkel
b337823bab SCUMM: fix verb and script handling 
- getVerbEntrypoint() should not handle walk-to differently (revert 0x0D handling back to original behavior)
- VAR_ACTIVE_ACTOR actually is VAR_ACTIVE_OBJECT2
- runSentenceScript(): "if (_cmdVerb == kVerbWalkTo)" must be "if (_cmdVerb != kVerbWalkTo)"
 2012-02-11 08:28:26 +01:00
Tobias Gunkel
c16ef940a1 SCUMM: make START-button in mm c64 kid selection screen work again 2012-02-11 08:28:24 +01:00
Tobias Gunkel
de0b5f7674 SCUMM: use command stack and SentenceTab in mm c64 
- MM C64 uses command stack (SentenceTab, doSentence()) now
- _cmdObject... added for current SentenceTab. The _active... variables are only used to build a sentence in the inventory but never by a script.
-> many routines are not needed anymore and are removed
 2012-02-11 08:28:22 +01:00
Tobias Gunkel
d8b435917d SCUMM: mm c64 cleanup 2012-02-11 08:28:21 +01:00
Tobias Gunkel
706b8cf1c5 SCUMM: replace verb, prep and currentMode values with symbolic constants 2012-02-11 08:28:19 +01:00
Tobias Gunkel
b01f601d7e SCUMM: use constants for c64 actor miscflags 2012-02-11 08:28:18 +01:00
Tobias Gunkel
6b5abf6919 SCUMM: selecting inventory objects and inventory scrolling works again 2012-02-11 08:28:16 +01:00
Tobias Gunkel
1c32000a00 SCUMM: start handling object type and id correctly in mm c64 
- removed complicated and unnecessary _v0ObjectIndex, _v0ObjectInInventory, _v0ObjectFlag vars
- started to merge object id and type into one object value (type<<8|id)
- verb preposition ids do not dependent on language -> remove from VerbSettings

Note:
- objects with type=0 are foreground objects. They have a state, an owner and a bg overlay image.
- objects with type=1 are bg objects. They do not have a state or owner and are already contained in the bg image. The do not have an entry in objectState/OwnerTable
 2012-02-11 08:28:14 +01:00
Tobias Gunkel
c69a52853c SCUMM: remove unneeded verbPrep() calls 2012-02-11 08:28:13 +01:00
Tobias Gunkel
a709a42319 SCUMM: fix ScummEngine_v0::o_stopCurrentScript() 2012-02-11 08:02:34 +01:00
Tobias Gunkel
a79f224c23 SCUMM: changed handling of _activeInventory/_activeActor to _activeObject(2)/_activeObject(2)Type 
Note: the transition is not completed yet. The code compiles but is probably not runnable as not every occurrence of _activeInventory has been properly replaced.
The usage of _v0ObjectIndex and _v0ObjectInInventory should be revised too and both variables should be replaced by another mechanism (maybe by using a single variable "obj = (type << 8) | id").

- moved v0 only vars _activeInventory, _activeObject, _activeVerb from  ScummEngine_v2 to ScummEngine_v0
- removed _activeActor, _activeInvExecute, _activeObject2Inv and _activeInventory. They are handled by _activeObject/_activeObjectType and _activeObject2/_activeObject2Type now.
- removed _activeObject(2)Index as they only bloat the code without any benefit (?)
- merge prep-name tables from ScummEngine_v2::drawPreposition() and ScummEngine_v0::drawSentenceWord() by introducing ScummEngine_v2::drawPreposition()
- rename ObjectData.flags -> obj_type (quick-fix only, needs review! Maybe obj_nr and obj_type can be merged into one var: obj_nr = (obj_type << 8) | obj_nr)
- o_unknown2 is negation of o_ifActiveObject (o_ifNotEqualActiveObject2)
- renamed o_ifActiveObject -> o_ifEqualActiveObject2 as it acts only on _activeObject2
- renamed ScummEngine_v0::drawSentenceWord() -> ScummEngine_v0::getObjectName()
 2012-02-11 08:02:32 +01:00
Tobias Gunkel
c9ae5f3838 SCUMM: Fix pickupObject() 2012-02-11 08:02:30 +01:00
Tobias Gunkel
3e2012483d SCUMM: make verbs working better 2012-02-11 08:02:29 +01:00
Tobias Gunkel
1e7ea7f95e SCUMM: Fix bug with tracker ID 3072094 
MANIAC C64: Bug while getting the stamps from the parcel - ID: 3072094
MMC64: use stamps with envelope - ID: 3095595
 2012-02-11 08:02:27 +01:00
Tobias Gunkel
05f853edd7 SCUMM: Fix meteor actor index 
- Now the correct actor name is shown with "give ... to meteor". Formerly the name was "".
- Add actor names that do not have a string assigned
 2012-02-11 08:02:25 +01:00
Tobias Gunkel
2acd5a8239 SCUMM: Fix sound playback if fast-mode is on 
Sounds are played that fast in fast-mode that the queue gets stuck.
This is just a workaround and only fixes the symptoms. Check the queue handling for a correct fix.
 2012-02-11 08:02:23 +01:00
Tarek Soliman
edc5249772 JANITORIAL: Fix template definition whitespace 2012-02-10 21:17:27 -06:00
Eugene Sandulenko
0deea6fbf8 Merge pull request #177 from BenCastricum/5db023646a8c685469bfe9dc551a282f8240ae04 
SCUMM: Use regular detection algorithms for FMTOWNS demos.
 2012-02-10 03:46:50 -08:00
Strangerke
3f6f814c6a TSAGE: R2R - Fix error in scene 1337 
Thanks to LordHoto for reporting it
 2012-02-10 07:12:11 +01:00
Strangerke
9e6e286db7 TSAGE: R2R - Fix glitch in scene 180 
Thanks to LordHoto for reporting it
 2012-02-10 07:11:20 +01:00
Johannes Schickel
6b16fe9423 TSAGE: Fix compilation by passing non-POD via pointer through "...". 
The other uses seem to pass Common::Point via a pointer to the object too,
so this seems fine to do here too.
 2012-02-09 23:10:12 +01:00
Strangerke
4b2938c9d0 TSAGE: R2R - Very preliminary implementation of scene 1337 2012-02-09 22:59:33 +01:00
D G Turner
0d6b4df014 DREAMWEB: Remove uneeded duplicate function "printUnderMon". 2012-02-08 17:18:35 +00:00
Alyssa Milburn
b9a93f354b Revert "SKY: Map the floppy intro track." 
This reverts commit 0599145ecf.
This mapping was incorrect, 503 is the outro.
 2012-02-07 13:20:50 +01:00
Paul Gilbert
2855735e1f TSAGE: Properly de-select inventory buttons when mouse has moved off before mouse is released. 
This fixes bug #3484777.
 2012-02-06 22:03:10 +11:00
Paul Gilbert
e81d1848d1 TSAGE: Add detection entry for Blue Force Spanish CD 2012-02-06 21:42:58 +11:00
Paul Gilbert
4a806d885a TSAGE: Clean up the dead code introduced for R2R 2012-02-05 20:40:03 +11:00
Paul Gilbert
45e61b985c TSAGE: Fix problem with scrolling wide scenes. 2012-02-05 20:31:56 +11:00
Paul Gilbert
27360d2071 TSAGE: Initial implementation of R2R Scene 180 2012-02-05 13:20:18 +11:00
Willem Jan Palenstijn
e8ef680400 TOUCHE: Add two missing accented letters to Spanish charset. 
The A-acute, I-acute, O-acute and U-acute seem to be missing from the font,
and are now all remapped to their unaccented ASCII variants. I and A
were added by 303333352a, and this patch adds O and U.
This is assuming the CP850 encoding, which is not entirely verified.

See bugs #2040311 and #3483383.
 2012-02-04 22:20:58 +01:00
Alyssa Milburn
9f8520fb81 QUEEN: Fix clicking at the pinnacle. 
Check where the click was *before* scrolling the view, so that
it works with a touchscreen. Also, check shouldQuit() here.
 2012-02-04 19:49:52 +01:00
Willem Jan Palenstijn
6fed44298e TOUCHE: Add charset debug channel 
This is intended to help debug the missing Spanish characters reported
in #2040311 and #3483383.
 2012-02-04 14:13:26 +01:00
Alyssa Milburn
7e9b0114d8 HUGO: Fix keyHandler (noticed by Strangerke). 2012-02-02 12:40:25 +01:00
Strangerke
c222afc933 TSAGE: R2R - Avoid a crash in scene 700 2012-02-02 00:31:25 +01:00
Strangerke
4aa494c19b TSAGE: R2R - Implement scene 700 2012-02-01 22:10:59 +01:00
Johannes Schickel
96853b234c ENGINES: Get rid of unnecessary friend in EngineManager. 2012-02-01 19:22:55 +01:00
Strangerke
81bc722605 TSAGE: R2R - Implement scene 900 2012-01-31 23:36:52 +01:00
Paul Gilbert
23a497f792 TSAGE: Minor cleanups for R2R scene 180 2012-01-31 22:41:36 +11:00
Paul Gilbert
d1db4a48ed TSAGE: Implement R2R Scene 205 - Star-field Credits 2012-01-31 22:23:55 +11:00
Paul Gilbert
e4e7827f77 TSAGE: Properly handle resetting flags when leaving a scene 2012-01-31 22:20:30 +11:00
Strangerke
4dffd4c1db TSAGE: R2R - Fix a couple of compilation errors not detected by MSVC 
Thanks Kirben for pointing those
 2012-01-31 01:02:37 +01:00
Strangerke
3e8547ebc1 TSAGE: R2R - Implement scene 600 2012-01-30 23:52:05 +01:00
athrxx
cf8a6dcd83 KYRA: (EOB) - fix typo 2012-01-30 22:23:06 +01:00
Strangerke
d34cf09608 TSAGE: R2R - Implement scene 525 2012-01-30 17:23:43 +01:00
Strangerke
c1352a1ae5 TSAGE - R2R: Implement scene 1750 2012-01-30 17:17:30 +01:00
Strangerke
14523275a3 TSAGE: R2R - Implement scene 3500 
This required a fix for direct draw code
 2012-01-30 01:17:56 +01:00
Torbjörn Andersson
5e50948e9d KYRA: Remove unnecessary semicolon 2012-01-29 21:41:23 +01:00
Torbjörn Andersson
54041675e5 TOLTECS: Some formatting fixes. 2012-01-29 21:41:16 +01:00
Johannes Schickel
fa401a2d3d SCI: Remove unnecessary break after return statement. 2012-01-29 16:34:41 +01:00
Johannes Schickel
21fb4af154 SWORD25: Return 0 instead of false in Screenshot::createThumbnail. 
This should "fix" a g++ warning.
 2012-01-29 16:33:43 +01:00
Johannes Schickel
f11b52a097 KYRA: Prevent unnecessary removal of const in some casts. 2012-01-29 16:26:20 +01:00
Travis Howell
0ceeee8148 SCUMM: Add script number differences in SCUMM V0, for two work arounds in Maniac Mansion. 2012-01-29 17:07:38 +11:00
Sven Hesse
885a29a1de GOB: Fix a segfault 2012-01-29 00:12:11 +01:00
Sven Hesse
2f7ae1109b GOB: Add a cheat debug command 
- Cheat the Diving minigame to a win
- Get the mastermind solution
 2012-01-29 00:10:11 +01:00
Sven Hesse
caeae1a7d6 GOB: Pick the pearl at the right frame of the animation 
And make the pearl picking a bit less...picky.
 2012-01-28 23:29:47 +01:00
Sven Hesse
1eb7c7507b GOB: Minor cleanup 2012-01-28 22:55:12 +01:00
Sven Hesse
0627a4244d GOB: Play the lungs animation when breathing 2012-01-28 22:29:19 +01:00
Sven Hesse
9fba98415d GOB: Don't play a hurt animation right before Oko dies 2012-01-28 20:09:58 +01:00
Sven Hesse
c161cc1232 GOB: Fade the Diving minigame in 2012-01-28 20:08:13 +01:00
Sven Hesse
c0d0792ccf GOB: End the Diving minigame when Oko is dead 2012-01-28 19:55:55 +01:00
Sven Hesse
4b60a761a0 GOB: Explicitely set the Diving palette 2012-01-28 19:53:26 +01:00
Sven Hesse
3a95cdf961 GOB: Correct the variable value for the Diving result 2012-01-28 19:45:27 +01:00
Sven Hesse
0eeae6e59e GOB: Oko gets hurt by fish and dies if health == 0 2012-01-28 19:45:02 +01:00
Sven Hesse
60306c40ac GOB: If there's no air left, Oko dies 2012-01-28 18:03:00 +01:00
Sven Hesse
7650fca040 GOB: Air gets used up and is refilled by breathing 2012-01-28 17:46:38 +01:00
Sven Hesse
9dd7035327 GOB: Add the air and health meters in Geisha's Diving minigame 2012-01-28 17:46:38 +01:00
Johannes Schickel
827cdbd22e AGOS: Make ArchiveMan a proper sub-type of SearchSet. 
Now all of the Archive API is implemented to avoid possibly inconsistent
behavior when an ArchiveMan object is accessed via a class type higher in the
class hierachy.
 2012-01-27 20:35:34 +01:00
Johannes Schickel
a231f9d5dd AGOS: Rename ArchiveMan's open to createReadStreamForMember to match our Archive API. 2012-01-27 20:30:02 +01:00
Johannes Schickel
a7cc5bd301 AGOS: Properly overwrite hasFile from SearchSet in ArchiveMan. 
Formerly the hasFile method was non-const, thus did not overwrite the virtual
hasFile method of SearchSet. Since all accesses to this function have been
done through a ArchiveMan typed variable, the missing overwrite should not
have caused any trouble.

It looks like this was forgotten in a6ec4f70da.
 2012-01-27 20:10:31 +01:00
Sven Hesse
0fd9abfe01 GOB: Play the correct animation when Oko's picking up pearls 2012-01-27 15:07:26 +01:00
Sven Hesse
cf45f49f72 GOB: Picking up pearls 2012-01-27 14:55:32 +01:00
Sven Hesse
8414627216 GOB: Play Oko's breathing sound 2012-01-27 14:45:41 +01:00
Sven Hesse
9d348f46ad GOB: Add a controlable Oko to Geisha's Diving minigame 
Still missing:
  - Air, constantly decreasing, fill up with breathing
  - Health, decreases by collision with evil fish
  - Death, when health == 0
  - Picking up pearls
 2012-01-27 14:27:16 +01:00
Sven Hesse
e0209358b7 GOB: Add pearls scrolling by on the ocean floor 2012-01-26 21:13:38 +01:00
Sven Hesse
a19eb26485 GOB: Add the background plants in Geisha's Diving minigame 2012-01-26 19:47:03 +01:00
Ben Castricum
5db023646a SCUMM: Use regular detection algorithms for FMTOWNS demos. 2012-01-26 18:06:10 +01:00
Johannes Schickel
baafd74b66 AGOS: Fix silly copy&paste mistake, which broke Vorbis and MP3 support. 2012-01-26 01:35:06 +01:00
Johannes Schickel
c82a75df69 AGOS: Rework digital sound playback. 
The BaseSound class does now only save the sound filename instead of a file
handle. When a new sound is started a new file handle is created, which
assures that each sound uses a different file handle and thus allows for
directly streaming sounds from disk.

This fixes bug #3475610
"AGOS: Wrong sound effects during intro of Simon 2 (DOS)".
 2012-01-26 01:01:41 +01:00
Strangerke
dd46de7569 TSAGE: Fix compilation, sorry 2012-01-25 22:20:34 +01:00
Strangerke
db26984ed4 TSAGE: R2R- Implement scene 1950 2012-01-25 22:08:40 +01:00
Strangerke
aec3a92377 TSAGE: R2R - Implement several missing functions in scene1550 2012-01-23 12:42:04 +01:00
Strangerke
2820573b43 TSAGE: R2R - Fix a couple of bugs in scenes 1925 and 1945, some renaming 2012-01-23 09:50:18 +01:00
Strangerke
e4d6d4780b TSAGE: R2R - Implement scene 1945 2012-01-23 00:58:42 +01:00
Strangerke
888c341c7a TSAGE: R2R - Implement scene 1925 2012-01-22 11:50:15 +01:00
Paul Gilbert
4e118ccf98 TSAGE: Implemented R2R Scene 500 2012-01-22 13:16:09 +11:00
Johannes Schickel
1758845af5 KYRA: Fix out of bounds access caused by a typo. 
Thanks to dhewg for pointing this one out.
 2012-01-21 19:31:12 +01:00
Paul Gilbert
d62e1f28cb TSAGE: Fix parenthesis in R2R scene 160 2012-01-21 19:52:14 +11:00
Paul Gilbert
cb1eaf4134 TSAGE: Implemented R2R Scene 160 - Credits 2012-01-21 14:15:51 +11:00
Strangerke
1c84ef4738 TSAGE: R2R - Implement scene 1900 2012-01-20 23:39:37 +01:00
Strangerke
0f67509456 TSAGE: R2R - Implement scene 1875 2012-01-20 19:45:24 +01:00
Strangerke
69a2c72c47 TSAGE: R2R - Implement scene 1800 2012-01-20 19:03:12 +01:00
Strangerke
00a9d394a5 TSAGE: R2R - Implement scene 1700 2012-01-18 23:21:50 +01:00
Thierry Crozat
4546ca0e22 SWORD1: Do not look for color indexes in cutscenes when there is no subtitles 2012-01-18 02:44:02 +00:00
Thierry Crozat
ace3bf6187 SWORD1: Use color for subtitles during cutscene 
During the game, different colors are used for subtitles depending
which character is speaking. This commit tries to use the same colors
for the cutscene subtitles. The color to use has to be specified in the
subtitle file between the frame end and the start of text using @1, @2,
@3 or @4 (for George, George as a narrator, Nicole and Maguire
respectively).
 2012-01-18 02:44:02 +00:00
Strangerke
29a063cb12 TSAGE: R2R - Implement scene 1625 2012-01-17 22:20:19 +01:00
Strangerke
8f03fef3a4 TSAGE: R2R - Fix bug in scene 1580 (not detected by MSVC) 
Thanks eriktorbjorn for pointing it
 2012-01-17 18:11:38 +01:00
Strangerke
a410584928 TSAGE: R2R - Implement scene 1580 
Also fix a couple of setdetails calls in scene 1550
 2012-01-17 17:56:29 +01:00