diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 09:46:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 09:46:41 +0400 |
commit | f3ece5a108db0bdbefb4663ef4ebd9a7e039e263 (patch) | |
tree | cb6329453be169ef1ec49ef8b8d50a6b14364880 /source/gameengine | |
parent | a1a0c8da13a7b91b0264c7535752864379f3d852 (diff) |
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/GameLogic/SCA_IInputDevice.h | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 12 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.h | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_MeshProxy.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index bc4d22eaaaf..1a403f40955 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -167,9 +167,9 @@ public: KX_CAPSLOCKKEY, // 123 KX_LEFTCTRLKEY, // 124 - KX_LEFTALTKEY, - KX_RIGHTALTKEY, - KX_RIGHTCTRLKEY, + KX_LEFTALTKEY, + KX_RIGHTALTKEY, + KX_RIGHTCTRLKEY, KX_RIGHTSHIFTKEY, KX_LEFTSHIFTKEY,// 129 diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index dfc8073303e..6979af10e0a 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -228,11 +228,11 @@ STR_String& KX_GameObject::GetName() } - +/* Set the name of the value */ void KX_GameObject::SetName(const char *name) { m_name = name; -}; // Set the name of the value +} KX_IPhysicsController* KX_GameObject::GetPhysicsController() { @@ -241,7 +241,7 @@ KX_IPhysicsController* KX_GameObject::GetPhysicsController() KX_GameObject* KX_GameObject::GetDupliGroupObject() { - return m_pDupliGroupObject; + return m_pDupliGroupObject; } CListValue* KX_GameObject::GetInstanceObjects() @@ -251,11 +251,11 @@ CListValue* KX_GameObject::GetInstanceObjects() void KX_GameObject::AddInstanceObjects(KX_GameObject* obj) { - if(!m_pInstanceObjects) + if (!m_pInstanceObjects) m_pInstanceObjects = new CListValue(); obj->AddRef(); - m_pInstanceObjects->Add(obj); + m_pInstanceObjects->Add(obj); } void KX_GameObject::RemoveInstanceObject(KX_GameObject* obj) @@ -267,7 +267,7 @@ void KX_GameObject::RemoveInstanceObject(KX_GameObject* obj) void KX_GameObject::RemoveDupliGroupObject() { - if(m_pDupliGroupObject) { + if (m_pDupliGroupObject) { m_pDupliGroupObject->Release(); m_pDupliGroupObject = NULL; } diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 157e282b557..5ceef2c60c9 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -221,11 +221,11 @@ public: GetInstanceObjects( ); - void + void SetDupliGroupObject(KX_GameObject* ); - void + void AddInstanceObjects(KX_GameObject* ); diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp index 8451dc3497d..b49c27fc6b8 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.cpp +++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp @@ -239,7 +239,7 @@ PyObject *KX_MeshProxy::pyattr_get_materials(void *self_v, const KX_PYATTRIBUTE_ KX_BlenderMaterial *mat = static_cast<KX_BlenderMaterial*>(polymat); PyList_SET_ITEM(materials, i, mat->GetProxy()); } - else { + else { KX_PolygonMaterial *mat = static_cast<KX_PolygonMaterial*>(polymat); PyList_SET_ITEM(materials, i, mat->GetProxy()); } diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 89799d065a4..7ec84cfa6b7 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -2240,9 +2240,9 @@ PyObject *initGameKeys() KX_MACRO_addTypesToDict(d, CAPSLOCKKEY, SCA_IInputDevice::KX_CAPSLOCKKEY); KX_MACRO_addTypesToDict(d, LEFTCTRLKEY, SCA_IInputDevice::KX_LEFTCTRLKEY); - KX_MACRO_addTypesToDict(d, LEFTALTKEY, SCA_IInputDevice::KX_LEFTALTKEY); - KX_MACRO_addTypesToDict(d, RIGHTALTKEY, SCA_IInputDevice::KX_RIGHTALTKEY); - KX_MACRO_addTypesToDict(d, RIGHTCTRLKEY, SCA_IInputDevice::KX_RIGHTCTRLKEY); + KX_MACRO_addTypesToDict(d, LEFTALTKEY, SCA_IInputDevice::KX_LEFTALTKEY); + KX_MACRO_addTypesToDict(d, RIGHTALTKEY, SCA_IInputDevice::KX_RIGHTALTKEY); + KX_MACRO_addTypesToDict(d, RIGHTCTRLKEY, SCA_IInputDevice::KX_RIGHTCTRLKEY); KX_MACRO_addTypesToDict(d, RIGHTSHIFTKEY, SCA_IInputDevice::KX_RIGHTSHIFTKEY); KX_MACRO_addTypesToDict(d, LEFTSHIFTKEY, SCA_IInputDevice::KX_LEFTSHIFTKEY); diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h index 7dac93acd21..976f3c58d68 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h @@ -50,7 +50,7 @@ class KX_SCA_AddObjectActuator : public SCA_IActuator /// Time field: lifetime of the new object int m_timeProp; - /// Original object reference (object to replicate) + /// Original object reference (object to replicate) SCA_IObject* m_OriginalObject; /// Object will be added to the following scene diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index a6b7ed3f732..f772fa5113a 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1027,7 +1027,7 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj) // if the object is the dupligroup proxy, you have to cleanup all m_pDupliGroupObject's in all // instances refering to this group - if(newobj->GetInstanceObjects()) { + if (newobj->GetInstanceObjects()) { for (int i = 0; i < newobj->GetInstanceObjects()->GetCount(); i++) { KX_GameObject* instance = (KX_GameObject*)newobj->GetInstanceObjects()->GetValue(i); instance->RemoveDupliGroupObject(); |