aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/math
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-08-13 03:42:30 +0200
committerEinar Johan Trøan Sømåen2012-08-13 03:42:30 +0200
commitfed19cb66ae5b56dd7dc81b90edd5a0d15986678 (patch)
treed1c3a237aa6b421aedea2cb3bab88b8689dea4a1 /engines/wintermute/math
parentddfa227b939d922f738f932997b70110453068cf (diff)
downloadscummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.gz
scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.bz2
scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.zip
WINTERMUTE: WinterMute -> Wintermute
Diffstat (limited to 'engines/wintermute/math')
-rw-r--r--engines/wintermute/math/math_util.cpp4
-rw-r--r--engines/wintermute/math/math_util.h4
-rw-r--r--engines/wintermute/math/matrix4.cpp4
-rw-r--r--engines/wintermute/math/matrix4.h4
-rw-r--r--engines/wintermute/math/rect32.h4
-rw-r--r--engines/wintermute/math/vector2.cpp4
-rw-r--r--engines/wintermute/math/vector2.h4
7 files changed, 14 insertions, 14 deletions
diff --git a/engines/wintermute/math/math_util.cpp b/engines/wintermute/math/math_util.cpp
index ef5b676662..4a308a914e 100644
--- a/engines/wintermute/math/math_util.cpp
+++ b/engines/wintermute/math/math_util.cpp
@@ -29,7 +29,7 @@
#include "engines/wintermute/math/math_util.h"
#include <cmath>
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
float MathUtil::round(float val) {
@@ -49,4 +49,4 @@ float MathUtil::roundUp(float val) {
return result;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/math/math_util.h b/engines/wintermute/math/math_util.h
index 258d9bd67b..506317a2b0 100644
--- a/engines/wintermute/math/math_util.h
+++ b/engines/wintermute/math/math_util.h
@@ -29,7 +29,7 @@
#ifndef WINTERMUTE_MATHUTIL_H
#define WINTERMUTE_MATHUTIL_H
-namespace WinterMute {
+namespace Wintermute {
class MathUtil {
public:
@@ -37,6 +37,6 @@ public:
static float roundUp(float val);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_MATHUTIL_H
diff --git a/engines/wintermute/math/matrix4.cpp b/engines/wintermute/math/matrix4.cpp
index 379c219ec3..e38833d094 100644
--- a/engines/wintermute/math/matrix4.cpp
+++ b/engines/wintermute/math/matrix4.cpp
@@ -30,7 +30,7 @@
#include "engines/wintermute/math/vector2.h"
#include <math.h>
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
Matrix4::Matrix4() {
@@ -83,4 +83,4 @@ void Matrix4::transformVector2(Vector2 &vec) {
vec.y = y;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/math/matrix4.h b/engines/wintermute/math/matrix4.h
index 4f65fe5779..5891b4c5ec 100644
--- a/engines/wintermute/math/matrix4.h
+++ b/engines/wintermute/math/matrix4.h
@@ -29,7 +29,7 @@
#ifndef WINTERMUTE_MATRIX4_H
#define WINTERMUTE_MATRIX4_H
-namespace WinterMute {
+namespace Wintermute {
class Vector2;
@@ -54,6 +54,6 @@ public:
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_MATRIX4_H
diff --git a/engines/wintermute/math/rect32.h b/engines/wintermute/math/rect32.h
index 428d49290c..51a1be15e4 100644
--- a/engines/wintermute/math/rect32.h
+++ b/engines/wintermute/math/rect32.h
@@ -25,7 +25,7 @@
#include "common/system.h"
-namespace WinterMute {
+namespace Wintermute {
struct Point32 {
int32 x;
@@ -89,6 +89,6 @@ struct Rect32 {
}
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_RECT32_H
diff --git a/engines/wintermute/math/vector2.cpp b/engines/wintermute/math/vector2.cpp
index ecf2f1e8e4..40c2b346d7 100644
--- a/engines/wintermute/math/vector2.cpp
+++ b/engines/wintermute/math/vector2.cpp
@@ -29,7 +29,7 @@
#include "engines/wintermute/math/vector2.h"
#include <math.h>
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
Vector2::Vector2() {
@@ -52,4 +52,4 @@ float Vector2::length() const {
return (float)sqrt(x * x + y * y);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/math/vector2.h b/engines/wintermute/math/vector2.h
index ca4f499794..ce7ebd331e 100644
--- a/engines/wintermute/math/vector2.h
+++ b/engines/wintermute/math/vector2.h
@@ -29,7 +29,7 @@
#ifndef WINTERMUTE_VECTOR2_H
#define WINTERMUTE_VECTOR2_H
-namespace WinterMute {
+namespace Wintermute {
class Vector2 {
public:
@@ -70,6 +70,6 @@ public:
float y;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_VECTOR2_H