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

10
source/Irrlicht/CGUIImageList.h
View File

@@ -1,8 +1,8 @@
// This file is part of the "Irrlicht Engine".
// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
#ifndef __C_GUI_IMAGE_LIST_H_INCLUDED__
#define __C_GUI_IMAGE_LIST_H_INCLUDED__
#ifndef IRR_C_GUI_IMAGE_LIST_H_INCLUDED
#define IRR_C_GUI_IMAGE_LIST_H_INCLUDED
#include "IGUIImageList.h"
#include "IVideoDriver.h"
@@ -38,16 +38,16 @@ public:
//! \param clip: Optional pointer to a rectangle against which the text will be clipped.
//! If the pointer is null, no clipping will be done.
virtual void draw( s32 index, const core::position2d<s32>& destPos,
const core::rect<s32>* clip = 0 ) _IRR_OVERRIDE_;
const core::rect<s32>* clip = 0 ) IRR_OVERRIDE;
//! Returns the count of Images in the list.
//! \return Returns the count of Images in the list.
virtual s32 getImageCount() const _IRR_OVERRIDE_
virtual s32 getImageCount() const IRR_OVERRIDE
{ return ImageCount; }
//! Returns the size of the images in the list.
//! \return Returns the size of the images in the list.
virtual core::dimension2d<s32> getImageSize() const _IRR_OVERRIDE_
virtual core::dimension2d<s32> getImageSize() const IRR_OVERRIDE
{ return ImageSize; }
private: