From daa6f236beecffa662d15a1fb7ba51814ca5baa5 Mon Sep 17 00:00:00 2001 From: Joseph Aquino Date: Thu, 25 Sep 2025 08:05:36 -0400 Subject: [PATCH] implemented custom max(), because std::vector::size() returns different types on msvc vs. gcc --- include/Math.h | 9 +++++++++ include/Util.h | 3 ++- src/Game.cpp | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 include/Math.h diff --git a/include/Math.h b/include/Math.h new file mode 100644 index 0000000..91b278e --- /dev/null +++ b/include/Math.h @@ -0,0 +1,9 @@ + +namespace Math +{ + template + inline T max(U first, V second) + { + return static_cast(first >= second ? first : second); + } +} \ No newline at end of file diff --git a/include/Util.h b/include/Util.h index bfe3fc1..7d2a935 100644 --- a/include/Util.h +++ b/include/Util.h @@ -2,4 +2,5 @@ #include #include -#include \ No newline at end of file +#include +#include \ No newline at end of file diff --git a/src/Game.cpp b/src/Game.cpp index ce31eae..b7c6b1a 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -607,7 +607,7 @@ void Game::soundSystem() void Game::scoreSystem() { - player.mult = (int)std::max(balls.size(), 1ull); + player.mult = Math::max(balls.size(), 1); for (auto& brick : bricks) { if (!brick.alive)