diff options
author | Kent Mein <mein@cs.umn.edu> | 2002-10-30 05:07:20 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2002-10-30 05:07:20 +0300 |
commit | 01bff7038323d617fbc83a39e9072631ccbdd65f (patch) | |
tree | 2ca70b537a273af35eb5c85c7bd55712fb112dcd /source/gameengine | |
parent | f6c7a8935762c5bf7ff77a0e7d5d63554c5eb80d (diff) |
fixed spacing in the headers to get rid of some warnings and some other
little minor spacing issues.
Diffstat (limited to 'source/gameengine')
193 files changed, 271 insertions, 157 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h index 85b41e37f1d..5f8b7541f76 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h @@ -162,4 +162,6 @@ private: /** Blender area the game engine is running within */ struct ScrArea* m_area; }; + #endif // __KX_BLENDERCANVAS + diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.h b/source/gameengine/BlenderRoutines/KX_BlenderGL.h index c3648a21810..e7cc220f88c 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.h @@ -61,6 +61,5 @@ void BL_print_gamedebug_line_padded(char* text, int xco, int yco, int width, int } #endif //__cplusplus - #endif //__BLENDERGL diff --git a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h index 7a2951838fc..24cd17415ac 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h @@ -212,9 +212,5 @@ public: virtual bool ConvertBlenderEvent(unsigned short incode,short val)=0; }; - - - - - #endif //__KX_BLENDERINPUTDEVICE + diff --git a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h index 98791dba95b..33809f039fa 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h @@ -45,4 +45,6 @@ public: virtual bool ConvertBlenderEvent(unsigned short incode,short val); virtual void NextFrame(); }; + #endif //__KX_BLENDERKEYBOARDDEVICE + diff --git a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h index 6eb02622f9b..a4a1d27b2ee 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h @@ -45,4 +45,6 @@ public: virtual bool ConvertBlenderEvent(unsigned short incode,short val); virtual void NextFrame(); }; + #endif //__KX_BLENDERMOUSEDEVICE + diff --git a/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h b/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h index 3513765410f..5e08a5a77af 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h @@ -96,3 +96,4 @@ inline RAS_IPolyMaterial::TCachingInfo KX_BlenderPolyMaterial::GetCachingInfo(vo } #endif // __KX_BLENDERPOLYMATERIAL + diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h index fb4c5a6f2ba..91227967185 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h @@ -96,5 +96,5 @@ public: void* tface); }; - #endif //__KX_BLENDERRENDERTOOLS + diff --git a/source/gameengine/BlenderRoutines/KX_BlenderSystem.h b/source/gameengine/BlenderRoutines/KX_BlenderSystem.h index 68db3194b0a..00a1bd1853f 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderSystem.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderSystem.h @@ -48,4 +48,6 @@ public: virtual ~KX_BlenderSystem() {}; virtual double GetTimeInSeconds(); }; + #endif //__KX_BLENDERSYSTEM + diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h index 49485cb324d..962f807f907 100644 --- a/source/gameengine/Converter/BL_ActionActuator.h +++ b/source/gameengine/Converter/BL_ActionActuator.h @@ -122,5 +122,6 @@ enum { ACT_FLAG_LOCKINPUT = 0x00000002, ACT_FLAG_KEYUP = 0x00000004 }; + #endif diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.h b/source/gameengine/Converter/BL_BlenderDataConversion.h index 1ed6a866269..29e1a29a149 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.h +++ b/source/gameengine/Converter/BL_BlenderDataConversion.h @@ -52,3 +52,4 @@ void BL_ConvertBlenderObjects(struct Main* maggie, ); #endif // __BLENDER_CONVERT + diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h index 9880725a2d0..90b4dd8328c 100644 --- a/source/gameengine/Converter/BL_MeshDeformer.h +++ b/source/gameengine/Converter/BL_MeshDeformer.h @@ -70,3 +70,4 @@ protected: }; #endif + diff --git a/source/gameengine/Converter/BL_SkinMeshObject.h b/source/gameengine/Converter/BL_SkinMeshObject.h index 5ac95b48a35..5dfca48af1e 100644 --- a/source/gameengine/Converter/BL_SkinMeshObject.h +++ b/source/gameengine/Converter/BL_SkinMeshObject.h @@ -179,6 +179,5 @@ public: }; - #endif diff --git a/source/gameengine/Converter/BlenderWorldInfo.h b/source/gameengine/Converter/BlenderWorldInfo.h index 1defd41bc72..f4bdff649cc 100644 --- a/source/gameengine/Converter/BlenderWorldInfo.h +++ b/source/gameengine/Converter/BlenderWorldInfo.h @@ -93,3 +93,4 @@ public: }; #endif //__BLENDERWORLDINFO_H + diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h index 6276b286ce4..fd9cfcb04ce 100644 --- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h +++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h @@ -66,5 +66,5 @@ public: KX_IScalarInterpolator *GetScalarInterpolator(BL_IpoChannel channel); }; - #endif //__KX_SCALARINTERPOLATOR_H + diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h index 446c238a274..2a15d5e2f0d 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.h +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h @@ -118,3 +118,4 @@ public: }; #endif //__KX_BLENDERSCENECONVERTER_H + diff --git a/source/gameengine/Converter/KX_ConvertActuators.h b/source/gameengine/Converter/KX_ConvertActuators.h index 80aa64a19ef..1e6e96e2e7c 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.h +++ b/source/gameengine/Converter/KX_ConvertActuators.h @@ -33,16 +33,17 @@ #define __KX_CONVERTACTUATORS_H void BL_ConvertActuators(char* maggiename, - struct Object* blenderobject, - class KX_GameObject* gameobj, - class SCA_LogicManager* logicmgr, - class KX_Scene* scene, - class KX_KetsjiEngine* ketsjiEngine, - int & executePriority, - int activeLayerBitInfo, - bool isInActiveLayer, - class RAS_IRenderTools* rendertools, - class KX_BlenderSceneConverter* converter); + struct Object* blenderobject, + class KX_GameObject* gameobj, + class SCA_LogicManager* logicmgr, + class KX_Scene* scene, + class KX_KetsjiEngine* ketsjiEngine, + int & executePriority, + int activeLayerBitInfo, + bool isInActiveLayer, + class RAS_IRenderTools* rendertools, + class KX_BlenderSceneConverter* converter); #endif //__KX_CONVERTACTUATORS_H + diff --git a/source/gameengine/Converter/KX_ConvertControllers.h b/source/gameengine/Converter/KX_ConvertControllers.h index 637780a7dbd..3c2b45bddd0 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.h +++ b/source/gameengine/Converter/KX_ConvertControllers.h @@ -46,6 +46,5 @@ void BL_ConvertControllers( ); - - #endif //__KX_CONVERTCONTROLLERS_H + diff --git a/source/gameengine/Converter/KX_ConvertProperties.h b/source/gameengine/Converter/KX_ConvertProperties.h index 7360baa2e47..eb44f7b7d35 100644 --- a/source/gameengine/Converter/KX_ConvertProperties.h +++ b/source/gameengine/Converter/KX_ConvertProperties.h @@ -33,9 +33,10 @@ #define __KX_CONVERTPROPERTIES void BL_ConvertProperties(struct Object* object, - class KX_GameObject* gameobj, - class SCA_TimeEventManager* timemgr, - class SCA_IScene* scene, - bool isInActiveLayer); + class KX_GameObject* gameobj, + class SCA_TimeEventManager* timemgr, + class SCA_IScene* scene, + bool isInActiveLayer); #endif //__KX_CONVERTPROPERTIES + diff --git a/source/gameengine/Converter/KX_ConvertSensors.h b/source/gameengine/Converter/KX_ConvertSensors.h index ed7dccf87a9..9878d4a7a09 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.h +++ b/source/gameengine/Converter/KX_ConvertSensors.h @@ -33,15 +33,15 @@ #define __KX_CONVERTSENSOR_H void BL_ConvertSensors(struct Object* blenderobject, - class KX_GameObject* gameobj, - class SCA_LogicManager* logicmgr, - class KX_Scene* kxscene, - class SCA_IInputDevice* keydev, - int & executePriority , - int activeLayerBitInfo, - bool isInActiveLayer, - class RAS_ICanvas* canvas, - class KX_BlenderSceneConverter* converter); - + class KX_GameObject* gameobj, + class SCA_LogicManager* logicmgr, + class KX_Scene* kxscene, + class SCA_IInputDevice* keydev, + int & executePriority , + int activeLayerBitInfo, + bool isInActiveLayer, + class RAS_ICanvas* canvas, + class KX_BlenderSceneConverter* converter); #endif //__KX_CONVERTSENSOR_H + diff --git a/source/gameengine/Converter/KX_IpoConvert.h b/source/gameengine/Converter/KX_IpoConvert.h index 5686ca866eb..e04f33f76fe 100644 --- a/source/gameengine/Converter/KX_IpoConvert.h +++ b/source/gameengine/Converter/KX_IpoConvert.h @@ -35,20 +35,20 @@ struct Object; void BL_ConvertIpos(struct Object* blenderobject, - class KX_GameObject* gameobj, - class KX_BlenderSceneConverter *converter - ); + class KX_GameObject* gameobj, + class KX_BlenderSceneConverter *converter); void BL_ConvertLampIpos(struct Lamp* blenderlight, - class KX_GameObject* lightobj, - class KX_BlenderSceneConverter *converter); + class KX_GameObject* lightobj, + class KX_BlenderSceneConverter *converter); void BL_ConvertWorldIpos(struct World* blenderworld, - class KX_BlenderSceneConverter *converter); + class KX_BlenderSceneConverter *converter); void BL_ConvertCameraIpos(struct Camera* blendercamera, - class KX_GameObject* cameraobj, - class KX_BlenderSceneConverter *converter); + class KX_GameObject* cameraobj, + class KX_BlenderSceneConverter *converter); #endif //__KX_IPOCONVERT_H + diff --git a/source/gameengine/Expressions/BoolValue.h b/source/gameengine/Expressions/BoolValue.h index e78ff2ef4bf..6c4d964249f 100644 --- a/source/gameengine/Expressions/BoolValue.h +++ b/source/gameengine/Expressions/BoolValue.h @@ -49,3 +49,4 @@ private: }; #endif // !defined _BOOLVALUE_H + diff --git a/source/gameengine/Expressions/ConstExpr.h b/source/gameengine/Expressions/ConstExpr.h index 4c01c142d32..e27ece52a83 100644 --- a/source/gameengine/Expressions/ConstExpr.h +++ b/source/gameengine/Expressions/ConstExpr.h @@ -44,3 +44,4 @@ private: }; #endif // !defined(AFX_CONSTEXPR_H__061ECFC3_BE87_11D1_A51C_00A02472FC58__INCLUDED_) + diff --git a/source/gameengine/Expressions/EXP_C-Api.h b/source/gameengine/Expressions/EXP_C-Api.h index e99152294f1..48167a7bf44 100644 --- a/source/gameengine/Expressions/EXP_C-Api.h +++ b/source/gameengine/Expressions/EXP_C-Api.h @@ -66,3 +66,4 @@ const char* EXP_GetText(EXP_ValueHandle); #endif #endif //__EXPRESSION_INCLUDE + diff --git a/source/gameengine/Expressions/EmptyValue.h b/source/gameengine/Expressions/EmptyValue.h index d400cd065f5..b9cca0e57e5 100644 --- a/source/gameengine/Expressions/EmptyValue.h +++ b/source/gameengine/Expressions/EmptyValue.h @@ -37,3 +37,4 @@ public: }; #endif // !defined _EMPTYVALUE_H + diff --git a/source/gameengine/Expressions/ErrorValue.h b/source/gameengine/Expressions/ErrorValue.h index 8a4726e196d..16e608ca01a 100644 --- a/source/gameengine/Expressions/ErrorValue.h +++ b/source/gameengine/Expressions/ErrorValue.h @@ -36,3 +36,4 @@ private: }; #endif // !defined _ERRORVALUE_H + diff --git a/source/gameengine/Expressions/Expression.h b/source/gameengine/Expressions/Expression.h index f48ac7eb160..10659dca875 100644 --- a/source/gameengine/Expressions/Expression.h +++ b/source/gameengine/Expressions/Expression.h @@ -131,3 +131,4 @@ protected: }; #endif // !defined _EXPRESSION_H + diff --git a/source/gameengine/Expressions/FloatValue.h b/source/gameengine/Expressions/FloatValue.h index 4dce35ebfa0..9a1a1d4ed2b 100644 --- a/source/gameengine/Expressions/FloatValue.h +++ b/source/gameengine/Expressions/FloatValue.h @@ -46,3 +46,4 @@ protected: }; #endif // !defined _FLOATVALUE_H + diff --git a/source/gameengine/Expressions/IfExpr.h b/source/gameengine/Expressions/IfExpr.h index 192edfe8fee..9ab13dca413 100644 --- a/source/gameengine/Expressions/IfExpr.h +++ b/source/gameengine/Expressions/IfExpr.h @@ -47,3 +47,4 @@ public: }; #endif // !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_) + diff --git a/source/gameengine/Expressions/InputParser.h b/source/gameengine/Expressions/InputParser.h index 43832f9c350..4caa47cbb0c 100644 --- a/source/gameengine/Expressions/InputParser.h +++ b/source/gameengine/Expressions/InputParser.h @@ -103,3 +103,4 @@ private: }; #endif + diff --git a/source/gameengine/Expressions/IntValue.h b/source/gameengine/Expressions/IntValue.h index 8174c863895..2361de8b0a9 100644 --- a/source/gameengine/Expressions/IntValue.h +++ b/source/gameengine/Expressions/IntValue.h @@ -58,3 +58,4 @@ private: }; #endif // !defined _INTVALUE_H + diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h index eccd23991bc..e96f0217039 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.h +++ b/source/gameengine/Expressions/KX_HashedPtr.h @@ -51,3 +51,4 @@ public: }; #endif //__KX_HASHEDPTR + diff --git a/source/gameengine/Expressions/KX_Python.h b/source/gameengine/Expressions/KX_Python.h index 705b01aa606..6ba31796e4f 100644 --- a/source/gameengine/Expressions/KX_Python.h +++ b/source/gameengine/Expressions/KX_Python.h @@ -36,3 +36,4 @@ #include "Python.h" #endif // KX_PYTHON_H + diff --git a/source/gameengine/Expressions/KX_Python_dynamic.h b/source/gameengine/Expressions/KX_Python_dynamic.h index 705b01aa606..6ba31796e4f 100644 --- a/source/gameengine/Expressions/KX_Python_dynamic.h +++ b/source/gameengine/Expressions/KX_Python_dynamic.h @@ -36,3 +36,4 @@ #include "Python.h" #endif // KX_PYTHON_H + diff --git a/source/gameengine/Expressions/KX_Python_static.h b/source/gameengine/Expressions/KX_Python_static.h index d147794d8fe..1a9682c8ef4 100644 --- a/source/gameengine/Expressions/KX_Python_static.h +++ b/source/gameengine/Expressions/KX_Python_static.h @@ -36,3 +36,4 @@ #include "Python.h" #endif // KX_PYTHON_H + diff --git a/source/gameengine/Expressions/ListValue.h b/source/gameengine/Expressions/ListValue.h index fce4e9da8c2..337d59e96ac 100644 --- a/source/gameengine/Expressions/ListValue.h +++ b/source/gameengine/Expressions/ListValue.h @@ -75,3 +75,4 @@ private: }; #endif // !defined _LISTVALUE_H + diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/Operator1Expr.h index 9362c568dc9..96b328dd504 100644 --- a/source/gameengine/Expressions/Operator1Expr.h +++ b/source/gameengine/Expressions/Operator1Expr.h @@ -51,3 +51,4 @@ private: }; #endif // !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_) + diff --git a/source/gameengine/Expressions/Operator2Expr.h b/source/gameengine/Expressions/Operator2Expr.h index 7e1dc3ed250..1d1c4d09f22 100644 --- a/source/gameengine/Expressions/Operator2Expr.h +++ b/source/gameengine/Expressions/Operator2Expr.h @@ -57,3 +57,4 @@ private: }; #endif // !defined _OPERATOR2EXPR_H + diff --git a/source/gameengine/Expressions/StringValue.h b/source/gameengine/Expressions/StringValue.h index 6f90536a98b..b824d4ef86d 100644 --- a/source/gameengine/Expressions/StringValue.h +++ b/source/gameengine/Expressions/StringValue.h @@ -49,3 +49,4 @@ private: }; #endif + diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index 8131cc152bc..5b3ad8ffa52 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -462,6 +462,5 @@ protected: STR_String* m_pstrNewName; // Identification }; - - #endif // !defined _VALUEBASECLASS_H + diff --git a/source/gameengine/Expressions/VoidValue.h b/source/gameengine/Expressions/VoidValue.h index 5cf40268b97..68a3270792c 100644 --- a/source/gameengine/Expressions/VoidValue.h +++ b/source/gameengine/Expressions/VoidValue.h @@ -66,3 +66,4 @@ public: }; #endif // !defined _VOIDVALUE_H + diff --git a/source/gameengine/GameLogic/SCA_ANDController.h b/source/gameengine/GameLogic/SCA_ANDController.h index a7d54004f90..f3064e931f2 100644 --- a/source/gameengine/GameLogic/SCA_ANDController.h +++ b/source/gameengine/GameLogic/SCA_ANDController.h @@ -56,3 +56,4 @@ public: }; #endif //__KX_ANDCONTROLLER + diff --git a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h index 0fbf02c5212..3a12987b2f3 100644 --- a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h +++ b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h @@ -45,4 +45,6 @@ public: }; + #endif //__KX_ALWAYSEVENTMGR + diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.h b/source/gameengine/GameLogic/SCA_AlwaysSensor.h index c6ff571be8a..34d57da5cea 100644 --- a/source/gameengine/GameLogic/SCA_AlwaysSensor.h +++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.h @@ -60,3 +60,4 @@ public: }; #endif //__KX_ALWAYSSENSOR + diff --git a/source/gameengine/GameLogic/SCA_EventManager.h b/source/gameengine/GameLogic/SCA_EventManager.h index 30928af5354..67908b9d5c7 100644 --- a/source/gameengine/GameLogic/SCA_EventManager.h +++ b/source/gameengine/GameLogic/SCA_EventManager.h @@ -66,4 +66,6 @@ public: protected: EVENT_MANAGER_TYPE m_mgrtype; }; + #endif + diff --git a/source/gameengine/GameLogic/SCA_ExpressionController.h b/source/gameengine/GameLogic/SCA_ExpressionController.h index 59f8b7a3e04..967307d8473 100644 --- a/source/gameengine/GameLogic/SCA_ExpressionController.h +++ b/source/gameengine/GameLogic/SCA_ExpressionController.h @@ -62,3 +62,4 @@ public: }; #endif //__KX_EXPRESSIONCONTROLLER + diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h index 67dd374b216..6b3d1007079 100644 --- a/source/gameengine/GameLogic/SCA_IActuator.h +++ b/source/gameengine/GameLogic/SCA_IActuator.h @@ -78,4 +78,6 @@ public: bool IsNegativeEvent() const; virtual ~SCA_IActuator(); }; + #endif //__KX_IACTUATOR + diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h index 4f30e5ad71d..31bbca2480a 100644 --- a/source/gameengine/GameLogic/SCA_IController.h +++ b/source/gameengine/GameLogic/SCA_IController.h @@ -53,4 +53,6 @@ public: }; + #endif + diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index 861b4bffb5e..6a8c1397882 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -305,3 +305,4 @@ public: }; #endif //KX_INPUTDEVICE_H + diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h index 9e293136e21..4dcc4f8bc02 100644 --- a/source/gameengine/GameLogic/SCA_ILogicBrick.h +++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h @@ -107,5 +107,5 @@ protected: }; - #endif + diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index e3c06a92b9f..6d874bdb45c 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -119,8 +119,6 @@ public: PyObject* _getattr(char* attr); }; -#endif //SCA_IOBJECT_H - - +#endif //SCA_IOBJECT_H diff --git a/source/gameengine/GameLogic/SCA_IScene.h b/source/gameengine/GameLogic/SCA_IScene.h index a8893fe9c59..f49d4d3004c 100644 --- a/source/gameengine/GameLogic/SCA_IScene.h +++ b/source/gameengine/GameLogic/SCA_IScene.h @@ -59,4 +59,6 @@ public: void AddDebugProperty(class CValue* debugprop, const STR_String &name); }; + #endif //__KX_ISCENE_H + diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h index ef3f037be96..3d99c92be9a 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.h +++ b/source/gameengine/GameLogic/SCA_ISensor.h @@ -128,3 +128,4 @@ public: }; #endif //__SCA_ISENSOR + diff --git a/source/gameengine/GameLogic/SCA_KeyboardManager.h b/source/gameengine/GameLogic/SCA_KeyboardManager.h index 1c665ef2b88..fcdb8ed5c4e 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardManager.h +++ b/source/gameengine/GameLogic/SCA_KeyboardManager.h @@ -64,3 +64,4 @@ public: }; #endif //__KX_KEYBOARDMANAGER + diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h index f9de2a0e715..2badc799206 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h @@ -156,3 +156,4 @@ public: }; #endif //__KX_KEYBOARDSENSOR + diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h index f79b19a0dbf..4447104a0a2 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.h +++ b/source/gameengine/GameLogic/SCA_LogicManager.h @@ -152,3 +152,4 @@ public: }; #endif //__KX_LOGICMANAGER + diff --git a/source/gameengine/GameLogic/SCA_MouseManager.h b/source/gameengine/GameLogic/SCA_MouseManager.h index 9f26a706c17..4c8fe102bfe 100644 --- a/source/gameengine/GameLogic/SCA_MouseManager.h +++ b/source/gameengine/GameLogic/SCA_MouseManager.h @@ -70,3 +70,4 @@ public: }; #endif //__KX_MOUSEMANAGER + diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h index dd6230f421c..5923b1e6b8c 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.h +++ b/source/gameengine/GameLogic/SCA_MouseSensor.h @@ -118,3 +118,4 @@ class SCA_MouseSensor : public SCA_ISensor }; #endif //__KX_MOUSESENSOR + diff --git a/source/gameengine/GameLogic/SCA_ORController.h b/source/gameengine/GameLogic/SCA_ORController.h index 89dab8731ca..e88beb22492 100644 --- a/source/gameengine/GameLogic/SCA_ORController.h +++ b/source/gameengine/GameLogic/SCA_ORController.h @@ -56,3 +56,4 @@ public: }; #endif //__KX_ORCONTROLLER + diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.h b/source/gameengine/GameLogic/SCA_PropertyActuator.h index 7d09a8683cf..5f7fcf9e87f 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.h +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.h @@ -113,4 +113,6 @@ public: /* 5. - ... setObject, getObject, setProp2, getProp2, setMode, getMode*/ }; + #endif //__KX_PROPERTYACTUATOR_DOC + diff --git a/source/gameengine/GameLogic/SCA_PropertyEventManager.h b/source/gameengine/GameLogic/SCA_PropertyEventManager.h index db203b7d92b..2e16ebd0668 100644 --- a/source/gameengine/GameLogic/SCA_PropertyEventManager.h +++ b/source/gameengine/GameLogic/SCA_PropertyEventManager.h @@ -49,4 +49,6 @@ public: virtual void RegisterSensor(SCA_ISensor* sensor); //SCA_LogicManager* GetLogicManager() { return m_logicmgr;} }; + #endif //__KX_PROPERTYEVENTMANAGER + diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.h b/source/gameengine/GameLogic/SCA_PropertySensor.h index 89debebda3d..37f4138c6fc 100644 --- a/source/gameengine/GameLogic/SCA_PropertySensor.h +++ b/source/gameengine/GameLogic/SCA_PropertySensor.h @@ -106,4 +106,6 @@ public: KX_PYMETHOD_DOC(SCA_PropertySensor,SetValue); }; + #endif + diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.h b/source/gameengine/GameLogic/SCA_RandomActuator.h index 236d41c5154..9045dad078c 100644 --- a/source/gameengine/GameLogic/SCA_RandomActuator.h +++ b/source/gameengine/GameLogic/SCA_RandomActuator.h @@ -142,3 +142,4 @@ class SCA_RandomActuator : public SCA_IActuator }; /* end of class KX_EditObjectActuator : public SCA_PropertyActuator */ #endif + diff --git a/source/gameengine/GameLogic/SCA_RandomEventManager.h b/source/gameengine/GameLogic/SCA_RandomEventManager.h index 1014bddcd82..f0832044042 100644 --- a/source/gameengine/GameLogic/SCA_RandomEventManager.h +++ b/source/gameengine/GameLogic/SCA_RandomEventManager.h @@ -50,4 +50,6 @@ public: virtual void NextFrame(double curtime,double deltatime); virtual void RegisterSensor(SCA_ISensor* sensor); }; + #endif //__KX_RANDOMEVENTMGR + diff --git a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h index c6cd52dd3db..75f2dd1bffd 100644 --- a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h +++ b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h @@ -63,3 +63,4 @@ class SCA_RandomNumberGenerator { }; #endif /* __KX_RANDOMNUMBERGENERATOR */ + diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h index 6a77f289be5..41f7f453556 100644 --- a/source/gameengine/GameLogic/SCA_RandomSensor.h +++ b/source/gameengine/GameLogic/SCA_RandomSensor.h @@ -73,3 +73,4 @@ public: }; #endif //__KX_RANDOMSENSOR + diff --git a/source/gameengine/GameLogic/SCA_TimeEventManager.h b/source/gameengine/GameLogic/SCA_TimeEventManager.h index 880659e1a87..fb2f1cee970 100644 --- a/source/gameengine/GameLogic/SCA_TimeEventManager.h +++ b/source/gameengine/GameLogic/SCA_TimeEventManager.h @@ -51,4 +51,6 @@ public: void AddTimeProperty(CValue* timeval); void RemoveTimeProperty(CValue* timeval); }; + #endif //__KX_TIMEEVENTMANAGER + diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index 51061301b55..d406871d970 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -273,3 +273,4 @@ protected: }; #endif // _GPC_CANVAS_H_ + diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.h b/source/gameengine/GamePlayer/common/GPC_Engine.h index ccf2997eba6..6554fb86b53 100644 --- a/source/gameengine/GamePlayer/common/GPC_Engine.h +++ b/source/gameengine/GamePlayer/common/GPC_Engine.h @@ -126,5 +126,5 @@ private: }; - #endif // __GPC_ENGINE_H + diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h index a247de301b9..678200b62d9 100644 --- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h @@ -83,5 +83,5 @@ public: virtual bool ConvertEvent(int incode, int val); }; - #endif // _GPC_KEYBOARDDEVICE_H + diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h index 51e3339a063..150b7808e4b 100644 --- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h +++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h @@ -101,5 +101,5 @@ protected: virtual bool ConvertEvent(KX_EnumInputs kxevent, int eventval); }; - #endif // __GPC_MOUSE_DEVICE_H + diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h index 392e27209e2..11cc040ea1e 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h +++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h @@ -83,5 +83,5 @@ inline GPC_PolygonMaterial::TCachingInfo GPC_PolygonMaterial::GetCachingInfo(voi return GetTFace(); } - #endif // __GPC_POLYGONMATERIAL_H + diff --git a/source/gameengine/GamePlayer/common/GPC_RawImage.h b/source/gameengine/GamePlayer/common/GPC_RawImage.h index ac9dad77d2f..ff4c532dd4d 100644 --- a/source/gameengine/GamePlayer/common/GPC_RawImage.h +++ b/source/gameengine/GamePlayer/common/GPC_RawImage.h @@ -118,5 +118,5 @@ protected: int m_height; }; - #endif // __GPC_RAWIMAGE_H__ + diff --git a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h index b82d24c5705..05b7e3d9c3a 100644 --- a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h +++ b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h @@ -33,8 +33,7 @@ #ifndef __GPC_RAWLOADDOTBLENDARRAY_H #define __GPC_RAWLOADDOTBLENDARRAY_H - void GetRawLoadingAnimation(unsigned char **data, int *dataSize); - #endif // __GPC_RAWLOADDOTBLENDARRAY_H + diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h index 7021e7a4a43..c346003411c 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h @@ -172,5 +172,5 @@ protected: BMF_Font* m_font; }; - #endif // __GPC_RENDERTOOLS_H + diff --git a/source/gameengine/GamePlayer/common/GPC_System.h b/source/gameengine/GamePlayer/common/GPC_System.h index 00720f13072..e102341749d 100644 --- a/source/gameengine/GamePlayer/common/GPC_System.h +++ b/source/gameengine/GamePlayer/common/GPC_System.h @@ -60,5 +60,5 @@ public: // NG_NetworkDeviceInterface* m_ndi; }; - #endif // __GPC_SYSTEM_H + diff --git a/source/gameengine/GamePlayer/common/unix/GPU_Canvas.h b/source/gameengine/GamePlayer/common/unix/GPU_Canvas.h index 5b3309a83bf..6ff1935d9c1 100644 --- a/source/gameengine/GamePlayer/common/unix/GPU_Canvas.h +++ b/source/gameengine/GamePlayer/common/unix/GPU_Canvas.h @@ -58,3 +58,4 @@ public: }; #endif // __GPU_CANVAS_H + diff --git a/source/gameengine/GamePlayer/common/unix/GPU_Engine.h b/source/gameengine/GamePlayer/common/unix/GPU_Engine.h index fe8743f7695..03f9d561b17 100644 --- a/source/gameengine/GamePlayer/common/unix/GPU_Engine.h +++ b/source/gameengine/GamePlayer/common/unix/GPU_Engine.h @@ -61,5 +61,5 @@ private: void AddEventHandlers(); }; - #endif // __GPU_ENGINE_H + diff --git a/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.h b/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.h index 24226bf6bfd..eb1a5a11cf6 100644 --- a/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.h @@ -60,5 +60,5 @@ public: convert_x_keycode_to_kx_keycode(unsigned int key); }; - #endif // _GPU_KEYBOARDDEVICE_H + diff --git a/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h b/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h index a0629c14158..983ed0ade5a 100644 --- a/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h +++ b/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h @@ -55,3 +55,4 @@ public: }; #endif // __GPU_POLYGONMATERIAL_H + diff --git a/source/gameengine/GamePlayer/common/unix/GPU_System.h b/source/gameengine/GamePlayer/common/unix/GPU_System.h index 7a578fb75ad..bf638327ff6 100644 --- a/source/gameengine/GamePlayer/common/unix/GPU_System.h +++ b/source/gameengine/GamePlayer/common/unix/GPU_System.h @@ -47,5 +47,5 @@ public: virtual double GetTimeInSeconds(); }; - #endif // __GPU_SYSTEM_H + diff --git a/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h b/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h index 59e3eef5b10..d08ec3c4fa5 100644 --- a/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h +++ b/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h @@ -114,6 +114,5 @@ protected: void ShowCursor(void); }; - - #endif // _GPW_CANVAS_H_ + diff --git a/source/gameengine/GamePlayer/common/windows/GPW_Engine.h b/source/gameengine/GamePlayer/common/windows/GPW_Engine.h index 7fcd6413e1e..d12b7cddda0 100644 --- a/source/gameengine/GamePlayer/common/windows/GPW_Engine.h +++ b/source/gameengine/GamePlayer/common/windows/GPW_Engine.h @@ -46,5 +46,5 @@ public: bool Initialize(HDC hdc, int width, int height); }; - #endif // __GPW_ENGINE_H + diff --git a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h index 663c0ee2563..495ad956dd9 100644 --- a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h @@ -67,3 +67,4 @@ protected: }; #endif //_GPW_KEYBOARDDEVICE_H_ + diff --git a/source/gameengine/GamePlayer/common/windows/GPW_System.h b/source/gameengine/GamePlayer/common/windows/GPW_System.h index 50b005d8342..e178ce3066a 100644 --- a/source/gameengine/GamePlayer/common/windows/GPW_System.h +++ b/source/gameengine/GamePlayer/common/windows/GPW_System.h @@ -58,5 +58,5 @@ protected: }; - #endif //_GPW_SYSTEM_H_ + diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h index ac502630440..6c215e54857 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.h +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h @@ -135,4 +135,3 @@ protected: SND_IAudioDevice* m_audiodevice; }; - diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h index 12ac3701be8..8da8983bf8c 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h +++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h @@ -62,3 +62,4 @@ public: }; #endif // _GPG_CANVAS_H_ + diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h index 0b77664f4e5..b8e578bcd8f 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h @@ -55,3 +55,4 @@ public: }; #endif //_GPG_KEYBOARDDEVICE_H_ + diff --git a/source/gameengine/GamePlayer/ghost/GPG_System.h b/source/gameengine/GamePlayer/ghost/GPG_System.h index f0bb186d370..d283c683f1d 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_System.h +++ b/source/gameengine/GamePlayer/ghost/GPG_System.h @@ -52,5 +52,5 @@ public: virtual double GetTimeInSeconds(); }; - #endif // _GPG_SYSTEM_H_ + diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h index 521a3b4d030..75715f5569c 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h @@ -57,3 +57,4 @@ public: }; #endif //KX_NETWORK_EVENTMANAGER_H + diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h index 2ab4319821c..2cc8a3d4a4c 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h @@ -74,4 +74,6 @@ public: KX_PYMETHOD(KX_NetworkMessageActuator, SetBody); }; + #endif //__KX_NETWORKMESSAGEACTUATOR_H + diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h index 2c30befd883..8335a8ba7a4 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h @@ -82,4 +82,6 @@ public: }; + #endif //__KX_NETWORKMESSAGE_SENSOR_H + diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectActuator.h index a7800aea8c8..39910963161 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectActuator.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectActuator.h @@ -29,3 +29,4 @@ * * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ + diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectSensor.h index a7800aea8c8..39910963161 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectSensor.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectSensor.h @@ -29,3 +29,4 @@ * * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ + diff --git a/source/gameengine/Ketsji/KX_CDActuator.h b/source/gameengine/Ketsji/KX_CDActuator.h index 48570523f51..3422e9eeefd 100644 --- a/source/gameengine/Ketsji/KX_CDActuator.h +++ b/source/gameengine/Ketsji/KX_CDActuator.h @@ -93,5 +93,6 @@ public: KX_PYMETHOD(KX_CDActuator,SetGain); KX_PYMETHOD(KX_CDActuator,GetGain); }; + #endif //__KX_CDACTUATOR diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h index 0bc80102e45..4a40ff12d7a 100644 --- a/source/gameengine/Ketsji/KX_Camera.h +++ b/source/gameengine/Ketsji/KX_Camera.h @@ -111,4 +111,6 @@ public: /** Gets all camera data. */ RAS_CameraData* GetCameraData(); }; + #endif //__KX_CAMERA + diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h index 1d819864cff..285444a8f38 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.h +++ b/source/gameengine/Ketsji/KX_CameraActuator.h @@ -125,4 +125,6 @@ private : }; + #endif //__KX_CAMERAACTUATOR + diff --git a/source/gameengine/Ketsji/KX_CameraIpoSGController.h b/source/gameengine/Ketsji/KX_CameraIpoSGController.h index 3ebbcc343d4..029aa6d7156 100644 --- a/source/gameengine/Ketsji/KX_CameraIpoSGController.h +++ b/source/gameengine/Ketsji/KX_CameraIpoSGController.h @@ -89,3 +89,4 @@ public: }; #endif // KX_CAMERAIPOSGCONTROLLER_H + diff --git a/source/gameengine/Ketsji/KX_ClientObjectInfo.h b/source/gameengine/Ketsji/KX_ClientObjectInfo.h index 8aec115e44d..0981463ed44 100644 --- a/source/gameengine/Ketsji/KX_ClientObjectInfo.h +++ b/source/gameengine/Ketsji/KX_ClientObjectInfo.h @@ -44,3 +44,4 @@ struct KX_ClientObjectInfo }; #endif //__KX_CLIENTOBJECT_INFO_H + diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h index 247e7ea55f9..70602622ef6 100644 --- a/source/gameengine/Ketsji/KX_ConstraintActuator.h +++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h @@ -106,4 +106,6 @@ class KX_ConstraintActuator : public SCA_IActuator KX_PYMETHOD_DOC(KX_ConstraintActuator,GetLimit); }; + #endif //__KX_CONSTRAINTACTUATOR + diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h index 3211a74192f..9f4bb78bdc4 100644 --- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h +++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h @@ -55,3 +55,4 @@ private: }; #endif //KX_CONSTRAINT_WRAPPER + diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h index 931b9e3d400..47eb449a15b 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h @@ -71,39 +71,32 @@ struct KX_ObjectProperties void KX_ConvertODEEngineObject(KX_GameObject* gameobj, - RAS_MeshObject* meshobj, - KX_Scene* kxscene, - struct PHY_ShapeProps* shapeprops, - struct PHY_MaterialProps* smmaterial, - struct KX_ObjectProperties* objprop); + RAS_MeshObject* meshobj, + KX_Scene* kxscene, + struct PHY_ShapeProps* shapeprops, + struct PHY_MaterialProps* smmaterial, + struct KX_ObjectProperties* objprop); #endif //USE_ODE void KX_ConvertDynamoObject(KX_GameObject* gameobj, - RAS_MeshObject* meshobj, - KX_Scene* kxscene, - struct PHY_ShapeProps* shapeprops, - struct PHY_MaterialProps* smmaterial, - struct KX_ObjectProperties* objprop); - - + RAS_MeshObject* meshobj, + KX_Scene* kxscene, + struct PHY_ShapeProps* shapeprops, + struct PHY_MaterialProps* smmaterial, + struct KX_ObjectProperties* objprop); #ifdef USE_SUMO_SOLID - - - - void KX_ConvertSumoObject( class KX_GameObject* gameobj, - class RAS_MeshObject* meshobj, - class KX_Scene* kxscene, - struct PHY_ShapeProps* shapeprops, - struct PHY_MaterialProps* smmaterial, - struct KX_ObjectProperties* objprop); + class RAS_MeshObject* meshobj, + class KX_Scene* kxscene, + struct PHY_ShapeProps* shapeprops, + struct PHY_MaterialProps* smmaterial, + struct KX_ObjectProperties* objprop); #endif - - #endif //KX_CONVERTPHYSICSOBJECTS + diff --git a/source/gameengine/Ketsji/KX_EmptyObject.h b/source/gameengine/Ketsji/KX_EmptyObject.h index 472cabe047e..b2038eb4816 100644 --- a/source/gameengine/Ketsji/KX_EmptyObject.h +++ b/source/gameengine/Ketsji/KX_EmptyObject.h @@ -42,4 +42,6 @@ public: virtual ~KX_EmptyObject() {}; }; + #endif //__KX_EMPTYOBJECT + diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index c9c9ccafd0d..28cdb8a9045 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -609,6 +609,5 @@ private : }; - #endif //__KX_GAMEOBJECT diff --git a/source/gameengine/Ketsji/KX_IInterpolator.h b/source/gameengine/Ketsji/KX_IInterpolator.h index 974f458681b..6a59f537c8d 100644 --- a/source/gameengine/Ketsji/KX_IInterpolator.h +++ b/source/gameengine/Ketsji/KX_IInterpolator.h @@ -44,3 +44,4 @@ public: typedef std::vector<KX_IInterpolator *> T_InterpolatorList; #endif + diff --git a/source/gameengine/Ketsji/KX_IPOTransform.h b/source/gameengine/Ketsji/KX_IPOTransform.h index 9f9f4a92602..45c6d0d9459 100644 --- a/source/gameengine/Ketsji/KX_IPOTransform.h +++ b/source/gameengine/Ketsji/KX_IPOTransform.h @@ -87,6 +87,3 @@ protected: #endif - - - diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.h b/source/gameengine/Ketsji/KX_IPO_SGController.h index 201a0051881..107d5026370 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.h +++ b/source/gameengine/Ketsji/KX_IPO_SGController.h @@ -108,4 +108,6 @@ public: m_modified = true; } }; + #endif //__IPO_SGCONTROLLER_H + diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.h b/source/gameengine/Ketsji/KX_IPhysicsController.h index 997317c0df5..0ed8cf1ad7d 100644 --- a/source/gameengine/Ketsji/KX_IPhysicsController.h +++ b/source/gameengine/Ketsji/KX_IPhysicsController.h @@ -96,4 +96,6 @@ public: }; + #endif //__KX_IPHYSICSCONTROLLER_H + diff --git a/source/gameengine/Ketsji/KX_IScalarInterpolator.h b/source/gameengine/Ketsji/KX_IScalarInterpolator.h index dd153f77205..f5d23d3e4e0 100644 --- a/source/gameengine/Ketsji/KX_IScalarInterpolator.h +++ b/source/gameengine/Ketsji/KX_IScalarInterpolator.h @@ -40,3 +40,4 @@ public: }; #endif + diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h index fcb73fa8872..41565096176 100644 --- a/source/gameengine/Ketsji/KX_ISceneConverter.h +++ b/source/gameengine/Ketsji/KX_ISceneConverter.h @@ -50,15 +50,17 @@ public: dictobj: python dictionary (for pythoncontrollers) */ virtual void ConvertScene(const STR_String& scenename, - class KX_Scene* destinationscene, - PyObject* dictobj, - class SCA_IInputDevice* keyinputdev, - class RAS_IRenderTools* rendertools, - class RAS_ICanvas* canvas)=0; + class KX_Scene* destinationscene, + PyObject* dictobj, + class SCA_IInputDevice* keyinputdev, + class RAS_IRenderTools* rendertools, + class RAS_ICanvas* canvas)=0; virtual void SetAlwaysUseExpandFraming(bool to_what) = 0; virtual void SetNewFileName(const STR_String& filename) = 0; virtual bool TryAndLoadNewFile() = 0; }; + #endif //__KX_ISCENECONVERTER_H + diff --git a/source/gameengine/Ketsji/KX_ISystem.h b/source/gameengine/Ketsji/KX_ISystem.h index 1ab3e521418..bf404bd3af7 100644 --- a/source/gameengine/Ketsji/KX_ISystem.h +++ b/source/gameengine/Ketsji/KX_ISystem.h @@ -53,3 +53,4 @@ public: }; #endif + diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h index 134de3817b4..e5cd1b943a8 100644 --- a/source/gameengine/Ketsji/KX_IpoActuator.h +++ b/source/gameengine/Ketsji/KX_IpoActuator.h @@ -139,3 +139,4 @@ public: }; #endif //__KX_IPOACTUATOR + diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h index 0ee91040c84..311780af755 100644 --- a/source/gameengine/Ketsji/KX_Light.h +++ b/source/gameengine/Ketsji/KX_Light.h @@ -48,3 +48,4 @@ public: }; #endif //__KX_LIGHT + diff --git a/source/gameengine/Ketsji/KX_LightIpoSGController.h b/source/gameengine/Ketsji/KX_LightIpoSGController.h index 2b115fcc00f..459d091ce80 100644 --- a/source/gameengine/Ketsji/KX_LightIpoSGController.h +++ b/source/gameengine/Ketsji/KX_LightIpoSGController.h @@ -97,3 +97,4 @@ public: }; #endif // KX_LIGHTIPOSGCONTROLLER_H + diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h index a6c5b7558a2..63feb220f67 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.h +++ b/source/gameengine/Ketsji/KX_MeshProxy.h @@ -63,4 +63,6 @@ public: KX_PYMETHOD(KX_MeshProxy,GetVertexArrayLength); KX_PYMETHOD(KX_MeshProxy,GetVertex); }; + #endif //__KX_MESHPROXY + diff --git a/source/gameengine/Ketsji/KX_MotionState.h b/source/gameengine/Ketsji/KX_MotionState.h index 3d0f9bd40be..d62dc1ed097 100644 --- a/source/gameengine/Ketsji/KX_MotionState.h +++ b/source/gameengine/Ketsji/KX_MotionState.h @@ -52,3 +52,4 @@ public: }; #endif //__KX_MOTIONSTATE + diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h index 590f69a81b3..23631711aff 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h @@ -150,3 +150,4 @@ class KX_MouseFocusSensor : public SCA_MouseSensor }; #endif //__KX_MOUSESENSOR + diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h index c87889f1ab7..33ec14ba2f2 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.h +++ b/source/gameengine/Ketsji/KX_NearSensor.h @@ -58,4 +58,6 @@ public: virtual PyObject* _getattr(char *attr); }; + #endif //KX_NEARSENSOR_H + diff --git a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h index df4d8d3bb4f..fe66de14848 100644 --- a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h +++ b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h @@ -75,3 +75,4 @@ public: }; #endif // KX_OBCOLORIPOSGCONTROLLER_H + diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h index d7d780d1f3c..204b2c43a09 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.h +++ b/source/gameengine/Ketsji/KX_ObjectActuator.h @@ -137,4 +137,6 @@ public: KX_PYMETHOD(KX_ObjectActuator,GetAngularVelocity); KX_PYMETHOD(KX_ObjectActuator,SetAngularVelocity); }; + #endif //__KX_OBJECTACTUATOR + diff --git a/source/gameengine/Ketsji/KX_OdePhysicsController.h b/source/gameengine/Ketsji/KX_OdePhysicsController.h index 89141f68488..314803ddbe9 100644 --- a/source/gameengine/Ketsji/KX_OdePhysicsController.h +++ b/source/gameengine/Ketsji/KX_OdePhysicsController.h @@ -97,4 +97,6 @@ public: }; }; + #endif //__KX_ODEPHYSICSCONTROLLER_H + diff --git a/source/gameengine/Ketsji/KX_OrientationInterpolator.h b/source/gameengine/Ketsji/KX_OrientationInterpolator.h index 9e65e72b125..1fb91ef785d 100644 --- a/source/gameengine/Ketsji/KX_OrientationInterpolator.h +++ b/source/gameengine/Ketsji/KX_OrientationInterpolator.h @@ -56,3 +56,4 @@ private: }; #endif + diff --git a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h index c9dd613da00..9f6bd6d8f0b 100644 --- a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h +++ b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h @@ -42,3 +42,4 @@ enum e_PhysicsEngine }; #endif //__KX_PHYSICSENGINEENUMS + diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h index de384cb5932..e1a8d20b1a1 100644 --- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h +++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h @@ -56,3 +56,4 @@ private: }; #endif //PHYP_PHYSICSOBJECT_WRAPPER + diff --git a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h index 84a9133d471..09d9cffce98 100644 --- a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h +++ b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h @@ -58,3 +58,4 @@ struct KX_MaterialProps { }; #endif //KX_PROPSH + diff --git a/source/gameengine/Ketsji/KX_PositionInterpolator.h b/source/gameengine/Ketsji/KX_PositionInterpolator.h index cdc8192528a..71f5b354088 100644 --- a/source/gameengine/Ketsji/KX_PositionInterpolator.h +++ b/source/gameengine/Ketsji/KX_PositionInterpolator.h @@ -56,3 +56,4 @@ private: }; #endif + diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.h b/source/gameengine/Ketsji/KX_PyConstraintBinding.h index f584649b579..0afa049d9e2 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.h +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.h @@ -41,3 +41,4 @@ void PHY_RemovePythonConstraintBinding(); void PHY_SetActiveEnvironment(class PHY_IPhysicsEnvironment* env); #endif //PHY_PYTHON_CONSTRAINTBINDING + diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h index f5de003c6a6..7999014991a 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.h +++ b/source/gameengine/Ketsji/KX_PythonInit.h @@ -51,5 +51,5 @@ void exitGamePythonScripting(); void exitGamePythonScripting(); void PHY_SetActiveScene(class KX_Scene* scene); - #endif //__KX_PYTHON_INIT + diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h index 3a69c6565b2..77e085d29a3 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.h +++ b/source/gameengine/Ketsji/KX_RadarSensor.h @@ -91,3 +91,4 @@ public: }; #endif //__KX_RADAR_SENSOR_H + diff --git a/source/gameengine/Ketsji/KX_RayEventManager.h b/source/gameengine/Ketsji/KX_RayEventManager.h index abfbf6cb0f8..c982abac5eb 100644 --- a/source/gameengine/Ketsji/KX_RayEventManager.h +++ b/source/gameengine/Ketsji/KX_RayEventManager.h @@ -49,4 +49,6 @@ public: virtual void NextFrame(double curtime,double deltatime); virtual void RegisterSensor(SCA_ISensor* sensor); }; + #endif //__KX_RAYEVENTMGR + diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h index 7eb16bd6d5b..4a783b398b4 100644 --- a/source/gameengine/Ketsji/KX_RaySensor.h +++ b/source/gameengine/Ketsji/KX_RaySensor.h @@ -76,4 +76,6 @@ public: virtual PyObject* _getattr(char *attr); }; + #endif //__KX_RAYSENSOR_H + diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h index 9810669034c..d5176bcd38e 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h @@ -127,7 +127,3 @@ public: #endif - - - - diff --git a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h index 39ee911b48f..60c97322223 100644 --- a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h @@ -78,3 +78,4 @@ class KX_SCA_EndObjectActuator : public SCA_IActuator }; /* end of class KX_EditObjectActuator : public SCA_PropertyActuator */ #endif + diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h index ada21d06847..e0bb2c0a9b8 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h @@ -86,3 +86,4 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator }; #endif + diff --git a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h index c6c3dbaf315..33dd0323370 100644 --- a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h +++ b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h @@ -199,16 +199,3 @@ private : }; - - - - - - - - - - - - - diff --git a/source/gameengine/Ketsji/KX_ScalarInterpolator.h b/source/gameengine/Ketsji/KX_ScalarInterpolator.h index 85c8900e8ab..72e8203d3c4 100644 --- a/source/gameengine/Ketsji/KX_ScalarInterpolator.h +++ b/source/gameengine/Ketsji/KX_ScalarInterpolator.h @@ -61,3 +61,4 @@ private: }; #endif + diff --git a/source/gameengine/Ketsji/KX_ScalingInterpolator.h b/source/gameengine/Ketsji/KX_ScalingInterpolator.h index fd7e00d7b24..25c5cc87d83 100644 --- a/source/gameengine/Ketsji/KX_ScalingInterpolator.h +++ b/source/gameengine/Ketsji/KX_ScalingInterpolator.h @@ -57,5 +57,3 @@ private: #endif - - diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h index a9f3751322e..38de267092c 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.h +++ b/source/gameengine/Ketsji/KX_SceneActuator.h @@ -113,3 +113,4 @@ class KX_SceneActuator : public SCA_IActuator }; /* end of class KXSceneActuator */ #endif + diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h index 1ebc3ef5250..0ae1ef39d97 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.h +++ b/source/gameengine/Ketsji/KX_SoundActuator.h @@ -102,5 +102,6 @@ public: KX_PYMETHOD(KX_SoundActuator,SetVelocity); KX_PYMETHOD(KX_SoundActuator,SetOrientation); }; + #endif //__KX_SOUNDACTUATOR diff --git a/source/gameengine/Ketsji/KX_SumoPhysicsController.h b/source/gameengine/Ketsji/KX_SumoPhysicsController.h index b1019b0c19b..523e139fc69 100644 --- a/source/gameengine/Ketsji/KX_SumoPhysicsController.h +++ b/source/gameengine/Ketsji/KX_SumoPhysicsController.h @@ -78,4 +78,6 @@ public: }; + #endif //__KX_SUMOPHYSICSCONTROLLER_H + diff --git a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h index ce4c7f37c0f..b96b1202f4c 100644 --- a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h +++ b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h @@ -131,3 +131,4 @@ protected: }; #endif // __KX_TIME_CATEGORY_LOGGER_H + diff --git a/source/gameengine/Ketsji/KX_TimeLogger.h b/source/gameengine/Ketsji/KX_TimeLogger.h index a802ed1a93a..a251e323d4c 100644 --- a/source/gameengine/Ketsji/KX_TimeLogger.h +++ b/source/gameengine/Ketsji/KX_TimeLogger.h @@ -105,3 +105,4 @@ protected: }; #endif // __KX_TIME_LOGGER_H + diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.h b/source/gameengine/Ketsji/KX_TouchEventManager.h index 4575814986f..e92a046d488 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.h +++ b/source/gameengine/Ketsji/KX_TouchEventManager.h @@ -55,13 +55,3 @@ public: #endif //__KX_TOUCHEVENTMANAGER - - - - - - - - - - diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index 123f7041968..35b23ecc60a 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -142,5 +142,3 @@ public: #endif //__KX_TOUCHSENSOR - - diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h index cbb9892706e..f549969a9f9 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.h +++ b/source/gameengine/Ketsji/KX_TrackToActuator.h @@ -83,3 +83,4 @@ class KX_TrackToActuator : public SCA_IActuator }; /* end of class KX_TrackToActuator : public KX_EditObjectActuator */ #endif + diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h index f23a2d6941c..8226c2b4558 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.h +++ b/source/gameengine/Ketsji/KX_VertexProxy.h @@ -67,4 +67,6 @@ public: KX_PYMETHOD(KX_VertexProxy,SetNormal); }; + #endif //__KX_VERTEXPROXY + diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.h b/source/gameengine/Ketsji/KX_VisibilityActuator.h index 1c079eee967..7e9a0aeca75 100644 --- a/source/gameengine/Ketsji/KX_VisibilityActuator.h +++ b/source/gameengine/Ketsji/KX_VisibilityActuator.h @@ -78,3 +78,4 @@ class KX_VisibilityActuator : public SCA_IActuator }; #endif + diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h index 7bcf4bb1589..c76fa188f7c 100644 --- a/source/gameengine/Ketsji/KX_WorldInfo.h +++ b/source/gameengine/Ketsji/KX_WorldInfo.h @@ -63,3 +63,4 @@ public: }; #endif //__KX_WORLDINFO_H + diff --git a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h index ad87b232794..bedf27b292b 100644 --- a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h +++ b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h @@ -66,3 +66,4 @@ public: }; #endif //NG_LOOPBACKNETWORKDEVICEINTERFACE_H + diff --git a/source/gameengine/Network/NG_NetworkDeviceInterface.h b/source/gameengine/Network/NG_NetworkDeviceInterface.h index f6f8b0e8631..c191cf41278 100644 --- a/source/gameengine/Network/NG_NetworkDeviceInterface.h +++ b/source/gameengine/Network/NG_NetworkDeviceInterface.h @@ -83,3 +83,4 @@ public: }; #endif //NG_NETWORKDEVICEINTERFACE_H + diff --git a/source/gameengine/Network/NG_NetworkMessage.h b/source/gameengine/Network/NG_NetworkMessage.h index 72abb3e4a71..b3efea402b2 100644 --- a/source/gameengine/Network/NG_NetworkMessage.h +++ b/source/gameengine/Network/NG_NetworkMessage.h @@ -128,3 +128,4 @@ public: }; #endif //NG_NETWORKMESSAGE_H + diff --git a/source/gameengine/Network/NG_NetworkObject.h b/source/gameengine/Network/NG_NetworkObject.h index d276ab6a25a..b5499010512 100644 --- a/source/gameengine/Network/NG_NetworkObject.h +++ b/source/gameengine/Network/NG_NetworkObject.h @@ -45,3 +45,4 @@ public: }; #endif //NG_NETWORKOBJECT_H + diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h index 487934205ec..62546429e67 100644 --- a/source/gameengine/Network/NG_NetworkScene.h +++ b/source/gameengine/Network/NG_NetworkScene.h @@ -100,3 +100,4 @@ protected: }; #endif //__NG_NETWORKSCENE_H + diff --git a/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h b/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h index b430b72d985..9e92b4f78ed 100644 --- a/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h +++ b/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h @@ -68,3 +68,4 @@ public: }; #endif //NG_TERRAPLAYNETWORKDEVICEINTERFACE_H + diff --git a/source/gameengine/Physics/BlOde/OdePhysicsController.h b/source/gameengine/Physics/BlOde/OdePhysicsController.h index 659a951a071..673bea1bed7 100644 --- a/source/gameengine/Physics/BlOde/OdePhysicsController.h +++ b/source/gameengine/Physics/BlOde/OdePhysicsController.h @@ -146,5 +146,3 @@ private: #endif //__ODE_PHYSICSCONTROLLER_H - - diff --git a/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h b/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h index b9872246afc..78e8853f2f4 100644 --- a/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h +++ b/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h @@ -68,6 +68,3 @@ private: #endif //_ODEPHYSICSENVIRONMENT - - - diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h index 874b747849d..2980bc9bd83 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h @@ -66,5 +66,3 @@ public: #endif //_DUMMYPHYSICSENVIRONMENT - - diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_ClientObjectInfo.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_ClientObjectInfo.h index 2063892e671..9e1ec5167bb 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_ClientObjectInfo.h +++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_ClientObjectInfo.h @@ -13,3 +13,4 @@ struct SM_ClientObjectInfo }; #endif //__SM_CLIENTOBJECT_INFO_H + diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h index 4aac43f6712..36ba075eeff 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h +++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h @@ -18,9 +18,9 @@ public: SM_Object *getClientObject() const { return m_client_object; } static void ray_hit(void *client_data, - void *object1, - void *object2, - const DT_CollData *coll_data); + void *object1, + void *object2, + const DT_CollData *coll_data); private: MT_Vector3 m_ray; @@ -30,7 +30,3 @@ private: #endif - - - - diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_MotionState.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_MotionState.h index 9c6a9ddaec2..92cecbdebaa 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_MotionState.h +++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_MotionState.h @@ -34,3 +34,4 @@ protected: }; #endif + diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h index 670da6e71db..b81d8a7b81e 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h +++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h @@ -278,3 +278,4 @@ private: }; #endif + diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Props.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Props.h index 0b2efacac2a..fb3f13c7b96 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Props.h +++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Props.h @@ -58,3 +58,4 @@ struct SM_MaterialProps { }; #endif //SM_PROPSH + diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h index 761e6c7c449..1d4a4afc721 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h +++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h @@ -127,3 +127,4 @@ private: }; #endif + diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsController.h b/source/gameengine/Physics/Sumo/SumoPhysicsController.h index d78c21dbd1b..5b15385cf55 100644 --- a/source/gameengine/Physics/Sumo/SumoPhysicsController.h +++ b/source/gameengine/Physics/Sumo/SumoPhysicsController.h @@ -168,4 +168,3 @@ private: #endif //__SUMO_PHYSICSCONTROLLER_H - diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h index 0e28b855833..1109ba0e738 100644 --- a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h +++ b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h @@ -84,5 +84,3 @@ private: #endif //_SUMOPhysicsEnvironment - - diff --git a/source/gameengine/Physics/Sumo/include/solid.h b/source/gameengine/Physics/Sumo/include/solid.h index 985014a2a46..00f282ed2a7 100644 --- a/source/gameengine/Physics/Sumo/include/solid.h +++ b/source/gameengine/Physics/Sumo/include/solid.h @@ -193,3 +193,4 @@ extern int DT_ObjectRayTest(DT_ObjectHandle object, #endif #endif + diff --git a/source/gameengine/Physics/Sumo/include/solid_broadphase.h b/source/gameengine/Physics/Sumo/include/solid_broadphase.h index d5d05e8a243..20847898091 100644 --- a/source/gameengine/Physics/Sumo/include/solid_broadphase.h +++ b/source/gameengine/Physics/Sumo/include/solid_broadphase.h @@ -36,3 +36,4 @@ extern void BP_SetBBox(BP_ProxyHandle proxy, #endif #endif + diff --git a/source/gameengine/Physics/Sumo/include/solid_types.h b/source/gameengine/Physics/Sumo/include/solid_types.h index 537bbcb5826..64b345c1e09 100644 --- a/source/gameengine/Physics/Sumo/include/solid_types.h +++ b/source/gameengine/Physics/Sumo/include/solid_types.h @@ -12,3 +12,4 @@ typedef DT_Scalar DT_Vector3[3]; typedef DT_Scalar DT_Quaternion[4]; #endif + diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h index 4b10a29e1e7..0b3b25ee8f1 100644 --- a/source/gameengine/Physics/common/PHY_DynamicTypes.h +++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h @@ -66,3 +66,4 @@ typedef enum PHY_ConstraintType { typedef float PHY_Vector3[3]; #endif //__PHY_DYNAMIC_TYPES + diff --git a/source/gameengine/Physics/common/PHY_IMotionState.h b/source/gameengine/Physics/common/PHY_IMotionState.h index 6dd97427b59..9a3ac2e6f74 100644 --- a/source/gameengine/Physics/common/PHY_IMotionState.h +++ b/source/gameengine/Physics/common/PHY_IMotionState.h @@ -55,3 +55,4 @@ class PHY_IMotionState }; #endif //PHY__MOTIONSTATE_H + diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h index e8309c0ca40..69dbd6bfa60 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsController.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h @@ -87,3 +87,4 @@ class PHY_IPhysicsController }; #endif //PHY_IPHYSICSCONTROLLER_H + diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h index 5867e27ce42..e3876efd1dc 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h @@ -58,3 +58,4 @@ class PHY_IPhysicsEnvironment }; #endif //_IPHYSICSENVIRONMENT + diff --git a/source/gameengine/Physics/common/PHY_Pro.h b/source/gameengine/Physics/common/PHY_Pro.h index 58f3badaff6..dddd93df7b4 100644 --- a/source/gameengine/Physics/common/PHY_Pro.h +++ b/source/gameengine/Physics/common/PHY_Pro.h @@ -58,3 +58,4 @@ struct PHY_MaterialProps { }; #endif //PHY_PROPSH + diff --git a/source/gameengine/Rasterizer/RAS_CameraData.h b/source/gameengine/Rasterizer/RAS_CameraData.h index 5c9b1dd0e88..b136aedf405 100644 --- a/source/gameengine/Rasterizer/RAS_CameraData.h +++ b/source/gameengine/Rasterizer/RAS_CameraData.h @@ -40,3 +40,4 @@ struct RAS_CameraData }; #endif //__RAS_CAMERADATA_H + diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h index 581c6b56fc9..8b3cc1b2f19 100644 --- a/source/gameengine/Rasterizer/RAS_FramingManager.h +++ b/source/gameengine/Rasterizer/RAS_FramingManager.h @@ -253,3 +253,4 @@ private : }; #endif + diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h index 8060313b4be..f1f2a8bcf62 100644 --- a/source/gameengine/Rasterizer/RAS_ICanvas.h +++ b/source/gameengine/Rasterizer/RAS_ICanvas.h @@ -169,4 +169,6 @@ public: const char* filename )=0; }; + #endif //__RAS_ICANVAS + diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h index dd5fadab008..0855c74f9dd 100644 --- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h +++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h @@ -119,5 +119,5 @@ inline bool operator ==( const RAS_IPolyMaterial & rhs,const RAS_IPolyMaterial return ( rhs.Equals(lhs)); } - #endif //__RAS_IPOLYGONMATERIAL + diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h index ac9033c7186..2fafed4cfa8 100644 --- a/source/gameengine/Rasterizer/RAS_IRenderTools.h +++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h @@ -194,3 +194,4 @@ public: }; #endif //__RAS_IRENDERTOOLS + diff --git a/source/gameengine/Rasterizer/RAS_LightObject.h b/source/gameengine/Rasterizer/RAS_LightObject.h index cd2014ba678..0c313df80c8 100644 --- a/source/gameengine/Rasterizer/RAS_LightObject.h +++ b/source/gameengine/Rasterizer/RAS_LightObject.h @@ -61,3 +61,4 @@ struct RAS_LightObject }; #endif //__RAS_LIGHTOBJECT_H + diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h index 06b1261c532..6e5307ca5ed 100644 --- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h +++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h @@ -122,5 +122,5 @@ public: const MT_Vector4& rgbavec); }; - #endif //__KX_BUCKET + diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h index 95a2858d7bf..ad4bbb4bbb2 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.h +++ b/source/gameengine/Rasterizer/RAS_MeshObject.h @@ -228,3 +228,4 @@ public: }; #endif //__RAS_MESHOBJECT + diff --git a/source/gameengine/Rasterizer/RAS_ObjectColor.h b/source/gameengine/Rasterizer/RAS_ObjectColor.h index 217ca9c8343..1592fc57e77 100644 --- a/source/gameengine/Rasterizer/RAS_ObjectColor.h +++ b/source/gameengine/Rasterizer/RAS_ObjectColor.h @@ -39,3 +39,4 @@ struct RAS_ObjectColor { }; #endif //__RAS_OBJECTCOLOR_H + diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.h index f9edafb7d2e..b87abb9c3dd 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.h @@ -35,3 +35,4 @@ bool RAS_SystemSupportsVertexArrays(); #endif //__RAS_CHECKVERTEXARRAYS + diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h index 9bbb19e8aa5..58573bdf5a7 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h @@ -224,3 +224,4 @@ public: }; #endif //__RAS_OPENGLRASTERIZER + diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h index f2500e02dde..6a44d36277b 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h @@ -47,12 +47,12 @@ public: virtual void SetDrawingMode(int drawingmode); virtual void IndexPrimitives( const vecVertexArray& vertexarrays, - const vecIndexArrays & indexarrays, - int mode, - class RAS_IPolyMaterial* polymat, - class RAS_IRenderTools* rendertools, - bool useObjectColor, - const MT_Vector4& rgbacolor); + const vecIndexArrays & indexarrays, + int mode, + class RAS_IPolyMaterial* polymat, + class RAS_IRenderTools* rendertools, + bool useObjectColor, + const MT_Vector4& rgbacolor); virtual void EnableTextures(bool enable); @@ -60,3 +60,4 @@ public: }; #endif //__KX_VERTEXARRAYOPENGLRASTERIZER + diff --git a/source/gameengine/Rasterizer/RAS_Polygon.h b/source/gameengine/Rasterizer/RAS_Polygon.h index d5b6123e153..7c1c0bd7093 100644 --- a/source/gameengine/Rasterizer/RAS_Polygon.h +++ b/source/gameengine/Rasterizer/RAS_Polygon.h @@ -89,4 +89,6 @@ public: RAS_MaterialBucket* GetMaterial(); }; + #endif + diff --git a/source/gameengine/Rasterizer/RAS_Rect.h b/source/gameengine/Rasterizer/RAS_Rect.h index 448a5ec73c1..b15e039b52c 100644 --- a/source/gameengine/Rasterizer/RAS_Rect.h +++ b/source/gameengine/Rasterizer/RAS_Rect.h @@ -95,5 +95,5 @@ public: } }; - #endif // _RAS_RECT + diff --git a/source/gameengine/Rasterizer/RAS_TexMatrix.h b/source/gameengine/Rasterizer/RAS_TexMatrix.h index c4d02c49154..619d2751e5d 100644 --- a/source/gameengine/Rasterizer/RAS_TexMatrix.h +++ b/source/gameengine/Rasterizer/RAS_TexMatrix.h @@ -43,3 +43,4 @@ void RAS_CalcTexMatrix(RAS_TexVert p[3],MT_Point3& origin,MT_Vector3& udir,MT_Vector3& vdir); #endif //__RASTEXMATRIX + diff --git a/source/gameengine/Rasterizer/RAS_TexVert.h b/source/gameengine/Rasterizer/RAS_TexVert.h index ebbd35fb91c..9b16e37a97d 100644 --- a/source/gameengine/Rasterizer/RAS_TexVert.h +++ b/source/gameengine/Rasterizer/RAS_TexVert.h @@ -96,3 +96,4 @@ public: }; #endif //__RAS_TEXVERT + diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h index 9753af45a99..99cc62344f2 100644 --- a/source/gameengine/SceneGraph/SG_Controller.h +++ b/source/gameengine/SceneGraph/SG_Controller.h @@ -114,3 +114,4 @@ protected: }; #endif //__SG_CONTROLLER_H + diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h index f9066a9b340..ac2fe9ed9f6 100644 --- a/source/gameengine/SceneGraph/SG_IObject.h +++ b/source/gameengine/SceneGraph/SG_IObject.h @@ -218,3 +218,4 @@ protected : }; #endif //__SG_IOBJECT + diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h index a42afefcf1e..e1b40c32ed3 100644 --- a/source/gameengine/SceneGraph/SG_Node.h +++ b/source/gameengine/SceneGraph/SG_Node.h @@ -205,4 +205,6 @@ private: SG_Node* m_SGparent; }; + #endif //__SG_NODE_H + diff --git a/source/gameengine/SceneGraph/SG_ParentRelation.h b/source/gameengine/SceneGraph/SG_ParentRelation.h index 5df8efe7027..b26c4758480 100644 --- a/source/gameengine/SceneGraph/SG_ParentRelation.h +++ b/source/gameengine/SceneGraph/SG_ParentRelation.h @@ -114,3 +114,4 @@ protected : }; #endif + diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h index ff54c4055be..2aa422a65fd 100644 --- a/source/gameengine/SceneGraph/SG_Spatial.h +++ b/source/gameengine/SceneGraph/SG_Spatial.h @@ -202,4 +202,6 @@ protected: ); }; + #endif //__SG_SPATIAL_H + |