First round of override updates.

Some fixes:
Added get/setCurrentRenderPass to scene manager (internally renamed, exposed)
Removed destructor from light scene node.
Removed getType calls from archive loaders (one file archives have this)
Removed some internal exposures and virtual attributes for protected classes

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4543 dfc29bdd-3216-0410-991c-e03cc46cb475

include/ISceneManager.h

@@ -1638,6 +1638,12 @@ namespace scene
 			current callbacks manager and restore the default behavior. */
 		virtual void setLightManager(ILightManager* lightManager) = 0;
 
+		//! Get current render pass.
+		virtual E_SCENE_NODE_RENDER_PASS getCurrentRenderPass() const =0;
+
+		//! Set current render pass.
+		virtual void setCurrentRenderPass(E_SCENE_NODE_RENDER_PASS nextPass) =0;
+
 		//! Get an instance of a geometry creator.
 		/** The geometry creator provides some helper methods to create various types of
 		basic geometry. This can be useful for custom scene nodes. */

source/Irrlicht/CAnimatedMeshSceneNode.h

@@ -127,7 +127,7 @@ namespace scene
 		virtual void setMesh(IAnimatedMesh* mesh);
 
 		//! Returns the current mesh
-		virtual IAnimatedMesh* getMesh(void) { return Mesh; }
+		virtual IAnimatedMesh* getMesh(void) _IRR_OVERRIDE_ { return Mesh; }
 
 		//! Writes attributes of the scene node.
 		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const;
@@ -136,7 +136,7 @@ namespace scene
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_ANIMATED_MESH; }
+		virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_ANIMATED_MESH; }
 
 		// returns the absolute transformation for a special MD3 Tag if the mesh is a md3 mesh,
 		// or the absolutetransformation if it's a normal scenenode

source/Irrlicht/CBillboardSceneNode.h

@@ -74,7 +74,7 @@ public:
 	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 	//! Returns type of the scene node
-	virtual ESCENE_NODE_TYPE getType() const { return ESNT_BILLBOARD; }
+	virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_BILLBOARD; }
 
 	//! Creates a clone of this scene node and its children.
 	virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);

source/Irrlicht/CCameraSceneNode.h

@@ -137,7 +137,7 @@ namespace scene
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_CAMERA; }
+		virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_CAMERA; }
 
 		//! Binds the camera scene node's rotation to its target position and vice vera, or unbinds them.
 		virtual void bindTargetAndRotation(bool bound);

source/Irrlicht/CCgMaterialRenderer.h

