ocrm.bsky.social
the game where you go into mines and start crafting! but for consoles (forked directly from smartcmd's github)
Further C-style struct definitions fixes
+20
-17
+4
-3
Minecraft.Client/TextureHolder.h
+4
-3
Minecraft.Client/TextureHolder.h
···
30
30
int compareTo(const TextureHolder *other) const;
31
31
};
32
32
33
-
typedef struct
33
+
struct TextureHolderLessThan
34
34
{
35
-
bool operator() (const TextureHolder *first, const TextureHolder *second) const { return first->compareTo(second) >= 0; }
36
-
} TextureHolderLessThan;
35
+
inline bool operator()(const TextureHolder *first, const TextureHolder *second) const
36
+
{ return first->compareTo(second) >= 0; }
37
+
};
+8
-7
Minecraft.World/ChunkPos.h
+8
-7
Minecraft.World/ChunkPos.h
···
28
28
ChunkPos & operator= (const ChunkPos & other) { x = other.x; z = other.z; return *this; }
29
29
};
30
30
31
-
typedef struct
31
+
struct ChunkPosKeyHash
32
32
{
33
-
__int64 operator() (const ChunkPos &k) const { return ChunkPos::hash_fnct(k); }
33
+
inline __int64 operator()(const ChunkPos &k) const
34
+
{ return ChunkPos::hash_fnct(k); }
35
+
};
34
36
35
-
} ChunkPosKeyHash;
36
-
37
-
typedef struct
37
+
struct ChunkPosKeyEq
38
38
{
39
-
bool operator() (const ChunkPos &x, const ChunkPos &y) const { return ChunkPos::eq_test(x, y); }
40
-
} ChunkPosKeyEq;
39
+
inline bool operator()(const ChunkPos &x, const ChunkPos &y) const
40
+
{ return ChunkPos::eq_test(x, y); }
41
+
};
+8
-7
Minecraft.World/TilePos.h
+8
-7
Minecraft.World/TilePos.h
···
14
14
static bool eq_test(const TilePos &x, const TilePos &y);
15
15
};
16
16
17
-
typedef struct
17
+
struct TilePosKeyHash
18
18
{
19
-
int operator() (const TilePos &k) const { return TilePos::hash_fnct (k); }
19
+
inline int operator()(const TilePos &k) const
20
+
{ return TilePos::hash_fnct (k); }
21
+
};
20
22
21
-
} TilePosKeyHash;
22
-
23
-
typedef struct
23
+
struct TilePosKeyEq
24
24
{
25
-
bool operator() (const TilePos &x, const TilePos &y) const { return TilePos::eq_test (x, y); }
26
-
} TilePosKeyEq;
25
+
inline bool operator()(const TilePos &x, const TilePos &y) const
26
+
{ return TilePos::eq_test (x, y); }
27
+
};
27
28