Minor changes in file type handling

This commit is contained in:
Eduardo Bart
2013-01-27 23:23:53 -02:00
parent 4536c68f00
commit 773837da98
18 changed files with 43 additions and 50 deletions

View File

@@ -48,7 +48,7 @@ void FontManager::clearFonts()
bool FontManager::importFont(std::string file)
{
try {
file = g_resources.guessFileType(file, "otfont");
file = g_resources.guessFilePath(file, "otfont");
OTMLDocumentPtr doc = OTMLDocument::parse(file);
OTMLNodePtr fontNode = doc->at("Font");

View File

@@ -39,7 +39,7 @@ ImagePtr Image::load(std::string file)
{
ImagePtr image;
try {
file = g_resources.guessFileType(file, "png");
file = g_resources.guessFilePath(file, "png");
// load image file data
image = loadPNG(file);

View File

@@ -29,7 +29,7 @@ ParticleManager g_particles;
bool ParticleManager::importParticle(std::string file)
{
try {
file = g_resources.guessFileType(file, "otps");
file = g_resources.guessFilePath(file, "otps");
OTMLDocumentPtr doc = OTMLDocument::parse(file);
for(const OTMLNodePtr& node : doc->children()) {

View File

@@ -78,7 +78,7 @@ TexturePtr TextureManager::getTexture(const std::string& fileName)
// texture not found, load it
if(!texture) {
try {
std::string filePathEx = g_resources.guessFileType(filePath, "png");
std::string filePathEx = g_resources.guessFilePath(filePath, "png");
// load texture file data
std::stringstream fin;