summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorFalkreon <falkreon@gmail.com>2009-04-15 00:44:52 -0400
committerJared Adams <jaxad0127@gmail.com>2009-04-15 08:07:25 -0600
commit8606e95b5c8a5fadde99a253de91a661454460db (patch)
treeb875f3ba1175db4b6400a20c2a31f502dd532168 /src/utils
parent31f0b79de3e23f3660c35795232020870fb38590 (diff)
downloadmana-8606e95b5c8a5fadde99a253de91a661454460db.tar.gz
mana-8606e95b5c8a5fadde99a253de91a661454460db.tar.bz2
mana-8606e95b5c8a5fadde99a253de91a661454460db.tar.xz
mana-8606e95b5c8a5fadde99a253de91a661454460db.zip
HP Bar Gradual Changes Config (+ bugfixes)
* Setup menu now has settings for the HP bar colors. * StatusWindow handles HP bar changes a little more consistently. * Fixed a bug that cut weightedAverage values in half, making the HP bar very dark.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/mathutils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utils/mathutils.cpp b/src/utils/mathutils.cpp
index 0ad8f3fb..7d50c68f 100644
--- a/src/utils/mathutils.cpp
+++ b/src/utils/mathutils.cpp
@@ -54,5 +54,5 @@ float weightedAverage(float n1, float n2, float w)
if (w > 1.0f)
return n2;
- return (w * n2 + (1.0f - w) * n1) / 2.0f;
+ return ((w * n2) + ((1.0f - w) * n1));
}