diff options
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.h')
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 52fc3da5465..157e282b557 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -33,9 +33,9 @@ #ifndef __KX_GAMEOBJECT_H__ #define __KX_GAMEOBJECT_H__ -#if defined(WIN32) && !defined(FREE_WINDOWS) -// get rid of this stupid "warning 'this' used in initialiser list", generated by VC when including Solid/Sumo -#pragma warning (disable : 4355) +#ifdef _MSC_VER + /* get rid of this stupid "warning 'this' used in initialiser list", generated by VC when including Solid/Sumo */ +# pragma warning (disable:4355) #endif #include <stddef.h> @@ -116,11 +116,11 @@ protected: KX_ObstacleSimulation* m_pObstacleSimulation; - CListValue* m_pInstanceObjects; + CListValue* m_pInstanceObjects; KX_GameObject* m_pDupliGroupObject; // The action manager is used to play/stop/update actions - BL_ActionManager* m_actionManager; + BL_ActionManager* m_actionManager; BL_ActionManager* GetActionManager(); |