From 48bc598658ef6b58d58be07aaf6d66220f8034c9 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Mon, 3 Jan 2005 18:05:24 +0000 Subject: [PATCH] More warning cleanups... added a casts to: blender/blenlib/intern/BLI_memarena.c gameengine/Rasterizer/RAS_TexVert.cpp Removed unused vars from: blender/python/api2_2x/vector.c gameengine/Ketsji/KX_PyMath.cpp gameengine/Ketsji/KX_Scene.cpp gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp gameengine/Rasterizer/RAS_FramingManager.cpp gameengine/Rasterizer/RAS_Polygon.cpp gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp Kent --- source/blender/blenlib/intern/BLI_memarena.c | 2 +- source/blender/python/api2_2x/vector.c | 1 - source/gameengine/Ketsji/KX_PyMath.cpp | 2 +- source/gameengine/Ketsji/KX_Scene.cpp | 8 -------- source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp | 1 - source/gameengine/Rasterizer/RAS_FramingManager.cpp | 3 --- .../RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp | 3 +-- source/gameengine/Rasterizer/RAS_Polygon.cpp | 1 - source/gameengine/Rasterizer/RAS_TexVert.cpp | 8 ++++---- 9 files changed, 7 insertions(+), 22 deletions(-) diff --git a/source/blender/blenlib/intern/BLI_memarena.c b/source/blender/blenlib/intern/BLI_memarena.c index 218fdb3c45b..39f36c88ff6 100644 --- a/source/blender/blenlib/intern/BLI_memarena.c +++ b/source/blender/blenlib/intern/BLI_memarena.c @@ -55,7 +55,7 @@ MemArena *BLI_memarena_new(int bufsize) { return ma; } void BLI_memarena_free(MemArena *ma) { - BLI_linklist_free(ma->bufs, MEM_freeN); + BLI_linklist_free(ma->bufs, (void(*)(void*)) MEM_freeN); MEM_freeN(ma); } diff --git a/source/blender/python/api2_2x/vector.c b/source/blender/python/api2_2x/vector.c index ba527352786..d7b2f8c8f74 100644 --- a/source/blender/python/api2_2x/vector.c +++ b/source/blender/python/api2_2x/vector.c @@ -707,7 +707,6 @@ PyObject *newVectorObject( float *vec, int size ) PyObject *newVectorProxy( float *vec, int size) { VectorObject *proxy; - int x; proxy = PyObject_NEW( VectorObject, &vector_Type ); diff --git a/source/gameengine/Ketsji/KX_PyMath.cpp b/source/gameengine/Ketsji/KX_PyMath.cpp index 5e300c4dd71..6eedc13df95 100644 --- a/source/gameengine/Ketsji/KX_PyMath.cpp +++ b/source/gameengine/Ketsji/KX_PyMath.cpp @@ -53,7 +53,7 @@ bool PyObject_IsMT_Matrix(PyObject *pymat, unsigned int rank) if (!pymat) return false; - unsigned int x, y; + unsigned int y; if (PySequence_Check(pymat)) { unsigned int rows = PySequence_Size(pymat); diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 09e4ae7bbb1..36e1596ee85 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -997,14 +997,6 @@ void KX_Scene::LogicEndFrame() KX_GameObject* gameobj = (KX_GameObject*)m_euthanasyobjects->GetValue(i); this->RemoveObject(gameobj); } - - numobj = m_euthanasyobjects->GetCount(); - if (numobj != 0) - { - // huh? - int ii=0; - } - // numobj is 0 we hope } diff --git a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp index 26687663006..ab1db7c7941 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp +++ b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp @@ -526,7 +526,6 @@ DT_Bool SM_Object::fix( void *object2, const DT_CollData *coll_data ){ - SM_Scene *scene = (SM_Scene *)client_data; SM_Object *obj1 = (SM_Object *)object1; SM_Object *obj2 = (SM_Object *)object2; diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.cpp b/source/gameengine/Rasterizer/RAS_FramingManager.cpp index d9b3708f6aa..131893bd79f 100644 --- a/source/gameengine/Rasterizer/RAS_FramingManager.cpp +++ b/source/gameengine/Rasterizer/RAS_FramingManager.cpp @@ -174,9 +174,6 @@ ComputeFrustum( RAS_FrameFrustum &frustum ){ - const int winx = availableViewport.GetWidth(); - const int winy = availableViewport.GetHeight(); - RAS_FrameSettings::RAS_FrameType type = settings.FrameType(); const float design_width = float(settings.DesignAspectWidth()); diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp index f01d76bd8d2..77beed5ead1 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp @@ -139,7 +139,6 @@ void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays bool useObjectColor, const MT_Vector4& rgbacolor) { - unsigned char* mypointer=NULL; static const GLsizei vtxstride = sizeof(RAS_TexVert); GLenum drawmode; switch (mode) @@ -187,7 +186,7 @@ void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays vertexarray = &((*vertexarrays[vt]) [0]); const KX_IndexArray & indexarray = (*indexarrays[vt]); numindices = indexarray.size(); - int numverts = vertexarrays[vt]->size(); + // int numverts = vertexarrays[vt]->size(); if (!numindices) continue; diff --git a/source/gameengine/Rasterizer/RAS_Polygon.cpp b/source/gameengine/Rasterizer/RAS_Polygon.cpp index 10b5c9ff51c..bfd87d4e416 100644 --- a/source/gameengine/Rasterizer/RAS_Polygon.cpp +++ b/source/gameengine/Rasterizer/RAS_Polygon.cpp @@ -67,7 +67,6 @@ RAS_Polygon::RAS_Polygon(RAS_MaterialBucket* bucket, m_numverts(numverts), m_edgecode(0) { - int size = sizeof(RAS_Polygon); m_vertexindexbase.m_vtxarray = vtxarrayindex ;//m_bucket->FindVertexArray(numverts); m_polyFlags.Visible = visible; } diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp index 5dae717cd8e..c68806d500c 100644 --- a/source/gameengine/Rasterizer/RAS_TexVert.cpp +++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp @@ -59,10 +59,10 @@ const MT_Point3& RAS_TexVert::xyz() void RAS_TexVert::SetRGBA(const MT_Vector4& rgba) { unsigned char *colp = (unsigned char*) &m_rgba; - colp[0] = rgba[0]*255.0; - colp[1] = rgba[1]*255.0; - colp[2] = rgba[2]*255.0; - colp[3] = rgba[3]*255.0; + colp[0] = (unsigned char) (rgba[0]*255.0); + colp[1] = (unsigned char) (rgba[1]*255.0); + colp[2] = (unsigned char) (rgba[2]*255.0); + colp[3] = (unsigned char) (rgba[3]*255.0); }