-// Copyright (C) 2012 Patryk Nadrowski
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_CG_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_CG_MATERIAL_RENDERER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_CG_
-
-#include "IMaterialRenderer.h"
-#include "IMaterialRendererServices.h"
-#include "IShaderConstantSetCallBack.h"
-#include "IGPUProgrammingServices.h"
-#include "irrArray.h"
-#include "irrString.h"
-#include "IVideoDriver.h"
-#include "os.h"
-#include "Cg/cg.h"
-
-#ifdef _MSC_VER
-	#pragma comment(lib, "cg.lib")
-#endif
-
-namespace irr
-{
-namespace video
-{
-
-class CCgUniform
-{
-public:
-	CCgUniform(const CGparameter& parameter, bool global);
-	virtual ~CCgUniform();
-
-	const core::stringc& getName() const;
-	const CGparameter& getParameter() const;
-	CGenum getSpace() const;
-	CGtype getType() const;
-
-	virtual void update(const void* data, const SMaterial& material) const = 0;
-
-protected:
-	core::stringc Name;
-	CGparameter Parameter;
-	CGenum Space;
-	CGtype Type;
-};
-
-class CCgUniform1f : public CCgUniform
-{
-public:
-	CCgUniform1f(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniform2f : public CCgUniform
-{
-public:
-	CCgUniform2f(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniform3f : public CCgUniform
-{
-public:
-	CCgUniform3f(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniform4f : public CCgUniform
-{
-public:
-	CCgUniform4f(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniform1i : public CCgUniform
-{
-public:
-	CCgUniform1i(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniform2i : public CCgUniform
-{
-public:
-	CCgUniform2i(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniform3i : public CCgUniform
-{
-public:
-	CCgUniform3i(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniform4i : public CCgUniform
-{
-public:
-	CCgUniform4i(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniform4x4f : public CCgUniform
-{
-public:
-	CCgUniform4x4f(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgUniformSampler2D : public CCgUniform
-{
-public:
-	CCgUniformSampler2D(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CCgMaterialRenderer : public IMaterialRenderer, public IMaterialRendererServices
-{
-public:
-	CCgMaterialRenderer(IShaderConstantSetCallBack* callback = 0, IMaterialRenderer* baseMaterial = 0, s32 userData = 0);
-	virtual ~CCgMaterialRenderer();
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates, IMaterialRendererServices* services) = 0;
-	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) = 0;
-	virtual void OnUnsetMaterial() = 0;
-
-	virtual bool isTransparent() const;
-
-	virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) = 0;
-	virtual s32 getVertexShaderConstantID(const c8* name);
-	virtual s32 getPixelShaderConstantID(const c8* name);
-	virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1);
-	virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1);
-	virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count);
-	virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count);
-	virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count);
-	virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count);
-	virtual IVideoDriver* getVideoDriver() = 0;
-
-protected:
-	void getUniformList();
-
-	IShaderConstantSetCallBack* CallBack;
-	IMaterialRenderer* BaseMaterial;
-	s32 UserData;
-
-	core::array<CCgUniform*> UniformInfo;
-
-	CGprogram VertexProgram;
-	CGprogram FragmentProgram;
-	CGprogram GeometryProgram;
-	CGprofile VertexProfile;
-	CGprofile FragmentProfile;
-	CGprofile GeometryProfile;
-
-	SMaterial Material;
-	CGerror Error;
-};
-
-}
-}
-
-#endif
-#endif
+// Copyright (C) 2012 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_CG_MATERIAL_RENDERER_H_INCLUDED__
+#define __C_CG_MATERIAL_RENDERER_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+#ifdef _IRR_COMPILE_WITH_CG_
+
+#include "IMaterialRenderer.h"
+#include "IMaterialRendererServices.h"
+#include "IShaderConstantSetCallBack.h"
+#include "IGPUProgrammingServices.h"
+#include "irrArray.h"
+#include "irrString.h"
+#include "IVideoDriver.h"
+#include "os.h"
+#include "Cg/cg.h"
+
+#ifdef _MSC_VER
+	#pragma comment(lib, "cg.lib")
+#endif
+
+namespace irr
+{
+namespace video
+{
+
+class CCgUniform
+{
+public:
+	CCgUniform(const CGparameter& parameter, bool global);
+	virtual ~CCgUniform();
+
+	const core::stringc& getName() const;
+	const CGparameter& getParameter() const;
+	CGenum getSpace() const;
+	CGtype getType() const;
+
+	virtual void update(const void* data, const SMaterial& material) const = 0;
+
+protected:
+	core::stringc Name;
+	CGparameter Parameter;
+	CGenum Space;
+	CGtype Type;
+};
+
+class CCgUniform1f : public CCgUniform
+{
+public:
+	CCgUniform1f(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniform2f : public CCgUniform
+{
+public:
+	CCgUniform2f(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniform3f : public CCgUniform
+{
+public:
+	CCgUniform3f(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniform4f : public CCgUniform
+{
+public:
+	CCgUniform4f(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniform1i : public CCgUniform
+{
+public:
+	CCgUniform1i(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniform2i : public CCgUniform
+{
+public:
+	CCgUniform2i(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniform3i : public CCgUniform
+{
+public:
+	CCgUniform3i(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniform4i : public CCgUniform
+{
+public:
+	CCgUniform4i(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniform4x4f : public CCgUniform
+{
+public:
+	CCgUniform4x4f(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgUniformSampler2D : public CCgUniform
+{
+public:
+	CCgUniformSampler2D(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CCgMaterialRenderer : public IMaterialRenderer, public IMaterialRendererServices
+{
+public:
+	CCgMaterialRenderer(IShaderConstantSetCallBack* callback = 0, IMaterialRenderer* baseMaterial = 0, s32 userData = 0);
+	virtual ~CCgMaterialRenderer();
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates, IMaterialRendererServices* services) = 0;
+	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) = 0;
+	virtual void OnUnsetMaterial() = 0;
+
+	virtual bool isTransparent() const;
+
+	virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) = 0;
+	virtual s32 getVertexShaderConstantID(const c8* name);
+	virtual s32 getPixelShaderConstantID(const c8* name);
+	virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1);
+	virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1);
+	virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count);
+	virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count);
+	virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count);
+	virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count);
+	virtual IVideoDriver* getVideoDriver() = 0;
+
+protected:
+	void getUniformList();
+
+	IShaderConstantSetCallBack* CallBack;
+	IMaterialRenderer* BaseMaterial;
+	s32 UserData;
+
+	core::array<CCgUniform*> UniformInfo;
+
+	CGprogram VertexProgram;
+	CGprogram FragmentProgram;
+	CGprogram GeometryProgram;
+	CGprofile VertexProfile;
+	CGprofile FragmentProfile;
+	CGprofile GeometryProfile;
+
+	SMaterial Material;
+	CGerror Error;
+};
+
+}
+}
+
+#endif
+#endif

source/Irrlicht/CCubeSceneNode.h

@@ -43,7 +43,7 @@ namespace scene
 		virtual u32 getMaterialCount() const;
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_CUBE; }
+		virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_CUBE; }
 
 		//! Creates shadow volume scene node as child of this node
 		//! and returns a pointer to it.
@@ -60,18 +60,18 @@ namespace scene
 		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);
 
 		//! Sets a new mesh to display
-		virtual void setMesh(IMesh* mesh) {}
+		virtual void setMesh(IMesh* mesh) _IRR_OVERRIDE_ {}
 
 		//! Returns the current mesh
-		virtual IMesh* getMesh(void) { return Mesh; }
+		virtual IMesh* getMesh(void) _IRR_OVERRIDE_ { return Mesh; }
 
 		//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
 		/* In this way it is possible to change the materials a mesh causing all mesh scene nodes
 		referencing this mesh to change too. */
-		virtual void setReadOnlyMaterials(bool readonly) {}
+		virtual void setReadOnlyMaterials(bool readonly) _IRR_OVERRIDE_ {}
 
 		//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
-		virtual bool isReadOnlyMaterials() const { return false; }
+		virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_ { return false; }
 
 		//! Removes a child from this scene node.
 		//! Implemented here, to be able to remove the shadow properly, if there is one,

source/Irrlicht/CD3D8Driver.h

@@ -227,7 +227,7 @@ namespace video
 		//! Returns the maximum texture size supported.
 		virtual core::dimension2du getMaxTextureSize() const;
 
-		virtual bool checkDriverReset() {return DriverWasReset;}
+		virtual bool checkDriverReset() _IRR_OVERRIDE_ {return DriverWasReset;}
 	private:
 
 		// enumeration for rendering modes such as 2d and 3d for minizing the switching of renderStates.

source/Irrlicht/CD3D8ParallaxMapRenderer.h

@@ -35,7 +35,7 @@ public:
 
 	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype);
 
-	virtual void OnSetMaterial(const SMaterial& material) { }
+	virtual void OnSetMaterial(const SMaterial& material) _IRR_OVERRIDE_ { }
 	virtual void OnSetMaterial(const video::SMaterial& material,
 		const video::SMaterial& lastMaterial,
 		bool resetAllRenderstates, video::IMaterialRendererServices* services);

source/Irrlicht/CD3D9CgMaterialRenderer.h

-// Copyright (C) 2012-2012 Patryk Nadrowski
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_DIRECT3D_9_CG_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_DIRECT3D_9_CG_MATERIAL_RENDERER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-#if defined(_IRR_COMPILE_WITH_DIRECT3D_9_) && defined(_IRR_COMPILE_WITH_CG_)
-
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-#include <d3d9.h>
-#include <d3dx9.h>
-#include "CCgMaterialRenderer.h"
-#include "Cg/cgD3D9.h"
-
-#ifdef _MSC_VER
-	#pragma comment(lib, "cgD3D9.lib")
-#endif
-
-namespace irr
-{
-namespace video
-{
-
-class CD3D9Driver;
-class IShaderConstantSetCallBack;
-
-class CD3D9CgUniformSampler2D : public CCgUniform
-{
-public:
-	CD3D9CgUniformSampler2D(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class CD3D9CgMaterialRenderer : public CCgMaterialRenderer
-{
-public:
-	CD3D9CgMaterialRenderer(CD3D9Driver* driver, s32& materialType,
-		const c8* vertexProgram = 0, const c8* vertexEntry = "main",
-		E_VERTEX_SHADER_TYPE vertexProfile = video::EVST_VS_1_1,
-		const c8* fragmentProgram = 0, const c8* fragmentEntry = "main",
-		E_PIXEL_SHADER_TYPE fragmentProfile = video::EPST_PS_1_1,
-		const c8* geometryProgram = 0, const c8* geometryEntry = "main",
-		E_GEOMETRY_SHADER_TYPE geometryProfile = video::EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 vertices = 0, IShaderConstantSetCallBack* callback = 0,
-		IMaterialRenderer* baseMaterial = 0, s32 userData = 0);
-
-	virtual ~CD3D9CgMaterialRenderer();
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates, IMaterialRendererServices* services);
-	virtual bool OnRender(IMaterialRendererServices* services, E_VERTEX_TYPE vtxtype);
-	virtual void OnUnsetMaterial();
-
-	virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates);
-	virtual IVideoDriver* getVideoDriver();
-
-protected:
-	void init(s32& materialType,
-		const c8* vertexProgram = 0, const c8* vertexEntry = "main",
-		E_VERTEX_SHADER_TYPE vertexProfile = video::EVST_VS_1_1,
-		const c8* fragmentProgram = 0, const c8* fragmentEntry = "main",
-		E_PIXEL_SHADER_TYPE fragmentProfile = video::EPST_PS_1_1,
-		const c8* geometryProgram = 0, const c8* geometryEntry = "main",
-		E_GEOMETRY_SHADER_TYPE geometryProfile = video::EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 vertices = 0);
-
-	CD3D9Driver* Driver;
-};
-
-}
-}
-
-#endif
-#endif
-
+// Copyright (C) 2012-2012 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_DIRECT3D_9_CG_MATERIAL_RENDERER_H_INCLUDED__
+#define __C_DIRECT3D_9_CG_MATERIAL_RENDERER_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+#if defined(_IRR_COMPILE_WITH_DIRECT3D_9_) && defined(_IRR_COMPILE_WITH_CG_)
+
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#include <d3d9.h>
+#include <d3dx9.h>
+#include "CCgMaterialRenderer.h"
+#include "Cg/cgD3D9.h"
+
+#ifdef _MSC_VER
+	#pragma comment(lib, "cgD3D9.lib")
+#endif
+
+namespace irr
+{
+namespace video
+{
+
+class CD3D9Driver;
+class IShaderConstantSetCallBack;
+
+class CD3D9CgUniformSampler2D : public CCgUniform
+{
+public:
+	CD3D9CgUniformSampler2D(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class CD3D9CgMaterialRenderer : public CCgMaterialRenderer
+{
+public:
+	CD3D9CgMaterialRenderer(CD3D9Driver* driver, s32& materialType,
+		const c8* vertexProgram = 0, const c8* vertexEntry = "main",
+		E_VERTEX_SHADER_TYPE vertexProfile = video::EVST_VS_1_1,
+		const c8* fragmentProgram = 0, const c8* fragmentEntry = "main",
+		E_PIXEL_SHADER_TYPE fragmentProfile = video::EPST_PS_1_1,
+		const c8* geometryProgram = 0, const c8* geometryEntry = "main",
+		E_GEOMETRY_SHADER_TYPE geometryProfile = video::EGST_GS_4_0,
+		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+		u32 vertices = 0, IShaderConstantSetCallBack* callback = 0,
+		IMaterialRenderer* baseMaterial = 0, s32 userData = 0);
+
+	virtual ~CD3D9CgMaterialRenderer();
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates, IMaterialRendererServices* services);
+	virtual bool OnRender(IMaterialRendererServices* services, E_VERTEX_TYPE vtxtype);
+	virtual void OnUnsetMaterial();
+
+	virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates);
+	virtual IVideoDriver* getVideoDriver();
+
+protected:
+	void init(s32& materialType,
+		const c8* vertexProgram = 0, const c8* vertexEntry = "main",
+		E_VERTEX_SHADER_TYPE vertexProfile = video::EVST_VS_1_1,
+		const c8* fragmentProgram = 0, const c8* fragmentEntry = "main",
+		E_PIXEL_SHADER_TYPE fragmentProfile = video::EPST_PS_1_1,
+		const c8* geometryProgram = 0, const c8* geometryEntry = "main",
+		E_GEOMETRY_SHADER_TYPE geometryProfile = video::EGST_GS_4_0,
+		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+		u32 vertices = 0);
+
+	CD3D9Driver* Driver;
+};
+
+}
+}
+
+#endif
+#endif
+

source/Irrlicht/CD3D9Driver.h

@@ -304,13 +304,13 @@ namespace video
 		virtual void enableClipPlane(u32 index, bool enable);
 
 		//! Returns the graphics card vendor name.
-		virtual core::stringc getVendorInfo() {return VendorName;}
+		virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ {return VendorName;}
 
 		//! Enable the 2d override material
 		virtual void enableMaterial2D(bool enable=true);
 
 		//! Check if the driver was recently reset.
-		virtual bool checkDriverReset() {return DriverWasReset;}
+		virtual bool checkDriverReset() _IRR_OVERRIDE_ {return DriverWasReset;}
 
 		// removes the depth struct from the DepthSurface array
 		void removeDepthSurface(SDepthSurface* depth);

source/Irrlicht/CD3D9ParallaxMapRenderer.h

@@ -43,7 +43,7 @@ public:
 	//! Returns the render capability of the material.
 	virtual s32 getRenderCapability() const;
 
-	virtual void OnSetMaterial(const SMaterial& material) { }
+	virtual void OnSetMaterial(const SMaterial& material) _IRR_OVERRIDE_ { }
 	virtual void OnSetMaterial(const video::SMaterial& material,
 		const video::SMaterial& lastMaterial,
 		bool resetAllRenderstates, video::IMaterialRendererServices* services);

source/Irrlicht/CDepthBuffer.h

@@ -32,13 +32,13 @@ namespace video
 		virtual const core::dimension2d<u32>& getSize() const;
 
 		//! locks the zbuffer
-		virtual void* lock() { return (void*) Buffer; }
+		virtual void* lock() _IRR_OVERRIDE_ { return (void*) Buffer; }
 
 		//! unlocks the zbuffer
-		virtual void unlock() {}
+		virtual void unlock() _IRR_OVERRIDE_ {}
 
 		//! returns pitch of depthbuffer (in bytes)
-		virtual u32 getPitch() const { return Pitch; }
+		virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; }
 
 
 	private:
@@ -70,13 +70,13 @@ namespace video
 		virtual const core::dimension2d<u32>& getSize() const;
 
 		//! locks the zbuffer
-		virtual void* lock() { return (void*) Buffer; }
+		virtual void* lock() _IRR_OVERRIDE_ { return (void*) Buffer; }
 
 		//! unlocks the zbuffer
-		virtual void unlock() {}
+		virtual void unlock() _IRR_OVERRIDE_ {}
 
 		//! returns pitch of depthbuffer (in bytes)
-		virtual u32 getPitch() const { return Pitch; }
+		virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; }
 
 
 	private:

source/Irrlicht/CDummyTransformationSceneNode.h

@@ -31,10 +31,10 @@ namespace scene
 		virtual core::matrix4 getRelativeTransformation() const;
 
 		//! does nothing.
-		virtual void render() {}
+		virtual void render() _IRR_OVERRIDE_ {}
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_DUMMY_TRANSFORMATION; }
+		virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_DUMMY_TRANSFORMATION; }
 
 		//! Creates a clone of this scene node and its children.
 		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);

source/Irrlicht/CEmptySceneNode.h

@@ -29,7 +29,7 @@ namespace scene
 		virtual void render();
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_EMPTY; }
+		virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_EMPTY; }
 
 		//! Creates a clone of this scene node and its children.
 		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);

source/Irrlicht/CGUIFont.h

@@ -60,7 +60,7 @@ public:
 	virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const;
 
 	//! Returns the type of this font
-	virtual EGUI_FONT_TYPE getType() const { return EGFT_BITMAP; }
+	virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_BITMAP; }
 
 	//! set an Pixel Offset on Drawing ( scale position on width )
 	virtual void setKerningWidth (s32 kerning);

source/Irrlicht/CImage.h

@@ -40,7 +40,7 @@ public:
 	}
 
 	//! Unlock function.
-	virtual void unlock() {}
+	virtual void unlock() _IRR_OVERRIDE_ {}
 
 	//! Returns width and height of image data.
 	virtual const core::dimension2d<u32>& getDimension() const;
@@ -79,7 +79,7 @@ public:
 	virtual ECOLOR_FORMAT getColorFormat() const;
 
 	//! returns pitch of image
-	virtual u32 getPitch() const { return Pitch; }
+	virtual u32 getPitch() const _IRR_OVERRIDE_ { return Pitch; }
 
 	//! copies this surface into another, scaling it to fit.
 	virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch=0);

source/Irrlicht/CImageLoaderDDS.h

-// Copyright (C) 2002-2012 Thomas Alten
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_IMAGE_LOADER_DDS_H_INCLUDED__
-#define __C_IMAGE_LOADER_DDS_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-
-#if defined(_IRR_COMPILE_WITH_DDS_LOADER_) || defined(_IRR_COMPILE_WITH_DDS_DECODER_LOADER_)
-
-#include "IImageLoader.h"
-
-namespace irr
-{
-namespace video
-{
-
-/* dds pixel format types */
-enum eDDSPixelFormat
-{
-	DDS_PF_ARGB8888,
-	DDS_PF_DXT1,
-	DDS_PF_DXT2,
-	DDS_PF_DXT3,
-	DDS_PF_DXT4,
-	DDS_PF_DXT5,
-	DDS_PF_UNKNOWN
-};
-
-// byte-align structures
-#include "irrpack.h"
-
-/* structures */
-
-struct ddsPixelFormat
-{
-	u32	Size;
-	u32 Flags;
-	u32 FourCC;
-	u32 RGBBitCount;
-	u32	RBitMask;
-	u32 GBitMask;
-	u32 BBitMask;
-	u32	ABitMask;
-} PACK_STRUCT;
-
-
-struct ddsCaps
-{
-	u32		caps1;
-	u32		caps2;
-	u32		caps3;
-	u32		caps4;
-} PACK_STRUCT;
-
-
-struct ddsHeader
-{
-	c8 Magic[4];
-	u32 Size;
-	u32 Flags;
-	u32 Height;
-	u32 Width;
-	u32 PitchOrLinearSize;
-	u32 Depth;
-	u32 MipMapCount;
-	u32 Reserved1[11];
-	ddsPixelFormat PixelFormat;
-	ddsCaps Caps;
-	u32 Reserved2;
-} PACK_STRUCT;
-
-
-#ifdef _IRR_COMPILE_WITH_DDS_DECODER_LOADER_
-
-struct ddsColorBlock
-{
-	u16		colors[ 2 ];
-	u8		row[ 4 ];
-} PACK_STRUCT;
-
-
-struct ddsAlphaBlockExplicit
-{
-	u16		row[ 4 ];
-} PACK_STRUCT;
-
-
-struct ddsAlphaBlock3BitLinear
-{
-	u8		alpha0;
-	u8		alpha1;
-	u8		stuff[ 6 ];
-} PACK_STRUCT;
-
-
-struct ddsColor
-{
-	u8		r, g, b, a;
-} PACK_STRUCT;
-
-#endif
-
-
-// Default alignment
-#include "irrunpack.h"
-
-
-/* endian tomfoolery */
-typedef union
-{
-	f32	f;
-	c8	c[ 4 ];
-}
-floatSwapUnion;
-
-
-#ifndef __BIG_ENDIAN__
-#ifdef _SGI_SOURCE
-#define	__BIG_ENDIAN__
-#endif
-#endif
-
-
-#ifdef __BIG_ENDIAN__
-
-	s32   DDSBigLong( s32 src ) { return src; }
-	s16 DDSBigShort( s16 src ) { return src; }
-	f32 DDSBigFloat( f32 src ) { return src; }
-
-	s32 DDSLittleLong( s32 src )
-	{
-		return ((src & 0xFF000000) >> 24) |
-			((src & 0x00FF0000) >> 8) |
-			((src & 0x0000FF00) << 8) |
-			((src & 0x000000FF) << 24);
-	}
-
-	s16 DDSLittleShort( s16 src )
-	{
-		return ((src & 0xFF00) >> 8) |
-			((src & 0x00FF) << 8);
-	}
-
-	f32 DDSLittleFloat( f32 src )
-	{
-		floatSwapUnion in,out;
-		in.f = src;
-		out.c[ 0 ] = in.c[ 3 ];
-		out.c[ 1 ] = in.c[ 2 ];
-		out.c[ 2 ] = in.c[ 1 ];
-		out.c[ 3 ] = in.c[ 0 ];
-		return out.f;
-	}
-
-#else /*__BIG_ENDIAN__*/
-
-	s32   DDSLittleLong( s32 src ) { return src; }
-	s16 DDSLittleShort( s16 src ) { return src; }
-	f32 DDSLittleFloat( f32 src ) { return src; }
-
-	s32 DDSBigLong( s32 src )
-	{
-		return ((src & 0xFF000000) >> 24) |
-			((src & 0x00FF0000) >> 8) |
-			((src & 0x0000FF00) << 8) |
-			((src & 0x000000FF) << 24);
-	}
-
-	s16 DDSBigShort( s16 src )
-	{
-		return ((src & 0xFF00) >> 8) |
-			((src & 0x00FF) << 8);
-	}
-
-	f32 DDSBigFloat( f32 src )
-	{
-		floatSwapUnion in,out;
-		in.f = src;
-		out.c[ 0 ] = in.c[ 3 ];
-		out.c[ 1 ] = in.c[ 2 ];
-		out.c[ 2 ] = in.c[ 1 ];
-		out.c[ 3 ] = in.c[ 0 ];
-		return out.f;
-	}
-
-#endif /*__BIG_ENDIAN__*/
-
-
-/*!
-	Surface Loader for DDS images
-*/
-class CImageLoaderDDS : public IImageLoader
-{
-public:
-
-	//! returns true if the file maybe is able to be loaded by this class
-	//! based on the file extension (e.g. ".tga")
-	virtual bool isALoadableFileExtension(const io::path& filename) const;
-
-	//! returns true if the file maybe is able to be loaded by this class
-	virtual bool isALoadableFileFormat(io::IReadFile* file) const;
-
-	//! creates a surface from the file
-	virtual IImage* loadImage(io::IReadFile* file) const;
-};
-
-
-} // end namespace video
-} // end namespace irr
-
-#endif // compiled with DDS loader
-#endif
-
+// Copyright (C) 2002-2012 Thomas Alten
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_IMAGE_LOADER_DDS_H_INCLUDED__
+#define __C_IMAGE_LOADER_DDS_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+
+#if defined(_IRR_COMPILE_WITH_DDS_LOADER_) || defined(_IRR_COMPILE_WITH_DDS_DECODER_LOADER_)
+
+#include "IImageLoader.h"
+
+namespace irr
+{
+namespace video
+{
+
+/* dds pixel format types */
+enum eDDSPixelFormat
+{
+	DDS_PF_ARGB8888,
+	DDS_PF_DXT1,
+	DDS_PF_DXT2,
+	DDS_PF_DXT3,
+	DDS_PF_DXT4,
+	DDS_PF_DXT5,
+	DDS_PF_UNKNOWN
+};
+
+// byte-align structures
+#include "irrpack.h"
+
+/* structures */
+
+struct ddsPixelFormat
+{
+	u32	Size;
+	u32 Flags;
+	u32 FourCC;
+	u32 RGBBitCount;
+	u32	RBitMask;
+	u32 GBitMask;
+	u32 BBitMask;
+	u32	ABitMask;
+} PACK_STRUCT;
+
+
+struct ddsCaps
+{
+	u32		caps1;
+	u32		caps2;
+	u32		caps3;
+	u32		caps4;
+} PACK_STRUCT;
+
+
+struct ddsHeader
+{
+	c8 Magic[4];
+	u32 Size;
+	u32 Flags;
+	u32 Height;
+	u32 Width;
+	u32 PitchOrLinearSize;
+	u32 Depth;
+	u32 MipMapCount;
+	u32 Reserved1[11];
+	ddsPixelFormat PixelFormat;
+	ddsCaps Caps;
+	u32 Reserved2;
+} PACK_STRUCT;
+
+
+#ifdef _IRR_COMPILE_WITH_DDS_DECODER_LOADER_
+
+struct ddsColorBlock
+{
+	u16		colors[ 2 ];
+	u8		row[ 4 ];
+} PACK_STRUCT;
+
+
+struct ddsAlphaBlockExplicit
+{
+	u16		row[ 4 ];
+} PACK_STRUCT;
+
+
+struct ddsAlphaBlock3BitLinear
+{
+	u8		alpha0;
+	u8		alpha1;
+	u8		stuff[ 6 ];
+} PACK_STRUCT;
+
+
+struct ddsColor
+{
+	u8		r, g, b, a;
+} PACK_STRUCT;
+
+#endif
+
+
+// Default alignment
+#include "irrunpack.h"
+
+
+/* endian tomfoolery */
+typedef union
+{
+	f32	f;
+	c8	c[ 4 ];
+}
+floatSwapUnion;
+
+
+#ifndef __BIG_ENDIAN__
+#ifdef _SGI_SOURCE
+#define	__BIG_ENDIAN__
+#endif
+#endif
+
+
+#ifdef __BIG_ENDIAN__
+
+	s32   DDSBigLong( s32 src ) { return src; }
+	s16 DDSBigShort( s16 src ) { return src; }
+	f32 DDSBigFloat( f32 src ) { return src; }
+
+	s32 DDSLittleLong( s32 src )
+	{
+		return ((src & 0xFF000000) >> 24) |
+			((src & 0x00FF0000) >> 8) |
+			((src & 0x0000FF00) << 8) |
+			((src & 0x000000FF) << 24);
+	}
+
+	s16 DDSLittleShort( s16 src )
+	{
+		return ((src & 0xFF00) >> 8) |
+			((src & 0x00FF) << 8);
+	}
+
+	f32 DDSLittleFloat( f32 src )
+	{
+		floatSwapUnion in,out;
+		in.f = src;
+		out.c[ 0 ] = in.c[ 3 ];
+		out.c[ 1 ] = in.c[ 2 ];
+		out.c[ 2 ] = in.c[ 1 ];
+		out.c[ 3 ] = in.c[ 0 ];
+		return out.f;
+	}
+
+#else /*__BIG_ENDIAN__*/
+
+	s32   DDSLittleLong( s32 src ) { return src; }
+	s16 DDSLittleShort( s16 src ) { return src; }
+	f32 DDSLittleFloat( f32 src ) { return src; }
+
+	s32 DDSBigLong( s32 src )
+	{
+		return ((src & 0xFF000000) >> 24) |
+			((src & 0x00FF0000) >> 8) |
+			((src & 0x0000FF00) << 8) |
+			((src & 0x000000FF) << 24);
+	}
+
+	s16 DDSBigShort( s16 src )
+	{
+		return ((src & 0xFF00) >> 8) |
+			((src & 0x00FF) << 8);
+	}
+
+	f32 DDSBigFloat( f32 src )
+	{
+		floatSwapUnion in,out;
+		in.f = src;
+		out.c[ 0 ] = in.c[ 3 ];
+		out.c[ 1 ] = in.c[ 2 ];
+		out.c[ 2 ] = in.c[ 1 ];
+		out.c[ 3 ] = in.c[ 0 ];
+		return out.f;
+	}
+
+#endif /*__BIG_ENDIAN__*/
+
+
+/*!
+	Surface Loader for DDS images
+*/
+class CImageLoaderDDS : public IImageLoader
+{
+public:
+
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".tga")
+	virtual bool isALoadableFileExtension(const io::path& filename) const;
+
+	//! returns true if the file maybe is able to be loaded by this class
+	virtual bool isALoadableFileFormat(io::IReadFile* file) const;
+
+	//! creates a surface from the file
+	virtual IImage* loadImage(io::IReadFile* file) const;
+};
+
+
+} // end namespace video
+} // end namespace irr
+
+#endif // compiled with DDS loader
+#endif
+

source/Irrlicht/CIrrDeviceConsole.h

@@ -310,16 +310,16 @@ namespace gui
 		}
 
 		//! Calculates the index of the character in the text which is on a specific position.
-		virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const { return pixel_x; };
+		virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const _IRR_OVERRIDE_ { return pixel_x; };
 
 		//! No kerning
-		virtual void setKerningWidth (s32 kerning) { }
-		virtual void setKerningHeight (s32 kerning) { }
-		virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const {return 0;}
-		virtual s32 getKerningHeight() const  { return 0;}
-		virtual void setInvisibleCharacters( const wchar_t *s ) { }
+		virtual void setKerningWidth (s32 kerning) _IRR_OVERRIDE_ { }
+		virtual void setKerningHeight (s32 kerning) _IRR_OVERRIDE_ { }
+		virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_ {return 0;}
+		virtual s32 getKerningHeight() const  _IRR_OVERRIDE_ { return 0;}
+		virtual void setInvisibleCharacters( const wchar_t *s ) _IRR_OVERRIDE_ { }
 		// I guess this is an OS specific font
-		virtual EGUI_FONT_TYPE getType() const { return EGFT_OS; }
+		virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_OS; }
 	private:
 		CIrrDeviceConsole* Device;
 		core::stringw tempText;

source/Irrlicht/CIrrDeviceLinux.h

@@ -298,10 +298,10 @@ namespace irr
 
 #ifdef _IRR_COMPILE_WITH_X11_
 			//! Set platform specific behavior flags.
-			virtual void setPlatformBehavior(gui::ECURSOR_PLATFORM_BEHAVIOR behavior) {PlatformBehavior = behavior; }
+			virtual void setPlatformBehavior(gui::ECURSOR_PLATFORM_BEHAVIOR behavior) _IRR_OVERRIDE_ {PlatformBehavior = behavior; }
 
 			//! Return platform specific behavior.
-			virtual gui::ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const { return PlatformBehavior; }
+			virtual gui::ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const _IRR_OVERRIDE_ { return PlatformBehavior; }
 
 			void update();
 			void clearCursors();

source/Irrlicht/CLightSceneNode.h

@@ -22,8 +22,6 @@ public:
 	CLightSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
 		const core::vector3df& position, video::SColorf color, f32 range);
 
-	virtual ~CLightSceneNode() { }
-
 	//! pre render event
 	virtual void OnRegisterSceneNode();
 
@@ -49,7 +47,7 @@ public:
 	virtual const core::aabbox3d<f32>& getBoundingBox() const;
 
 	//! Returns type of the scene node
-	virtual ESCENE_NODE_TYPE getType() const { return ESNT_LIGHT; }
+	virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_LIGHT; }
 
 	//! Writes attributes of the scene node.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const;

source/Irrlicht/CMeshSceneNode.h

@@ -52,13 +52,13 @@ namespace scene
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_MESH; }
+		virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_MESH; }
 
 		//! Sets a new mesh
 		virtual void setMesh(IMesh* mesh);
 
 		//! Returns the current mesh
