From e66d6fa7a3f8097c42166557dcac1e27d68c0df5 Mon Sep 17 00:00:00 2001
From: hybrid <hybrid@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Mon, 21 Jan 2008 23:56:39 +0000
Subject: [PATCH] Fixed some warnings, bugs, and still the annoying merge
 conflict.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1197 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 include/ISceneManager.h                | 13 -------------
 source/Irrlicht/CColladaFileLoader.h   |  2 +-
 source/Irrlicht/CLWOMeshFileLoader.cpp |  4 ++--
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/include/ISceneManager.h b/include/ISceneManager.h
index b41851d9..0880082a 100644
--- a/include/ISceneManager.h
+++ b/include/ISceneManager.h
@@ -82,19 +82,6 @@ namespace scene
 		//! to front and drawn in that order.
 		ESNRP_TRANSPARENT,
 
-		//! Scene Nodes with special support
-		ESNRP_SHADER_0,
-		ESNRP_SHADER_1,
-		ESNRP_SHADER_2,
-		ESNRP_SHADER_3,
-		ESNRP_SHADER_4,
-		ESNRP_SHADER_5,
-		ESNRP_SHADER_6,
-		ESNRP_SHADER_7,
-		ESNRP_SHADER_8,
-		ESNRP_SHADER_9,
-		ESNRP_SHADER_10,
-
 		//! Never used, value specifing how much parameters there are.
 		ESNRP_COUNT
 	};
diff --git a/source/Irrlicht/CColladaFileLoader.h b/source/Irrlicht/CColladaFileLoader.h
index 6c485144..acdc8e96 100644
--- a/source/Irrlicht/CColladaFileLoader.h
+++ b/source/Irrlicht/CColladaFileLoader.h
@@ -176,7 +176,7 @@ private:
 	void readLibrarySection(io::IXMLReaderUTF8* reader);
 
 	//! reads a <visual_scene> element and stores it as a prefab
-	void CColladaFileLoader::readVisualSceneSection(io::IXMLReaderUTF8* reader);
+	void readVisualSceneSection(io::IXMLReaderUTF8* reader);
 
 	//! reads a <scene> section and its content
 	void readSceneSection(io::IXMLReaderUTF8* reader);
diff --git a/source/Irrlicht/CLWOMeshFileLoader.cpp b/source/Irrlicht/CLWOMeshFileLoader.cpp
index a870c919..4f2aeeed 100644
--- a/source/Irrlicht/CLWOMeshFileLoader.cpp
+++ b/source/Irrlicht/CLWOMeshFileLoader.cpp
@@ -555,7 +555,7 @@ void CLWOMeshFileLoader::readMat(u32 size)
 		u32 uiType;
 		u32 tmp32;
 		u16 subsize, tmp16;
-		u32 tmpf32;
+		f32 tmpf32;
 		File->read(&type, 4);
 		//Convert 4-char string to 4-byte integer
 		//Makes it possible to do a switch statement
@@ -985,7 +985,7 @@ void CLWOMeshFileLoader::readMat(u32 size)
 #ifndef __BIG_ENDIAN__
 					tmp16=os::Byteswap::byteswap(tmp16);
 #endif
-					mat->Texture[currTexture].Active=tmp16;
+					mat->Texture[currTexture].Active=(tmp16!=0);
 					size -= 2;
 				}
 				break;