From f33589936c4ae9f61ad638055def66b7f1443214 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <dvpdiner2@gmail.com>
Date: Fri, 28 Oct 2011 23:14:56 -0700
Subject: [PATCH] Fix some errors in plAvatar.

---
 Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp | 6 +++---
 Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp
index 325d70f9..f5111027 100644
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp
@@ -458,9 +458,9 @@ hsScalar plAGAnimInstance::ICalcFade(hsBool &fade, hsScalar curVal, hsScalar goa
     hsScalar newVal;
     hsScalar curStep = rate * elapsed;
     if(rate > 0) {
-        newVal = __min(goal, curVal + curStep);
+        newVal = std::min(goal, curVal + curStep);
     } else {
-        newVal = __max(goal, curVal + curStep);
+        newVal = std::max(goal, curVal + curStep);
     }
 
     if(newVal == goal)
@@ -593,7 +593,7 @@ void DumpAGAllocs()
         agAlloc * al = (*i).second;
         delete al;
 
-        i = gAGAllocs.erase(i);
+        gAGAllocs.erase(i++);
     }
     hsStatusMessage("FINISHED DUMPING AG ALLOCATIONS *********************************************");
 }
diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
index b2e2ec11..431c9bd8 100644
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
@@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAGAnimInstance.h"
 #include "plMatrixChannel.h"
 #include "plAvBrainGeneric.h"
-#include "plMultiStageBehMod.h"
+#include "plMultistageBehMod.h"
 
 // global
 #include "hsUtils.h"