diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
| commit | cd972535027a73ba70069051fe9038b6a8b5696a (patch) | |
| tree | b50696bddbc710192b89e34fcdd1e82e6c8073b7 /source/gameengine | |
| parent | aca76ddb502cbf0ee7888c3356f9f35240919410 (diff) | |
- added GCC warning -Wstrict-prototypes
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Light.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/FilterBlueScreen.h | 2 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/ImageRender.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/ImageRender.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp index b608be4c89f..3e03a33e82f 100644 --- a/source/gameengine/Ketsji/KX_Light.cpp +++ b/source/gameengine/Ketsji/KX_Light.cpp @@ -301,7 +301,6 @@ PyAttributeDef KX_LightObject::Attributes[] = { KX_PYATTRIBUTE_FLOAT_RW("energy", 0, 10, KX_LightObject, m_lightobj.m_energy), KX_PYATTRIBUTE_FLOAT_RW("distance", 0.01, 5000, KX_LightObject, m_lightobj.m_distance), KX_PYATTRIBUTE_RW_FUNCTION("color", KX_LightObject, pyattr_get_color, pyattr_set_color), - KX_PYATTRIBUTE_RW_FUNCTION("colour", KX_LightObject, pyattr_get_color, pyattr_set_color), KX_PYATTRIBUTE_FLOAT_RW("lin_attenuation", 0, 1, KX_LightObject, m_lightobj.m_att1), KX_PYATTRIBUTE_FLOAT_RW("quad_attenuation", 0, 1, KX_LightObject, m_lightobj.m_att2), KX_PYATTRIBUTE_FLOAT_RW("spotsize", 1, 180, KX_LightObject, m_lightobj.m_spotsize), diff --git a/source/gameengine/VideoTexture/FilterBlueScreen.h b/source/gameengine/VideoTexture/FilterBlueScreen.h index 820e4a44501..78728d291d8 100644 --- a/source/gameengine/VideoTexture/FilterBlueScreen.h +++ b/source/gameengine/VideoTexture/FilterBlueScreen.h @@ -75,7 +75,7 @@ protected: VT_A(val) = 0; // condition for fully opaque color else if (m_squareLimits[1] <= dist) - // return normal colour + // return normal color VT_A(val) = 0xFF; // otherwise calc alpha else diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 7580563a74f..fafb19fd05b 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -64,7 +64,7 @@ ImageRender::ImageRender (KX_Scene * scene, KX_Camera * camera) : m_mirror(NULL), m_clip(100.f) { - // initialize background colour + // initialize background color setBackground(0, 0, 255, 255); // retrieve rendering objects m_engine = KX_GetActiveEngine(); diff --git a/source/gameengine/VideoTexture/ImageRender.h b/source/gameengine/VideoTexture/ImageRender.h index d49544ce42a..7861a2df79a 100644 --- a/source/gameengine/VideoTexture/ImageRender.h +++ b/source/gameengine/VideoTexture/ImageRender.h @@ -85,7 +85,7 @@ protected: /// engine KX_KetsjiEngine* m_engine; - /// background colour + /// background color float m_background[4]; |