luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/Irrlicht/CFileList.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_FILE_LIST_H_INCLUDED__
#define __C_FILE_LIST_H_INCLUDED__
#ifndef IRR_C_FILE_LIST_H_INCLUDED
#define IRR_C_FILE_LIST_H_INCLUDED
#include "IFileList.h"
#include "irrString.h"
@@ -82,37 +82,37 @@ public:
\param offset The offset where the file is stored in an archive
\param size The size of the file in bytes.
\param id The ID of the file in the archive which owns it */
virtual u32 addItem(const io::path& fullPath, u32 offset, u32 size, bool isDirectory, u32 id=0) _IRR_OVERRIDE_;
virtual u32 addItem(const io::path& fullPath, u32 offset, u32 size, bool isDirectory, u32 id=0) IRR_OVERRIDE;
//! Sorts the file list. You should call this after adding any items to the file list
virtual void sort() _IRR_OVERRIDE_;
virtual void sort() IRR_OVERRIDE;
//! Returns the amount of files in the filelist.
virtual u32 getFileCount() const _IRR_OVERRIDE_;
virtual u32 getFileCount() const IRR_OVERRIDE;
//! Gets the name of a file in the list, based on an index.
virtual const io::path& getFileName(u32 index) const _IRR_OVERRIDE_;
virtual const io::path& getFileName(u32 index) const IRR_OVERRIDE;
//! Gets the full name of a file in the list, path included, based on an index.
virtual const io::path& getFullFileName(u32 index) const _IRR_OVERRIDE_;
virtual const io::path& getFullFileName(u32 index) const IRR_OVERRIDE;
//! Returns the ID of a file in the file list, based on an index.
virtual u32 getID(u32 index) const _IRR_OVERRIDE_;
virtual u32 getID(u32 index) const IRR_OVERRIDE;
//! Returns true if the file is a directory
virtual bool isDirectory(u32 index) const _IRR_OVERRIDE_;
virtual bool isDirectory(u32 index) const IRR_OVERRIDE;
//! Returns the size of a file
virtual u32 getFileSize(u32 index) const _IRR_OVERRIDE_;
virtual u32 getFileSize(u32 index) const IRR_OVERRIDE;
//! Returns the offset of a file
virtual u32 getFileOffset(u32 index) const _IRR_OVERRIDE_;
virtual u32 getFileOffset(u32 index) const IRR_OVERRIDE;
//! Searches for a file or folder within the list, returns the index
virtual s32 findFile(const io::path& filename, bool isFolder) const _IRR_OVERRIDE_;
virtual s32 findFile(const io::path& filename, bool isFolder) const IRR_OVERRIDE;
//! Returns the base path of the file list
virtual const io::path& getPath() const _IRR_OVERRIDE_;
virtual const io::path& getPath() const IRR_OVERRIDE;
protected:
@@ -135,4 +135,3 @@ protected:
#endif