games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-04 22:14:25 +02:00
Code Issues Releases Activity

- fixed several cases of accessing full path to files in archives

Browse Source
This commit is contained in:
Ivan Savenko 2013-07-29 11:38:18 +00:00
parent 9f7c89d5e3
commit 77496bcea9
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/CBitmapHandler.cpp
View File

@ -130,13 +130,10 @@ SDL_Surface * BitmapHandler::loadBitmapFromDir(std::string path, std::string fna
} }
else else
{ //loading via SDL_Image { //loading via SDL_Image
CFileInfo info(*CResourceHandler::get()->getResourceName(ResourceID(path + fname, EResType::IMAGE))); ret = IMG_Load_RW(
ret = IMG_LoadTyped_RW(
//create SDL_RW with our data (will be deleted by SDL) //create SDL_RW with our data (will be deleted by SDL)
SDL_RWFromConstMem((void*)readFile.first.get(), readFile.second), SDL_RWFromConstMem((void*)readFile.first.get(), readFile.second),
1, // mark it for auto-deleting 1); // mark it for auto-deleting
&info.getExtension()[0] + 1); //pass extension without dot (+1 character)
if (ret) if (ret)
{ {
if (ret->format->palette) if (ret->format->palette)

4
client/CMT.cpp
View File

@ -660,7 +660,7 @@ void processCommand(const std::string &message)
{ {
CDefEssential * cde = CDefHandler::giveDefEss(URI); CDefEssential * cde = CDefHandler::giveDefEss(URI);
std::string outName = *CResourceHandler::get()->getResourceName(ResourceID("SPRITES/" + URI)); std::string outName = URI;
std::string outPath = VCMIDirs::get().userCachePath() + "/extracted/"; std::string outPath = VCMIDirs::get().userCachePath() + "/extracted/";
boost::filesystem::create_directories(outPath + outName); boost::filesystem::create_directories(outPath + outName);
@ -681,7 +681,7 @@ void processCommand(const std::string &message)
if (CResourceHandler::get()->existsResource(ResourceID(URI))) if (CResourceHandler::get()->existsResource(ResourceID(URI)))
{ {
std::string outName = *CResourceHandler::get()->getResourceName(ResourceID(URI)); std::string outName = URI;
std::string outPath = VCMIDirs::get().userCachePath() + "/extracted/"; std::string outPath = VCMIDirs::get().userCachePath() + "/extracted/";
std::string fullPath = outPath + outName; std::string fullPath = outPath + outName;

16
client/CVideoHandler.cpp
View File

@ -412,20 +412,20 @@ bool CVideoPlayer::open(std::string name)
// We can handle only videos in form of single file, no archive support yet. // We can handle only videos in form of single file, no archive support yet.
{ {
ResourceID videoID = ResourceID("VIDEO/" + name, EResType::VIDEO); ResourceID videoID = ResourceID("VIDEO/" + name, EResType::VIDEO);
std::string realVideoFilename = CResourceHandler::get()->getResourceName(videoID).get(); auto data = CResourceHandler::get()->load(videoID)->readAll();
if(boost::algorithm::iends_with(realVideoFilename, ".BIK")) // try to determine video format using magic number from header (3 bytes, SMK or BIK)
std::string magic(reinterpret_cast<char*>(data.first.get()), 3);
if (magic == "BIK")
current = &bikPlayer; current = &bikPlayer;
else else if (magic == "SMK")
current = &smkPlayer; current = &smkPlayer;
else
auto myVideo = CResourceHandler::get()->load(videoID); throw std::runtime_error("Unknown video format: " + magic);
unique_ptr<char[]> data = unique_ptr<char[]>(new char[myVideo->getSize()]);
myVideo->read((ui8*)data.get(), myVideo->getSize());
std::ofstream out(name, std::ofstream::binary); std::ofstream out(name, std::ofstream::binary);
out.exceptions(std::ifstream::failbit | std::ifstream::badbit); out.exceptions(std::ifstream::failbit | std::ifstream::badbit);
out.write(data.get(), myVideo->getSize()); out.write(data.first.get(), data.second);
} }
current->open(name); current->open(name);