eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix name clash

This commit is contained in:
Alexander Batalov 2023-07-13 13:25:58 +03:00
parent fdc80c31f8
commit 433447ed88
1 changed files with 8 additions and 8 deletions

16
src/animation.cc
View File

@ -2045,10 +2045,10 @@ int _make_straight_path_func(Object* obj, int from, int to, StraightPathNode* st
if (tile != prevTile) {
if (obstaclePtr != NULL) {
Object* obj = callback(obj, tile, obj->elevation);
if (obj != NULL) {
if (obj != *obstaclePtr && (a6 != 32 || (obj->flags & OBJECT_SHOOT_THRU) == 0)) {
*obstaclePtr = obj;
Object* obstacle = callback(obj, tile, obj->elevation);
if (obstacle != NULL) {
if (obstacle != *obstaclePtr && (a6 != 32 || (obstacle->flags & OBJECT_SHOOT_THRU) == 0)) {
*obstaclePtr = obstacle;
break;
}
}
@ -2098,10 +2098,10 @@ int _make_straight_path_func(Object* obj, int from, int to, StraightPathNode* st
if (tile != prevTile) {
if (obstaclePtr != NULL) {
Object* obj = callback(obj, tile, obj->elevation);
if (obj != NULL) {
if (obj != *obstaclePtr && (a6 != 32 || (obj->flags & OBJECT_SHOOT_THRU) == 0)) {
*obstaclePtr = obj;
Object* obstacle = callback(obj, tile, obj->elevation);
if (obstacle != NULL) {
if (obstacle != *obstaclePtr && (a6 != 32 || (obstacle->flags & OBJECT_SHOOT_THRU) == 0)) {
*obstaclePtr = obstacle;
break;
}
}