mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-29 00:48:58 +02:00
Code Issues Projects Releases Wiki Activity

- updated error handling to be more flexible so we can display better error details (like bad tga file, etc)

Browse Source
This commit is contained in:
Mark Vejvoda
2012-11-10 23:19:42 +00:00
parent 56e4843d13
commit 8ba5524f35
12 changed files with 377 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/shared_lib/include/graphics/FileReader.h
View File

@@ -158,6 +158,9 @@ static inline T* readFromFileReaders(vector<FileReader<T> const *>* readers, con
FileReader<T> const * reader = *i;
ret = reader->read(file, filepath); //It is guaranteed that at least the filepath matches ...
}
catch (megaglest_runtime_error &ex) { //TODO: Specific exceptions
throw;
}
catch (...) { //TODO: Specific exceptions
continue;
}
@@ -202,7 +205,11 @@ static inline T* readFromFileReaders(vector<FileReader<T> const *>* readers, con
try {
FileReader<T> const * reader = *i;
ret = reader->read(file, filepath, object); //It is guaranteed that at least the filepath matches ...
} catch (...) { //TODO: Specific exceptions
}
catch (megaglest_runtime_error &ex) { //TODO: Specific exceptions
throw;
}
catch (...) { //TODO: Specific exceptions
continue;
}
if (ret != NULL) {
@@ -321,7 +328,11 @@ bool FileReader<T>::canRead(ifstream& file) const {
bool ret = (wouldRead != NULL);
delete wouldRead;
return ret;
} catch (...) {
}
catch (megaglest_runtime_error &ex) { //TODO: Specific exceptions
throw;
}
catch (...) {
return false;
}
}