diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-03-25 15:13:06 +0100 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-03-26 16:54:03 +0100 |
| commit | 0fe55eb5432906016cc3526caf3f86d5bf85aff1 (patch) | |
| tree | 0f4f6bfafc9e3138bf090efb16b18e6fa22c2eab /src/control/PathFind.cpp | |
| parent | Merge pull request #353 from Sergeanur/Debug (diff) | |
| download | re3-0fe55eb5432906016cc3526caf3f86d5bf85aff1.tar re3-0fe55eb5432906016cc3526caf3f86d5bf85aff1.tar.gz re3-0fe55eb5432906016cc3526caf3f86d5bf85aff1.tar.bz2 re3-0fe55eb5432906016cc3526caf3f86d5bf85aff1.tar.lz re3-0fe55eb5432906016cc3526caf3f86d5bf85aff1.tar.xz re3-0fe55eb5432906016cc3526caf3f86d5bf85aff1.tar.zst re3-0fe55eb5432906016cc3526caf3f86d5bf85aff1.zip | |
Diffstat (limited to 'src/control/PathFind.cpp')
| -rw-r--r-- | src/control/PathFind.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp index daa27e57..608a209a 100644 --- a/src/control/PathFind.cpp +++ b/src/control/PathFind.cpp @@ -11,19 +11,10 @@ CPathFind &ThePaths = *(CPathFind*)0x8F6754; WRAPPER bool CPedPath::CalcPedRoute(uint8, CVector, CVector, CVector*, int16*, int16) { EAXJMP(0x42E680); } -enum -{ - NodeTypeExtern = 1, - NodeTypeIntern = 2, - - ObjectFlag1 = 1, - ObjectEastWest = 2, - - MAX_DIST = INT16_MAX-1 -}; +#define MAX_DIST INT16_MAX-1 // object flags: -// 1 +// 1 UseInRoadBlock // 2 east/west road(?) CPathInfoForObject *&InfoForTileCars = *(CPathInfoForObject**)0x8F1A8C; @@ -218,14 +209,14 @@ CPathFind::PreparePathData(void) if(numIntern == 1 && numExtern == 2){ if(numLanes < 4){ if((i & 7) == 4){ // WHAT? - m_objectFlags[i] |= ObjectFlag1; + m_objectFlags[i] |= UseInRoadBlock; if(maxX > maxY) m_objectFlags[i] |= ObjectEastWest; else m_objectFlags[i] &= ~ObjectEastWest; } }else{ - m_objectFlags[i] |= ObjectFlag1; + m_objectFlags[i] |= UseInRoadBlock; if(maxX > maxY) m_objectFlags[i] |= ObjectEastWest; else |