summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-01-28 23:44:33 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2021-01-28 23:44:33 +0100
commit810bad9fd8cf344f7d73b82f042910a4c443b0f7 (patch)
tree642eb40736bd71d12edbe5cdc7afa1a70ffe7c36 /src/control
parentfix (diff)
downloadre3-810bad9fd8cf344f7d73b82f042910a4c443b0f7.tar
re3-810bad9fd8cf344f7d73b82f042910a4c443b0f7.tar.gz
re3-810bad9fd8cf344f7d73b82f042910a4c443b0f7.tar.bz2
re3-810bad9fd8cf344f7d73b82f042910a4c443b0f7.tar.lz
re3-810bad9fd8cf344f7d73b82f042910a4c443b0f7.tar.xz
re3-810bad9fd8cf344f7d73b82f042910a4c443b0f7.tar.zst
re3-810bad9fd8cf344f7d73b82f042910a4c443b0f7.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/PathFind.cpp2
-rw-r--r--src/control/PathFind.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index 2d3972f6..bf72199d 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -859,7 +859,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
mag = Sqrt(dx*dx + dy*dy);
dx /= mag;
dy /= mag;
- int width = Max(m_pathNodes[i].width, m_pathNodes[j].width);
+ uint8 width = Max(m_pathNodes[i].width, m_pathNodes[j].width);
if(i < j){
dx = -dx;
dy = -dy;
diff --git a/src/control/PathFind.h b/src/control/PathFind.h
index acf9929a..99759590 100644
--- a/src/control/PathFind.h
+++ b/src/control/PathFind.h
@@ -120,7 +120,7 @@ struct CCarPathLink
uint8 trafficLightDirection : 1;
uint8 trafficLightType : 2;
uint8 bBridgeLights : 1; // at least in LCS...
- int8 width;
+ uint8 width;
CVector2D GetPosition(void) { return CVector2D(x/8.0f, y/8.0f); }
CVector2D GetDirection(void) { return CVector2D(dirX/100.0f, dirY/100.0f); }
@@ -151,7 +151,7 @@ struct CPathInfoForObject
int8 numLeftLanes;
int8 numRightLanes;
int8 speedLimit;
- int8 width;
+ uint8 width;
uint8 crossing : 1;
uint8 onlySmallBoats : 1;
@@ -177,7 +177,7 @@ struct CTempNode
int16 link2;
int8 numLeftLanes;
int8 numRightLanes;
- int8 width;
+ uint8 width;
bool isCross;
int8 linkState;
};
@@ -188,7 +188,7 @@ struct CTempNodeExternal // made up name
int16 next;
int8 numLeftLanes;
int8 numRightLanes;
- int8 width;
+ uint8 width;
bool isCross;
};