ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
51 Commits
Author SHA1 Message Date
Eugene Sandulenko abea37c9bb ALL: Update ScummVM project license to GPLv3+ 2021-12-26 18:48:43 +01:00
Torbjörn Andersson 022a65ee52 ZVISION: Delay location changes one cycle 
Since the script that triggers a location change can also trigger other
scripts, wait one cycle before actually changing the location to give
them time to run. This fixes a couple more missing points. I've verified
that this does not cause any obvious regressions in ZGI. I'll try
Nemesis when all is done, to see if any of the fixes needs to be for ZGI
and ZGI only.
 2020-08-24 14:15:23 +02:00
D G Turner 008e2b85b6 ZVISION: Fix Missing Default Switch Cases 
These are flagged by GCC if -Wswitch-default is enabled.
 2019-10-24 02:04:53 +01:00
Eugene Sandulenko fab199d37e JANITORIAL: Make GPL headers uniform 2016-09-03 12:46:38 +02:00
Filippos Karapetis 14914b2a31 ZVISION: Add custom equality operators for game location 
This makes the location checks more readable
 2015-02-14 15:08:28 +02: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
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 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
Filippos Karapetis 21e9007d80 Revert "ZVISION: Remove ActionRestoreGame and loading of r.svr (restart slot)" 
This reverts commit 9f642074ba, as it
broke the credits screen in ZGI.

This has been rewritten to use the common save code
 2015-01-10 22:03:15 +02:00
Filippos Karapetis 616b34e629 ZVISION: Change wording 2015-01-10 17:30:11 +02:00
Filippos Karapetis 9f642074ba ZVISION: Remove ActionRestoreGame and loading of r.svr (restart slot) 
This is handled internally now, so r.svr isn't needed anymore
 2015-01-07 11:42:24 +02:00
RichieSams 68d3ebd57b ZVISION: Rename some scripting classes to better represent what the classes are 
Also, rename the graphics 'Effect' class in order to avoid naming clashes (and/or coder
confusion) with the newly named ScriptingEffect class.
Lastly, add some documentation for the classes for further clarity.
 2014-12-30 01:10:36 -06:00
Filippos Karapetis e5f0ee2271 ZVISION: Implement auto-saving 2014-12-26 18:22:18 +02:00
Filippos Karapetis eea1ee445f ZVISION: Move more graphics code out of the main engine code 2014-12-26 13:14:24 +02:00
Filippos Karapetis 4d0ebfaa22 ZVISION: Move the save manager together with the other file classes 2014-12-26 04:03:20 +02:00
Marisa-Chan e934ffdd5e ZVISION: Fix uninitialized scalar field (CID 1257089) 2014-12-19 17:06:47 +06:00
Filippos Karapetis 77705752ef ZVISION: Move trimCommentsAndWhiteSpace() into the script manager 
This allows us to remove the last remnants of utility.*
 2014-12-16 01:58:57 +02:00
Filippos Karapetis 7630e3204e ZVISION: Move all the remaining utility classes into the core 2014-12-16 01:58:56 +02:00
Filippos Karapetis 4b2b5e686b ZVISION: Move the mouse cursor handling code into the graphics code 2014-12-16 01:58:55 +02:00
Filippos Karapetis ec1fdeb25a ZVISION: Implement several advanced engine features and ScummVM dialogs 
The functionality to return to launcher, list saves, delete saves, load
games from the launcher and load and save games during runtime has been
implemented. Also, ScummVM save/load dialogs have been implemented.
Saved games now have three numbers in their file extension, bumping the
possible save game slots up to 999
 2014-12-08 01:08:27 +02:00
Filippos Karapetis 2a4a6df5f2 ZVISION: Remove superfluous spacing and reorder some includes 2014-12-03 01:12:35 +02:00
Marisa-Chan 5b352da304 ZVISION: More CamelCase and a bit of comments cleanup 2014-11-20 14:48:24 +06:00
Marisa-Chan bb06ecf798 ZVISION: Make menu bar fully enabled after changelocation called 2014-11-12 16:01:23 +06:00
Marisa-Chan 418b5f6dd2 ZVISION: Passive borders check for tilt and panorama for changelocation 2014-11-12 15:58:35 +06:00
Marisa-Chan ea8cc34a66 ZVISION: Implement action:restore_game 2014-11-08 13:06:48 +06:00
Marisa-Chan 66d2cb4698 ZVISION: Implement action:flush_mouse_events 2014-11-08 12:59:58 +06:00
Marisa-Chan be8cf97674 ZVISION: Implement settings functions 2014-11-04 10:12:13 +06:00
Marisa-Chan a65ec38f8d ZVISION: Fix code style 2014-10-10 16:50:59 +07:00
Marisa-Chan 1696e0dd96 ZVISION: Prepare save data while changing location 2014-08-04 16:43:15 +07:00
Marisa-Chan 73d26bc233 ZVISION: Don't focus on already focused control 2014-08-04 16:33:36 +07:00
Marisa-Chan d7d058cd60 ZVISION: New scriptManager location methods 2014-08-04 16:32:48 +07:00
Marisa-Chan fb62b9477b ZVISION: Make controls processing breakeable. 2014-08-04 16:29:58 +07:00
Marisa-Chan 5a870100bd ZVISION: Bool results for keyUp and keyDown events for controls. 2014-07-12 21:52:56 +00:00
Marisa-Chan 7f2d4d9a6c ZVISION: Implement fuctionality for change focus without of calling focus/unfocus 2014-07-12 21:44:10 +00:00
Marisa-Chan bc4b0b5bf6 ZVISION: Implement code for getControl 2014-07-12 21:39:02 +00:00
Marisa-Chan bbaebdf680 ZVISION: Process events for controls similar to original engine, fix some errors. 2014-07-05 17:27:08 +00:00
Marisa-Chan 628d6cb4ee ZVISION: Fix puzzle disable condition check 2014-07-05 17:15:04 +00:00
Marisa-Chan 23c1b50861 ZVISION: Reorgonize source files into directories. 2014-07-02 19:50:55 +00:00
Marisa-Chan ace0e5e88f ZVISION: Fix compilation errors with latest scummvm 2014-06-14 15:18:24 +07:00
Marisa-Chan 45589950c0 Merge remote-tracking branch 'upstream/master' into zvision 
Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h
 2014-06-13 21:43:04 +07:00
Johannes Schickel aa4c5d46f7 ZVISION: Make GPL headers consistent in themselves. 2014-02-18 02:39:40 +01:00
Torbjörn Andersson c93249cfd0 ZVISION: Fix compilation 2013-11-01 08:57:50 +01:00
RichieSams e50797d6b1 ZVISION: Update includes to use the new file structure 2013-11-01 02:52:57 -05:00