OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Fix some errors in plAvatar.

Darryl Pogue 13 years ago
parent
d1608edf4a
commit
f33589936c
2 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp
  2. 2
      Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp

6
Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp
Unescape View File

@ -458,9 +458,9 @@ hsScalar plAGAnimInstance::ICalcFade(hsBool &fade, hsScalar curVal, hsScalar goa
hsScalar newVal; hsScalar newVal;
hsScalar curStep = rate * elapsed; hsScalar curStep = rate * elapsed;
if(rate > 0) { if(rate > 0) {
newVal = __min(goal, curVal + curStep); newVal = std::min(goal, curVal + curStep);
} else { } else {
newVal = __max(goal, curVal + curStep); newVal = std::max(goal, curVal + curStep);
} }
if(newVal == goal) if(newVal == goal)
@ -593,7 +593,7 @@ void DumpAGAllocs()
agAlloc * al = (*i).second; agAlloc * al = (*i).second;
delete al; delete al;
i = gAGAllocs.erase(i); gAGAllocs.erase(i++);
} }
hsStatusMessage("FINISHED DUMPING AG ALLOCATIONS *********************************************"); hsStatusMessage("FINISHED DUMPING AG ALLOCATIONS *********************************************");
} }

2
Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
Unescape View File

@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plAGAnimInstance.h" #include "plAGAnimInstance.h"
#include "plMatrixChannel.h" #include "plMatrixChannel.h"
#include "plAvBrainGeneric.h" #include "plAvBrainGeneric.h"
#include "plMultiStageBehMod.h" #include "plMultistageBehMod.h"
// global // global
#include "hsUtils.h" #include "hsUtils.h"

Write Preview
Loading…
Cancel
Save