diff options
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r-- | linden/indra/newview/llagent.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp index 26ef1b0..6d9137d 100644 --- a/linden/indra/newview/llagent.cpp +++ b/linden/indra/newview/llagent.cpp | |||
@@ -2115,11 +2115,11 @@ void LLAgent::updateWanderTarget() | |||
2115 | F32 rand_x; | 2115 | F32 rand_x; |
2116 | F32 rand_y; | 2116 | F32 rand_y; |
2117 | 2117 | ||
2118 | if (mWanderTimer.checkExpirationAndReset(frand(MAX_WANDER_TIME))) | 2118 | if (mWanderTimer.checkExpirationAndReset(ll_frand(MAX_WANDER_TIME))) |
2119 | { | 2119 | { |
2120 | // Pick a random spot to wander towards | 2120 | // Pick a random spot to wander towards |
2121 | num_regions = gWorldPointer->mActiveRegionList.getLength(); | 2121 | num_regions = gWorldPointer->mActiveRegionList.getLength(); |
2122 | S32 region_num = llround(frand(1.f) * num_regions); | 2122 | S32 region_num = llround(ll_frand() * num_regions); |
2123 | rand_region = gWorldPointer->mActiveRegionList.getFirstData(); | 2123 | rand_region = gWorldPointer->mActiveRegionList.getFirstData(); |
2124 | S32 i = 0; | 2124 | S32 i = 0; |
2125 | while (i < region_num) | 2125 | while (i < region_num) |
@@ -2127,8 +2127,8 @@ void LLAgent::updateWanderTarget() | |||
2127 | rand_region = gWorldPointer->mActiveRegionList.getNextData(); | 2127 | rand_region = gWorldPointer->mActiveRegionList.getNextData(); |
2128 | i++; | 2128 | i++; |
2129 | } | 2129 | } |
2130 | rand_x = frand(rand_region->getWidth()); | 2130 | rand_x = ll_frand(rand_region->getWidth()); |
2131 | rand_y = frand(rand_region->getWidth()); | 2131 | rand_y = ll_frand(rand_region->getWidth()); |
2132 | 2132 | ||
2133 | stopAutoPilot(); | 2133 | stopAutoPilot(); |
2134 | startAutoPilotGlobal(rand_region->getPosGlobalFromRegion(LLVector3(rand_x, rand_y, 0.f))); | 2134 | startAutoPilotGlobal(rand_region->getPosGlobalFromRegion(LLVector3(rand_x, rand_y, 0.f))); |
@@ -5687,7 +5687,7 @@ void LLAgent::fidget() | |||
5687 | // pick a random fidget anim here | 5687 | // pick a random fidget anim here |
5688 | S32 oldFidget = mCurrentFidget; | 5688 | S32 oldFidget = mCurrentFidget; |
5689 | 5689 | ||
5690 | mCurrentFidget = gLindenLabRandomNumber.llrand(NUM_AGENT_STAND_ANIMS); | 5690 | mCurrentFidget = ll_rand(NUM_AGENT_STAND_ANIMS); |
5691 | 5691 | ||
5692 | if (mCurrentFidget != oldFidget) | 5692 | if (mCurrentFidget != oldFidget) |
5693 | { | 5693 | { |
@@ -5719,7 +5719,7 @@ void LLAgent::fidget() | |||
5719 | } | 5719 | } |
5720 | 5720 | ||
5721 | // calculate next fidget time | 5721 | // calculate next fidget time |
5722 | mNextFidgetTime = curTime + gLindenLabRandomNumber.llfrand(MAX_FIDGET_TIME - MIN_FIDGET_TIME) + MIN_FIDGET_TIME; | 5722 | mNextFidgetTime = curTime + ll_frand(MAX_FIDGET_TIME - MIN_FIDGET_TIME) + MIN_FIDGET_TIME; |
5723 | } | 5723 | } |
5724 | } | 5724 | } |
5725 | } | 5725 | } |