mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-01 15:35:47 +00:00
Code Issues Releases Wiki Activity

fixes for osx

Browse source
This commit is contained in:
fgenesis 2023-11-19 19:59:06 +01:00
parent 4dc374c367
commit 6d70204847
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Aquaria/Game.cpp
View file

@ -1264,7 +1264,7 @@ Path *Game::getWaterbubbleAt(const Vector& pos, float rad) const
UnderWaterResult Game::isUnderWater(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 if (!game->useWaterLevel || game->waterLevel.x == 0
|| (useWaterLevel && waterLevel.x > 0 && pos.y-rad > waterLevel.x)) || (useWaterLevel && waterLevel.x > 0 && pos.y-rad > waterLevel.x))
{ {

2
Aquaria/Game.h
View file

@ -90,6 +90,8 @@ class ObsRow
public: public:
inline ObsRow(unsigned tx, unsigned ty, unsigned len) inline ObsRow(unsigned tx, unsigned ty, unsigned len)
: tx(tx), ty(ty), len(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; const unsigned tx, ty, len;
}; };

2
BBGE/Precacher.cpp
View file

@ -90,7 +90,7 @@ void Precacher::doCache(ProgressCallback progress)
debugLog(os.str()); debugLog(os.str());
std::vector<Texture*> tmp(todo.size()); std::vector<Texture*> tmp(todo.size());
core->texmgr.loadBatch(&tmp[0], &todo[0], todo.size(), TextureMgr::KEEP, core->texmgr.loadBatch(&tmp[0], &todo[0], todo.size(), TextureMgr::KEEP,
progress ? texLoadProgressCallback : NULL, progress); progress ? texLoadProgressCallback : NULL, (void*)progress);
todo.clear(); todo.clear();
texkeep.reserve(texkeep.size() + tmp.size()); texkeep.reserve(texkeep.size() + tmp.size());
for(size_t i = 0; i < tmp.size(); ++i) for(size_t i = 0; i < tmp.size(); ++i)

1
CMakeLists.txt
View file

@ -1,5 +1,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6...3.20) CMAKE_MINIMUM_REQUIRED(VERSION 2.6...3.20)
PROJECT(Aquaria) PROJECT(Aquaria)
SET(CMAKE_CXX_STANDARD 98)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")