-		virtual IMesh* getMesh(void) { return Mesh; }
+		virtual IMesh* getMesh(void) _IRR_OVERRIDE_ { return Mesh; }
 
 		//! Creates shadow volume scene node as child of this node
 		//! and returns a pointer to it.

source/Irrlicht/CMountPointReader.h

-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_MOUNT_READER_H_INCLUDED__
-#define __C_MOUNT_READER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-
-#ifdef __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
-
-#include "IFileSystem.h"
-#include "CFileList.h"
-
-namespace irr
-{
-namespace io
-{
-
-	//! Archiveloader capable of loading MountPoint Archives
-	class CArchiveLoaderMount : public IArchiveLoader
-	{
-	public:
-
-		//! Constructor
-		CArchiveLoaderMount(io::IFileSystem* fs);
-
-		//! returns true if the file maybe is able to be loaded by this class
-		//! based on the file extension (e.g. ".zip")
-		virtual bool isALoadableFileFormat(const io::path& filename) const;
-
-		//! Check if the file might be loaded by this class
-		/** Check might look into the file.
-		\param file File handle to check.
-		\return True if file seems to be loadable. */
-		virtual bool isALoadableFileFormat(io::IReadFile* file) const;
-
-		//! Check to see if the loader can create archives of this type.
-		/** Check based on the archive type.
-		\param fileType The archive type to check.
-		\return True if the archile loader supports this type, false if not */
-		virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const;
-
-		//! Creates an archive from the filename
-		/** \param file File handle to check.
-		\return Pointer to newly created archive, or 0 upon error. */
-		virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const;
-
-		//! creates/loads an archive from the file.
-		//! \return Pointer to the created archive. Returns 0 if loading failed.
-		virtual IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const;
-
-	private:
-		io::IFileSystem* FileSystem;
-	};
-
-	//! A File Archive which uses a mountpoint
-	class CMountPointReader : public virtual IFileArchive, virtual CFileList
-	{
-	public:
-
-		//! Constructor
-		CMountPointReader(IFileSystem *parent, const io::path& basename,
-				bool ignoreCase, bool ignorePaths);
-
-		//! opens a file by index
-		virtual IReadFile* createAndOpenFile(u32 index);
-
-		//! opens a file by file name
-		virtual IReadFile* createAndOpenFile(const io::path& filename);
-
-		//! returns the list of files
-		virtual const IFileList* getFileList() const;
-
-		//! get the class Type
-		virtual E_FILE_ARCHIVE_TYPE getType() const { return EFAT_FOLDER; }
-
-	private:
-
-		core::array<io::path> RealFileNames;
-
-		IFileSystem *Parent;
-		void buildDirectory();
-	};
-} // io
-} // irr
-
-#endif // __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
-#endif // __C_MOUNT_READER_H_INCLUDED__
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_MOUNT_READER_H_INCLUDED__
+#define __C_MOUNT_READER_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+
+#ifdef __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
+
+#include "IFileSystem.h"
+#include "CFileList.h"
+
+namespace irr
+{
+namespace io
+{
+
+	//! Archiveloader capable of loading MountPoint Archives
+	class CArchiveLoaderMount : public IArchiveLoader
+	{
+	public:
+
+		//! Constructor
+		CArchiveLoaderMount(io::IFileSystem* fs);
+
+		//! returns true if the file maybe is able to be loaded by this class
+		//! based on the file extension (e.g. ".zip")
+		virtual bool isALoadableFileFormat(const io::path& filename) const;
+
+		//! Check if the file might be loaded by this class
+		/** Check might look into the file.
+		\param file File handle to check.
+		\return True if file seems to be loadable. */
+		virtual bool isALoadableFileFormat(io::IReadFile* file) const;
+
+		//! Check to see if the loader can create archives of this type.
+		/** Check based on the archive type.
+		\param fileType The archive type to check.
+		\return True if the archile loader supports this type, false if not */
+		virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const;
+
+		//! Creates an archive from the filename
+		/** \param file File handle to check.
+		\return Pointer to newly created archive, or 0 upon error. */
+		virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const;
+
+		//! creates/loads an archive from the file.
+		//! \return Pointer to the created archive. Returns 0 if loading failed.
+		virtual IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const;
+
+	private:
+		io::IFileSystem* FileSystem;
+	};
+
+	//! A File Archive which uses a mountpoint
+	class CMountPointReader : public virtual IFileArchive, virtual CFileList
+	{
+	public:
+
+		//! Constructor
+		CMountPointReader(IFileSystem *parent, const io::path& basename,
+				bool ignoreCase, bool ignorePaths);
+
+		//! opens a file by index
+		virtual IReadFile* createAndOpenFile(u32 index);
+
+		//! opens a file by file name
+		virtual IReadFile* createAndOpenFile(const io::path& filename);
+
+		//! returns the list of files
+		virtual const IFileList* getFileList() const;
+
+		//! get the class Type
+		virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_ { return EFAT_FOLDER; }
+
+	private:
+
+		core::array<io::path> RealFileNames;
+
+		IFileSystem *Parent;
+		void buildDirectory();
+	};
+} // io
+} // irr
+
+#endif // __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
+#endif // __C_MOUNT_READER_H_INCLUDED__

source/Irrlicht/CNPKReader.h

