Prefer static_cast to reinterpret_cast where possible.

Just safer. Could probably do in a lot more places... another time.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6293 dfc29bdd-3216-0410-991c-e03cc46cb475

diff --git a/include/CMeshBuffer.h b/include/CMeshBuffer.h
index 05b8acdf0b26d58a7bef6cce5311ea20bdda3962..fe84fb9f706fa883eec8df4c2690841f1cde3f91 100644 (file)
--- a/include/CMeshBuffer.h
+++ b/include/CMeshBuffer.h
@@ -193,8 +193,8 @@ namespace scene
                        Vertices.reallocate(vertexCount+numVertices);\r
                        for (i=0; i<numVertices; ++i)\r
                        {\r
-                               Vertices.push_back(reinterpret_cast<const T*>(vertices)[i]);\r
-                               BoundingBox.addInternalPoint(reinterpret_cast<const T*>(vertices)[i].Pos);\r
+                               Vertices.push_back(static_cast<const T*>(vertices)[i]);\r
+                               BoundingBox.addInternalPoint(static_cast<const T*>(vertices)[i].Pos);\r
                        }\r
 \r
                        Indices.reallocate(getIndexCount()+numIndices);\r

diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.cpp b/source/Irrlicht/CAnimatedMeshSceneNode.cpp
index 085ba6313b271cb409f23fb33fc57a12df1de9ca..15a0018571a5c7d2685ff667e6b520ab222c7ec2 100644 (file)
--- a/source/Irrlicht/CAnimatedMeshSceneNode.cpp
+++ b/source/Irrlicht/CAnimatedMeshSceneNode.cpp
@@ -192,7 +192,7 @@ IMesh * CAnimatedMeshSceneNode::getMeshForCurrentFrame()
                // As multiple scene nodes may be sharing the same skinned mesh, we have to\r
                // re-animate it every frame to ensure that this node gets the mesh that it needs.\r
 \r
-               CSkinnedMesh* skinnedMesh = reinterpret_cast<CSkinnedMesh*>(Mesh);\r
+               CSkinnedMesh* skinnedMesh = static_cast<CSkinnedMesh*>(Mesh);\r
 \r
                if (JointMode == EJUOR_CONTROL)//write to mesh\r
                        skinnedMesh->transferJointsToMesh(JointChildSceneNodes);\r
@@ -747,7 +747,7 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
                checkJoints();\r
                const f32 frame = getFrameNr(); //old?\r
 \r
-               CSkinnedMesh* skinnedMesh=reinterpret_cast<CSkinnedMesh*>(Mesh);\r
+               CSkinnedMesh* skinnedMesh=static_cast<CSkinnedMesh*>(Mesh);\r
 \r
                skinnedMesh->transferOnlyJointsHintsToMesh( JointChildSceneNodes );\r
                skinnedMesh->animateMesh(frame, 1.0f);\r

diff --git a/source/Irrlicht/CIrrDeviceWin32.cpp b/source/Irrlicht/CIrrDeviceWin32.cpp
index 985fec8e9cd6be985dde7d1a14e6654e527945e4..101068e73c337cb82d976880497956cd249c4400 100644 (file)
--- a/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -1140,7 +1140,7 @@ bool CIrrDeviceWin32::present(video::IImage* image, void* windowId, core::rect<s
 {\r
        HWND hwnd = HWnd;\r
        if ( windowId )\r
-               hwnd = reinterpret_cast<HWND>(windowId);\r
+               hwnd = static_cast<HWND>(windowId);\r
 \r
        HDC dc = GetDC(hwnd);\r
 \r