Fix warnings about deprecated methods. Fix bug with unsupported driver causing a test error.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3684 dfc29bdd-3216-0410-991c-e03cc46cb475

tests/filesystem.cpp

@@ -159,7 +159,7 @@ bool filesystem(void)
 	assert(changed);
 	
 	// adding  a folder archive which just should not really change anything
-	device->getFileSystem()->addFolderFileArchive( "./" );
+	device->getFileSystem()->addFileArchive( "./" );
 	
 	if ( fs->existFile(empty) )
 	{

tests/lightMaps.cpp

@@ -21,7 +21,7 @@ static bool runTestWithDriver(E_DRIVER_TYPE driverType)
 	ISceneManager * smgr = device->getSceneManager();
 
 	bool result = true;
-	bool added = device->getFileSystem()->addZipFileArchive("../media/map-20kdm2.pk3");
+	bool added = device->getFileSystem()->addFileArchive("../media/map-20kdm2.pk3");
 	assert(added);
 
 	if(added)

tests/loadTextures.cpp

@@ -60,7 +60,7 @@ bool loadFromFileFolder(void)
 	readFile->drop();
 
 	// adding  a folder archive
-	device->getFileSystem()->addFolderFileArchive( "../media/" );
+	device->getFileSystem()->addFileArchive( "../media/" );
 
 	ITexture * tex3 = driver->getTexture("tools.png");
 	assert(tex3);

tests/planeMatrix.cpp

@@ -56,7 +56,7 @@ static bool drawScaledOctree(void)
 	video::IVideoDriver* driver = device->getVideoDriver();
 	ISceneManager * smgr = device->getSceneManager();
 
-	bool added = device->getFileSystem()->addZipFileArchive("../media/map-20kdm2.pk3");
+	bool added = device->getFileSystem()->addFileArchive("../media/map-20kdm2.pk3");
 	assert(added);
 
 	if(added)

tests/transparentMaterials.cpp

@@ -13,7 +13,7 @@ using namespace video;
 bool testTransparentAlphaChannelRef(video::E_DRIVER_TYPE driverType)
 {
 	IrrlichtDevice* device = createDevice(driverType, core::dimension2d<u32>(160, 120), 32);
-	if(!device)
+	if (!device)
 		return true;
 
 	video::IVideoDriver* driver = device->getVideoDriver();
@@ -53,7 +53,7 @@ bool testTransparentAlphaChannelRef(video::E_DRIVER_TYPE driverType)
 bool testTransparentAlphaChannel(video::E_DRIVER_TYPE driverType)
 {
 	IrrlichtDevice* device = createDevice(driverType, core::dimension2d<u32>(160, 120), 32);
-	if(!device)
+	if (!device)
 		return true;
 
 	video::IVideoDriver* driver = device->getVideoDriver();
@@ -93,7 +93,7 @@ bool testTransparentAlphaChannel(video::E_DRIVER_TYPE driverType)
 bool testTransparentVertexAlpha(video::E_DRIVER_TYPE driverType)
 {
 	IrrlichtDevice* device = createDevice(driverType, core::dimension2d<u32>(160, 120), 32);
-	if(!device)
+	if (!device)
 		return true;
 
 	video::IVideoDriver* driver = device->getVideoDriver();
@@ -140,7 +140,7 @@ bool testTransparentVertexAlpha(video::E_DRIVER_TYPE driverType)
 bool testTransparentReflection2Layer(video::E_DRIVER_TYPE driverType)
 {
 	IrrlichtDevice* device = createDevice(driverType, core::dimension2d<u32>(160, 120), 32);
-	if(!device)
+	if (!device)
 		return true;
 
 	video::IVideoDriver* driver = device->getVideoDriver();
@@ -190,7 +190,7 @@ bool testTransparentReflection2Layer(video::E_DRIVER_TYPE driverType)
 bool testTransparentAddColor(video::E_DRIVER_TYPE driverType)
 {
 	IrrlichtDevice* device = createDevice(driverType, core::dimension2d<u32>(160, 120), 32);
-	if(!device)
+	if (!device)
 		return true;
 
 	video::IVideoDriver* driver = device->getVideoDriver();
@@ -229,6 +229,8 @@ bool testTransparentAddColor(video::E_DRIVER_TYPE driverType)
 bool testTransparentVertexAlphaMore(E_DRIVER_TYPE driverType)
 {
 	IrrlichtDevice *device = createDevice(driverType, dimension2d<u32>(160, 120));
+	if (!device)
+		return true;
 
 	IVideoDriver* driver = device->getVideoDriver();
 	ISceneManager* smgr = device->getSceneManager();