-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// Copyright (C) 2009-2012 Christian Stehno
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_NPK_READER_H_INCLUDED__
-#define __C_NPK_READER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-
-#ifdef __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_
-
-#include "IReferenceCounted.h"
-#include "IReadFile.h"
-#include "irrArray.h"
-#include "irrString.h"
-#include "IFileSystem.h"
-#include "CFileList.h"
-
-namespace irr
-{
-namespace io
-{
-	namespace
-	{
-	//! File header containing location and size of the table of contents
-	struct SNPKHeader
-	{
-		// Don't change the order of these fields!  They must match the order stored on disk.
-		c8 Tag[4];
-		u32 Length;
-		u32 Offset;
-	};
-
-	//! An entry in the NPK file's table of contents.
-	struct SNPKFileEntry
-	{
-		core::stringc Name;
-		u32 Offset;
-		u32 Length;
-	};
-	} // end namespace
-
-	//! Archiveloader capable of loading Nebula Device 2 NPK Archives
-	class CArchiveLoaderNPK : public IArchiveLoader
-	{
-	public:
-
-		//! Constructor
-		CArchiveLoaderNPK(io::IFileSystem* fs);
-
-		//! returns true if the file maybe is able to be loaded by this class
-		//! based on the file extension (e.g. ".zip")
-		virtual bool isALoadableFileFormat(const io::path& filename) const;
-
-		//! Check if the file might be loaded by this class
-		/** Check might look into the file.
-		\param file File handle to check.
-		\return True if file seems to be loadable. */
-		virtual bool isALoadableFileFormat(io::IReadFile* file) const;
-
-		//! Check to see if the loader can create archives of this type.
-		/** Check based on the archive type.
-		\param fileType The archive type to check.
-		\return True if the archile loader supports this type, false if not */
-		virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const;
-
-		//! Creates an archive from the filename
-		/** \param file File handle to check.
-		\return Pointer to newly created archive, or 0 upon error. */
-		virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const;
-
-		//! creates/loads an archive from the file.
-		//! \return Pointer to the created archive. Returns 0 if loading failed.
-		virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const;
-
-		//! Returns the type of archive created by this loader
-		virtual E_FILE_ARCHIVE_TYPE getType() const { return EFAT_NPK; }
-
-	private:
-		io::IFileSystem* FileSystem;
-	};
-
-
-	//! reads from NPK
-	class CNPKReader : public virtual IFileArchive, virtual CFileList
-	{
-	public:
-
-		CNPKReader(IReadFile* file, bool ignoreCase, bool ignorePaths);
-		virtual ~CNPKReader();
-
-		// file archive methods
-
-		//! return the id of the file Archive
-		virtual const io::path& getArchiveName() const
-		{
-			return File->getFileName();
-		}
-
-		//! opens a file by file name
-		virtual IReadFile* createAndOpenFile(const io::path& filename);
-
-		//! opens a file by index
-		virtual IReadFile* createAndOpenFile(u32 index);
-
-		//! returns the list of files
-		virtual const IFileList* getFileList() const;
-
-		//! get the class Type
-		virtual E_FILE_ARCHIVE_TYPE getType() const { return EFAT_NPK; }
-
-	private:
-
-		//! scans for a local header, returns false if the header is invalid
-		bool scanLocalHeader();
-		void readString(core::stringc& name);
-
-		IReadFile* File;
-	};
-
-} // end namespace io
-} // end namespace irr
-
-#endif // __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_
-
-#endif // __C_NPK_READER_H_INCLUDED__
-
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// Copyright (C) 2009-2012 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_NPK_READER_H_INCLUDED__
+#define __C_NPK_READER_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+
+#ifdef __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_
+
+#include "IReferenceCounted.h"
+#include "IReadFile.h"
+#include "irrArray.h"
+#include "irrString.h"
+#include "IFileSystem.h"
+#include "CFileList.h"
+
+namespace irr
+{
+namespace io
+{
+	namespace
+	{
+	//! File header containing location and size of the table of contents
+	struct SNPKHeader
+	{
+		// Don't change the order of these fields!  They must match the order stored on disk.
+		c8 Tag[4];
+		u32 Length;
+		u32 Offset;
+	};
+
+	//! An entry in the NPK file's table of contents.
+	struct SNPKFileEntry
+	{
+		core::stringc Name;
+		u32 Offset;
+		u32 Length;
+	};
+	} // end namespace
+
+	//! Archiveloader capable of loading Nebula Device 2 NPK Archives
+	class CArchiveLoaderNPK : public IArchiveLoader
+	{
+	public:
+
+		//! Constructor
+		CArchiveLoaderNPK(io::IFileSystem* fs);
+
+		//! returns true if the file maybe is able to be loaded by this class
+		//! based on the file extension (e.g. ".zip")
+		virtual bool isALoadableFileFormat(const io::path& filename) const;
+
+		//! Check if the file might be loaded by this class
+		/** Check might look into the file.
+		\param file File handle to check.
+		\return True if file seems to be loadable. */
+		virtual bool isALoadableFileFormat(io::IReadFile* file) const;
+
+		//! Check to see if the loader can create archives of this type.
+		/** Check based on the archive type.
+		\param fileType The archive type to check.
+		\return True if the archile loader supports this type, false if not */
+		virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const;
+
+		//! Creates an archive from the filename
+		/** \param file File handle to check.
+		\return Pointer to newly created archive, or 0 upon error. */
+		virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const;
+
+		//! creates/loads an archive from the file.
+		//! \return Pointer to the created archive. Returns 0 if loading failed.
+		virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const;
+
+	private:
+		io::IFileSystem* FileSystem;
+	};
+
+
+	//! reads from NPK
+	class CNPKReader : public virtual IFileArchive, virtual CFileList
+	{
+	public:
+
+		CNPKReader(IReadFile* file, bool ignoreCase, bool ignorePaths);
+		virtual ~CNPKReader();
+
+		// file archive methods
+
+		//! return the id of the file Archive
+		virtual const io::path& getArchiveName() const
+		{
+			return File->getFileName();
+		}
+
+		//! opens a file by file name
+		virtual IReadFile* createAndOpenFile(const io::path& filename);
+
+		//! opens a file by index
+		virtual IReadFile* createAndOpenFile(u32 index);
+
+		//! returns the list of files
+		virtual const IFileList* getFileList() const;
+
+		//! get the class Type
+		virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_ { return EFAT_NPK; }
+
+	private:
+
+		//! scans for a local header, returns false if the header is invalid
+		bool scanLocalHeader();
+		void readString(core::stringc& name);
+
+		IReadFile* File;
+	};
+
+} // end namespace io
+} // end namespace irr
+
+#endif // __IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_
+
+#endif // __C_NPK_READER_H_INCLUDED__
+

source/Irrlicht/CNullDriver.h

@@ -618,7 +618,7 @@ namespace video
 		virtual void enableClipPlane(u32 index, bool enable);
 
 		//! Returns the graphics card vendor name.
-		virtual core::stringc getVendorInfo() {return "Not available on this driver.";}
+		virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ {return "Not available on this driver.";}
 
 		//! Set the minimum number of vertices for which a hw buffer will be created
 		/** \param count Number of vertices to set as minimum. */
@@ -660,7 +660,7 @@ namespace video
 		virtual ITexture* createRenderTargetTexture(const core::dimension2d<u32>& size,
 				const c8* name=0);
 
-		virtual bool checkDriverReset() {return false;}
+		virtual bool checkDriverReset() _IRR_OVERRIDE_ {return false;}
 	protected:
 
 		//! deletes all textures
@@ -728,14 +728,14 @@ namespace video
 		{
 			SDummyTexture(const io::path& name) : ITexture(name), size(0,0) {};
 
-			virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0) { return 0; };
-			virtual void unlock(){}
-			virtual const core::dimension2d<u32>& getOriginalSize() const { return size; }
-			virtual const core::dimension2d<u32>& getSize() const { return size; }
-			virtual E_DRIVER_TYPE getDriverType() const { return video::EDT_NULL; }
-			virtual ECOLOR_FORMAT getColorFormat() const { return video::ECF_A1R5G5B5; };
-			virtual u32 getPitch() const { return 0; }
-			virtual void regenerateMipMapLevels(void* mipmapData=0) {};
+			virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0) _IRR_OVERRIDE_ { return 0; };
+			virtual void unlock()_IRR_OVERRIDE_ {}
+			virtual const core::dimension2d<u32>& getOriginalSize() const _IRR_OVERRIDE_ { return size; }
+			virtual const core::dimension2d<u32>& getSize() const _IRR_OVERRIDE_ { return size; }
+			virtual E_DRIVER_TYPE getDriverType() const _IRR_OVERRIDE_ { return video::EDT_NULL; }
+			virtual ECOLOR_FORMAT getColorFormat() const _IRR_OVERRIDE_ { return video::ECF_A1R5G5B5; };
+			virtual u32 getPitch() const _IRR_OVERRIDE_ { return 0; }
+			virtual void regenerateMipMapLevels(void* mipmapData=0) _IRR_OVERRIDE_ {};
 			core::dimension2d<u32> size;
 		};
 		core::array<SSurface> Textures;

source/Irrlicht/COctreeSceneNode.h

@@ -52,7 +52,7 @@ namespace scene
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_OCTREE; }
+		virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_OCTREE; }
 
 		//! Sets a new mesh to display
 		virtual void setMesh(IMesh* mesh);

source/Irrlicht/COpenGLCgMaterialRenderer.h

-// Copyright (C) 2012-2012 Patryk Nadrowski
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_OPENGL_CG_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_OPENGL_CG_MATERIAL_RENDERER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-#if defined(_IRR_COMPILE_WITH_OPENGL_) && defined(_IRR_COMPILE_WITH_CG_)
-
-#ifdef _IRR_WINDOWS_API_
-	#define WIN32_LEAN_AND_MEAN
-	#include <windows.h>
-	#include <GL/gl.h>
-	#include "glext.h"
-#else
-#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-	#define GL_GLEXT_LEGACY 1
-#else
-	#define GL_GLEXT_PROTOTYPES 1
-#endif
-#if defined(_IRR_OSX_PLATFORM_)
-	#include <OpenGL/gl.h>
-#else
-	#include <GL/gl.h>
-#endif
-#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-	#include "glext.h"
-#endif
-#endif
-
-#include "CCgMaterialRenderer.h"
-#include "Cg/cgGL.h"
-
-#ifdef _MSC_VER
-	#pragma comment(lib, "cgGL.lib")
-#endif
-
-namespace irr
-{
-namespace video
-{
-
-class COpenGLDriver;
-class IShaderConstantSetCallBack;
-
-class COpenGLCgUniformSampler2D : public CCgUniform
-{
-public:
-	COpenGLCgUniformSampler2D(const CGparameter& parameter, bool global);
-
-	void update(const void* data, const SMaterial& material) const;
-};
-
-class COpenGLCgMaterialRenderer : public CCgMaterialRenderer
-{
-public:
-	COpenGLCgMaterialRenderer(COpenGLDriver* driver, s32& materialType,
-		const c8* vertexProgram = 0, const c8* vertexEntry = "main",
-		E_VERTEX_SHADER_TYPE vertexProfile = video::EVST_VS_1_1,
-		const c8* fragmentProgram = 0, const c8* fragmentEntry = "main",
-		E_PIXEL_SHADER_TYPE fragmentProfile = video::EPST_PS_1_1,
-		const c8* geometryProgram = 0, const c8* geometryEntry = "main",
-		E_GEOMETRY_SHADER_TYPE geometryProfile = video::EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 vertices = 0, IShaderConstantSetCallBack* callback = 0,
-		IMaterialRenderer* baseMaterial = 0, s32 userData = 0);
-
-	virtual ~COpenGLCgMaterialRenderer();
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates, IMaterialRendererServices* services);
-	virtual bool OnRender(IMaterialRendererServices* services, E_VERTEX_TYPE vtxtype);
-	virtual void OnUnsetMaterial();
-
-	virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates);
-	virtual IVideoDriver* getVideoDriver();
-
-protected:
-	void init(s32& materialType,
-		const c8* vertexProgram = 0, const c8* vertexEntry = "main",
-		E_VERTEX_SHADER_TYPE vertexProfile = video::EVST_VS_1_1,
-		const c8* fragmentProgram = 0, const c8* fragmentEntry = "main",
-		E_PIXEL_SHADER_TYPE fragmentProfile = video::EPST_PS_1_1,
-		const c8* geometryProgram = 0, const c8* geometryEntry = "main",
-		E_GEOMETRY_SHADER_TYPE geometryProfile = video::EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 vertices = 0);
-
-	COpenGLDriver* Driver;
-};
-
-}
-}
-
-#endif
-#endif
-
+// Copyright (C) 2012-2012 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_OPENGL_CG_MATERIAL_RENDERER_H_INCLUDED__
+#define __C_OPENGL_CG_MATERIAL_RENDERER_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+#if defined(_IRR_COMPILE_WITH_OPENGL_) && defined(_IRR_COMPILE_WITH_CG_)
+
+#ifdef _IRR_WINDOWS_API_
+	#define WIN32_LEAN_AND_MEAN
+	#include <windows.h>
+	#include <GL/gl.h>
+	#include "glext.h"
+#else
+#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+	#define GL_GLEXT_LEGACY 1
+#else
+	#define GL_GLEXT_PROTOTYPES 1
+#endif
+#if defined(_IRR_OSX_PLATFORM_)
+	#include <OpenGL/gl.h>
+#else
+	#include <GL/gl.h>
+#endif
+#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+	#include "glext.h"
+#endif
+#endif
+
+#include "CCgMaterialRenderer.h"
+#include "Cg/cgGL.h"
+
+#ifdef _MSC_VER
+	#pragma comment(lib, "cgGL.lib")
+#endif
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGLDriver;
+class IShaderConstantSetCallBack;
+
+class COpenGLCgUniformSampler2D : public CCgUniform
+{
+public:
+	COpenGLCgUniformSampler2D(const CGparameter& parameter, bool global);
+
+	void update(const void* data, const SMaterial& material) const;
+};
+
+class COpenGLCgMaterialRenderer : public CCgMaterialRenderer
+{
+public:
+	COpenGLCgMaterialRenderer(COpenGLDriver* driver, s32& materialType,
+		const c8* vertexProgram = 0, const c8* vertexEntry = "main",
+		E_VERTEX_SHADER_TYPE vertexProfile = video::EVST_VS_1_1,
+		const c8* fragmentProgram = 0, const c8* fragmentEntry = "main",
+		E_PIXEL_SHADER_TYPE fragmentProfile = video::EPST_PS_1_1,
+		const c8* geometryProgram = 0, const c8* geometryEntry = "main",
+		E_GEOMETRY_SHADER_TYPE geometryProfile = video::EGST_GS_4_0,
+		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+		u32 vertices = 0, IShaderConstantSetCallBack* callback = 0,
+		IMaterialRenderer* baseMaterial = 0, s32 userData = 0);
+
+	virtual ~COpenGLCgMaterialRenderer();
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates, IMaterialRendererServices* services);
+	virtual bool OnRender(IMaterialRendererServices* services, E_VERTEX_TYPE vtxtype);
+	virtual void OnUnsetMaterial();
+
+	virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates);
+	virtual IVideoDriver* getVideoDriver();
+
+protected:
+	void init(s32& materialType,
+		const c8* vertexProgram = 0, const c8* vertexEntry = "main",
+		E_VERTEX_SHADER_TYPE vertexProfile = video::EVST_VS_1_1,
+		const c8* fragmentProgram = 0, const c8* fragmentEntry = "main",
+		E_PIXEL_SHADER_TYPE fragmentProfile = video::EPST_PS_1_1,
+		const c8* geometryProgram = 0, const c8* geometryEntry = "main",
+		E_GEOMETRY_SHADER_TYPE geometryProfile = video::EGST_GS_4_0,
+		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+		u32 vertices = 0);
+
+	COpenGLDriver* Driver;
+};
+
+}
+}
+
+#endif
+#endif
+

source/Irrlicht/COpenGLDriver.h

@@ -399,7 +399,7 @@ namespace video
 		virtual void enableMaterial2D(bool enable=true);
 
 		//! Returns the graphics card vendor name.
-		virtual core::stringc getVendorInfo() {return VendorName;}
+		virtual core::stringc getVendorInfo() _IRR_OVERRIDE_ {return VendorName;}
 
 		//! Returns the maximum texture size supported.
 		virtual core::dimension2du getMaxTextureSize() const;

source/Irrlicht/COpenGLParallaxMapRenderer.h

@@ -35,7 +35,7 @@ public:
 	//! Returns the render capability of the material.
 	virtual s32 getRenderCapability() const;
 
-	virtual void OnSetMaterial(const SMaterial& material) { }
+	virtual void OnSetMaterial(const SMaterial& material) _IRR_OVERRIDE_ { }
 	virtual void OnSetMaterial(const video::SMaterial& material,
 		const video::SMaterial& lastMaterial,
 		bool resetAllRenderstates, video::IMaterialRendererServices* services);

