[Scummvm-cvs-logs] scummvm master -> 1f80e1389fca2fc86d7176730115c48f4e503474
bluegr
bluegr at gmail.com
Tue Dec 9 18:39:25 CET 2014
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ea8db1969a ZVISION: Fix the 'dumpfile' console command
1f80e1389f ZVISION: Fix the responsiveness of level controls to mouse movement
Commit: ea8db1969a7f975103d26f6a6a7eaa54835db7c1
https://github.com/scummvm/scummvm/commit/ea8db1969a7f975103d26f6a6a7eaa54835db7c1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-09T19:38:11+02:00
Commit Message:
ZVISION: Fix the 'dumpfile' console command
Changed paths:
engines/zvision/core/console.cpp
diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index f8e2833..e641783 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -209,7 +209,8 @@ bool Console::cmdDumpFile(int argc, const char **argv) {
}
Common::File f;
- if (!f.open(argv[1])) {
+ if (!_engine->getSearchManager()->openFile(f, argv[1])) {
+ warning("File not found: %s", argv[1]);
return true;
}
Commit: 1f80e1389fca2fc86d7176730115c48f4e503474
https://github.com/scummvm/scummvm/commit/1f80e1389fca2fc86d7176730115c48f4e503474
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-09T19:38:11+02:00
Commit Message:
ZVISION: Fix the responsiveness of level controls to mouse movement
This fixes the responsiveness of the levers in the planet screen of
Zork: Nemesis
Changed paths:
engines/zvision/scripting/controls/lever_control.cpp
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 12b07d7..1e40879 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -221,10 +221,9 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
bool cursorWasChanged = false;
if (_mouseIsCaptured) {
- // Make sure the square distance between the last point and the current point is greater than 64
+ // Make sure the square distance between the last point and the current point is greater than 16
// This is a heuristic. This determines how responsive the lever is to mouse movement.
- // TODO: Fiddle with the heuristic to get a good lever responsiveness 'feel'
- if (_lastMousePos.sqrDist(backgroundImageSpacePos) >= 64) {
+ if (_lastMousePos.sqrDist(backgroundImageSpacePos) >= 16) {
int angle = calculateVectorAngle(_lastMousePos, backgroundImageSpacePos);
_lastMousePos = backgroundImageSpacePos;
More information about the Scummvm-git-logs
mailing list