diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-10 19:20:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-10 19:20:10 +0400 |
| commit | 5534701e5d7659d8fdd73ef64375116bb07463e8 (patch) | |
| tree | 9c667fb154109a59a0682b036879d15e7038f0ea /source/gameengine | |
| parent | 10932e2e9785b92f786deeec2794816a05a6fed1 (diff) | |
style cleanup: use capital camel case names for typedef's
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.h | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_TouchSensor.h | 6 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/ImageBase.cpp | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h index 8655d93d406..82f523283ed 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.h +++ b/source/gameengine/Ketsji/KX_NearSensor.h @@ -74,7 +74,7 @@ public: virtual void ReParent(SCA_IObject* parent); virtual bool NewHandleCollision(void* obj1,void* obj2, - const PHY_CollData * coll_data); + const PHY_CollData * coll_data); virtual bool BroadPhaseFilterCollision(void*obj1,void*obj2); virtual bool BroadPhaseSensorFilterCollision(void* obj1,void* obj2) { return false; } virtual sensortype GetSensorType() { return ST_NEAR; } diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index 1a22067f9ac..d739144d70d 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -93,8 +93,10 @@ public: virtual void UnregisterSumo(KX_TouchEventManager* touchman); virtual void UnregisterToManager(); -// virtual DT_Bool HandleCollision(void* obj1,void* obj2, -// const DT_CollData * coll_data); +#if 0 + virtual DT_Bool HandleCollision(void* obj1,void* obj2, + const DT_CollData * coll_data); +#endif virtual bool NewHandleCollision(void*obj1,void*obj2,const PHY_CollData* colldata); diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp index b1d77d8807f..ac92bcc6d41 100644 --- a/source/gameengine/VideoTexture/ImageBase.cpp +++ b/source/gameengine/VideoTexture/ImageBase.cpp @@ -444,9 +444,9 @@ PyObject * Image_getImage (PyImage * self, char * mode) // get an empty buffer buffer = BGL_MakeBuffer( GL_BYTE, 1, &dimensions, NULL); // and fill it - for (i=0, d=(unsigned char*)buffer->buf.asbyte, s=(unsigned char*)image; - i<pixels; - ++i, d+=ncolor, s+=4) + for (i = 0, d = (unsigned char *)buffer->buf.asbyte, s = (unsigned char *)image; + i < pixels; + i++, d += ncolor, s += 4) { for (c=0; c<ncolor; c++) { |