source/Irrlicht/CPakReader.h

@@ -71,9 +71,6 @@ namespace io
 		//! \return Pointer to the created archive. Returns 0 if loading failed.
 		virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const;
 
-		//! Returns the type of archive created by this loader
-		virtual E_FILE_ARCHIVE_TYPE getType() const { return EFAT_PAK; }
-
 	private:
 		io::IFileSystem* FileSystem;
 	};
@@ -105,7 +102,7 @@ namespace io
 		virtual const IFileList* getFileList() const;
 
 		//! get the class Type
-		virtual E_FILE_ARCHIVE_TYPE getType() const { return EFAT_PAK; }
+		virtual E_FILE_ARCHIVE_TYPE getType() const _IRR_OVERRIDE_ { return EFAT_PAK; }
 
 	private:
 

source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h

@@ -45,87 +45,87 @@ public:
 	virtual void setAnimatedMeshSceneNode( IAnimatedMeshSceneNode* node );
 
 	//! Set whether to use vertex normal for direction, or direction specified
-	virtual void setUseNormalDirection( bool useNormalDirection ) { UseNormalDirection = useNormalDirection; }
+	virtual void setUseNormalDirection( bool useNormalDirection ) _IRR_OVERRIDE_ { UseNormalDirection = useNormalDirection; }
 
 	//! Set direction the emitter emits particles
-	virtual void setDirection( const core::vector3df& newDirection ) { Direction = newDirection; }
+	virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; }
 
 	//! Set the amount that the normal is divided by for getting a particles direction
-	virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) { NormalDirectionModifier = normalDirectionModifier; }
+	virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) _IRR_OVERRIDE_ { NormalDirectionModifier = normalDirectionModifier; }
 
 	//! Sets whether to emit min<->max particles for every vertex per second, or to pick
 	//! min<->max vertices every second
-	virtual void setEveryMeshVertex( bool everyMeshVertex ) { EveryMeshVertex = everyMeshVertex; }
+	virtual void setEveryMeshVertex( bool everyMeshVertex ) _IRR_OVERRIDE_ { EveryMeshVertex = everyMeshVertex; }
 
 	//! Set minimum number of particles the emitter emits per second
-	virtual void setMinParticlesPerSecond( u32 minPPS ) { MinParticlesPerSecond = minPPS; }
+	virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; }
 
 	//! Set maximum number of particles the emitter emits per second
-	virtual void setMaxParticlesPerSecond( u32 maxPPS ) { MaxParticlesPerSecond = maxPPS; }
+	virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; }
 
 	//! Set minimum starting color for particles
-	virtual void setMinStartColor( const video::SColor& color ) { MinStartColor = color; }
+	virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; }
 
 	//! Set maximum starting color for particles
-	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
+	virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; }
 
 	//! Set the maximum starting size for particles
-	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; }
+	virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; }
 
 	//! Set the minimum starting size for particles
-	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; }
+	virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; }
 
 	//! Set the minimum particle life-time in milliseconds
-	virtual void setMinLifeTime( u32 lifeTimeMin ) { MinLifeTime = lifeTimeMin; }
+	virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; }
 
 	//! Set the maximum particle life-time in milliseconds
-	virtual void setMaxLifeTime( u32 lifeTimeMax ) { MaxLifeTime = lifeTimeMax; }
+	virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; }
 
 	//!	Maximal random derivation from the direction
-	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) { MaxAngleDegrees = maxAngleDegrees; }
+	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; }
 
 	//! Get Mesh we're emitting particles from
-	virtual const IAnimatedMeshSceneNode* getAnimatedMeshSceneNode() const { return Node; }
+	virtual const IAnimatedMeshSceneNode* getAnimatedMeshSceneNode() const _IRR_OVERRIDE_ { return Node; }
 
 	//! Get whether to use vertex normal for direciton, or direction specified
-	virtual bool isUsingNormalDirection() const { return UseNormalDirection; }
+	virtual bool isUsingNormalDirection() const _IRR_OVERRIDE_ { return UseNormalDirection; }
 
 	//! Get direction the emitter emits particles
-	virtual const core::vector3df& getDirection() const { return Direction; }
+	virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; }
 
 	//! Get the amount that the normal is divided by for getting a particles direction
-	virtual f32 getNormalDirectionModifier() const { return NormalDirectionModifier; }
+	virtual f32 getNormalDirectionModifier() const _IRR_OVERRIDE_ { return NormalDirectionModifier; }
 
 	//! Gets whether to emit min<->max particles for every vertex per second, or to pick
 	//! min<->max vertices every second
-	virtual bool getEveryMeshVertex() const { return EveryMeshVertex; }
+	virtual bool getEveryMeshVertex() const _IRR_OVERRIDE_ { return EveryMeshVertex; }
 
 	//! Get the minimum number of particles the emitter emits per second
-	virtual u32 getMinParticlesPerSecond() const { return MinParticlesPerSecond; }
+	virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; }
 
 	//! Get the maximum number of particles the emitter emits per second
-	virtual u32 getMaxParticlesPerSecond() const { return MaxParticlesPerSecond; }
+	virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; }
 
 	//! Get the minimum starting color for particles
-	virtual const video::SColor& getMinStartColor() const { return MinStartColor; }
+	virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; }
 
 	//! Get the maximum starting color for particles
-	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
+	virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; }
 
 	//! Get the maximum starting size for particles
-	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; }
+	virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; }
 
 	//! Get the minimum starting size for particles
-	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; }
+	virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; }
 
 	//! Get the minimum particle life-time in milliseconds
-	virtual u32 getMinLifeTime() const { return MinLifeTime; }
+	virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; }
 
 	//! Get the maximum particle life-time in milliseconds
-	virtual u32 getMaxLifeTime() const { return MaxLifeTime; }
+	virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; }
 
 	//!	Maximal random derivation from the direction
-	virtual s32 getMaxAngleDegrees() const { return MaxAngleDegrees; }
+	virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; }
 
 private:
 

source/Irrlicht/CParticleAttractionAffector.h

@@ -26,40 +26,40 @@ public:
 	virtual void affect(u32 now, SParticle* particlearray, u32 count);
 
 	//! Set the point that particles will attract to
-	virtual void setPoint( const core::vector3df& point ) { Point = point; }
+	virtual void setPoint( const core::vector3df& point ) _IRR_OVERRIDE_ { Point = point; }
 
 	//! Set the speed, in game units per second that the particles will attract to the specified point
-	virtual void setSpeed( f32 speed ) { Speed = speed; }
+	virtual void setSpeed( f32 speed ) _IRR_OVERRIDE_ { Speed = speed; }
 
 	//! Set whether or not the particles are attracting or detracting
-	virtual void setAttract( bool attract ) { Attract = attract; }
+	virtual void setAttract( bool attract ) _IRR_OVERRIDE_ { Attract = attract; }
 
 	//! Set whether or not this will affect particles in the X direction
-	virtual void setAffectX( bool affect ) { AffectX = affect; }
+	virtual void setAffectX( bool affect ) _IRR_OVERRIDE_ { AffectX = affect; }
 
 	//! Set whether or not this will affect particles in the Y direction
-	virtual void setAffectY( bool affect ) { AffectY = affect; }
+	virtual void setAffectY( bool affect ) _IRR_OVERRIDE_ { AffectY = affect; }
 
 	//! Set whether or not this will affect particles in the Z direction
-	virtual void setAffectZ( bool affect ) { AffectZ = affect; }
+	virtual void setAffectZ( bool affect ) _IRR_OVERRIDE_ { AffectZ = affect; }
 
 	//! Get the point that particles are attracted to
-	virtual const core::vector3df& getPoint() const { return Point; }
+	virtual const core::vector3df& getPoint() const _IRR_OVERRIDE_ { return Point; }
 
 	//! Get the speed that points attract to the specified point
-	virtual f32 getSpeed() const { return Speed; }
+	virtual f32 getSpeed() const _IRR_OVERRIDE_ { return Speed; }
 
 	//! Get whether or not the particles are attracting or detracting
-	virtual bool getAttract() const { return Attract; }
+	virtual bool getAttract() const _IRR_OVERRIDE_ { return Attract; }
 
 	//! Get whether or not the particles X position are affected
-	virtual bool getAffectX() const { return AffectX; }
+	virtual bool getAffectX() const _IRR_OVERRIDE_ { return AffectX; }
 
 	//! Get whether or not the particles Y position are affected
-	virtual bool getAffectY() const { return AffectY; }
+	virtual bool getAffectY() const _IRR_OVERRIDE_ { return AffectY; }
 
 	//! Get whether or not the particles Z position are affected
-	virtual bool getAffectZ() const { return AffectZ; }
+	virtual bool getAffectZ() const _IRR_OVERRIDE_ { return AffectZ; }
 
 	//! Writes attributes of the object.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;

source/Irrlicht/CParticleBoxEmitter.h

@@ -39,70 +39,70 @@ public:
 	virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray);
 
 	//! Set direction the emitter emits particles.
-	virtual void setDirection( const core::vector3df& newDirection ) { Direction = newDirection; }
+	virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; }
 
 	//! Set minimum number of particles emitted per second.
-	virtual void setMinParticlesPerSecond( u32 minPPS ) { MinParticlesPerSecond = minPPS; }
+	virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; }
 
 	//! Set maximum number of particles emitted per second.
-	virtual void setMaxParticlesPerSecond( u32 maxPPS ) { MaxParticlesPerSecond = maxPPS; }
+	virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; }
 
 	//! Set minimum start color.
-	virtual void setMinStartColor( const video::SColor& color ) { MinStartColor = color; }
+	virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; }
 
 	//! Set maximum start color.
-	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
+	virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; }
 
 	//! Set the maximum starting size for particles
-	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; };
+	virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; };
 
 	//! Set the minimum starting size for particles
-	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; };
+	virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; };
 
 	//! Set the minimum particle life-time in milliseconds
-	virtual void setMinLifeTime( u32 lifeTimeMin ) { MinLifeTime = lifeTimeMin; }
+	virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; }
 
 	//! Set the maximum particle life-time in milliseconds
-	virtual void setMaxLifeTime( u32 lifeTimeMax ) { MaxLifeTime = lifeTimeMax; }
+	virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; }
 
 	//!	Maximal random derivation from the direction
-	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) { MaxAngleDegrees = maxAngleDegrees; }
+	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; }
 
 	//! Set box from which the particles are emitted.
-	virtual void setBox( const core::aabbox3df& box ) { Box = box; }
+	virtual void setBox( const core::aabbox3df& box ) _IRR_OVERRIDE_ { Box = box; }
 
 	//! Gets direction the emitter emits particles.
-	virtual const core::vector3df& getDirection() const { return Direction; }
+	virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; }
 
 	//! Gets minimum number of particles emitted per second.
-	virtual u32 getMinParticlesPerSecond() const { return MinParticlesPerSecond; }
+	virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; }
 
 	//! Gets maximum number of particles emitted per second.
-	virtual u32 getMaxParticlesPerSecond() const { return MaxParticlesPerSecond; }
+	virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; }
 
 	//! Gets minimum start color.
-	virtual const video::SColor& getMinStartColor() const { return MinStartColor; }
+	virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; }
 
 	//! Gets maximum start color.
-	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
+	virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; }
 
 	//! Gets the maximum starting size for particles
-	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; }
+	virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; }
 
 	//! Gets the minimum starting size for particles
-	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; }
+	virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; }
 
 	//! Get the minimum particle life-time in milliseconds
-	virtual u32 getMinLifeTime() const { return MinLifeTime; }
+	virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; }
 
 	//! Get the maximum particle life-time in milliseconds
-	virtual u32 getMaxLifeTime() const { return MaxLifeTime; }
+	virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; }
 
 	//!	Maximal random derivation from the direction
-	virtual s32 getMaxAngleDegrees() const { return MaxAngleDegrees; }
+	virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; }
 
 	//! Get box from which the particles are emitted.
-	virtual const core::aabbox3df& getBox() const { return Box; }
+	virtual const core::aabbox3df& getBox() const _IRR_OVERRIDE_ { return Box; }
 
 	//! Writes attributes of the object.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;

source/Irrlicht/CParticleCylinderEmitter.h

@@ -39,94 +39,94 @@ public:
 	virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray);
 
 	//! Set the center of the radius for the cylinder, at one end of the cylinder
-	virtual void setCenter( const core::vector3df& center ) { Center = center; }
+	virtual void setCenter( const core::vector3df& center ) _IRR_OVERRIDE_ { Center = center; }
 
 	//! Set the normal of the cylinder
-	virtual void setNormal( const core::vector3df& normal ) { Normal = normal; }
+	virtual void setNormal( const core::vector3df& normal ) _IRR_OVERRIDE_ { Normal = normal; }
 
 	//! Set the radius of the cylinder
-	virtual void setRadius( f32 radius ) { Radius = radius; }
+	virtual void setRadius( f32 radius ) _IRR_OVERRIDE_ { Radius = radius; }
 
 	//! Set the length of the cylinder
-	virtual void setLength( f32 length ) { Length = length; }
+	virtual void setLength( f32 length ) _IRR_OVERRIDE_ { Length = length; }
 
 	//! Set whether or not to draw points inside the cylinder
-	virtual void setOutlineOnly( bool outlineOnly ) { OutlineOnly = outlineOnly; }
+	virtual void setOutlineOnly( bool outlineOnly ) _IRR_OVERRIDE_ { OutlineOnly = outlineOnly; }
 
 	//! Set direction the emitter emits particles
-	virtual void setDirection( const core::vector3df& newDirection ) { Direction = newDirection; }
+	virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; }
 
 	//! Set direction the emitter emits particles
-	virtual void setMinParticlesPerSecond( u32 minPPS ) { MinParticlesPerSecond = minPPS; }
+	virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; }
 
 	//! Set direction the emitter emits particles
-	virtual void setMaxParticlesPerSecond( u32 maxPPS ) { MaxParticlesPerSecond = maxPPS; }
+	virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; }
 
 	//! Set direction the emitter emits particles
-	virtual void setMinStartColor( const video::SColor& color ) { MinStartColor = color; }
+	virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; }
 
 	//! Set direction the emitter emits particles
-	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
+	virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; }
 
 	//! Set the maximum starting size for particles
-	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; }
+	virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; }
 
 	//! Set the minimum starting size for particles
