forked from Mirrorlandia_minetest/irrlicht
Fix compiler warnings
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6466 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
9622a8b138
commit
e184e4aedb
@ -37,21 +37,21 @@ namespace io
|
|||||||
virtual ~CAndroidAssetFileArchive();
|
virtual ~CAndroidAssetFileArchive();
|
||||||
|
|
||||||
//! opens a file by file name
|
//! opens a file by file name
|
||||||
virtual IReadFile* createAndOpenFile(const io::path& filename);
|
virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE;
|
||||||
|
|
||||||
//! opens a file by index
|
//! opens a file by index
|
||||||
virtual IReadFile* createAndOpenFile(u32 index);
|
virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE;
|
||||||
|
|
||||||
//! returns the list of files
|
//! returns the list of files
|
||||||
virtual const IFileList* getFileList() const;
|
virtual const IFileList* getFileList() const IRR_OVERRIDE;
|
||||||
|
|
||||||
//! get the archive type
|
//! get the archive type
|
||||||
virtual E_FILE_ARCHIVE_TYPE getType() const;
|
virtual E_FILE_ARCHIVE_TYPE getType() const IRR_OVERRIDE;
|
||||||
|
|
||||||
//! Add a directory to read files from. Since the Android
|
//! Add a directory to read files from. Since the Android
|
||||||
//! API does not return names of directories, they need to
|
//! API does not return names of directories, they need to
|
||||||
//! be added manually.
|
//! be added manually.
|
||||||
virtual void addDirectoryToFileList(const io::path &filename);
|
virtual void addDirectoryToFileList(const io::path &filename) IRR_OVERRIDE;
|
||||||
|
|
||||||
//! return the name (id) of the file Archive
|
//! return the name (id) of the file Archive
|
||||||
virtual const io::path& getArchiveName() const IRR_OVERRIDE {return Path;}
|
virtual const io::path& getArchiveName() const IRR_OVERRIDE {return Path;}
|
||||||
|
@ -43,15 +43,15 @@ public:
|
|||||||
GLuint getProgram() const;
|
GLuint getProgram() const;
|
||||||
|
|
||||||
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
|
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
|
||||||
bool resetAllRenderstates, IMaterialRendererServices* services);
|
bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE;
|
||||||
|
|
||||||
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype);
|
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE;
|
||||||
|
|
||||||
virtual void OnUnsetMaterial();
|
virtual void OnUnsetMaterial() IRR_OVERRIDE;
|
||||||
|
|
||||||
virtual bool isTransparent() const;
|
virtual bool isTransparent() const IRR_OVERRIDE;
|
||||||
|
|
||||||
virtual s32 getRenderCapability() const;
|
virtual s32 getRenderCapability() const IRR_OVERRIDE;
|
||||||
|
|
||||||
virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) IRR_OVERRIDE;
|
virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) IRR_OVERRIDE;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user