diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-14 12:49:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-14 12:49:01 +0400 |
| commit | 3a947cf537aa8c818ee1b0df8cbadd47f878a497 (patch) | |
| tree | 952094f9f75b1e349c945bf31907886e804619c3 /source/gameengine/BlenderRoutines | |
| parent | 27e54f4d37d70b5f2c63c2cdbbca722f01fed414 (diff) | |
code cleanup: remove redundant casts
Diffstat (limited to 'source/gameengine/BlenderRoutines')
| -rw-r--r-- | source/gameengine/BlenderRoutines/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp | 8 | ||||
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderCanvas.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index fa0994d788a..a053e069153 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blender/makesdna ../../blender/makesrna ../../blender/windowmanager - ../../../extern/bullet2/src ../../../intern/container ../../../intern/guardedalloc ../../../intern/moto/include @@ -31,6 +30,7 @@ set(INC ) set(INC_SYS + ../../../extern/bullet2/src ${PTHREADS_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ) diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp index 0b41cceb646..1afa5d3d07b 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp @@ -119,14 +119,14 @@ int KX_BlenderCanvas::GetHeight( int KX_BlenderCanvas::GetMouseX(int x) { - float left = GetWindowArea().GetLeft(); - return float(x - (left - m_area_left)); + int left = GetWindowArea().GetLeft(); + return x - (left - m_area_left); } int KX_BlenderCanvas::GetMouseY(int y) { - float top = GetWindowArea().GetTop(); - return float(y - (m_area_top - top)); + int top = GetWindowArea().GetTop(); + return y - (m_area_top - top); } float KX_BlenderCanvas::GetMouseNormalizedX(int x) diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h index bbec7e0fada..244394a115d 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h @@ -192,8 +192,8 @@ private: struct wmWindow* m_win; RAS_Rect m_frame_rect; RAS_Rect m_area_rect; - short m_area_left; - short m_area_top; + int m_area_left; + int m_area_top; #ifdef WITH_CXX_GUARDEDALLOC |