-	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; }
+	virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; }
 
 	//! Set the minimum particle life-time in milliseconds
-	virtual void setMinLifeTime( u32 lifeTimeMin ) { MinLifeTime = lifeTimeMin; }
+	virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; }
 
 	//! Set the maximum particle life-time in milliseconds
-	virtual void setMaxLifeTime( u32 lifeTimeMax ) { MaxLifeTime = lifeTimeMax; }
+	virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; }
 
 	//!	Maximal random derivation from the direction
-	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) { MaxAngleDegrees = maxAngleDegrees; }
+	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; }
 
 	//! Get the center of the cylinder
-	virtual const core::vector3df& getCenter() const { return Center; }
+	virtual const core::vector3df& getCenter() const _IRR_OVERRIDE_ { return Center; }
 
 	//! Get the normal of the cylinder
-	virtual const core::vector3df& getNormal() const { return Normal; }
+	virtual const core::vector3df& getNormal() const _IRR_OVERRIDE_ { return Normal; }
 
 	//! Get the radius of the cylinder
-	virtual f32 getRadius() const { return Radius; }
+	virtual f32 getRadius() const _IRR_OVERRIDE_ { return Radius; }
 
 	//! Get the center of the cylinder
-	virtual f32 getLength() const { return Length; }
+	virtual f32 getLength() const _IRR_OVERRIDE_ { return Length; }
 
 	//! Get whether or not to draw points inside the cylinder
-	virtual bool getOutlineOnly() const { return OutlineOnly; }
+	virtual bool getOutlineOnly() const _IRR_OVERRIDE_ { return OutlineOnly; }
 
 	//! Gets direction the emitter emits particles
-	virtual const core::vector3df& getDirection() const { return Direction; }
+	virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; }
 
 	//! Gets direction the emitter emits particles
-	virtual u32 getMinParticlesPerSecond() const { return MinParticlesPerSecond; }
+	virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; }
 
 	//! Gets direction the emitter emits particles
-	virtual u32 getMaxParticlesPerSecond() const { return MaxParticlesPerSecond; }
+	virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; }
 
 	//! Gets direction the emitter emits particles
-	virtual const video::SColor& getMinStartColor() const { return MinStartColor; }
+	virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; }
 
 	//! Gets direction the emitter emits particles
-	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
+	virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; }
 
 	//! Gets the maximum starting size for particles
-	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; }
+	virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; }
 
 	//! Gets the minimum starting size for particles
-	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; }
+	virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; }
 
 	//! Get the minimum particle life-time in milliseconds
-	virtual u32 getMinLifeTime() const { return MinLifeTime; }
+	virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; }
 
 	//! Get the maximum particle life-time in milliseconds
-	virtual u32 getMaxLifeTime() const { return MaxLifeTime; }
+	virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; }
 
 	//!	Maximal random derivation from the direction
-	virtual s32 getMaxAngleDegrees() const { return MaxAngleDegrees; }
+	virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; }
 
 	//! Writes attributes of the object.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;

source/Irrlicht/CParticleFadeOutAffector.h

@@ -25,17 +25,17 @@ public:
 
 	//! Sets the targetColor, i.e. the color the particles will interpolate
 	//! to over time.
-	virtual void setTargetColor( const video::SColor& targetColor ) { TargetColor = targetColor; }
+	virtual void setTargetColor( const video::SColor& targetColor ) _IRR_OVERRIDE_ { TargetColor = targetColor; }
 
 	//! Sets the amount of time it takes for each particle to fade out.
-	virtual void setFadeOutTime( u32 fadeOutTime ) { FadeOutTime = fadeOutTime ? static_cast<f32>(fadeOutTime) : 1.0f; }
+	virtual void setFadeOutTime( u32 fadeOutTime ) _IRR_OVERRIDE_ { FadeOutTime = fadeOutTime ? static_cast<f32>(fadeOutTime) : 1.0f; }
 
 	//! Sets the targetColor, i.e. the color the particles will interpolate
 	//! to over time.
-	virtual const video::SColor& getTargetColor() const { return TargetColor; }
+	virtual const video::SColor& getTargetColor() const _IRR_OVERRIDE_ { return TargetColor; }
 
 	//! Sets the amount of time it takes for each particle to fade out.
-	virtual u32 getFadeOutTime() const { return static_cast<u32>(FadeOutTime); }
+	virtual u32 getFadeOutTime() const _IRR_OVERRIDE_ { return static_cast<u32>(FadeOutTime); }
 
 	//! Writes attributes of the object.
 	//! Implement this to expose the attributes of your scene node animator for

source/Irrlicht/CParticleGravityAffector.h

@@ -27,17 +27,17 @@ public:
 
 	//! Set the time in milliseconds when the gravity force is totally
 	//! lost and the particle does not move any more.
-	virtual void setTimeForceLost( f32 timeForceLost ) { TimeForceLost = timeForceLost; }
+	virtual void setTimeForceLost( f32 timeForceLost ) _IRR_OVERRIDE_ { TimeForceLost = timeForceLost; }
 
 	//! Set the direction and force of gravity.
-	virtual void setGravity( const core::vector3df& gravity ) { Gravity = gravity; }
+	virtual void setGravity( const core::vector3df& gravity ) _IRR_OVERRIDE_ { Gravity = gravity; }
 
 	//! Set the time in milliseconds when the gravity force is totally
 	//! lost and the particle does not move any more.
-	virtual f32 getTimeForceLost() const { return TimeForceLost; }
+	virtual f32 getTimeForceLost() const _IRR_OVERRIDE_ { return TimeForceLost; }
 
 	//! Set the direction and force of gravity.
-	virtual const core::vector3df& getGravity() const { return Gravity; }
+	virtual const core::vector3df& getGravity() const _IRR_OVERRIDE_ { return Gravity; }
 
 	//! Writes attributes of the object.
 	//! Implement this to expose the attributes of your scene node animator for

source/Irrlicht/CParticleMeshEmitter.h

@@ -46,87 +46,87 @@ public:
 	virtual void setMesh( IMesh* mesh );
 
 	//! Set whether to use vertex normal for direction, or direction specified
-	virtual void setUseNormalDirection( bool useNormalDirection ) { UseNormalDirection = useNormalDirection; }
+	virtual void setUseNormalDirection( bool useNormalDirection ) _IRR_OVERRIDE_ { UseNormalDirection = useNormalDirection; }
 
 	//! Set direction the emitter emits particles
-	virtual void setDirection( const core::vector3df& newDirection ) { Direction = newDirection; }
+	virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; }
 
 	//! Set the amount that the normal is divided by for getting a particles direction
-	virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) { NormalDirectionModifier = normalDirectionModifier; }
+	virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) _IRR_OVERRIDE_ { NormalDirectionModifier = normalDirectionModifier; }
 
 	//! Sets whether to emit min<->max particles for every vertex per second, or to pick
 	//! min<->max vertices every second
-	virtual void setEveryMeshVertex( bool everyMeshVertex ) { EveryMeshVertex = everyMeshVertex; }
+	virtual void setEveryMeshVertex( bool everyMeshVertex ) _IRR_OVERRIDE_ { EveryMeshVertex = everyMeshVertex; }
 
 	//! Set minimum number of particles the emitter emits per second
-	virtual void setMinParticlesPerSecond( u32 minPPS ) { MinParticlesPerSecond = minPPS; }
+	virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; }
 
 	//! Set maximum number of particles the emitter emits per second
-	virtual void setMaxParticlesPerSecond( u32 maxPPS ) { MaxParticlesPerSecond = maxPPS; }
+	virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; }
 
 	//! Set minimum starting color for particles
-	virtual void setMinStartColor( const video::SColor& color ) { MinStartColor = color; }
+	virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; }
 
 	//! Set maximum starting color for particles
-	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
+	virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; }
 
 	//! Set the maximum starting size for particles
-	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; }
+	virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; }
 
 	//! Set the minimum starting size for particles
-	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; }
+	virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; }
 
 	//! Set the minimum particle life-time in milliseconds
-	virtual void setMinLifeTime( u32 lifeTimeMin ) { MinLifeTime = lifeTimeMin; }
+	virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; }
 
 	//! Set the maximum particle life-time in milliseconds
-	virtual void setMaxLifeTime( u32 lifeTimeMax ) { MaxLifeTime = lifeTimeMax; }
+	virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; }
 
 	//!	Set maximal random derivation from the direction
-	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) { MaxAngleDegrees = maxAngleDegrees; }
+	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; }
 
 	//! Get Mesh we're emitting particles from
-	virtual const IMesh* getMesh() const { return Mesh; }
+	virtual const IMesh* getMesh() const _IRR_OVERRIDE_ { return Mesh; }
 
 	//! Get whether to use vertex normal for direciton, or direction specified
-	virtual bool isUsingNormalDirection() const { return UseNormalDirection; }
+	virtual bool isUsingNormalDirection() const _IRR_OVERRIDE_ { return UseNormalDirection; }
 
 	//! Get direction the emitter emits particles
-	virtual const core::vector3df& getDirection() const { return Direction; }
+	virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; }
 
 	//! Get the amount that the normal is divided by for getting a particles direction
-	virtual f32 getNormalDirectionModifier() const { return NormalDirectionModifier; }
+	virtual f32 getNormalDirectionModifier() const _IRR_OVERRIDE_ { return NormalDirectionModifier; }
 
 	//! Gets whether to emit min<->max particles for every vertex per second, or to pick
 	//! min<->max vertices every second
-	virtual bool getEveryMeshVertex() const { return EveryMeshVertex; }
+	virtual bool getEveryMeshVertex() const _IRR_OVERRIDE_ { return EveryMeshVertex; }
 
 	//! Get the minimum number of particles the emitter emits per second
-	virtual u32 getMinParticlesPerSecond() const { return MinParticlesPerSecond; }
+	virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; }
 
 	//! Get the maximum number of particles the emitter emits per second
-	virtual u32 getMaxParticlesPerSecond() const { return MaxParticlesPerSecond; }
+	virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; }
 
 	//! Get the minimum starting color for particles
-	virtual const video::SColor& getMinStartColor() const { return MinStartColor; }
+	virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; }
 
 	//! Get the maximum starting color for particles
-	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
+	virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; }
 
 	//! Gets the maximum starting size for particles
-	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; }
+	virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; }
 
 	//! Gets the minimum starting size for particles
-	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; }
+	virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; }
 
 	//! Get the minimum particle life-time in milliseconds
-	virtual u32 getMinLifeTime() const { return MinLifeTime; }
+	virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; }
 
 	//! Get the maximum particle life-time in milliseconds
-	virtual u32 getMaxLifeTime() const { return MaxLifeTime; }
+	virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; }
 
 	//!	Get maximal random derivation from the direction
-	virtual s32 getMaxAngleDegrees() const { return MaxAngleDegrees; }
+	virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; }
 
 private:
 

source/Irrlicht/CParticlePointEmitter.h

@@ -36,64 +36,64 @@ public:
 	virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray);
 
 	//! Set direction the emitter emits particles.
-	virtual void setDirection( const core::vector3df& newDirection ) { Direction = newDirection; }
+	virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; }
 
 	//! Set minimum number of particles emitted per second.
-	virtual void setMinParticlesPerSecond( u32 minPPS ) { MinParticlesPerSecond = minPPS; }
+	virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; }
 
 	//! Set maximum number of particles emitted per second.
-	virtual void setMaxParticlesPerSecond( u32 maxPPS ) { MaxParticlesPerSecond = maxPPS; }
+	virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; }
 
 	//! Set minimum start color.
-	virtual void setMinStartColor( const video::SColor& color ) { MinStartColor = color; }
+	virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; }
 
 	//! Set maximum start color.
-	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
+	virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; }
 
 	//! Set the maximum starting size for particles
-	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; }
+	virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; }
 
 	//! Set the minimum starting size for particles
-	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; }
+	virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; }
 
 	//! Set the minimum particle life-time in milliseconds
-	virtual void setMinLifeTime( u32 lifeTimeMin ) { MinLifeTime = lifeTimeMin; }
+	virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; }
 
 	//! Set the maximum particle life-time in milliseconds
-	virtual void setMaxLifeTime( u32 lifeTimeMax ) { MaxLifeTime = lifeTimeMax; }
+	virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; }
 
 	//!	Set maximal random derivation from the direction
-	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) { MaxAngleDegrees = maxAngleDegrees; }
+	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; }
 
 	//! Gets direction the emitter emits particles.
-	virtual const core::vector3df& getDirection() const { return Direction; }
+	virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; }
 
 	//! Gets minimum number of particles emitted per second.
-	virtual u32 getMinParticlesPerSecond() const { return MinParticlesPerSecond; }
+	virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; }
 
 	//! Gets maximum number of particles emitted per second.
-	virtual u32 getMaxParticlesPerSecond() const { return MaxParticlesPerSecond; }
+	virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; }
 
 	//! Gets minimum start color.
-	virtual const video::SColor& getMinStartColor() const { return MinStartColor; }
+	virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; }
 
 	//! Gets maximum start color.
-	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
+	virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; }
 
 	//! Gets the maximum starting size for particles
-	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; }
+	virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; }
 
 	//! Gets the minimum starting size for particles
-	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; }
+	virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; }
 
 	//! Get the minimum particle life-time in milliseconds
-	virtual u32 getMinLifeTime() const { return MinLifeTime; }
+	virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; }
 
 	//! Get the maximum particle life-time in milliseconds
-	virtual u32 getMaxLifeTime() const { return MaxLifeTime; }
+	virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; }
 
 	//!	Get maximal random derivation from the direction
-	virtual s32 getMaxAngleDegrees() const { return MaxAngleDegrees; }
+	virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; }
 
 	//! Writes attributes of the object.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;

source/Irrlicht/CParticleRingEmitter.h

@@ -38,82 +38,82 @@ public:
 	virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray);
 
 	//! Set direction the emitter emits particles
-	virtual void setDirection( const core::vector3df& newDirection ) { Direction = newDirection; }
+	virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; }
 
 	//! Set minimum number of particles the emitter emits per second
-	virtual void setMinParticlesPerSecond( u32 minPPS ) { MinParticlesPerSecond = minPPS; }
+	virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; }
 
 	//! Set maximum number of particles the emitter emits per second
-	virtual void setMaxParticlesPerSecond( u32 maxPPS ) { MaxParticlesPerSecond = maxPPS; }
+	virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; }
 
 	//! Set minimum starting color for particles
