Support for iOS builds! #21

Merged
Kolyah35 merged 21 commits from ios-support into main 2026-04-06 21:58:51 +02:00
2 changed files with 11 additions and 11 deletions
Showing only changes of commit 44ece561e8 - Show all commits

View File

@@ -3,7 +3,6 @@
#include "GuiElement.h" #include "GuiElement.h"
#include "../../../client/Options.h" #include "../../../client/Options.h"
#include "Option.h"
class Slider : public GuiElement { class Slider : public GuiElement {
typedef GuiElement super; typedef GuiElement super;

View File

@@ -6,23 +6,24 @@ NetherReactorPattern::NetherReactorPattern( ) {
const int netherCoreId = Tile::netherReactor->id; const int netherCoreId = Tile::netherReactor->id;
const unsigned int types[3][3][3] = const unsigned int types[3][3][3] =
{ {
// Changing all of these values to be unsigned is needed to get the nether reactor pattern to compile. In the past having them be normal ints was fine but the c++ convention has changed
// Level 0 // Level 0
{ {
{goldId, stoneId, goldId}, {static_cast<unsigned int>(goldId), static_cast<unsigned int>(stoneId), static_cast<unsigned int>(goldId)},
{stoneId, stoneId, stoneId}, {static_cast<unsigned int>(stoneId), static_cast<unsigned int>(stoneId), static_cast<unsigned int>(stoneId)},
{goldId, stoneId, goldId} {static_cast<unsigned int>(goldId), static_cast<unsigned int>(stoneId), static_cast<unsigned int>(goldId)}
}, },
// Level 1 // Level 1
{ {
{stoneId, 0, stoneId}, {static_cast<unsigned int>(stoneId), 0, static_cast<unsigned int>(stoneId)},
{0, netherCoreId, 0}, {0, static_cast<unsigned int>(netherCoreId), 0},
{stoneId, 0, stoneId} {static_cast<unsigned int>(stoneId), 0, static_cast<unsigned int>(stoneId)}
}, },
// Level 2 // Level 2
{ {
{0, stoneId, 0}, {0, static_cast<unsigned int>(stoneId), 0},
{stoneId, stoneId, stoneId}, {static_cast<unsigned int>(stoneId), static_cast<unsigned int>(stoneId), static_cast<unsigned int>(stoneId)},
{0, stoneId, 0} {0, static_cast<unsigned int>(stoneId), 0}
} }
}; };
for(int setLevel = 0; setLevel <= 2; ++setLevel) { for(int setLevel = 0; setLevel <= 2; ++setLevel) {