diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2015-03-16 20:46:40 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2015-03-16 20:46:40 +0300 |
| commit | 9ed5a1073ef9db3761ab5ddc30f34955096f9ea8 (patch) | |
| tree | dcc5cfa5801bf53767fc5a5053025c1c95fe82fe /source | |
| parent | 77bc623bc4b1b1d6389eb749468348c13ed19ce8 (diff) | |
fix D1130 renamed the enum OBJ_FONT to OBJ_TEXT to avoid naming conflicts in Windows
Diffstat (limited to 'source')
| -rw-r--r-- | source/gameengine/GameLogic/SCA_IObject.h | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_FontObject.h | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index d5972a0a807..a695fd4e7be 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -221,7 +221,7 @@ public: OBJ_ARMATURE=0, OBJ_CAMERA=1, OBJ_LIGHT=2, - OBJ_FONT=3, + OBJ_TEXT=4 } ObjectTypes; }; diff --git a/source/gameengine/Ketsji/KX_FontObject.h b/source/gameengine/Ketsji/KX_FontObject.h index 3a25d366148..bf70eedfde6 100644 --- a/source/gameengine/Ketsji/KX_FontObject.h +++ b/source/gameengine/Ketsji/KX_FontObject.h @@ -54,7 +54,7 @@ public: */ virtual CValue* GetReplica(); virtual void ProcessReplica(); - virtual int GetGameObjectType() { return OBJ_FONT; } + virtual int GetGameObjectType() { return OBJ_TEXT; } protected: std::vector<STR_String> m_text; diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 6d989ca1760..d1b10098237 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -532,7 +532,7 @@ KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CVal m_objectlist->Add(newobj->AddRef()); if (newobj->GetGameObjectType()==SCA_IObject::OBJ_LIGHT) m_lightlist->Add(newobj->AddRef()); - else if (newobj->GetGameObjectType()==SCA_IObject::OBJ_FONT) + else if (newobj->GetGameObjectType()==SCA_IObject::OBJ_TEXT) AddFont((KX_FontObject*)newobj); newobj->AddMeshUser(); |