summaryrefslogtreecommitdiff
path: root/indra/newview/lltracker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lltracker.cpp')
-rw-r--r--indra/newview/lltracker.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index 4c55ea1fc6..6c91c8a316 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -75,7 +75,7 @@ const S32 HUD_ARROW_SIZE = 32;
// static
LLTracker *LLTracker::sTrackerp = NULL;
-BOOL LLTracker::sCheesyBeacon = FALSE;
+bool LLTracker::sCheesyBeacon = false;
LLTracker::LLTracker()
: mTrackingStatus(TRACKING_NOTHING),
@@ -84,12 +84,12 @@ LLTracker::LLTracker()
mHUDArrowCenterY(0),
mToolTip( "" ),
mTrackedLandmarkName(""),
- mHasReachedLandmark(FALSE),
- mHasLandmarkPosition(FALSE),
- mLandmarkHasBeenVisited(FALSE),
+ mHasReachedLandmark(false),
+ mHasLandmarkPosition(false),
+ mLandmarkHasBeenVisited(false),
mTrackedLocationName( "" ),
- mIsTrackingLocation(FALSE),
- mHasReachedLocation(FALSE)
+ mIsTrackingLocation(false),
+ mHasReachedLocation(false)
{ }
@@ -182,7 +182,7 @@ void LLTracker::render3D()
if (!instance()->mBeaconText)
{
instance()->mBeaconText = (LLHUDText *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_TEXT);
- instance()->mBeaconText->setDoFade(FALSE);
+ instance()->mBeaconText->setDoFade(false);
}
LLVector3d pos_global = instance()->mTrackedPositionGlobal;
@@ -206,7 +206,7 @@ void LLTracker::render3D()
if (!instance()->mBeaconText)
{
instance()->mBeaconText = (LLHUDText *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_TEXT);
- instance()->mBeaconText->setDoFade(FALSE);
+ instance()->mBeaconText->setDoFade(false);
}
if (instance()->mHasLandmarkPosition)
@@ -235,7 +235,7 @@ void LLTracker::render3D()
// disappear when they're created only a few meters
// away, yet disappear when the agent wanders away
// and back again
- instance()->mHasReachedLandmark = FALSE;
+ instance()->mHasReachedLandmark = false;
}
renderBeacon( instance()->mTrackedPositionGlobal, map_track_color, map_track_color_under,
instance()->mBeaconText, instance()->mTrackedLandmarkName );
@@ -256,7 +256,7 @@ void LLTracker::render3D()
if (!instance()->mBeaconText)
{
instance()->mBeaconText = (LLHUDText *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_TEXT);
- instance()->mBeaconText->setDoFade(FALSE);
+ instance()->mBeaconText->setDoFade(false);
}
F32 dist = gFloaterWorldMap->getDistanceToDestination(instance()->getTrackedPositionGlobal(), 0.0f);
@@ -272,22 +272,22 @@ void LLTracker::render3D()
}
else
{
- BOOL stop_tracking = FALSE;
+ bool stop_tracking = false;
const LLUUID& avatar_id = av_tracker.getAvatarID();
if(avatar_id.isNull())
{
- stop_tracking = TRUE;
+ stop_tracking = true;
}
else
{
const LLRelationship* buddy = av_tracker.getBuddyInfo(avatar_id);
if(buddy && !buddy->isOnline() && !gAgent.isGodlike())
{
- stop_tracking = TRUE;
+ stop_tracking = true;
}
if(!buddy && !gAgent.isGodlike())
{
- stop_tracking = TRUE;
+ stop_tracking = true;
}
}
if(stop_tracking)
@@ -336,7 +336,7 @@ void LLTracker::trackLocation(const LLVector3d& pos_global, const std::string& f
instance()->mTrackedPositionGlobal = pos_global;
instance()->mTrackedLocationName = full_name;
- instance()->mIsTrackingLocation = TRUE;
+ instance()->mIsTrackingLocation = true;
instance()->mTrackingStatus = TRACKING_LOCATION;
instance()->mTrackingLocationType = location_type;
instance()->mLabel = full_name;
@@ -345,9 +345,9 @@ void LLTracker::trackLocation(const LLVector3d& pos_global, const std::string& f
// static
-BOOL LLTracker::handleMouseDown(S32 x, S32 y)
+bool LLTracker::handleMouseDown(S32 x, S32 y)
{
- BOOL eat_mouse_click = FALSE;
+ bool eat_mouse_click = false;
// fortunately, we can always compute the tracking arrow center
S32 dist_sqrd = (x - instance()->mHUDArrowCenterX) * (x - instance()->mHUDArrowCenterX) +
(y - instance()->mHUDArrowCenterY) * (y - instance()->mHUDArrowCenterY);
@@ -358,14 +358,14 @@ BOOL LLTracker::handleMouseDown(S32 x, S32 y)
// turn off tracking
if (gAgent.getAutoPilot())
{
- gAgent.stopAutoPilot(TRUE); // TRUE because cancelled by user
- eat_mouse_click = TRUE;
+ gAgent.stopAutoPilot(true); // true because cancelled by user
+ eat_mouse_click = true;
}
*/
if (getTrackingStatus())
{
instance()->stopTrackingAll();
- eat_mouse_click = TRUE;
+ eat_mouse_click = true;
}
}
return eat_mouse_click;
@@ -403,7 +403,7 @@ LLVector3d LLTracker::getTrackedPositionGlobal()
// static
-BOOL LLTracker::hasLandmarkPosition()
+bool LLTracker::hasLandmarkPosition()
{
if (!instance()->mHasLandmarkPosition)
{
@@ -605,7 +605,7 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
str += text;
hud_textp->setFont(LLFontGL::getFontSansSerif());
- hud_textp->setZCompare(FALSE);
+ hud_textp->setZCompare(false);
hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST))));
hud_textp->setString(str);
@@ -655,9 +655,9 @@ void LLTracker::stopTrackingLandmark(bool clear_ui)
mTrackedLandmarkItemID.setNull();
mTrackedLandmarkName.assign("");
mTrackedPositionGlobal.zeroVec();
- mHasLandmarkPosition = FALSE;
- mHasReachedLandmark = FALSE;
- mLandmarkHasBeenVisited = TRUE;
+ mHasLandmarkPosition = false;
+ mHasReachedLandmark = false;
+ mLandmarkHasBeenVisited = true;
gFloaterWorldMap->clearLandmarkSelection(clear_ui);
mTrackingStatus = TRACKING_NOTHING;
}
@@ -667,7 +667,7 @@ void LLTracker::stopTrackingLocation(bool clear_ui, bool dest_reached)
{
purgeBeaconText();
mTrackedLocationName.assign("");
- mIsTrackingLocation = FALSE;
+ mIsTrackingLocation = false;
mTrackedPositionGlobal.zeroVec();
gFloaterWorldMap->clearLocationSelection(clear_ui, dest_reached);
mTrackingStatus = TRACKING_NOTHING;
@@ -688,7 +688,7 @@ void LLTracker::drawMarker(const LLVector3d& pos_global, const LLColor4& color)
LLCoordGL screen;
S32 x = 0;
S32 y = 0;
- const BOOL CLAMP = TRUE;
+ const bool CLAMP = true;
if (LLViewerCamera::getInstance()->projectPosAgentToScreen(pos_local, screen, CLAMP)
|| LLViewerCamera::getInstance()->projectPosAgentToScreenEdge(pos_local, screen) )
@@ -802,13 +802,13 @@ void LLTracker::cacheLandmarkPosition()
{
// the landmark asset download may have finished, in which case
// we'll now be able to figure out where we're trying to go
- BOOL found_landmark = FALSE;
+ bool found_landmark = false;
if( mTrackedLandmarkAssetID == LLFloaterWorldMap::getHomeID())
{
LLVector3d pos_global;
if ( gAgent.getHomePosGlobal( &mTrackedPositionGlobal ))
{
- found_landmark = TRUE;
+ found_landmark = true;
}
else
{
@@ -822,27 +822,27 @@ void LLTracker::cacheLandmarkPosition()
LLLandmark* landmark = gLandmarkList.getAsset(mTrackedLandmarkAssetID);
if(landmark && landmark->getGlobalPos(mTrackedPositionGlobal))
{
- found_landmark = TRUE;
+ found_landmark = true;
// cache the object's visitation status
- mLandmarkHasBeenVisited = FALSE;
+ mLandmarkHasBeenVisited = false;
LLInventoryItem* item = gInventory.getItem(mTrackedLandmarkItemID);
if ( item
&& item->getFlags()&LLInventoryItemFlags::II_FLAGS_LANDMARK_VISITED)
{
- mLandmarkHasBeenVisited = TRUE;
+ mLandmarkHasBeenVisited = true;
}
}
}
if ( found_landmark && gFloaterWorldMap )
{
- mHasReachedLandmark = FALSE;
+ mHasReachedLandmark = false;
F32 dist = gFloaterWorldMap->getDistanceToDestination(mTrackedPositionGlobal, 1.0f);
if ( dist < DESTINATION_UNVISITED_RADIUS )
{
- mHasReachedLandmark = TRUE;
+ mHasReachedLandmark = true;
}
- mHasLandmarkPosition = TRUE;
+ mHasLandmarkPosition = true;
}
mHasLandmarkPosition = found_landmark;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 02:57:43 +0000