From: cutealien Date: Wed, 9 Feb 2022 19:28:45 +0000 (+0000) Subject: IVideoDriver::setMaterialRendererName now using u32 for index like other similar... X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=739a9eaf7c14e1240a13d1556974a43a30fbf326;p=irrlicht.git IVideoDriver::setMaterialRendererName now using u32 for index like other similar functions Other functions like getMaterialRendererName got switched to u32 in the past. I can see no reason why this one was left out, so changing it to be same as the rest. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6300 dfc29bdd-3216-0410-991c-e03cc46cb475 --- diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index b220e5e..ed4e6fa 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.h @@ -1279,7 +1279,7 @@ namespace video E_MATERIAL_TYPE enum or a value which was returned by addMaterialRenderer(). \param name: New name of the material renderer. */ - virtual void setMaterialRendererName(s32 idx, const c8* name) =0; + virtual void setMaterialRendererName(u32 idx, const c8* name) =0; //! Swap the material renderers used for certain id's /** Swap the IMaterialRenderers responsible for rendering specific diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp index 2cbd47c..21e143a 100644 --- a/source/Irrlicht/CNullDriver.cpp +++ b/source/Irrlicht/CNullDriver.cpp @@ -1824,10 +1824,10 @@ s32 CNullDriver::addMaterialRenderer(IMaterialRenderer* renderer, const char* na //! Sets the name of a material renderer. -void CNullDriver::setMaterialRendererName(s32 idx, const char* name) +void CNullDriver::setMaterialRendererName(u32 idx, const char* name) { - if (idx < s32(sizeof(sBuiltInMaterialTypeNames) / sizeof(char*))-1 || - idx >= (s32)MaterialRenderers.size()) + if (idx < (sizeof(sBuiltInMaterialTypeNames) / sizeof(char*))-1 || + idx >= MaterialRenderers.size()) return; MaterialRenderers[idx].Name = name; diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h index e6cdce6..625ff1a 100644 --- a/source/Irrlicht/CNullDriver.h +++ b/source/Irrlicht/CNullDriver.h @@ -585,7 +585,7 @@ namespace video bool writeImageToFile(IImage* image, io::IWriteFile * file, u32 param = 0) override; //! Sets the name of a material renderer. - void setMaterialRendererName(s32 idx, const char* name) override; + void setMaterialRendererName(u32 idx, const char* name) override; //! Swap the material renderers used for certain id's void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) override;