Commit 618e7f81 authored by hybrid's avatar hybrid

Add new image and archive extensions supported by Irrlicht.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3085 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 7414995b
...@@ -179,7 +179,8 @@ void loadModel(const c8* fn) ...@@ -179,7 +179,8 @@ void loadModel(const c8* fn)
extension == ".png" || extension == ".ppm" || extension == ".png" || extension == ".ppm" ||
extension == ".pgm" || extension == ".pbm" || extension == ".pgm" || extension == ".pbm" ||
extension == ".psd" || extension == ".tga" || extension == ".psd" || extension == ".tga" ||
extension == ".bmp" || extension == ".wal") extension == ".bmp" || extension == ".wal" ||
extension == ".rgb" || extension == ".rgba")
{ {
video::ITexture * texture = video::ITexture * texture =
Device->getVideoDriver()->getTexture( filename ); Device->getVideoDriver()->getTexture( filename );
...@@ -194,14 +195,9 @@ void loadModel(const c8* fn) ...@@ -194,14 +195,9 @@ void loadModel(const c8* fn)
return; return;
} }
// if a archive is loaded add it to the FileArchive.. // if a archive is loaded add it to the FileArchive..
else if (extension == ".pk3" || extension == ".zip") else if (extension == ".pk3" || extension == ".zip" || extension == ".pak" || extension == ".npk")
{ {
Device->getFileSystem()->addZipFileArchive(filename.c_str()); Device->getFileSystem()->addFileArchive(filename.c_str());
return;
}
else if (extension == ".pak")
{
Device->getFileSystem()->addPakFileArchive(filename.c_str());
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment