style cleanup - remove unneeded ';'s

source/gameengine/BlenderRoutines/KX_BlenderSystem.h

@@ -45,7 +45,7 @@ class KX_BlenderSystem : public KX_ISystem
 
 public:
 	KX_BlenderSystem();
-	virtual ~KX_BlenderSystem() {};
+	virtual ~KX_BlenderSystem() {}
 	virtual double GetTimeInSeconds();
 
 #ifdef WITH_CXX_GUARDEDALLOC

source/gameengine/Converter/BL_MeshDeformer.h

@@ -63,16 +63,16 @@ public:
 		m_lastDeformUpdate(-1)
 	{};
 	virtual ~BL_MeshDeformer();
-	virtual void SetSimulatedTime(double time){};
+	virtual void SetSimulatedTime(double time){}
 	virtual bool Apply(class RAS_IPolyMaterial *mat);
-	virtual bool Update(void){ return false; };
-	virtual bool UpdateBuckets(void){ return false; };
-	virtual	RAS_Deformer*	GetReplica(){return NULL;};
+	virtual bool Update(void){ return false; }
+	virtual bool UpdateBuckets(void){ return false; }
+	virtual	RAS_Deformer*	GetReplica(){return NULL;}
 	virtual void ProcessReplica();
-	struct Mesh* GetMesh() { return m_bmesh; };
-	virtual class RAS_MeshObject* GetRasMesh() { return (RAS_MeshObject*)m_pMeshObject; };
+	struct Mesh* GetMesh() { return m_bmesh; }
+	virtual class RAS_MeshObject* GetRasMesh() { return (RAS_MeshObject*)m_pMeshObject; }
 	virtual float (* GetTransVerts(int *tot))[3]	{	*tot= m_tvtot; return m_transverts; }
-	//	virtual void InitDeform(double time){};
+	//	virtual void InitDeform(double time){}
 
 protected:
 	class RAS_MeshObject*		m_pMeshObject;

source/gameengine/Converter/KX_BlenderScalarInterpolator.h

@@ -48,7 +48,7 @@ public:
 	virtual ~BL_ScalarInterpolator() {}
 	
 	virtual float GetValue(float currentTime) const;
-	struct FCurve *GetFCurve() { return m_fcu;};
+	struct FCurve *GetFCurve() { return m_fcu; }
 
 private:
 	struct FCurve *m_fcu;

source/gameengine/Converter/KX_BlenderSceneConverter.h

@@ -143,7 +143,7 @@ public:
 
 	struct Scene* GetBlenderSceneForName(const STR_String& name);
 
-//	struct Main* GetMain() { return m_maggie; };
+//	struct Main* GetMain() { return m_maggie; }
 	struct Main*		  GetMainDynamicPath(const char *path);
 	vector<struct Main*> &GetMainDynamic();
 	

source/gameengine/Expressions/Operator1Expr.h

@@ -31,7 +31,7 @@ public:
 	virtual bool MergeExpression(CExpression* otherexpr);
 	virtual void BroadcastOperators(VALUE_OPERATOR op);
 
-	virtual unsigned char GetExpressionID() { return COPERATOR1EXPRESSIONID;};
+	virtual unsigned char GetExpressionID() { return COPERATOR1EXPRESSIONID; }
 	CExpression* CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks);
 	//virtual bool IsInside(float x,float y,float z,bool bBorderInclude = true);
 	virtual	bool NeedsRecalculated();

source/gameengine/Expressions/Operator2Expr.h

@@ -29,7 +29,7 @@ class COperator2Expr : public CExpression
 
 public:
 	virtual bool MergeExpression(CExpression* otherexpr);
-	virtual unsigned char GetExpressionID() { return COPERATOR2EXPRESSIONID;};
+	virtual unsigned char GetExpressionID() { return COPERATOR2EXPRESSIONID; }
 	virtual void BroadcastOperators(VALUE_OPERATOR op);
 	CExpression* CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks);
 	//virtual bool IsInside(float x,float y,float z,bool bBorderInclude=true);

source/gameengine/GameLogic/SCA_LogicManager.h

@@ -127,8 +127,8 @@ public:
 	// for the scripting... needs a FactoryManager later (if we would have time... ;)
 	void	RegisterMeshName(const STR_String& meshname,void* mesh);
 	void	UnregisterMeshName(const STR_String& meshname,void* mesh);
