Commit Graph
86814 Commits
Author SHA1 Message Date
Torbjörn Andersson 796fb134f1 ZVISION: Remove unnecessary spaces 2015-01-21 01:24:59 +01:00
Strangerke d7f37d213c ACCESS: MM - Implement printWatch and clearWatch 2015-01-21 01:10:37 +01:00
Filippos Karapetis 1330cb7c99 ZVISION: Remove superfluous check 2015-01-21 01:42:01 +02:00
Strangerke f60a4d3e71 ACCESS: MM - Fix the "android" watch dialog and animation 2015-01-21 00:26:11 +01: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
Paul Gilbert 8b4d25d415 XEEN: Implemented doStepCode 2015-01-20 08:46:27 -05:00
Paul Gilbert 2427f203ee XEEN: Implemented handleLight 2015-01-20 08:20:07 -05:00
Paul Gilbert aab62d606e XEEN: More minimap fixes 2015-01-19 23:57:13 -05:00
Paul Gilbert d32c90eee9 XEEN: Some minimap drawing fixes 2015-01-19 23:18:44 -05:00
Paul Gilbert 8cd2e5ad92 XEEN: Further work on sprite scaling 2015-01-19 22:38:33 -05:00
Paul Gilbert a1fb631fe3 XEEN: Fix resetting sprites on ground tiles when drawing 2015-01-19 22:38:20 -05:00
Paul Gilbert dc8592a912 XEEN: Fix loading of wall types 2015-01-19 19:28:38 -05: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
Paul Gilbert ebc155ac0a XEEN: Replaced UI button values with KeyCode constants 2015-01-19 18:51:29 -05:00
Paul Gilbert e966feff5e XEEN: Implemented movement code 2015-01-19 18:42:40 -05: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
Paul Gilbert 1f312098ad XEEN: Minor minimap fixes 2015-01-19 16:20:40 -05:00
Paul Gilbert e559a99c27 XEEN: Initial implementation of drawMiniMap 2015-01-19 15:29:57 -05:00
Fedor 08b6a5b486 ZVISION: Fix comparison between signed and unsigned integers 2015-01-19 23:25:40 +03:00
Strangerke c810ee9a5a ACCESS: MM - Make CharEntry version-dependent 2015-01-19 20:53:53 +01:00
Paul Gilbert ec294d662e XEEN: Add extra ending code for pausing turns 2015-01-19 12:13:03 -05:00
Paul Gilbert 687423b361 XEEN: Beginnings of main game loop and waiting 2015-01-19 11:32:57 -05:00
Paul Gilbert 83442b9586 XEEN: Fix Valgrind warnings 2015-01-19 10:51:05 -05:00
Paul Gilbert f46b9d77dd XEEN: Compilation fixes for gcc 2015-01-19 10:28:48 -05: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
Paul Gilbert b12e26836a XEEN: Disable initial fade out for now 2015-01-18 20:56:35 -05:00
Paul Gilbert 130bd58e2c XEEN: Load correct surface sprites for the maze 2015-01-18 20:54:58 -05: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
Paul Gilbert e4c4736306 XEEN: Renaming of flags and surface display 2015-01-18 20:11:31 -05:00
Paul Gilbert ecdf6412a6 XEEN: Fix drawing the game window border 2015-01-18 19:18:00 -05:00
Paul Gilbert 07a10855be XEEN: In progress work on sprite scaling 2015-01-18 19:12:10 -05:00
Strangerke 6ba81a9749 ACCESS: MM - Implement printBubble_v1 2015-01-19 00:11:05 +01:00
RichieSams a26a9c7268 ZVISION: Fix formatting and add curlies 2015-01-18 17:06:37 -06:00
Paul Gilbert f18a8c364b XEEN: Convert default values for monsters flying flags from int to bool 2015-01-18 17:35:17 -05:00
Paul Gilbert 9925453774 XEEN: Fix loading of MonsterData array 2015-01-18 17:17:55 -05: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
Paul Gilbert ceeda17ab1 XEEN: Remove old test sprite from being displayed 2015-01-18 15:59:07 -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