Fix duplicate definition of struct TileRoad in gamemanager.h
This commit is contained in:
+5
-14
@@ -25,11 +25,11 @@ enum class ActionMode {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct TileRoad {
|
struct TileRoad {
|
||||||
int tileX;
|
QString roadTypeId = "dirt"; // "dirt", "stone", "rail"
|
||||||
int tileY;
|
int tileX = 0;
|
||||||
int playerId;
|
int tileY = 0;
|
||||||
QString roadTypeId; // "dirt", "stone", "rail"
|
int playerId = 1;
|
||||||
unsigned char connectionMask; // 6 bits: bit e (0..5) is 1 if connected to neighbor across edge e
|
unsigned char connectionMask = 0; // 6 bits: bit e (0..5) is 1 if connected to neighbor across edge e
|
||||||
QVector3D worldPos;
|
QVector3D worldPos;
|
||||||
|
|
||||||
bool hasConnection(int edge) const {
|
bool hasConnection(int edge) const {
|
||||||
@@ -49,15 +49,6 @@ struct TileImprovement {
|
|||||||
QVector3D worldPos;
|
QVector3D worldPos;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TileRoad {
|
|
||||||
QString roadTypeId = "dirt";
|
|
||||||
int tileX = 0;
|
|
||||||
int tileY = 0;
|
|
||||||
int playerId = 1;
|
|
||||||
QVector3D worldPos;
|
|
||||||
unsigned char connectionMask = 0; // bit e (0..5) indicates connected across edge e
|
|
||||||
};
|
|
||||||
|
|
||||||
struct FloatingText {
|
struct FloatingText {
|
||||||
QString text;
|
QString text;
|
||||||
QVector3D worldPos;
|
QVector3D worldPos;
|
||||||
|
|||||||
Reference in New Issue
Block a user