-	CTR_Map<STR_HashedString,void*>&	GetMeshMap() { return m_mapStringToMeshes; };
-	CTR_Map<STR_HashedString,void*>&	GetActionMap() { return m_mapStringToActions; };
+	CTR_Map<STR_HashedString,void*>&	GetMeshMap() { return m_mapStringToMeshes; }
+	CTR_Map<STR_HashedString,void*>&	GetActionMap() { return m_mapStringToActions; }
 	
 	void	RegisterActionName(const STR_String& actname,void* action);
 

source/gameengine/GamePlayer/ghost/GPG_Canvas.h

@@ -55,14 +55,14 @@ public:
 	virtual void SetMousePosition(int x, int y);
 	virtual void SetMouseState(RAS_MouseState mousestate);
 	virtual void SwapBuffers();
-	virtual int GetMouseX(int x){return x;};
-	virtual int GetMouseY(int y){return y;};
+	virtual int GetMouseX(int x) { return x; }
+	virtual int GetMouseY(int y) { return y; }
 	virtual float GetMouseNormalizedX(int x);
 	virtual float GetMouseNormalizedY(int y);
 
 	virtual void ResizeWindow(int width, int height);
 
-	bool BeginDraw() { return true;};
+	bool BeginDraw() { return true; }
 	void EndDraw() {};
 };
 

source/gameengine/Ketsji/BL_Action.cpp

@@ -25,6 +25,7 @@
  */
 
 #include <cstdlib>
+#include <stdio.h>
 
 #include "BL_Action.h"
 #include "BL_ArmatureObject.h"

source/gameengine/Ketsji/BL_Shader.h

@@ -194,7 +194,7 @@ public:
 	bool				Ok()const;
 	unsigned int		GetProg();
 	void				SetProg(bool enable);
-	int					GetAttribute(){return mAttr;};
+	int					GetAttribute() { return mAttr; }
 
 	// -- 
 	// Apply methods : sets colected uniforms

source/gameengine/Ketsji/KX_ConstraintWrapper.h

@@ -41,7 +41,7 @@ class	KX_ConstraintWrapper : public PyObjectPlus
 public:
 	KX_ConstraintWrapper(PHY_ConstraintType ctype,int constraintId,class PHY_IPhysicsEnvironment* physenv);
 	virtual ~KX_ConstraintWrapper ();
-	int			getConstraintId() { return m_constraintId;};
+	int			getConstraintId() { return m_constraintId; }
 	
 #ifdef WITH_PYTHON
 	KX_PYMETHOD_NOARGS(KX_ConstraintWrapper,GetConstraintId);

source/gameengine/Ketsji/KX_Dome.h

@@ -112,7 +112,7 @@ public:
 	int nfacestop, nfacesbottom, nfacesleft, nfacesright, nfacesfront, nfacesback;
 	int nfacesleftback, nfacesrightback;
 
-	int GetNumberRenders(){return m_numfaces;};
+	int GetNumberRenders() { return m_numfaces; }
 
 	void RenderDome(void);
 	void RenderDomeFrame(KX_Scene* scene, KX_Camera* cam, int i);

source/gameengine/Ketsji/KX_KetsjiEngine.h

