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

BBVS: Silence gcc conversion warnings

Browse Source
This commit is contained in:
Matthew Hoops 2014-06-01 17:28:11 -04:00
parent a83ce70467
commit d5b5d4b545
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/bbvs/minigames/bbtennis.cpp
View File

@ -594,9 +594,9 @@ void MinigameBbTennis::updateTennisBall(int objIndex) {
}
obj->fltX = obj->fltX - obj->fltStepX;
obj->x = obj->fltX;
obj->x = (int)obj->fltX;
obj->fltY = obj->fltY - obj->fltStepY;
obj->y = obj->fltY;
obj->y = (int)obj->fltY;
}
@ -1100,9 +1100,9 @@ void MinigameBbTennis::updateEnemyTennisBall(int objIndex) {
}
obj->fltX = obj->fltX - obj->fltStepX;
obj->x = obj->fltX;
obj->x = (int)obj->fltX;
obj->fltY = obj->fltY - obj->fltStepY;
obj->y = obj->fltY;
obj->y = (int)obj->fltY;
}

6
engines/bbvs/walk.cpp
View File

@ -112,9 +112,9 @@ void BbvsEngine::walkObject(SceneObject *sceneObject, const Common::Point &destP
float distance = sqrt((double)(deltaX * deltaX + deltaY * deltaY));
// NOTE The original doesn't have this check but without it the whole pathfinding breaks
if (distance > 0.0) {
sceneObject->walkCount = distance / ((((float)ABS(deltaX) / distance) + 1.0) * ((float)walkSpeed / 120));
sceneObject->xIncr = ((float)deltaX / sceneObject->walkCount) * 65536.0;
sceneObject->yIncr = ((float)deltaY / sceneObject->walkCount) * 65536.0;
sceneObject->walkCount = (int)(distance / ((((float)ABS(deltaX) / distance) + 1.0) * ((float)walkSpeed / 120)));
sceneObject->xIncr = (int)(((float)deltaX / sceneObject->walkCount) * 65536.0);
sceneObject->yIncr = (int)(((float)deltaY / sceneObject->walkCount) * 65536.0);
sceneObject->x = (sceneObject->x & 0xFFFF0000) | 0x8000;
sceneObject->y = (sceneObject->y & 0xFFFF0000) | 0x8000;
} else