From c2fef27e6f8bf1c2f15eaf6582f3946d361bdbef Mon Sep 17 00:00:00 2001 From: hybrid Date: Sun, 16 Sep 2007 19:10:42 +0000 Subject: [PATCH] Some more fixes for d3d8 and tab control. git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@963 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CD3D8Driver.cpp | 2 +- source/Irrlicht/CD3D8Driver.h | 2 +- source/Irrlicht/CGUITabControl.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Irrlicht/CD3D8Driver.cpp b/source/Irrlicht/CD3D8Driver.cpp index cd93ed58..7b45fc8e 100644 --- a/source/Irrlicht/CD3D8Driver.cpp +++ b/source/Irrlicht/CD3D8Driver.cpp @@ -590,7 +590,7 @@ void CD3D8Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 //! sets the current Texture -bool CD3D8Driver::setTexture(s32 stage, video::ITexture* texture) +bool CD3D8Driver::setTexture(s32 stage, const video::ITexture* texture) { if (CurrentTexture[stage] == texture) return true; diff --git a/source/Irrlicht/CD3D8Driver.h b/source/Irrlicht/CD3D8Driver.h index e80948e6..7b9f51b8 100644 --- a/source/Irrlicht/CD3D8Driver.h +++ b/source/Irrlicht/CD3D8Driver.h @@ -225,7 +225,7 @@ namespace video void setRenderStatesStencilShadowMode(bool zfail); //! sets the current Texture - bool setTexture(s32 stage, video::ITexture* texture); + bool setTexture(s32 stage, const video::ITexture* texture); //! resets the device bool reset(); diff --git a/source/Irrlicht/CGUITabControl.cpp b/source/Irrlicht/CGUITabControl.cpp index 25277b92..8270bdde 100644 --- a/source/Irrlicht/CGUITabControl.cpp +++ b/source/Irrlicht/CGUITabControl.cpp @@ -458,7 +458,7 @@ void CGUITabControl::removeChild(IGUIElement* child) // reassign numbers if (isTab) { - for (i=0; i<(s32)Tabs.size(); ++i) + for (i=0; isetNumber(i); }