diff options
Diffstat (limited to 'source/gameengine')
29 files changed, 51 insertions, 48 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index ddf6dc3bef7..d8a89461031 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -336,7 +336,7 @@ int KX_BlenderRenderTools::applyLights(int objectlayer) { // taken from blender source, incompatibility between Blender Object / GameObject - int count; + unsigned int count; float vec[4]; vec[3]= 1.0; diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 645977108ac..d3b994eda91 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -300,7 +300,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools* } Material* ma = give_current_material(blenderobj, 1 /* mface->mat_nr */); - const char* matnameptr = (ma ? ma->id.name : ""); + //const char* matnameptr = (ma ? ma->id.name : ""); /*unused*/ bool polyvisible = true; if (mesh->tface && tface) @@ -410,7 +410,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools* int vtxarray = meshobj->FindVertexArray(nverts,polymat); RAS_Polygon* poly = new RAS_Polygon(bucket,polyvisible,nverts,vtxarray); if (skinMesh) { - int d1, d2, d3, d4; + int d1, d2, d3, d4=0; bool flat; /* If the face is set to solid, all fnors are the same */ @@ -715,7 +715,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, ) { - SYS_SystemHandle syshandle = SYS_GetSystem(); + //SYS_SystemHandle syshandle = SYS_GetSystem(); /*unused*/ //int userigidbody = SYS_GetCommandLineInt(syshandle,"norigidbody",0); //bool bRigidBody = (userigidbody == 0); diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index f7eb25a70a6..e8f0c2997e7 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -156,6 +156,7 @@ bool KX_BlenderSceneConverter::TryAndLoadNewFile() * Find the specified scene by name, or the first * scene if nothing matches (shouldn't happen). */ +#if 0 static struct Scene *GetSceneForName2(struct Main *maggie, const STR_String& scenename) { Scene *sce; @@ -165,7 +166,7 @@ static struct Scene *GetSceneForName2(struct Main *maggie, const STR_String& sce return (Scene*) maggie->scene.first; } - +#endif void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename, class KX_Scene* destinationscene, @@ -175,7 +176,7 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename, class RAS_ICanvas* canvas) { //find out which physics engine - Scene *blenderscene = GetSceneForName2(m_maggie, scenename); + // Scene *blenderscene = GetSceneForName2(m_maggie, scenename); /*unused*/ e_PhysicsEngine physics_engine = UseSumo; diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index 9233a10b784..fbb1e9a8c99 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -83,7 +83,7 @@ int cvalue_coerce(PyObject** pv,PyObject** pw) { if (PyInt_Check(*pw)) { double db = (double)PyInt_AsLong(*pw); - *pw = new CIntValue(db); + *pw = new CIntValue((int) db); Py_INCREF(*pv); return 0; } diff --git a/source/gameengine/GameLogic/SCA_LogicManager.cpp b/source/gameengine/GameLogic/SCA_LogicManager.cpp index 0829fb0657b..483a3c59a26 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.cpp +++ b/source/gameengine/GameLogic/SCA_LogicManager.cpp @@ -182,7 +182,7 @@ void SCA_LogicManager::BeginFrame(double curtime, double fixedtime) (*ie)->NextFrame(curtime, fixedtime); // for this frame, look up for activated sensors, and build the collection of triggered controllers - int numsensors = this->m_activatedsensors.size(); + // int numsensors = this->m_activatedsensors.size(); /*unused*/ set<SmartControllerPtr> triggeredControllerSet; @@ -201,7 +201,7 @@ void SCA_LogicManager::BeginFrame(double curtime, double fixedtime) } - int numtriggered = triggeredControllerSet.size(); + // int numtriggered = triggeredControllerSet.size(); /*unused*/ for (set<SmartControllerPtr>::iterator tit=triggeredControllerSet.begin(); !(tit==triggeredControllerSet.end());tit++) { diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp index a39e59fe451..c3e2066fc65 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp @@ -103,7 +103,7 @@ bool SCA_PropertyActuator::Update() CValue* oldprop = propowner->GetProperty(m_propname); if (oldprop) { - int waarde = (int)oldprop->GetNumber(); + // int waarde = (int)oldprop->GetNumber(); /*unused*/ CExpression* expr = new COperator2Expr(VALUE_ADD_OPERATOR,new CConstExpr(oldprop->AddRef()), userexpr->AddRef()); diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index 26ab3da7c13..3a7932fa51c 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -128,7 +128,6 @@ void SCA_PythonController::SetDictionary(PyObject* pythondictionary) m_pythondictionary = PyDict_Copy(pythondictionary); /* new reference */ } - static char* sPyGetCurrentController__doc__; diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.cpp b/source/gameengine/GameLogic/SCA_RandomActuator.cpp index da6fe06a708..474ad08eee3 100644 --- a/source/gameengine/GameLogic/SCA_RandomActuator.cpp +++ b/source/gameengine/GameLogic/SCA_RandomActuator.cpp @@ -88,7 +88,7 @@ CValue* SCA_RandomActuator::GetReplica() bool SCA_RandomActuator::Update() { - bool result = false; + //bool result = false; /*unused*/ bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); diff --git a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp index a25ac4089f9..06b5cca6ce9 100644 --- a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp +++ b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp @@ -57,7 +57,7 @@ #define TEMPERING_SHIFT_L(y) (y >> 18) SCA_RandomNumberGenerator::SCA_RandomNumberGenerator(long seed) { - int mti = N + 1; + // int mti = N + 1; /*unused*/ m_seed = seed; SetStartVector(); } diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp index 328352b70a2..dba4792c83c 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.cpp +++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp @@ -89,7 +89,7 @@ GetReplica( /* three functions copied from blender arith... don't know if there's an equivalent */ -float Normalise(float *n) +static float Kx_Normalise(float *n) { float d; @@ -108,7 +108,7 @@ float Normalise(float *n) return d; } -void Crossf(float *c, float *a, float *b) +static void Kx_Crossf(float *c, float *a, float *b) { c[0] = a[1] * b[2] - a[2] * b[1]; c[1] = a[2] * b[0] - a[0] * b[2]; @@ -116,7 +116,7 @@ void Crossf(float *c, float *a, float *b) } -void VecUpMat3(float *vec, float mat[][3], short axis) +static void Kx_VecUpMat3(float *vec, float mat[][3], short axis) { // Construct a camera matrix s.t. the specified axis @@ -158,16 +158,16 @@ void VecUpMat3(float *vec, float mat[][3], short axis) mat[coz][0]= vec[0]; mat[coz][1]= vec[1]; mat[coz][2]= vec[2]; - Normalise((float *)mat[coz]); + Kx_Normalise((float *)mat[coz]); inp= mat[coz][2]; mat[coy][0]= - inp*mat[coz][0]; mat[coy][1]= - inp*mat[coz][1]; mat[coy][2]= 1.0 - inp*mat[coz][2]; - Normalise((float *)mat[coy]); + Kx_Normalise((float *)mat[coy]); - Crossf(mat[cox], mat[coy], mat[coz]); + Kx_Crossf(mat[cox], mat[coy], mat[coz]); } @@ -293,7 +293,7 @@ bool KX_CameraActuator::Update(double curtime, bool frame) rc[0]= (lookat[0]-from[0]); rc[1]= (lookat[1]-from[1]); rc[2]= (lookat[2]-from[2]); - VecUpMat3(rc, mat, 3); /* y up Track -z */ + Kx_VecUpMat3(rc, mat, 3); /* y up Track -z */ diff --git a/source/gameengine/Ketsji/KX_GameActuator.cpp b/source/gameengine/Ketsji/KX_GameActuator.cpp index ada6e3eda0d..1340a9c8497 100644 --- a/source/gameengine/Ketsji/KX_GameActuator.cpp +++ b/source/gameengine/Ketsji/KX_GameActuator.cpp @@ -85,7 +85,7 @@ CValue* KX_GameActuator::GetReplica() bool KX_GameActuator::Update() { - bool result = false; + // bool result = false; /*unused*/ bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index d6f9b62f222..d255fd1d18f 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -957,7 +957,7 @@ PyObject* KX_GameObject::PyGetMesh(PyObject* self, if (PyArg_ParseTuple(args, "|i", &mesh)) { - if (mesh < m_meshes.size() && mesh >= 0) + if (((unsigned int)mesh < m_meshes.size()) && mesh >= 0) { KX_MeshProxy* meshproxy = new KX_MeshProxy(m_meshes[mesh]); return meshproxy; diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp index 0e30e324e87..1ffde7e31f8 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp @@ -120,7 +120,7 @@ bool KX_MouseFocusSensor::Evaluate(CValue* event) bool KX_MouseFocusSensor::ParentObjectHasFocus(void) { - bool res = false; + // bool res = false; /*unused*/ m_hitPosition = MT_Vector3(0,0,0); m_hitNormal = MT_Vector3(1,0,0); MT_Point3 resultpoint; diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp index bfcf9794d1b..4766d837069 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.cpp +++ b/source/gameengine/Ketsji/KX_NearSensor.cpp @@ -163,7 +163,7 @@ KX_NearSensor::~KX_NearSensor() bool KX_NearSensor::Evaluate(CValue* event) { bool result = false; - KX_GameObject* parent = static_cast<KX_GameObject*>(GetParent()); + // KX_GameObject* parent = static_cast<KX_GameObject*>(GetParent()); /*unused*/ if (m_bTriggered != m_bLastTriggered) { @@ -192,7 +192,7 @@ bool KX_NearSensor::Evaluate(CValue* event) DT_Bool KX_NearSensor::HandleCollision(void* obj1,void* obj2,const DT_CollData * coll_data) { - KX_TouchEventManager* toucheventmgr = static_cast<KX_TouchEventManager*>(m_eventmgr); + // KX_TouchEventManager* toucheventmgr = static_cast<KX_TouchEventManager*>(m_eventmgr); /*unused*/ KX_GameObject* parent = static_cast<KX_GameObject*>(GetParent()); // need the mapping from SM_Objects to gameobjects now diff --git a/source/gameengine/Ketsji/KX_PyMath.cpp b/source/gameengine/Ketsji/KX_PyMath.cpp index 6eedc13df95..1eee4e7043c 100644 --- a/source/gameengine/Ketsji/KX_PyMath.cpp +++ b/source/gameengine/Ketsji/KX_PyMath.cpp @@ -66,7 +66,7 @@ bool PyObject_IsMT_Matrix(PyObject *pymat, unsigned int rank) PyObject *pyrow = PySequence_GetItem(pymat, y); /* new ref */ if (PySequence_Check(pyrow)) { - if (PySequence_Size(pyrow) != rank) + if (((unsigned int)PySequence_Size(pyrow)) != rank) ismatrix = false; } else ismatrix = false; diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h index a588334f621..96a3431fe07 100644 --- a/source/gameengine/Ketsji/KX_PyMath.h +++ b/source/gameengine/Ketsji/KX_PyMath.h @@ -44,11 +44,11 @@ #include "KX_Python.h" -static unsigned int Size(const MT_Matrix4x4&) { return 4; } -static unsigned int Size(const MT_Matrix3x3&) { return 3; } -static unsigned int Size(const MT_Tuple2&) { return 2; } -static unsigned int Size(const MT_Tuple3&) { return 3; } -static unsigned int Size(const MT_Tuple4&) { return 4; } +inline unsigned int Size(const MT_Matrix4x4&) { return 4; } +inline unsigned int Size(const MT_Matrix3x3&) { return 3; } +inline unsigned int Size(const MT_Tuple2&) { return 2; } +inline unsigned int Size(const MT_Tuple3&) { return 3; } +inline unsigned int Size(const MT_Tuple4&) { return 4; } /** * Converts the given python matrix to an MT class. diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp index 3df0092dfb5..d9517a3a65b 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp @@ -80,7 +80,7 @@ KX_SCA_AddObjectActuator::~KX_SCA_AddObjectActuator() bool KX_SCA_AddObjectActuator::Update() { - bool result = false; + //bool result = false; /*unused*/ bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); diff --git a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp index 11d2a895ce9..1df1ad1f27a 100644 --- a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp @@ -65,7 +65,7 @@ KX_SCA_EndObjectActuator::~KX_SCA_EndObjectActuator() bool KX_SCA_EndObjectActuator::Update() { - bool result = false; + // bool result = false; /*unused*/ bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp index 742bcd43607..452c92a77ec 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp @@ -161,7 +161,7 @@ KX_SCA_ReplaceMeshActuator::~KX_SCA_ReplaceMeshActuator() bool KX_SCA_ReplaceMeshActuator::Update() { - bool result = false; + // bool result = false; /*unused*/ bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); diff --git a/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp b/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp index 1b4783d0b8b..8af01c561f2 100644 --- a/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp +++ b/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp @@ -157,9 +157,9 @@ UpdateChildCoordinates( // This is a vertex parent so we do not inherit orientation // information. - const MT_Vector3 & p_world_scale = parent->GetWorldScaling(); + // const MT_Vector3 & p_world_scale = parent->GetWorldScaling(); /*unused*/ const MT_Point3 & p_world_pos = parent->GetWorldPosition(); - const MT_Matrix3x3 & p_world_rotation = parent->GetWorldOrientation(); + // const MT_Matrix3x3 & p_world_rotation = parent->GetWorldOrientation(); /*unused*/ child_w_scale = child_scale; child_w_rotation = child_rotation; diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index a5b5369a826..017de1acaf8 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -402,7 +402,7 @@ KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CVal } SG_IObject* replicanode = newobj->GetSGNode(); - SG_Node* rootnode = (replicanode == m_rootnode ? NULL : m_rootnode); + // SG_Node* rootnode = (replicanode == m_rootnode ? NULL : m_rootnode); /*unused*/ replicanode->SetSGClientObject(newobj); diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp index 60e5195534b..a37fce434be 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.cpp +++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp @@ -86,7 +86,7 @@ CValue* KX_SceneActuator::GetReplica() bool KX_SceneActuator::Update() { - bool result = false; + // bool result = false; /*unused*/ bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp index 267bb414c13..793c3b84206 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.cpp +++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp @@ -276,7 +276,7 @@ PyObject* KX_SoundActuator::_getattr(const STR_String& attr) PyObject* KX_SoundActuator::PySetFilename(PyObject* self, PyObject* args, PyObject* kwds) { char *soundName = NULL; - void *soundPointer = NULL; + // void *soundPointer = NULL; /*unused*/ if (!PyArg_ParseTuple(args, "s", &soundName)) return NULL; diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp index 4a7e9d8646d..64dc175f451 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.cpp +++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp @@ -94,7 +94,7 @@ m_bCollision(false), m_bTriggered(false), m_bLastTriggered(false) { - KX_TouchEventManager* touchmgr = (KX_TouchEventManager*) eventmgr; + // KX_TouchEventManager* touchmgr = (KX_TouchEventManager*) eventmgr; /*unused*/ // m_resptable = touchmgr->GetResponseTable(); // m_solidHandle = m_sumoObj->getObjectHandle(); @@ -161,7 +161,7 @@ void KX_TouchSensor::RegisterSumo(KX_TouchEventManager *touchman) DT_Bool KX_TouchSensor::HandleCollision(void* obj1,void* obj2,const DT_CollData * coll_data) { - KX_TouchEventManager* toucheventmgr = (KX_TouchEventManager*)m_eventmgr; + // KX_TouchEventManager* toucheventmgr = (KX_TouchEventManager*)m_eventmgr; /*unused*/ KX_GameObject* parent = (KX_GameObject*)GetParent(); // need the mapping from SM_Objects to gameobjects now diff --git a/source/gameengine/Ketsji/KX_WorldIpoController.cpp b/source/gameengine/Ketsji/KX_WorldIpoController.cpp index 4d7e6592b6b..c4800dc9d91 100644 --- a/source/gameengine/Ketsji/KX_WorldIpoController.cpp +++ b/source/gameengine/Ketsji/KX_WorldIpoController.cpp @@ -46,7 +46,7 @@ bool KX_WorldIpoController::Update(double currentTime) (*i)->Execute(m_ipotime);//currentTime); } - KX_WorldInfo *world; + KX_WorldInfo *world = NULL; if (m_modify_mist_start) { world->setMistStart(m_mist_start); diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp index a9934df1d02..abc3495d391 100644 --- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp +++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp @@ -181,11 +181,13 @@ bool RAS_MaterialBucket::ActivateMaterial(const MT_Transform& cameratrans, RAS_I if ((rasty->GetDrawingMode() <= RAS_IRasterizer::KX_SOLID) || !dolights) { - bool bUseLights = rendertools->ProcessLighting(-1); + // bool bUseLights = rendertools->ProcessLighting(-1); /*unused*/ + ; } else { - bool bUseLights = rendertools->ProcessLighting(m_material->GetLightLayer()); + // bool bUseLights = rendertools->ProcessLighting(m_material->GetLightLayer()); /*unused*/ + ; } drawmode = (rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID ? diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index a28cbac2580..6bc3b75fd5a 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -463,7 +463,7 @@ RAS_TexVert* RAS_MeshObject::GetVertex(short array, void RAS_MeshObject::ClearArrayData() { - for (unsigned int i=0;i<m_matVertexArrayS.size();i++) + for (int i=0;i<m_matVertexArrayS.size();i++) { KX_ArrayOptimizer** ao = m_matVertexArrayS.at(i); if (ao) @@ -567,7 +567,7 @@ struct RAS_MeshObject::polygonSlot RAS_TexVert *vert = mesh->GetVertex(base.m_vtxarray, base.m_indexarray[0], poly->GetMaterial()->GetPolyMaterial()); m_z = MT_dot(pnorm, vert->getLocalXYZ()) + pval; - for( unsigned int i = 1; i < m_poly->VertexCount(); i++) + for(int i = 1; i < m_poly->VertexCount(); i++) { vert = mesh->GetVertex(base.m_vtxarray, base.m_indexarray[i], poly->GetMaterial()->GetPolyMaterial()); float z = MT_dot(pnorm, vert->getLocalXYZ()) + pval; diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp index 8b232c7d932..cd7fb7f2c45 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp @@ -155,6 +155,7 @@ static void bglDeallocEntryPoints (void) // ------------------------- +/*unused*/ static void * bglGetProcAddress (const GLubyte * pszProc) { if (!gBundleRefOpenGL) diff --git a/source/gameengine/SceneGraph/SG_Tree.cpp b/source/gameengine/SceneGraph/SG_Tree.cpp index fcbf3d924d3..947d771f06c 100644 --- a/source/gameengine/SceneGraph/SG_Tree.cpp +++ b/source/gameengine/SceneGraph/SG_Tree.cpp @@ -366,9 +366,9 @@ SG_Tree* SG_TreeFactory::MakeTreeUp() while (num_objects > 2) { /* Find the pair of bboxes that produce the smallest combined bbox. */ - unsigned int minx, miny; + unsigned int minx = UINT_MAX, miny = UINT_MAX; MT_Scalar min_volume = FLT_MAX; - SG_Tree *min; + SG_Tree *min = NULL; //char temp[16]; for( y = 0; y < num_objects; y++) { |