fixed slider for hopefully the final fucking time. Nether Reactor fix: Need to make the array for building it all unsigned integers as now Xcode is strict about the new C++ Standards as they have changed since 2011

This commit is contained in:
deepfriedwaffles
2026-03-23 16:07:02 -04:00
parent 967080a435
commit 359a9d2620
2 changed files with 11 additions and 11 deletions

View File

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

View File

@@ -6,23 +6,24 @@ NetherReactorPattern::NetherReactorPattern( ) {
const int netherCoreId = Tile::netherReactor->id;
const unsigned int types[3][3][3] =
{
// Level 0
// 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
{
{goldId, stoneId, goldId},
{stoneId, stoneId, stoneId},
{goldId, stoneId, goldId}
{static_cast<unsigned int>(goldId), static_cast<unsigned int>(stoneId), static_cast<unsigned int>(goldId)},
{static_cast<unsigned int>(stoneId), static_cast<unsigned int>(stoneId), static_cast<unsigned int>(stoneId)},
{static_cast<unsigned int>(goldId), static_cast<unsigned int>(stoneId), static_cast<unsigned int>(goldId)}
},
// Level 1
{
{stoneId, 0, stoneId},
{0, netherCoreId, 0},
{stoneId, 0, stoneId}
{static_cast<unsigned int>(stoneId), 0, static_cast<unsigned int>(stoneId)},
{0, static_cast<unsigned int>(netherCoreId), 0},
{static_cast<unsigned int>(stoneId), 0, static_cast<unsigned int>(stoneId)}
},
// Level 2
{
{0, stoneId, 0},
{stoneId, stoneId, stoneId},
{0, stoneId, 0}
{0, static_cast<unsigned int>(stoneId), 0},
{static_cast<unsigned int>(stoneId), static_cast<unsigned int>(stoneId), static_cast<unsigned int>(stoneId)},
{0, static_cast<unsigned int>(stoneId), 0}
}
};
for(int setLevel = 0; setLevel <= 2; ++setLevel) {