bart/Ascent-of-Man
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplicate definition of struct TileRoad in gamemanager.h

Browse Source
This commit is contained in:
bart
2026-11-08 21:57:44 +01:00
parent 8c907a5215
commit b1f67be139
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamemanager.h
+5 -14
View File
@@ -25,11 +25,11 @@ enum class ActionMode {
};
struct TileRoad {
int tileX;
int tileY;
int playerId;
QString roadTypeId; // "dirt", "stone", "rail"
unsigned char connectionMask; // 6 bits: bit e (0..5) is 1 if connected to neighbor across edge e
QString roadTypeId = "dirt"; // "dirt", "stone", "rail"
int tileX = 0;
int tileY = 0;
int playerId = 1;
unsigned char connectionMask = 0; // 6 bits: bit e (0..5) is 1 if connected to neighbor across edge e
QVector3D worldPos;
bool hasConnection(int edge) const {
@@ -49,15 +49,6 @@ struct TileImprovement {
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 {
QString text;
QVector3D worldPos;