-	virtual void setMinStartColor( const video::SColor& color ) { MinStartColor = color; }
+	virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; }
 
 	//! Set maximum starting color for particles
-	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
+	virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; }
 
 	//! Set the maximum starting size for particles
-	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; }
+	virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; }
 
 	//! Set the minimum starting size for particles
-	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; }
+	virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; }
 
 	//! Set the minimum particle life-time in milliseconds
-	virtual void setMinLifeTime( u32 lifeTimeMin ) { MinLifeTime = lifeTimeMin; }
+	virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; }
 
 	//! Set the maximum particle life-time in milliseconds
-	virtual void setMaxLifeTime( u32 lifeTimeMax ) { MaxLifeTime = lifeTimeMax; }
+	virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; }
 
 	//!	Set maximal random derivation from the direction
-	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) { MaxAngleDegrees = maxAngleDegrees; }
+	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; }
 
 	//! Set the center of the ring
-	virtual void setCenter( const core::vector3df& center ) { Center = center; }
+	virtual void setCenter( const core::vector3df& center ) _IRR_OVERRIDE_ { Center = center; }
 
 	//! Set the radius of the ring
-	virtual void setRadius( f32 radius ) { Radius = radius; }
+	virtual void setRadius( f32 radius ) _IRR_OVERRIDE_ { Radius = radius; }
 
 	//! Set the thickness of the ring
-	virtual void setRingThickness( f32 ringThickness ) { RingThickness = ringThickness; }
+	virtual void setRingThickness( f32 ringThickness ) _IRR_OVERRIDE_ { RingThickness = ringThickness; }
 
 	//! Gets direction the emitter emits particles
-	virtual const core::vector3df& getDirection() const { return Direction; }
+	virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; }
 
 	//! Gets the minimum number of particles the emitter emits per second
-	virtual u32 getMinParticlesPerSecond() const { return MinParticlesPerSecond; }
+	virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; }
 
 	//! Gets the maximum number of particles the emitter emits per second
-	virtual u32 getMaxParticlesPerSecond() const { return MaxParticlesPerSecond; }
+	virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; }
 
 	//! Gets the minimum starting color for particles
-	virtual const video::SColor& getMinStartColor() const { return MinStartColor; }
+	virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; }
 
 	//! Gets the maximum starting color for particles
-	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
+	virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; }
 
 	//! Gets the maximum starting size for particles
-	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; }
+	virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; }
 
 	//! Gets the minimum starting size for particles
-	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; }
+	virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; }
 
 	//! Get the minimum particle life-time in milliseconds
-	virtual u32 getMinLifeTime() const { return MinLifeTime; }
+	virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; }
 
 	//! Get the maximum particle life-time in milliseconds
-	virtual u32 getMaxLifeTime() const { return MaxLifeTime; }
+	virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; }
 
 	//!	Get maximal random derivation from the direction
-	virtual s32 getMaxAngleDegrees() const { return MaxAngleDegrees; }
+	virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; }
 
 	//! Get the center of the ring
-	virtual const core::vector3df& getCenter() const { return Center; }
+	virtual const core::vector3df& getCenter() const _IRR_OVERRIDE_ { return Center; }
 
 	//! Get the radius of the ring
-	virtual f32 getRadius() const { return Radius; }
+	virtual f32 getRadius() const _IRR_OVERRIDE_ { return Radius; }
 
 	//! Get the thickness of the ring
-	virtual f32 getRingThickness() const { return RingThickness; }
+	virtual f32 getRingThickness() const _IRR_OVERRIDE_ { return RingThickness; }
 
 	//! Writes attributes of the object.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;

source/Irrlicht/CParticleRotationAffector.h

@@ -24,16 +24,16 @@ public:
 	virtual void affect(u32 now, SParticle* particlearray, u32 count);
 
 	//! Set the point that particles will attract to
-	virtual void setPivotPoint( const core::vector3df& point ) { PivotPoint = point; }
+	virtual void setPivotPoint( const core::vector3df& point ) _IRR_OVERRIDE_ { PivotPoint = point; }
 
 	//! Set the speed in degrees per second
-	virtual void setSpeed( const core::vector3df& speed ) { Speed = speed; }
+	virtual void setSpeed( const core::vector3df& speed ) _IRR_OVERRIDE_ { Speed = speed; }
 
 	//! Get the point that particles are attracted to
-	virtual const core::vector3df& getPivotPoint() const { return PivotPoint; }
+	virtual const core::vector3df& getPivotPoint() const _IRR_OVERRIDE_ { return PivotPoint; }
 
 	//! Get the speed in degrees per second
-	virtual const core::vector3df& getSpeed() const { return Speed; }
+	virtual const core::vector3df& getSpeed() const _IRR_OVERRIDE_ { return Speed; }
 
 	//! Writes attributes of the object.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;

source/Irrlicht/CParticleSphereEmitter.h

@@ -38,76 +38,76 @@ public:
 	virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray);
 
 	//! Set direction the emitter emits particles
-	virtual void setDirection( const core::vector3df& newDirection ) { Direction = newDirection; }
+	virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; }
 
 	//! Set minimum number of particles per second.
-	virtual void setMinParticlesPerSecond( u32 minPPS ) { MinParticlesPerSecond = minPPS; }
+	virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; }
 
 	//! Set maximum number of particles per second.
-	virtual void setMaxParticlesPerSecond( u32 maxPPS ) { MaxParticlesPerSecond = maxPPS; }
+	virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; }
 
 	//! Set minimum start color
-	virtual void setMinStartColor( const video::SColor& color ) { MinStartColor = color; }
+	virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; }
 
 	//! Set maximum start color
-	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
+	virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; }
 
 	//! Set the maximum starting size for particles
-	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; }
+	virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; }
 
 	//! Set the minimum starting size for particles
-	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; }
+	virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; }
 
 	//! Set the minimum particle life-time in milliseconds
-	virtual void setMinLifeTime( u32 lifeTimeMin ) { MinLifeTime = lifeTimeMin; }
+	virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; }
 
 	//! Set the maximum particle life-time in milliseconds
-	virtual void setMaxLifeTime( u32 lifeTimeMax ) { MaxLifeTime = lifeTimeMax; }
+	virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; }
 
 	//!	Set maximal random derivation from the direction
-	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) { MaxAngleDegrees = maxAngleDegrees; }
+	virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; }
 
 	//! Set the center of the sphere for particle emissions
-	virtual void setCenter( const core::vector3df& center ) { Center = center; }
+	virtual void setCenter( const core::vector3df& center ) _IRR_OVERRIDE_ { Center = center; }
 
 	//! Set the radius of the sphere for particle emissions
-	virtual void setRadius( f32 radius ) { Radius = radius; }
+	virtual void setRadius( f32 radius ) _IRR_OVERRIDE_ { Radius = radius; }
 
 	//! Gets direction the emitter emits particles
-	virtual const core::vector3df& getDirection() const { return Direction; }
+	virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; }
 
 	//! Get minimum number of particles per second.
-	virtual u32 getMinParticlesPerSecond() const { return MinParticlesPerSecond; }
+	virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; }
 
 	//! Get maximum number of particles per second.
-	virtual u32 getMaxParticlesPerSecond() const { return MaxParticlesPerSecond; }
+	virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; }
 
 	//! Get minimum start color
-	virtual const video::SColor& getMinStartColor() const { return MinStartColor; }
+	virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; }
 
 	//! Get maximum start color
-	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
+	virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; }
 
 	//! Gets the maximum starting size for particles
-	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; }
+	virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; }
 
 	//! Gets the minimum starting size for particles
-	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; }
+	virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; }
 
 	//! Get the minimum particle life-time in milliseconds
-	virtual u32 getMinLifeTime() const { return MinLifeTime; }
+	virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; }
 
 	//! Get the maximum particle life-time in milliseconds
-	virtual u32 getMaxLifeTime() const { return MaxLifeTime; }
+	virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; }
 
 	//!	Get maximal random derivation from the direction
-	virtual s32 getMaxAngleDegrees() const { return MaxAngleDegrees; }
+	virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; }
 
 	//! Get the center of the sphere for particle emissions
-	virtual const core::vector3df& getCenter() const { return Center; }
+	virtual const core::vector3df& getCenter() const _IRR_OVERRIDE_ { return Center; }
 
 	//! Get the radius of the sphere for particle emissions
-	virtual f32 getRadius() const { return Radius; }
+	virtual f32 getRadius() const _IRR_OVERRIDE_ { return Radius; }
 
 	//! Writes attributes of the object.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;

source/Irrlicht/CParticleSystemSceneNode.h

@@ -205,7 +205,7 @@ public:
 	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 	//! Returns type of the scene node
-	virtual ESCENE_NODE_TYPE getType() const { return ESNT_PARTICLE_SYSTEM; }
+	virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_PARTICLE_SYSTEM; }
 
 private:
 

source/Irrlicht/CQuake3ShaderSceneNode.h

@@ -40,12 +40,12 @@ public:
 	virtual video::SMaterial& getMaterial(u32 i);
 
 	//! Returns type of the scene node
-	virtual ESCENE_NODE_TYPE getType() const { return ESNT_Q3SHADER_SCENE_NODE; }
+	virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_Q3SHADER_SCENE_NODE; }
 
-	virtual void setMesh(IMesh* mesh){}
-	virtual IMesh* getMesh() { return Mesh; }
-	virtual void setReadOnlyMaterials(bool readonly) {}
-	virtual bool isReadOnlyMaterials() const { return true; }
+	virtual void setMesh(IMesh* mesh)_IRR_OVERRIDE_ {}
+	virtual IMesh* getMesh() _IRR_OVERRIDE_ { return Mesh; }
+	virtual void setReadOnlyMaterials(bool readonly) _IRR_OVERRIDE_ {}
+	virtual bool isReadOnlyMaterials() const _IRR_OVERRIDE_ { return true; }
 
 	//! Creates shadow volume scene node as child of this node
 	//! and returns a pointer to it.

source/Irrlicht/CSMFMeshFileLoader.h

-// Copyright (C) 2010-2012 Gaz Davidson
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_SMF_MESH_LOADER_H_INCLUDED__
-#define __C_SMF_MESH_LOADER_H_INCLUDED__
-
-#include "IMeshLoader.h"
-#include "SMesh.h"
-
-namespace irr
-{
-
-namespace video
-{
-	class IVideoDriver;
-}
-
-namespace scene
-{
-
-//! Class which can load
-class CSMFMeshFileLoader : public virtual IMeshLoader
-{
-public:
-
-	CSMFMeshFileLoader(video::IVideoDriver* driver);
-
-	//! Returns true if the file might be loaded by this class.
-	virtual bool isALoadableFileExtension(const io::path& filename) const;
-
-	//! Creates/loads an animated mesh from the file.
-	virtual IAnimatedMesh* createMesh(io::IReadFile* file);
-private:
-
-	void loadLimb(io::IReadFile* file, scene::SMesh* mesh, const core::matrix4 &parentTransformation);
-
-	video::IVideoDriver* Driver;
-};
-
-} // end namespace scene
-
-namespace io
-{
-	class BinaryFile
-	{
-	public:
-		//! reads most types from the given file, moving the file pointer along
-		template <class T>
-		static void read(io::IReadFile* file, T &out, bool bigEndian=false);
-
-		//! reads a 3d vector from the file, moving the file pointer along
-		static void read(io::IReadFile* file, core::vector3df &outVector2d, bool bigEndian=false);
-
-		//! reads a 2d vector from the file, moving the file pointer along
-		static void read(io::IReadFile* file, core::vector2df &outVector2d, bool bigEndian=false);
-
-		//! reads a null terminated string from the file, moving the file pointer along
-		static void read(io::IReadFile* file, core::stringc &outString, bool bigEndian=false);
-
-	};
-}
-
-} // end namespace irr
-
-#endif // __C_SMF_MESH_LOADER_H_INCLUDED__
-
+// Copyright (C) 2010-2012 Gaz Davidson
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_SMF_MESH_LOADER_H_INCLUDED__
+#define __C_SMF_MESH_LOADER_H_INCLUDED__
+
+#include "IMeshLoader.h"
+#include "SMesh.h"
+
+namespace irr
+{
+
+namespace video
+{
+	class IVideoDriver;
+}
+
+namespace scene
+{
+
+//! Class which can load
+class CSMFMeshFileLoader : public virtual IMeshLoader
+{
+public:
+
+	CSMFMeshFileLoader(video::IVideoDriver* driver);
+
+	//! Returns true if the file might be loaded by this class.
+	virtual bool isALoadableFileExtension(const io::path& filename) const;
+
+	//! Creates/loads an animated mesh from the file.
+	virtual IAnimatedMesh* createMesh(io::IReadFile* file);
+private:
+
+	void loadLimb(io::IReadFile* file, scene::SMesh* mesh, const core::matrix4 &parentTransformation);
+
+	video::IVideoDriver* Driver;
+};
+
+} // end namespace scene
+
+namespace io
+{
+	class BinaryFile
+	{
+	public:
+		//! reads most types from the given file, moving the file pointer along
+		template <class T>
+		static void read(io::IReadFile* file, T &out, bool bigEndian=false);
+
+		//! reads a 3d vector from the file, moving the file pointer along
+		static void read(io::IReadFile* file, core::vector3df &outVector2d, bool bigEndian=false);
+
+		//! reads a 2d vector from the file, moving the file pointer along
+		static void read(io::IReadFile* file, core::vector2df &outVector2d, bool bigEndian=false);
+
+		//! reads a null terminated string from the file, moving the file pointer along
+		static void read(io::IReadFile* file, core::stringc &outString, bool bigEndian=false);
+
+	};
+}
+
+} // end namespace irr
+
+#endif // __C_SMF_MESH_LOADER_H_INCLUDED__
+

source/Irrlicht/CSceneLoaderIrr.h

