From 8aebb67aa1c77c66ac7bf62b738830c9a34479c1 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Tue, 13 May 2014 22:45:25 -0500 Subject: [PATCH] conforms losmask to standard nomenclature --- Engine/source/T3D/aiPlayer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/T3D/aiPlayer.cpp b/Engine/source/T3D/aiPlayer.cpp index 0b869c2a0..d3aed1fd4 100644 --- a/Engine/source/T3D/aiPlayer.cpp +++ b/Engine/source/T3D/aiPlayer.cpp @@ -28,7 +28,7 @@ #include "T3D/gameBase/moveManager.h" #include "console/engineAPI.h" -static U32 AIPLAYER_LOSMASK = TerrainObjectType | WaterObjectType | +static U32 sAIPlayerLoSMask = TerrainObjectType | WaterObjectType | ShapeBaseObjectType | StaticShapeObjectType | PlayerObjectType | ItemObjectType; @@ -628,7 +628,7 @@ bool AIPlayer::checkInLos(GameBase* target, bool _checkEnabled = false) } Point3F muzzlePoint; getMuzzlePointAI(0, &muzzlePoint); - bool hit = gServerContainer.castRay(muzzlePoint, target->getBoxCenter(), AIPLAYER_LOSMASK, &ri); + bool hit = gServerContainer.castRay(muzzlePoint, target->getBoxCenter(), sAIPlayerLoSMask, &ri); enableCollision(); for (S32 i = 0; i < mountCount; i++) @@ -654,7 +654,7 @@ bool AIPlayer::checkLosClear(Point3F _pos) Point3F muzzlePoint; getMuzzlePointAI(0, &muzzlePoint); - gServerContainer.castRay(muzzlePoint, _pos, AIPLAYER_LOSMASK, &ri); + gServerContainer.castRay(muzzlePoint, _pos, sAIPlayerLoSMask, &ri); bool emptySpace = bool(ri.object == NULL); enableCollision(); return emptySpace;