Commit Graph

66953 Commits

Author SHA1 Message Date
Chris Apers
975b1cf7fb MORTEVIELLE: more drawBox() adjustments 2015-01-25 20:53:42 +01:00
chrilith
241f459582 Merge pull request #1 from scummvm/master
Latest changes including mines
2015-01-24 16:46:03 +01:00
Torbjörn Andersson
4e1ffc9434 ZVISION: Delete stream if there is no audio stream to queue to
This probably never happens, but is consistent with our common AVI
decoder.
2015-01-24 14:57:47 +01:00
Torbjörn Andersson
ca83ecd8c2 ZVISION: Fix lag at beginning of cutscenes
We have to update _curChunk when decoding audio, otherwise it will
decode the entire audio track on the first frame. For the ZGI intro
this would take 700-800 ms, and since the audio started playing
before the video it looked to me as if it had to play the first bit
faster to catch up.

Thanks to fuzzie for setting me on the right track with an off-hand
remark about the Zork AVI decoder (I was looking at the standard
AVI decoder), and for finding the cause a few seconds before I did.
2015-01-24 14:57:47 +01:00
Arnaud Boutonné
bf3e2bca07 Merge pull request #570 from chrilith/mortevielle_3rdintro
MORTEVIELLE: Added missing mesgId handling for 3rd intro screen
2015-01-24 14:37:00 +01:00
Arnaud Boutonné
378d031b94 Merge pull request #569 from chrilith/mortevielle
MORTEVIELLE: some display bugs fixed
2015-01-24 14:19:00 +01:00
Chris Apers
a4d822f98a MORTEVIELLE: alternatively we can make it local to delay() 2015-01-24 14:03:22 +01:00
Chris Apers
6691f9d812 MORTEVIELLE: Added missing mesgId handling for 3rd intro screen
This message is displayed during disk access, so it is not visible as
is in ScummVM version, a delay is required. Also delay should hide the
mouse to prevent frozen screen.
2015-01-24 11:13:32 +01:00
chrilith
a7d5ac9963 MORTEVIELLE: Fixed read index parsing alert strings
because Pascal code is base 1
2015-01-23 14:29:29 +01:00
chrilith
3839d9ce0b MORTEVIELLE: Fixed drawBox() to match original code 2015-01-23 14:29:16 +01:00
Filippos Karapetis
d75fbe79f0 ZVISION: Error out when a script file can't be found or be parsed
This should be an error, as we've effectively reached a non-existing
scene (such as in bug #6780), or we haven't parsed script files of a
scene fully, thus unexpected behavior will likely occur
2015-01-23 03:04:50 +02:00
Filippos Karapetis
1bd83a96f0 ZVISION: Fix script bug #6780 (invalid hotspot at base of tower in ZGI) 2015-01-23 03:02:24 +02:00
Filippos Karapetis
f7e0d1e958 ZVISION: Fix shadowed variable
A bug in commit 21e9007d80. Thanks to fingolfin for pointing it out
2015-01-23 03:01:29 +02:00
Filippos Karapetis
e66883d5cb ZVISION: Add console commands to manipulate state flags and variables 2015-01-21 14:06:13 +02:00
Filippos Karapetis
46fe6b64b9 ZVISION: Properly handle confirmation dialogs in the French ver. of ZGI 2015-01-21 12:36:02 +02:00
Matthew Hoops
cb25b7b5ee VIDEO: Make the QuickTime code error out again if the frame data can't be found
The case shouldn't actually ever happen; the off-by-one bug when seeking to the last frame of the media (in an edit) caused this originally
2015-01-20 20:10:59 -05:00
Matthew Hoops
7d1ee5563a VIDEO: Remove the "-1" edit hack
With the previous commits' fixes, it's no longer needed
2015-01-20 20:10:59 -05:00
Matthew Hoops
1a0f104acf VIDEO: Fix potential off-by-one frame time after seek
If seeking to the final frame of an edit, _nextFrameStartTime wouldn't be adjust properly and would wrongly say that it's at the end of the edit. This never affected anything because of the edit "-1" hack.
2015-01-20 20:10:59 -05:00
Matthew Hoops
8e2a438dd9 VIDEO: Fix edit frame calculation
An edit that seeks to the last frame of the media would not show
2015-01-20 20:10:59 -05:00
Matthew Hoops
aaf4d38a56 VIDEO: Round the edit time offset instead of truncating it
Allows for the KQ6 Mac intro to play without the edit "-1" hack
2015-01-20 20:10:58 -05:00
Matthew Hoops
a59f5db505 VIDEO: Fix timing with frames going past the edit boundary 2015-01-20 20:10:58 -05:00
Torbjörn Andersson
dfe04491c1 JANITORIAL: Remove unnecessary semicolons 2015-01-21 01:29:22 +01:00
Torbjörn Andersson
796fb134f1 ZVISION: Remove unnecessary spaces 2015-01-21 01:24:59 +01:00
Filippos Karapetis
1330cb7c99 ZVISION: Remove superfluous check 2015-01-21 01:42:01 +02:00
Torbjörn Andersson
5a6f711d07 ZVISION: Convert subtitles to UTF-32 before rendering them (bug #6772)
Because we use Common::String to store UTF-8 data, the font
renderer will draw the wrong glyphs for non-ASCII characters,
unless we first convert the string to UTF-32. (I thought the same
change would have to be made for the ZGI game over screens, but
apparently they work anyway. At least the German version, I'm told.)

I've discussed this change with [md5], and while it would probably
be more correct to make the engine use UTF-32 throughout, that is
also rather painful.
2015-01-20 23:41:59 +01:00
Filippos Karapetis
0776709f31 ZVISION: Do not process cheat codes while in the game menus
This prevents the cheat codes from being accidentally triggered when
using the save screen, for example
2015-01-21 00:33:54 +02:00
Filippos Karapetis
1d6a807349 ZVISION: Adapt confirmation dialogs for non-English versions 2015-01-20 22:51:25 +02:00
Torbjörn Andersson
ad83f03315 ZVISION: Fix mis-parsing of criteria, a.k.a bug #6774
A condition in a criteria is made up of three tokens: An id, an
operator and an id/value. However, in my copy of ZGI, puzzle:07507
has "[00202] !3  # SPELL_12_IN_BOOK", i.e. there was no space
between the second and third tokens. This caused the "glorf" spell
to not be properly inscribed in your spell book.

To fix this, if the second token is more than one character we use
the rest of it as the third token.
2015-01-20 19:21:39 +01:00
Filippos Karapetis
750d72812b ZVISION: Properly skip commented out puzzle criteria - fixes bug #6776
In the Zork: Nemesis version bundled in the ZGI SE DVD, the bell rope
puzzle has been modified so that it's non-interactive, i.e. there isn't
a hotspot to click while the video is playing, and the player is
transported to the next room. In the patched script, all criteria of
that puzzle were commented out, resulting in an invalid criteria list.
Skip any commented out criteria, to avoid ending with an invalid list.
2015-01-20 02:16:21 +02:00
Filippos Karapetis
5f9858844a ZVISION: Fix saving when using the original save dialog
A regression from commit dcac5be493
2015-01-20 01:21:16 +02:00
Filippos Karapetis
5df2e08c16 ZVISION: Fix bug #6771 (unable to leave room when loading a game)
Avoid overwriting the previous location when loading a saved game
2015-01-19 23:54:42 +02:00
Filippos Karapetis
dcac5be493 ZVISION: Simplify the checks in the location changing code 2015-01-19 23:54:41 +02:00
Filippos Karapetis
ecc45b961f Merge pull request #567 from fedor4ever/master
ZVISION: Fix comparison between signed and unsigned integers
2015-01-19 23:22:23 +02:00
Fedor
08b6a5b486 ZVISION: Fix comparison between signed and unsigned integers 2015-01-19 23:25:40 +03:00
Filippos Karapetis
68b7839d99 ZVISION: Fix bug #6768 (unable to save in the prison area)
The save buffer preparation code had a bug, which triggered in the
jail area because its room is 'j'
2015-01-19 05:09:03 +02:00
RichieSams
3a31e1de96 ZVISION: Don't change location when coming back from ScummVM save dialog and do change location when coming back from restore dialog
Fixes bug # 6771

We don't need to change locations, since we use the ScummVM save dialog instead
of the original one (which is actually a location). Instead we just need to reset _nextLocation to
_currentLocation so the engine can stop trying to save. If we change locations, the
StateKey_LastWorld/Room/etc. end up being overwritten with the current room. So if a script
refers to location 0, 0, 0, 0 (aka, the last room), the engine will try to change location to the same room.

On restore, we have to force a location change, just in case we restore to the same room. (Since the logic
will only do a location change if _nextLocation != _currentLocation)
2015-01-18 20:22:02 -06:00
RichieSams
0fafb6a62c Revert "ZVISION: Don't change location when coming back from ScummVM save dialog"
This reverts commit b835eacc0c.
2015-01-18 20:11:10 -06:00
RichieSams
b835eacc0c ZVISION: Don't change location when coming back from ScummVM save dialog
Fixes bug # 6771

We don't need to change locations, since we use the ScummVM save dialog instead
of the original one (which is actually a location). Instead we just need to reset _nextLocation to
_currentLocation so the engine can stop trying to save. If we change locations, the
StateKey_LastWorld/Room/etc. end up being overwritten with the current room. So if a script
refers to location 0, 0, 0, 0 (aka, the last room), the engine will try to change location to the same room.
2015-01-18 19:26:49 -06:00
RichieSams
a26a9c7268 ZVISION: Fix formatting and add curlies 2015-01-18 17:06:37 -06:00
Matthew Hoops
762e2ca69b CONFIGURE: Use -mlongcall on Mac PPC builds
Calls larger than 32MB away should no longer cause linker errors, provided libraries are rebuilt with that too
2015-01-18 17:00:51 -05:00
Matthew Hoops
e10512c8b9 CONFIGURE: Use "powerpc" instead of "ppc" as config.guess outputs
powerpc-* targets get detected properly again now
2015-01-18 16:58:03 -05:00
clone2727
79c902338b TEST: Use "/usr/bin/env python" as the shebang line in cxxtestgen.py 2015-01-18 14:41:16 -05:00
clone2727
db64442c4a COMMON: Fix strict-alignment READ_BE_UINT64 on LE and READ_LE_UINT64 on BE 2015-01-18 14:41:15 -05:00
Sven Hesse
3f66f28624 ZVISION: Remove trailing whitespace 2015-01-18 20:35:51 +01:00
Filippos Karapetis
7c23eae102 ZVISION: Fix path handling in case-sensitive file systems (bug #6775)
A regression from commit d70503cc98. Thanks to wjp for bisecting.
2015-01-18 21:30:07 +02:00
Alyssa Milburn
cac7be425a ANDROID: Remove plugins/unpacker from makefile. 2015-01-18 12:04:15 +01:00
Thierry Crozat
1244597849 JANITORIAL: Update copyright year 2015-01-18 02:24:51 +00:00
Paul Gilbert
926404bd10 MADS: Renamings of Layer and a transition type 2015-01-17 20:51:52 -05:00
Paul Gilbert
9b8fa20c76 MADS: Fix horizontal flipping of scene background sprites 2015-01-17 17:29:08 -05:00
Paul Gilbert
4ee29ef3a8 MADS: Add loading of SpriteInfo frame numbers for scene background sprites 2015-01-17 16:46:57 -05:00