Skip to content

Commit ad25726

Browse files
authored
Fix a couple of clang-19 warnings (#5461)
Remove unused functions in lib/irrlicht/source/Irrlicht/CBlit.h Handle unused debug variables
1 parent b528010 commit ad25726

File tree

12 files changed

+29
-477
lines changed

12 files changed

+29
-477
lines changed

lib/irrlicht/source/Irrlicht/CBlit.h

Lines changed: 0 additions & 461 deletions
Large diffs are not rendered by default.

src/graphics/sp/sp_shader_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ std::shared_ptr<SPShader> SPShaderManager::buildSPShader(const ShaderInfo& si,
387387
std::shared_ptr<SPShader> sps;
388388
#ifndef SERVER_ONLY
389389
sps = std::make_shared<SPShader>(si.m_shader_name,
390-
[this, pi, ua, skinned](SPShader* shader)
390+
[pi, ua, skinned](SPShader* shader)
391391
{
392392
// First pass
393393
assert(!pi[0].m_vertex_shader.empty() ||

src/guiengine/screen.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,13 @@ void Screen::loadFromFile()
152152
void Screen::unload()
153153
{
154154
assert(m_magic_number == 0xCAFEC001);
155+
#ifndef NDEBUG
155156
Widget* w;
156157
for_in (w, m_widgets)
157158
{
158159
assert(w->m_magic_number == 0xCAFEC001);
159160
}
160-
161+
#endif
161162
m_loaded = false;
162163
m_widgets.clearAndDeleteAll();
163164

src/guiengine/widgets/player_kart_widget.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ void PlayerKartWidget::add()
351351

352352
assert(KartSelectionScreen::getRunningInstance()
353353
->m_kart_widgets.contains(this));
354+
#ifdef DEBUG
354355
if (m_associated_player) // if player is local
355356
{
356357
#ifdef DEBUG
@@ -366,7 +367,7 @@ void PlayerKartWidget::add()
366367
assert(mineInList);
367368
#endif
368369
}
369-
370+
#endif
370371
// the first player will have an ID of its own to allow for keyboard
371372
// navigation despite this widget being added last
372373
if (m_irrlicht_widget_id != -1)

src/karts/controller/test_ai.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,16 +1552,17 @@ void SkiddingAI::handleRaceStart()
15521552
// smaller depending on the difficulty.
15531553
m_start_delay = stk_config->time2Ticks(
15541554
m_ai_properties->m_min_start_delay
1555-
+ (float) rand() / RAND_MAX
1556-
* (m_ai_properties->m_max_start_delay -
1557-
m_ai_properties->m_min_start_delay) );
1555+
+ static_cast<float>(
1556+
static_cast<double>(rand()) / static_cast<double>(RAND_MAX)
1557+
* (m_ai_properties->m_max_start_delay -
1558+
m_ai_properties->m_min_start_delay)));
15581559

15591560
float false_start_probability =
15601561
m_superpower == RaceManager::SUPERPOWER_NOLOK_BOSS
15611562
? 0.0f : m_ai_properties->m_false_start_probability;
15621563

15631564
// Now check for a false start. If so, add 1 second penalty time.
1564-
if (rand() < RAND_MAX * false_start_probability)
1565+
if (static_cast<double>(rand()) < static_cast<double>(RAND_MAX) * false_start_probability)
15651566
{
15661567
m_start_delay+=stk_config->m_penalty_ticks;
15671568
return;

src/modes/linear_world.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,6 @@ void LinearWorld::updateRacePosition()
900900
setKartPosition(i, kart->getPosition());
901901
continue;
902902
}
903-
KartInfo& kart_info = m_kart_info[i];
904903

905904
int p = 1 ;
906905

src/online/http_request.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
#include <assert.h>
3232
#include <string>
3333

34-
#if defined(CURLOPT_XFERINFODATA)
34+
#if LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR > 31)
35+
// Use CURLOPT_XFERINFOFUNCTION (introduced in 7.32.0)
3536
#define PROGRESSDATA CURLOPT_XFERINFODATA
3637
#define PROGRESSFUNCTION CURLOPT_XFERINFOFUNCTION
3738
typedef curl_off_t progress_t;
3839
#else
40+
// Use CURLOPT_PROGRESSFUNCTION (deprecated since 7.32.0)
3941
#define PROGRESSDATA CURLOPT_PROGRESSDATA
4042
#define PROGRESSFUNCTION CURLOPT_PROGRESSFUNCTION
4143
typedef double progress_t;

src/race/race_manager.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ class RaceManager
350350
int m_skipped_tracks_in_gp;
351351
/** Time target for GP, used in Lap Trial mode */
352352
float m_gp_time_target;
353-
/** Total laps from every track, used in Lap Trial mode */
354-
int m_gp_total_laps;
353+
/** Total laps from every track, used in Lap Trial mode
354+
int m_gp_total_laps;*/
355355
void startNextRace(); // start a next race
356356

357357
friend bool operator< (const KartStatus& left, const KartStatus& right)

src/states_screens/kart_selection.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,7 @@ bool KartSelectionScreen::validateIdentChoices()
15141514
m_kart_widgets[n].m_player_ident_spinner->markAsCorrect();
15151515

15161516
// verify internal consistency in debug mode
1517+
#ifndef NDEBUG
15171518
if (m_multiplayer)
15181519
{
15191520
int spinner_value = m_kart_widgets[n].m_player_ident_spinner->getValue();
@@ -1522,6 +1523,7 @@ bool KartSelectionScreen::validateIdentChoices()
15221523
assert(m_kart_widgets[n].getAssociatedPlayer()->getProfile() ==
15231524
PlayerManager::get()->getPlayer(spinner_value));
15241525
}
1526+
#endif
15251527
}
15261528
}
15271529

src/states_screens/race_result_gui.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,9 @@ void RaceResultGUI::renderGlobal(float dt)
12941294
break;
12951295
case RR_INCREASE_POINTS:
12961296
{
1297+
#ifndef NDEBUG
12971298
WorldWithRank *wwr = dynamic_cast<WorldWithRank*>(World::getWorld());
1299+
#endif
12981300
assert(wwr);
12991301
ri->m_current_displayed_points += dt * m_most_points / time_for_points;
13001302
if (ri->m_current_displayed_points > ri->m_new_overall_points)

0 commit comments

Comments
 (0)