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

SAGA2: Fix more warnings

Browse source
This commit is contained in:
a/ 2021-06-20 19:29:56 +09:00 • committed by Eugene Sandulenko
parent efda4028a9
commit 1ab3ffa869
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/saga2/objects.cpp
View file

@ -58,7 +58,6 @@ APPFUNC(cmdControl);
const uint32 nameListID = MKTAG('N', 'A', 'M', 'E'),
objListID = MKTAG('O', 'B', 'J', 'E'),
worldListID = MKTAG('W', 'R', 'L', 'D'),
objProtoID = MKTAG('P', 'R', 'O', 0),
actorProtoID = MKTAG('P', 'R', 'O', 1);
@ -4218,16 +4217,16 @@ GameObject *objectCollision(GameObject *obj, GameWorld *world, const TilePoint &
obstacle != nullptr;
iter.next(&obstacle)) {
TilePoint tp = obstacle->getLocation();
ProtoObj *proto = obstacle->proto();
ProtoObj *obstacleProto = obstacle->proto();
if (obstacle == obj) continue;
if (tp.z < volume.max.z
&& tp.z + proto->height > volume.min.z
&& tp.u - proto->crossSection < volume.max.u
&& tp.u + proto->crossSection > volume.min.u
&& tp.v - proto->crossSection < volume.max.v
&& tp.v + proto->crossSection > volume.min.v) {
&& tp.z + obstacleProto->height > volume.min.z
&& tp.u - obstacleProto->crossSection < volume.max.u
&& tp.u + obstacleProto->crossSection > volume.min.u
&& tp.v - obstacleProto->crossSection < volume.max.v
&& tp.v + obstacleProto->crossSection > volume.min.v) {
// If the actor is dead, then it is not an obstacle.
if (isActor(obstacle) && ((Actor *)obstacle)->isDead()) continue;