OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 03:39:08 +00:00
Code Releases Activity

Fix some errors in plAvatar.

Browse Source
This commit is contained in:
Darryl Pogue
2011-10-28 23:14:56 -07:00
parent d1608edf4a
commit f33589936c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp
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
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"