@@ -72,12 +72,12 @@ class KX_KetsjiEngine
 {
 
 private:
-	class RAS_ICanvas*				m_canvas; // 2D Canvas (2D Rendering Device Context)
+	class RAS_ICanvas*					m_canvas; // 2D Canvas (2D Rendering Device Context)
 	class RAS_IRasterizer*				m_rasterizer;  // 3D Rasterizer (3D Rendering)
-	class KX_ISystem*				m_kxsystem;
+	class KX_ISystem*					m_kxsystem;
 	class RAS_IRenderTools*				m_rendertools;
 	class KX_ISceneConverter*			m_sceneconverter;
-	class NG_NetworkDeviceInterface*		m_networkdevice;
+	class NG_NetworkDeviceInterface*	m_networkdevice;
 #ifdef WITH_PYTHON
 	/* borrowed from sys.modules["__main__"], dont manage ref's */
 	PyObject*					m_pythondictionary;
@@ -222,16 +222,16 @@ public:
 	void			SetRasterizer(RAS_IRasterizer* rasterizer);
 #ifdef WITH_PYTHON
 	void			SetPyNamespace(PyObject* pythondictionary);
-	PyObject*		GetPyNamespace(){return m_pythondictionary;};
+	PyObject*		GetPyNamespace() { return m_pythondictionary; }
 #endif
 	void			SetSceneConverter(KX_ISceneConverter* sceneconverter);
 	void			SetAnimRecordMode(bool animation_record, int startFrame);
 
-	RAS_IRasterizer*		GetRasterizer(){return m_rasterizer;};
-	RAS_ICanvas*		    GetCanvas(){return m_canvas;};
-	RAS_IRenderTools*	    GetRenderTools(){return m_rendertools;};
-	SCA_IInputDevice*		GetKeyboardDevice(){return m_keyboarddevice;};
-	SCA_IInputDevice*		GetMouseDevice(){return m_mousedevice;};
+	RAS_IRasterizer*		GetRasterizer() { return m_rasterizer; }
+	RAS_ICanvas*		    GetCanvas() { return m_canvas; }
+	RAS_IRenderTools*	    GetRenderTools() { return m_rendertools; }
+	SCA_IInputDevice*		GetKeyboardDevice() { return m_keyboarddevice; }
+	SCA_IInputDevice*		GetMouseDevice() { return m_mousedevice; }
 
 	/// Dome functions
 	void			InitDome(short res, short mode, short angle, float resbuf, short tilt, struct Text* text); 
@@ -265,7 +265,7 @@ public:
 	void			GetSceneViewport(KX_Scene* scene, KX_Camera* cam, RAS_Rect& area, RAS_Rect& viewport);
 
 	void SetDrawType(int drawingtype);
-	int  GetDrawType(){return m_drawingmode;};
+	int  GetDrawType() { return m_drawingmode; }
 
 	void SetCameraZoom(float camzoom);
 	

source/gameengine/Ketsji/KX_MouseFocusSensor.h

@@ -61,7 +61,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 						KX_KetsjiEngine* kxengine,
 						SCA_IObject* gameobj);
 