-// Copyright (C) 2010-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_SCENE_LOADER_IRR_H_INCLUDED__
-#define __C_SCENE_LOADER_IRR_H_INCLUDED__
-
-#include "ISceneLoader.h"
-
-#include "IXMLReader.h"
-
-namespace irr
-{
-
-namespace io
-{
-	class IFileSystem;
-}
-
-namespace scene
-{
-
-class ISceneManager;
-
-//! Class which can load a scene into the scene manager.
-class CSceneLoaderIrr : public virtual ISceneLoader
-{
-public:
-
-	//! Constructor
-	CSceneLoaderIrr(ISceneManager *smgr, io::IFileSystem* fs);
-
-	//! Destructor
-	virtual ~CSceneLoaderIrr();
-
-	//! Returns true if the class might be able to load this file.
-	virtual bool isALoadableFileExtension(const io::path& filename) const;
-
-	//! Returns true if the class might be able to load this file.
-	virtual bool isALoadableFileFormat(io::IReadFile *file) const;
-
-	//! Loads the scene into the scene manager.
-	virtual bool loadScene(io::IReadFile* file,
-		ISceneUserDataSerializer* userDataSerializer=0,
-		ISceneNode* rootNode=0);
-
-private:
-
-	//! Recursively reads nodes from the xml file
-	void readSceneNode(io::IXMLReader* reader, ISceneNode* parent,
-		ISceneUserDataSerializer* userDataSerializer);
-
-	//! read a node's materials
-	void readMaterials(io::IXMLReader* reader, ISceneNode* node);
-
-	//! read a node's animators
-	void readAnimators(io::IXMLReader* reader, ISceneNode* node);
-
-	//! read any other data into the user serializer
-	void readUserData(io::IXMLReader* reader, ISceneNode* node,
-		ISceneUserDataSerializer* userDataSerializer);
-
-	ISceneManager   *SceneManager;
-	io::IFileSystem *FileSystem;
-
-	//! constants for reading and writing XML.
-	//! Not made static due to portability problems.
-	// TODO: move to own header
-	const core::stringw IRR_XML_FORMAT_SCENE;
-	const core::stringw IRR_XML_FORMAT_NODE;
-	const core::stringw IRR_XML_FORMAT_NODE_ATTR_TYPE;
-	const core::stringw IRR_XML_FORMAT_ATTRIBUTES;
-	const core::stringw IRR_XML_FORMAT_MATERIALS;
-	const core::stringw IRR_XML_FORMAT_ANIMATORS;
-	const core::stringw IRR_XML_FORMAT_USERDATA;
-};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-
+// Copyright (C) 2010-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_SCENE_LOADER_IRR_H_INCLUDED__
+#define __C_SCENE_LOADER_IRR_H_INCLUDED__
+
+#include "ISceneLoader.h"
+
+#include "IXMLReader.h"
+
+namespace irr
+{
+
+namespace io
+{
+	class IFileSystem;
+}
+
+namespace scene
+{
+
+class ISceneManager;
+
+//! Class which can load a scene into the scene manager.
+class CSceneLoaderIrr : public virtual ISceneLoader
+{
+public:
+
+	//! Constructor
+	CSceneLoaderIrr(ISceneManager *smgr, io::IFileSystem* fs);
+
+	//! Destructor
+	virtual ~CSceneLoaderIrr();
+
+	//! Returns true if the class might be able to load this file.
+	virtual bool isALoadableFileExtension(const io::path& filename) const;
+
+	//! Returns true if the class might be able to load this file.
+	virtual bool isALoadableFileFormat(io::IReadFile *file) const;
+
+	//! Loads the scene into the scene manager.
+	virtual bool loadScene(io::IReadFile* file,
+		ISceneUserDataSerializer* userDataSerializer=0,
+		ISceneNode* rootNode=0);
+
+private:
+
+	//! Recursively reads nodes from the xml file
+	void readSceneNode(io::IXMLReader* reader, ISceneNode* parent,
+		ISceneUserDataSerializer* userDataSerializer);
+
+	//! read a node's materials
+	void readMaterials(io::IXMLReader* reader, ISceneNode* node);
+
+	//! read a node's animators
+	void readAnimators(io::IXMLReader* reader, ISceneNode* node);
+
+	//! read any other data into the user serializer
+	void readUserData(io::IXMLReader* reader, ISceneNode* node,
+		ISceneUserDataSerializer* userDataSerializer);
+
+	ISceneManager   *SceneManager;
+	io::IFileSystem *FileSystem;
+
+	//! constants for reading and writing XML.
+	//! Not made static due to portability problems.
+	// TODO: move to own header
+	const core::stringw IRR_XML_FORMAT_SCENE;
+	const core::stringw IRR_XML_FORMAT_NODE;
+	const core::stringw IRR_XML_FORMAT_NODE_ATTR_TYPE;
+	const core::stringw IRR_XML_FORMAT_ATTRIBUTES;
+	const core::stringw IRR_XML_FORMAT_MATERIALS;
+	const core::stringw IRR_XML_FORMAT_ANIMATORS;
+	const core::stringw IRR_XML_FORMAT_USERDATA;
+};
+
+
+} // end namespace scene
+} // end namespace irr
+
+#endif
+

source/Irrlicht/CSceneManager.cpp

@@ -188,7 +188,7 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 : ISceneNode(0, 0), Driver(driver), FileSystem(fs), GUIEnvironment(gui),
 	CursorControl(cursorControl), CollisionManager(0),
 	ActiveCamera(0), ShadowColor(150,0,0,0), AmbientLight(0,0,0,0), Parameters(0),
-	MeshCache(cache), CurrentRendertime(ESNRP_NONE), LightManager(0),
+	MeshCache(cache), CurrentRenderPass(ESNRP_NONE), LightManager(0),
 	IRR_XML_FORMAT_SCENE(L"irr_scene"), IRR_XML_FORMAT_NODE(L"node"), IRR_XML_FORMAT_NODE_ATTR_TYPE(L"type")
 {
 	#ifdef _DEBUG
@@ -1391,11 +1391,11 @@ void CSceneManager::drawAll()
 
 	//render camera scenes
 	{
-		CurrentRendertime = ESNRP_CAMERA;
-		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRendertime) != 0);
+		CurrentRenderPass = ESNRP_CAMERA;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
 
 		if (LightManager)
-			LightManager->OnRenderPassPreRender(CurrentRendertime);
+			LightManager->OnRenderPassPreRender(CurrentRenderPass);
 
 		for (i=0; i<CameraList.size(); ++i)
 			CameraList[i]->render();
@@ -1403,17 +1403,17 @@ void CSceneManager::drawAll()
 		CameraList.set_used(0);
 
 		if (LightManager)
-			LightManager->OnRenderPassPostRender(CurrentRendertime);
+			LightManager->OnRenderPassPostRender(CurrentRenderPass);
 	}
 
 	//render lights scenes
 	{
-		CurrentRendertime = ESNRP_LIGHT;
-		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRendertime) != 0);
+		CurrentRenderPass = ESNRP_LIGHT;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
 
 		if (LightManager)
 		{
-			LightManager->OnRenderPassPreRender(CurrentRendertime);
+			LightManager->OnRenderPassPreRender(CurrentRenderPass);
 		}
 		else
 		{
@@ -1447,17 +1447,17 @@ void CSceneManager::drawAll()
 			LightList[i]->render();
 
 		if (LightManager)
-			LightManager->OnRenderPassPostRender(CurrentRendertime);
+			LightManager->OnRenderPassPostRender(CurrentRenderPass);
 	}
 
 	// render skyboxes
 	{
-		CurrentRendertime = ESNRP_SKY_BOX;
-		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRendertime) != 0);
+		CurrentRenderPass = ESNRP_SKY_BOX;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
 
 		if (LightManager)
 		{
-			LightManager->OnRenderPassPreRender(CurrentRendertime);
+			LightManager->OnRenderPassPreRender(CurrentRenderPass);
 			for (i=0; i<SkyBoxList.size(); ++i)
 			{
 				ISceneNode* node = SkyBoxList[i];
@@ -1475,20 +1475,20 @@ void CSceneManager::drawAll()
 		SkyBoxList.set_used(0);
 
 		if (LightManager)
-			LightManager->OnRenderPassPostRender(CurrentRendertime);
+			LightManager->OnRenderPassPostRender(CurrentRenderPass);
 	}
 
 
 	// render default objects
 	{
-		CurrentRendertime = ESNRP_SOLID;
-		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRendertime) != 0);
+		CurrentRenderPass = ESNRP_SOLID;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
 
 		SolidNodeList.sort(); // sort by textures
 
 		if (LightManager)
 		{
-			LightManager->OnRenderPassPreRender(CurrentRendertime);
+			LightManager->OnRenderPassPreRender(CurrentRenderPass);
 			for (i=0; i<SolidNodeList.size(); ++i)
 			{
 				ISceneNode* node = SolidNodeList[i].Node;
@@ -1507,17 +1507,17 @@ void CSceneManager::drawAll()
 		SolidNodeList.set_used(0);
 
 		if (LightManager)
-			LightManager->OnRenderPassPostRender(CurrentRendertime);
+			LightManager->OnRenderPassPostRender(CurrentRenderPass);
 	}
 
 	// render shadows
 	{
-		CurrentRendertime = ESNRP_SHADOW;
-		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRendertime) != 0);
+		CurrentRenderPass = ESNRP_SHADOW;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
 
 		if (LightManager)
 		{
-			LightManager->OnRenderPassPreRender(CurrentRendertime);
+			LightManager->OnRenderPassPreRender(CurrentRenderPass);
 			for (i=0; i<ShadowNodeList.size(); ++i)
 			{
 				ISceneNode* node = ShadowNodeList[i];
@@ -1539,18 +1539,18 @@ void CSceneManager::drawAll()
 		ShadowNodeList.set_used(0);
 
 		if (LightManager)
-			LightManager->OnRenderPassPostRender(CurrentRendertime);
+			LightManager->OnRenderPassPostRender(CurrentRenderPass);
 	}
 
 	// render transparent objects.
 	{
-		CurrentRendertime = ESNRP_TRANSPARENT;
-		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRendertime) != 0);
+		CurrentRenderPass = ESNRP_TRANSPARENT;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
 
 		TransparentNodeList.sort(); // sort by distance from camera
 		if (LightManager)
 		{
-			LightManager->OnRenderPassPreRender(CurrentRendertime);
+			LightManager->OnRenderPassPreRender(CurrentRenderPass);
 
 			for (i=0; i<TransparentNodeList.size(); ++i)
 			{
@@ -1570,19 +1570,19 @@ void CSceneManager::drawAll()
 		TransparentNodeList.set_used(0);
 
 		if (LightManager)
-			LightManager->OnRenderPassPostRender(CurrentRendertime);
+			LightManager->OnRenderPassPostRender(CurrentRenderPass);
 	}
 
 	// render transparent effect objects.
 	{
-		CurrentRendertime = ESNRP_TRANSPARENT_EFFECT;
-		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRendertime) != 0);
+		CurrentRenderPass = ESNRP_TRANSPARENT_EFFECT;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
 
 		TransparentEffectNodeList.sort(); // sort by distance from camera
 
 		if (LightManager)
 		{
-			LightManager->OnRenderPassPreRender(CurrentRendertime);
+			LightManager->OnRenderPassPreRender(CurrentRenderPass);
 
 			for (i=0; i<TransparentEffectNodeList.size(); ++i)
 			{
@@ -1608,7 +1608,7 @@ void CSceneManager::drawAll()
 	LightList.set_used(0);
 	clearDeletionList();
 
-	CurrentRendertime = ESNRP_NONE;
+	CurrentRenderPass = ESNRP_NONE;
 }
 
 void CSceneManager::setLightManager(ILightManager* lightManager)
@@ -2010,7 +2010,7 @@ io::IAttributes* CSceneManager::getParameters()
 //! Returns current render pass.
 E_SCENE_NODE_RENDER_PASS CSceneManager::getSceneNodeRenderPass() const
 {
-	return CurrentRendertime;
+	return CurrentRenderPass;
 }
 
 

source/Irrlicht/CSceneManager.h

@@ -433,7 +433,7 @@ namespace scene
 		virtual ISceneManager* createNewSceneManager(bool cloneContent);
 
 		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_SCENE_MANAGER; }
+		virtual ESCENE_NODE_TYPE getType() const _IRR_OVERRIDE_ { return ESNT_SCENE_MANAGER; }
 
 		//! Returns the default scene node factory which can create all built in scene nodes
 		virtual ISceneNodeFactory* getDefaultSceneNodeFactory();
@@ -510,13 +510,13 @@ namespace scene
 		virtual void setLightManager(ILightManager* lightManager);
 
 		//! Get current render time.
-		virtual E_SCENE_NODE_RENDER_PASS getCurrentRendertime() const { return CurrentRendertime; }
+		virtual E_SCENE_NODE_RENDER_PASS getCurrentRenderPass() const _IRR_OVERRIDE_ { return CurrentRenderPass; }
 
 		//! Set current render time.
-		virtual void setCurrentRendertime(E_SCENE_NODE_RENDER_PASS currentRendertime) { CurrentRendertime = currentRendertime; }
+		virtual void setCurrentRenderPass(E_SCENE_NODE_RENDER_PASS nextPass) _IRR_OVERRIDE_ { CurrentRenderPass = nextPass; }
 
 		//! Get an instance of a geometry creator.
-		virtual const IGeometryCreator* getGeometryCreator(void) const { return GeometryCreator; }
+		virtual const IGeometryCreator* getGeometryCreator(void) const _IRR_OVERRIDE_ { return GeometryCreator; }
 
 		//! returns if node is culled
 		virtual bool isCulled(const ISceneNode* node) const;
@@ -636,7 +636,7 @@ namespace scene
 		//! Mesh cache
 		IMeshCache* MeshCache;
 
-		E_SCENE_NODE_RENDER_PASS CurrentRendertime;
+		E_SCENE_NODE_RENDER_PASS CurrentRenderPass;
 
 		//! An optional callbacks manager to allow the user app finer control
 		//! over the scene lighting and rendering.

source/Irrlicht/CSceneNodeAnimatorFlyCircle.h

@@ -31,7 +31,7 @@ namespace scene
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 		//! Returns type of the scene node animator
-		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_FLY_CIRCLE; }
+		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_FLY_CIRCLE; }
 
 		//! Creates a clone of this animator.
 		/** Please note that you will have to drop

source/Irrlicht/CSceneNodeAnimatorFlyStraight.h

@@ -31,7 +31,7 @@ namespace scene
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 		//! Returns type of the scene node animator
-		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_FLY_STRAIGHT; }
+		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_FLY_STRAIGHT; }
 
 		//! Creates a clone of this animator.
 		/** Please note that you will have to drop

source/Irrlicht/CSceneNodeAnimatorFollowSpline.h

@@ -34,7 +34,7 @@ namespace scene
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
 		//! Returns type of the scene node animator
-		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_FOLLOW_SPLINE; }
+		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const _IRR_OVERRIDE_ { return ESNAT_FOLLOW_SPLINE; }
 
 		//! Creates a clone of this animator.
 		/** Please note that you will have to drop