aboutsummaryrefslogtreecommitdiff
path: root/src/game/GameObject.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-12 14:49:12 -0600
committermegamage <none@none>2009-03-12 14:49:12 -0600
commitc8e391cf7dd5df9723dc1bfa5252ff47a925512c (patch)
tree4380785a6dd6c37e57e79fb7a99e1d2ebc0bd223 /src/game/GameObject.cpp
parent4d62cf902feaf5288f7438b1005a9e6aa299462e (diff)
[7444] Fixed some recently added and old type conversion warnings. Author: VladimirMangos
--HG-- branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
-rw-r--r--src/game/GameObject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index d0c27cdde34..583bcab36c4 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -129,8 +129,8 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa
int64 rotation = 0;
- float f_rot1 = sin(ang / 2.0f);
- int64 i_rot1 = f_rot1 / atan(pow(2.0f, -20.0f));
+ double f_rot1 = sin(ang / 2.0f);
+ int64 i_rot1 = int64(f_rot1 / atan(pow(2.0f, -20.0f)));
rotation |= (i_rot1 << 43 >> 43) & 0x00000000001FFFFF;
//float f_rot2 = sin(0.0f / 2.0f);