-	virtual ~KX_MouseFocusSensor() { ; };
+	virtual ~KX_MouseFocusSensor() { }
 	virtual CValue* GetReplica() {
 		CValue* replica = new KX_MouseFocusSensor(*this);
 		// this will copy properties and so on...

source/gameengine/Ketsji/KX_NavMeshObject.cpp

@@ -620,7 +620,7 @@ void KX_NavMeshObject::DrawPath(const float *path, int pathLen, const MT_Vector3
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 //----------------------------------------------------------------------------
 //Python
 
@@ -718,4 +718,4 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_NavMeshObject, rebuild,
 	Py_RETURN_NONE;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON

source/gameengine/Ketsji/KX_NavMeshObject.h

@@ -65,7 +65,7 @@ public:
 
 	MT_Point3 TransformToLocalCoords(const MT_Point3& wpos);
 	MT_Point3 TransformToWorldCoords(const MT_Point3& lpos);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
@@ -74,7 +74,7 @@ public:
 	KX_PYMETHOD_DOC(KX_NavMeshObject, raycast);
 	KX_PYMETHOD_DOC(KX_NavMeshObject, draw);
 	KX_PYMETHOD_DOC_NOARGS(KX_NavMeshObject, rebuild);
-#endif
+#endif // WITH_PYTHON
 };
 
 #endif //__KX_NAVMESHOBJECT_H__

source/gameengine/Ketsji/KX_NearSensor.h

@@ -76,7 +76,7 @@ public:
 	virtual bool	NewHandleCollision(void* obj1,void* obj2,
 						 const PHY_CollData * coll_data); 
 	virtual bool	BroadPhaseFilterCollision(void*obj1,void*obj2);
-	virtual bool	BroadPhaseSensorFilterCollision(void*obj1,void*obj2) { return false; };
+	virtual bool	BroadPhaseSensorFilterCollision(void* obj1,void* obj2) { return false; }
 	virtual sensortype GetSensorType() { return ST_NEAR; }
 
 #ifdef WITH_PYTHON

source/gameengine/Ketsji/KX_Scene.h

@@ -558,10 +558,10 @@ public:
 	bool IsClearingZBuffer();
 	void EnableZBufferClearing(bool isclearingZbuffer);
 	// use of DBVT tree for camera culling
-	void SetDbvtCulling(bool b) { m_dbvt_culling = b; };
-	bool GetDbvtCulling() { return m_dbvt_culling; };
-	void SetDbvtOcclusionRes(int i) { m_dbvt_occlusion_res = i; };
-	int GetDbvtOcclusionRes() { return m_dbvt_occlusion_res; };
+	void SetDbvtCulling(bool b) { m_dbvt_culling = b; }
+	bool GetDbvtCulling() { return m_dbvt_culling; }
+	void SetDbvtOcclusionRes(int i) { m_dbvt_occlusion_res = i; }
+	int GetDbvtOcclusionRes() { return m_dbvt_occlusion_res; }
 	
 	void SetSceneConverter(class KX_BlenderSceneConverter* sceneConverter);
 
@@ -587,7 +587,7 @@ public:
 	void Update2DFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
 	void Render2DFilters(RAS_ICanvas* canvas);
 
-	KX_ObstacleSimulation* GetObstacleSimulation() {return m_obstacleSimulation;};
+	KX_ObstacleSimulation* GetObstacleSimulation() { return m_obstacleSimulation; }
 
 #ifdef WITH_PYTHON
 	/* --------------------------------------------------------------------- */
@@ -628,8 +628,8 @@ public:
 	 */
 	void RunDrawingCallbacks(PyObject* cb_list);
 	
-	PyObject* GetPreDrawCB() { return m_draw_call_pre; };
-	PyObject* GetPostDrawCB() { return m_draw_call_post; };
+	PyObject* GetPreDrawCB() { return m_draw_call_pre; }
+	PyObject* GetPostDrawCB() { return m_draw_call_post; }
 #endif
 
 	/**

source/gameengine/Ketsji/KX_SteeringActuator.cpp

@@ -502,7 +502,7 @@ void KX_SteeringActuator::HandleActorFace(MT_Vector3& velocity)
 
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -620,7 +620,7 @@ PyObject* KX_SteeringActuator::pyattr_get_steeringVec(void *self, const struct K
 	return PyObjectFrom(steeringVec);
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
 

source/gameengine/Ketsji/KX_SteeringActuator.h

@@ -99,7 +99,7 @@ public:
 	virtual bool UnlinkObject(SCA_IObject* clientobj);
 	const MT_Vector3& GetSteeringVec();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
@@ -113,7 +113,7 @@ public:
 	static PyObject* pyattr_get_steeringVec(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 }; /* end of class KX_SteeringActuator : public SCA_PropertyActuator */
 

source/gameengine/Network/NG_NetworkMessage.h

@@ -84,17 +84,17 @@ public:
 	/**
 	 * get the (read-only) To part of this message
 	 */
-	const STR_String& GetDestinationName() { return m_to;};
+	const STR_String& GetDestinationName() { return m_to; }
 
 	/**
 	 * get the (read-only) From part of this message
 	 */
-	const STR_String& GetSenderName() { return m_from;};
+	const STR_String& GetSenderName() { return m_from; }
 
 	/**
 	 * get the (read-only) Subject part of this message
 	 */
-	const STR_String& GetSubject() { return m_subject;};
+	const STR_String& GetSubject() { return m_subject; }
 
 	/**
 	 * get the (read-only) Body part of this message

source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h

@@ -132,7 +132,7 @@ protected:
 		}
 		//returns 0.f if no fixed timestep is used
 
-		virtual	float		getFixedTimeStep(){ return 0.f;};
+		virtual	float		getFixedTimeStep() { return 0.f; }
 
 		virtual void		setDebugMode(int debugMode);
 

source/gameengine/Rasterizer/RAS_BucketManager.h

@@ -65,8 +65,8 @@ public:
 
 	/* for merging */
 	void MergeBucketManager(RAS_BucketManager *other, SCA_IScene *scene);
-	BucketList & GetSolidBuckets() {return m_SolidBuckets;};
-	BucketList & GetAlphaBuckets() {return m_AlphaBuckets;};
+	BucketList & GetSolidBuckets() {return m_SolidBuckets;}
+	BucketList & GetAlphaBuckets() {return m_AlphaBuckets;}
 
 	/*void PrintStats(int verbose_level) {
 		printf("\nMappings...\n");

source/gameengine/Rasterizer/RAS_IPolygonMaterial.h

@@ -130,7 +130,7 @@ public:
 					bool image,
 					struct GameSettings* game);
 
-	virtual ~RAS_IPolyMaterial() {};
+	virtual ~RAS_IPolyMaterial() {}
  
 	/**
 	 * Returns the caching information for this material,

source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h

@@ -298,8 +298,8 @@ public:
 	
 	virtual void	EnableMotionBlur(float motionblurvalue);
 	virtual void	DisableMotionBlur();
-	virtual float	GetMotionBlurValue(){return m_motionblurvalue;};
-	virtual int		GetMotionBlurState(){return m_motionblur;};
+	virtual float	GetMotionBlurValue() { return m_motionblurvalue; }
+	virtual int		GetMotionBlurState() { return m_motionblur; }
 	virtual void	SetMotionBlurState(int newstate)
 	{
 		if(newstate<0)