Fix clang errors

This commit is contained in:
Eidolon 2024-01-02 13:17:50 -06:00
parent 4277c6d930
commit 4a761c2e27
3 changed files with 11 additions and 7 deletions

View file

@ -7,9 +7,11 @@
// terms of the GNU General Public License, version 2. // terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details. // See the 'LICENSE' file for more details.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/// \file k_botitem.c /// \file k_botitem.cpp
/// \brief Bot item usage logic /// \brief Bot item usage logic
#include <algorithm>
#include <tracy/tracy/Tracy.hpp> #include <tracy/tracy/Tracy.hpp>
#include "doomdef.h" #include "doomdef.h"
@ -240,7 +242,7 @@ static player_t *K_PlayerInCone(const player_t *player, fixed_t radius, UINT16 c
{ {
ad = AngleFixed(a)>>FRACBITS; ad = AngleFixed(a)>>FRACBITS;
} }
else else
{ {
ad = 360-(AngleFixed(a)>>FRACBITS); ad = 360-(AngleFixed(a)>>FRACBITS);
} }

View file

@ -7,9 +7,11 @@
// terms of the GNU General Public License, version 2. // terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details. // See the 'LICENSE' file for more details.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/// \file k_botsearch.c /// \file k_botsearch.cpp
/// \brief Bot blockmap search functions /// \brief Bot blockmap search functions
#include <algorithm>
#include <tracy/tracy/Tracy.hpp> #include <tracy/tracy/Tracy.hpp>
#include "doomdef.h" #include "doomdef.h"
@ -441,7 +443,7 @@ static BlockItReturn_t K_FindObjectsForNudging(mobj_t *thing)
{ {
angledelta = AngleFixed(angle)>>FRACBITS; angledelta = AngleFixed(angle)>>FRACBITS;
} }
else else
{ {
angledelta = 360-(AngleFixed(angle)>>FRACBITS); angledelta = 360-(AngleFixed(angle)>>FRACBITS);
side = 1; side = 1;
@ -930,7 +932,7 @@ static BlockItReturn_t K_FindPlayersToBully(mobj_t *thing)
{ {
anglediff = AngleFixed(angle)>>FRACBITS; anglediff = AngleFixed(angle)>>FRACBITS;
} }
else else
{ {
anglediff = 360-(AngleFixed(angle)>>FRACBITS); anglediff = 360-(AngleFixed(angle)>>FRACBITS);
} }
@ -1007,7 +1009,7 @@ INT32 K_PositionBully(const player_t *player)
{ {
anglediff = AngleFixed(angle)>>FRACBITS; anglediff = AngleFixed(angle)>>FRACBITS;
} }
else else
{ {
anglediff = 360-(AngleFixed(angle)>>FRACBITS); anglediff = 360-(AngleFixed(angle)>>FRACBITS);
} }

View file

@ -4473,7 +4473,7 @@ static void K_drawKartMinimap(void)
MiniWaypoint(waypoint_t* wp) : waypoint(wp), rank(K_RankMinimapWaypoint(wp)) {} MiniWaypoint(waypoint_t* wp) : waypoint(wp), rank(K_RankMinimapWaypoint(wp)) {}
bool operator<(const MiniWaypoint& b) { return rank < b.rank; } bool operator<(const MiniWaypoint& b) const noexcept { return rank < b.rank; }
}; };
std::vector<MiniWaypoint> waypoints; std::vector<MiniWaypoint> waypoints;