From 6d70204847eab03183216d49aabe86ad5e41c687 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Sun, 19 Nov 2023 19:59:06 +0100 Subject: [PATCH] fixes for osx --- Aquaria/Game.cpp | 2 +- Aquaria/Game.h | 2 ++ BBGE/Precacher.cpp | 2 +- CMakeLists.txt | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp index 9419eb3..79d21e7 100644 --- a/Aquaria/Game.cpp +++ b/Aquaria/Game.cpp @@ -1264,7 +1264,7 @@ Path *Game::getWaterbubbleAt(const Vector& pos, float rad) const UnderWaterResult Game::isUnderWater(const Vector& pos, float rad) const { - UnderWaterResult ret { false, NULL }; + UnderWaterResult ret = { false, NULL }; if (!game->useWaterLevel || game->waterLevel.x == 0 || (useWaterLevel && waterLevel.x > 0 && pos.y-rad > waterLevel.x)) { diff --git a/Aquaria/Game.h b/Aquaria/Game.h index 5cb2298..82dac8e 100644 --- a/Aquaria/Game.h +++ b/Aquaria/Game.h @@ -90,6 +90,8 @@ class ObsRow public: inline ObsRow(unsigned tx, unsigned ty, unsigned len) : tx(tx), ty(ty), len(len) {} + inline ObsRow(const ObsRow& o) + : tx(o.tx), ty(o.ty), len(o.len) {} const unsigned tx, ty, len; }; diff --git a/BBGE/Precacher.cpp b/BBGE/Precacher.cpp index bb4e417..1216c5d 100644 --- a/BBGE/Precacher.cpp +++ b/BBGE/Precacher.cpp @@ -90,7 +90,7 @@ void Precacher::doCache(ProgressCallback progress) debugLog(os.str()); std::vector tmp(todo.size()); core->texmgr.loadBatch(&tmp[0], &todo[0], todo.size(), TextureMgr::KEEP, - progress ? texLoadProgressCallback : NULL, progress); + progress ? texLoadProgressCallback : NULL, (void*)progress); todo.clear(); texkeep.reserve(texkeep.size() + tmp.size()); for(size_t i = 0; i < tmp.size(); ++i) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6e7548..e38dbd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6...3.20) PROJECT(Aquaria) +SET(CMAKE_CXX_STANDARD 98) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")