upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 05:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow reading images from zip files

Browse Source
This commit is contained in:
Yann Dirson 2005-01-08 00:13:30 +00:00
parent a2fa7dd9c6
commit e50b5a0a76
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filesystem.cpp
View File

@ -573,6 +573,10 @@ bool is_directory(const std::string& fname)
bool file_exists(const std::string& name)
{
#ifdef USE_ZIPIOS
if (the_collection.getEntry(name))
return true;
#endif
std::ifstream file(name.c_str());
if (file.rdstate() != 0)
return false;

22
src/image.cpp
View File

@ -201,6 +201,21 @@ bool locator::value::operator<(const value& a) const
surface locator::load_image_file() const
{
#ifdef USE_ZIPIOS
std::string s = read_file("images/" + val_.filename_);
if (s.empty()) {
return surface(NULL);
} else {
SDL_RWops* ops = SDL_RWFromMem((void*)s.c_str(), s.size());
const surface res(IMG_Load_RW(ops, 0));
if(res == NULL) {
ERR_DP << "could not open image '" << val_.filename_ << "'\n";
}
SDL_FreeRW(ops);
return res;
}
#else
const std::string& location = get_binary_file_location("images", val_.filename_);
if(location.empty()) {
@ -213,6 +228,7 @@ surface locator::load_image_file() const
return res;
}
#endif
}
surface locator::load_image_sub_file() const
@ -622,10 +638,14 @@ bool exists(const image::locator& i_locator)
if(image_existance_map.find(i_locator) != image_existance_map.end())
return image_existance_map[i_locator];
#ifdef USE_ZIPIOS
if(file_exists("images/" + i_locator.get_filename()))
ret = true;
#else
if(get_binary_file_location("images",i_locator.get_filename()).empty() == false) {
ret = true;
}
#endif
image_existance_map[i_locator] = ret;
return ret;