From 61a4f17263bec918a80c73c08822d1c890ff744e Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 8 May 2023 23:54:38 +0300 Subject: [PATCH] bot: cosmetic fixes --- inc/planner.h | 18 +++++++++--------- src/botlib.cpp | 2 +- src/planner.cpp | 2 +- src/vistable.cpp | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/inc/planner.h b/inc/planner.h index eaab1bc..9559521 100644 --- a/inc/planner.h +++ b/inc/planner.h @@ -55,32 +55,32 @@ public: public: // least kills and number of nodes to goal for a team - static float gfunctionKillsDist (int team, int currentIndex, int parentIndex);; + static float gfunctionKillsDist (int team, int currentIndex, int parentIndex); // least kills and number of nodes to goal for a team (when with hostage) - static float gfunctionKillsDistCTWithHostage (int team, int currentIndex, int parentIndex);; + static float gfunctionKillsDistCTWithHostage (int team, int currentIndex, int parentIndex); // least kills to goal for a team - static float gfunctionKills (int team, int currentIndex, int);; + static float gfunctionKills (int team, int currentIndex, int); // least kills to goal for a team (when with hostage) - static auto gfunctionKillsCTWithHostage (int team, int currentIndex, int parentIndex) -> float;; + static float gfunctionKillsCTWithHostage (int team, int currentIndex, int parentIndex); // least distance for a team - static float gfunctionPathDist (int, int currentIndex, int parentIndex);; + static float gfunctionPathDist (int, int currentIndex, int parentIndex); // least distance for a team (when with hostage) - static float gfunctionPathDistWithHostage (int, int currentIndex, int parentIndex);; + static float gfunctionPathDistWithHostage (int, int currentIndex, int parentIndex); public: // square distance heuristic - static float hfunctionPathDist (int index, int, int goalIndex);; + static float hfunctionPathDist (int index, int, int goalIndex); // square distance heuristic with hostages - static float hfunctionPathDistWithHostage (int index, int, int goalIndex);; + static float hfunctionPathDistWithHostage (int index, int, int goalIndex); // none heuristic - static float hfunctionNone (int index, int, int goalIndex);; + static float hfunctionNone (int index, int, int goalIndex); }; // A* algorithm for bots diff --git a/src/botlib.cpp b/src/botlib.cpp index ce28a17..0700ce2 100644 --- a/src/botlib.cpp +++ b/src/botlib.cpp @@ -2761,7 +2761,7 @@ void Bot::updateAimDir () { } } else if (m_seeEnemyTime + 3.0f > game.time () && !m_lastEnemyOrigin.empty ()) { - m_lookAt = m_lastEnemyOrigin;; + m_lookAt = m_lastEnemyOrigin; } else { m_lookAt = m_destOrigin; diff --git a/src/planner.cpp b/src/planner.cpp index 4565347..923d9c9 100644 --- a/src/planner.cpp +++ b/src/planner.cpp @@ -523,7 +523,7 @@ bool PathPlanner::find (int srcIndex, int destIndex, NodeAdderFn onAddedNode, in if (m_memoryLimitHit) { return m_dijkstra->find (srcIndex, destIndex, onAddedNode, pathDistance); } - return m_floyd->find (srcIndex, destIndex, onAddedNode, pathDistance);; + return m_floyd->find (srcIndex, destIndex, onAddedNode, pathDistance); } float PathPlanner::dist (int srcIndex, int destIndex) { diff --git a/src/vistable.cpp b/src/vistable.cpp index 47840bf..2de5726 100644 --- a/src/vistable.cpp +++ b/src/vistable.cpp @@ -87,10 +87,10 @@ void GraphVistable::rebuild () { // check if line of sight to object is not blocked (i.e. visible) if (!cr::fequal (tr.flFraction, 1.0f)) { - res |= VisIndex::Crouch;; + res |= VisIndex::Crouch; } else { - res &= VisIndex::Stand;; + res &= VisIndex::Stand; } game.testLine (sourceStand, dest, TraceIgnore::Monsters, nullptr, &tr); @@ -99,7 +99,7 @@ void GraphVistable::rebuild () { res |= VisIndex::Stand; } else { - res &= VisIndex::Crouch;; + res &= VisIndex::Crouch; } } shift = static_cast ((path.number % 4) << 1);