1
0
mirror of https://github.com/td512/re3.git synced 2026-03-09 16:11:28 +00:00

Merge branch 'master' into miami

# Conflicts:
#	src/core/Game.cpp
This commit is contained in:
Sergeanur
2020-05-05 18:33:32 +03:00
15 changed files with 4 additions and 126 deletions

View File

@@ -1424,7 +1424,6 @@ CPathFind::RemoveBadStartNode(CVector pos, CPathNode **nodes, int16 *n)
}
}
#ifdef GTA_BRIDGE
void
CPathFind::SetLinksBridgeLights(float x1, float x2, float y1, float y2, bool enable)
{
@@ -1436,7 +1435,6 @@ CPathFind::SetLinksBridgeLights(float x1, float x2, float y1, float y2, bool ena
m_carPathLinks[i].bBridgeLights = enable;
}
}
#endif
//--MIAMI: done
void