diff --git a/GameVersion.cpp b/GameVersion.cpp index 0912812e1..aa9735420 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.439" }; + INT16 zVersionLabel[256] = { L"Release v1.13.444" }; #endif -INT8 czVersionNumber[16] = { "Build 06.08.13" }; +INT8 czVersionNumber[16] = { "Build 06.08.15" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/TacticalAI/Movement.cpp b/TacticalAI/Movement.cpp index 619220661..feaa2521b 100644 --- a/TacticalAI/Movement.cpp +++ b/TacticalAI/Movement.cpp @@ -82,6 +82,18 @@ int LegalNPCDestination(SOLDIERTYPE *pSoldier, INT16 sGridno, UINT8 ubPathMode, if (!ubWaterOK && Water(sGridno)) return(FALSE); + //Madd: added to prevent people from running into gas and fire + if ( (gpWorldLevelData[sGridno].ubExtFlags[pSoldier->bLevel] & (MAPELEMENT_EXT_TEARGAS | MAPELEMENT_EXT_MUSTARDGAS)) && + FindGasMask(pSoldier) == NO_SLOT ) + { + return( FALSE ); + } + if ( gpWorldLevelData[sGridno].ubExtFlags[pSoldier->bLevel] & MAPELEMENT_EXT_BURNABLEGAS ) + { + return( FALSE ); + } + + // passed all checks, now try to make sure we can get there! switch (ubPathMode) {