From 433447ed8896eaebe3fadd14169e92d186cdc27f Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Thu, 13 Jul 2023 13:25:58 +0300 Subject: [PATCH] Fix name clash --- src/animation.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/animation.cc b/src/animation.cc index e813728..0b496c2 100644 --- a/src/animation.cc +++ b/src/animation.cc @@ -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; } }