IVideoDriver::setMaterialRendererName now using u32 for index like other similar...

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 b220e5e608eb9a1f32e04457db59b666cc1775d2..ed4e6fa55c28191026ea4ad3400645c10884d977 100644 (file)
--- 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\r
                addMaterialRenderer().\r
                \param name: New name of the material renderer. */\r
-               virtual void setMaterialRendererName(s32 idx, const c8* name) =0;\r
+               virtual void setMaterialRendererName(u32 idx, const c8* name) =0;\r
 \r
                //! Swap the material renderers used for certain id's\r
                /** Swap the IMaterialRenderers responsible for rendering specific\r

diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp
index 2cbd47cd70c676c5ac5016c0fb26a07664034fab..21e143a4cf35e76c2286365840f1b4232ac3cdcf 100644 (file)
--- a/source/Irrlicht/CNullDriver.cpp
+++ b/source/Irrlicht/CNullDriver.cpp
@@ -1824,10 +1824,10 @@ s32 CNullDriver::addMaterialRenderer(IMaterialRenderer* renderer, const char* na
 \r
 \r
 //! Sets the name of a material renderer.\r
-void CNullDriver::setMaterialRendererName(s32 idx, const char* name)\r
+void CNullDriver::setMaterialRendererName(u32 idx, const char* name)\r
 {\r
-       if (idx < s32(sizeof(sBuiltInMaterialTypeNames) / sizeof(char*))-1 ||\r
-               idx >= (s32)MaterialRenderers.size())\r
+       if (idx < (sizeof(sBuiltInMaterialTypeNames) / sizeof(char*))-1 ||\r
+               idx >= MaterialRenderers.size())\r
                return;\r
 \r
        MaterialRenderers[idx].Name = name;\r

diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h
index e6cdce66da61b296cb978f0e6b340fa157dcb637..625ff1a6c45204846a0e7d599f39ba4ad41941aa 100644 (file)
--- 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;\r
 \r
                //! Sets the name of a material renderer.\r
-               void setMaterialRendererName(s32 idx, const char* name) override;\r
+               void setMaterialRendererName(u32 idx, const char* name) override;\r
 \r
                //! Swap the material renderers used for certain id's\r
                void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) override;\r