libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOON: Fix two latent off-by-one errors in Character Class.

Browse Source 
These were exposed by assertions from Common::Array usage.
This commit is contained in:
D G Turner 2012-06-14 21:02:44 +01:00
parent 57d34d2576
commit acaf8f7623
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/toon/character.cpp
View File

@ -201,7 +201,7 @@ bool Character::walkTo(int16 newPosX, int16 newPosY) {
if (_blockingWalk) {
while ((_x != newPosX || _y != newPosY) && _currentPathNode < _currentPath.size() && !_vm->shouldQuitGame()) {
if (_currentPathNode < _currentPath.size() - 4) {
int32 delta = MIN<int32>(4, _currentPath.size() - _currentPathNode);
int32 delta = MIN<int32>(4, _currentPath.size() - 1 - _currentPathNode);
int16 dx = _currentPath[_currentPathNode+delta].x - _x;
int16 dy = _currentPath[_currentPathNode+delta].y - _y;
@ -348,7 +348,7 @@ void Character::update(int32 timeIncrement) {
if ((_flags & 0x1) && _currentPath.size() > 0) {
if (_currentPathNode < _currentPath.size()) {
if (_currentPathNode < _currentPath.size() - 10) {
int32 delta = MIN<int32>(10, _currentPath.size() - _currentPathNode);
int32 delta = MIN<int32>(10, _currentPath.size() - 1 - _currentPathNode);
int16 dx = _currentPath[_currentPathNode+delta].x - _x;
int16 dy = _currentPath[_currentPathNode+delta].y - _y;
setFacing(getFacingFromDirection(dx, dy));