thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: Further FIXED_INT_MULTIPLIER refactoring

Browse source 
Also converted multiplier factor from 100 to 1000, which will be
needed for Rose Tattoo
This commit is contained in:
Paul Gilbert 2015-06-05 21:13:48 -04:00
parent cf76576035
commit 9ada143d14
9 changed files with 76 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sherlock/scalpel/scalpel_user_interface.cpp
View file

@ -500,7 +500,7 @@ void ScalpelUserInterface::examine() {
scene.startCAnim(_cNum, canimSpeed);
} else if (obj._lookPosition.y != 0) {
// Need to walk to the object to be examined
people.walkToCoords(Common::Point(obj._lookPosition.x, obj._lookPosition.y * 100), obj._lookFacing);
people.walkToCoords(obj._lookPosition, obj._lookFacing);
}
if (!talk._talkToAbort) {
@ -2158,7 +2158,7 @@ void ScalpelUserInterface::checkAction(ActionType &action, const char *const mes
Scene &scene = *_vm->_scene;
Screen &screen = *_vm->_screen;
Talk &talk = *_vm->_talk;
Common::Point pt(-1, -1);
Point32 pt(-1, -1);
if (objNum >= 1000)
// Ignore actions done on characters
@ -2197,7 +2197,7 @@ void ScalpelUserInterface::checkAction(ActionType &action, const char *const mes
}
}
} else {
pt = Common::Point(-1, -1);
pt = Point32(-1, -1);
dir = -1;
}