diff options
author | Jean-Luc Peurière <jlp@nerim.net> | 2005-03-09 22:45:59 +0300 |
---|---|---|
committer | Jean-Luc Peurière <jlp@nerim.net> | 2005-03-09 22:45:59 +0300 |
commit | c78e44cdc563853c250da78ee78ba622c39126b2 (patch) | |
tree | fb116af7e1edd94ef96ae883bea727be372e2bd2 /source/gameengine/Ketsji | |
parent | 77d44e88e95d86661fc8b29db923083ec747cf9d (diff) |
big warning hunt commit
lot of casts, added prototypes, missing includes and some true errors
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/KX_CameraActuator.cpp | 14 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_GameActuator.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_MouseFocusSensor.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PyMath.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PyMath.h | 10 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SceneActuator.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SoundActuator.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_TouchSensor.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_WorldIpoController.cpp | 2 |
16 files changed, 29 insertions, 29 deletions
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); |