games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Modified CMediaHandler to handle more than one file.

Browse Source
This commit is contained in:
Frank Zago
2011-08-07 19:14:46 +00:00
parent f417cee2c0
commit 2cc80e1267
6 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/CVideoHandler.cpp
View File

@ -401,15 +401,14 @@ void CSmackPlayer::redraw( int x, int y, SDL_Surface *dst, bool update )
CVideoPlayer::CVideoPlayer()
{
vidh = new CVidHandler(std::string(DATA_DIR "/Data/VIDEO.VID"));
vidh_ab = new CVidHandler(std::string(DATA_DIR "/Data/H3ab_ahd.vid"));
vidh.add_file(std::string(DATA_DIR "/Data/VIDEO.VID"));
vidh.add_file(std::string(DATA_DIR "/Data/H3ab_ahd.vid"));
current = NULL;
}
CVideoPlayer::~CVideoPlayer()
{
delete vidh;
delete vidh_ab;
}
bool CVideoPlayer::open(std::string name)
@ -663,8 +662,8 @@ CVideoPlayer::CVideoPlayer()
av_register_protocol(&lod_protocol);
#endif
vidh = new CVidHandler(std::string(DATA_DIR "/Data/VIDEO.VID"));
vidh_ab = new CVidHandler(std::string(DATA_DIR "/Data/H3ab_ahd.vid"));
vidh.add_file(std::string(DATA_DIR "/Data/VIDEO.VID"));
vidh.add_file(std::string(DATA_DIR "/Data/H3ab_ahd.vid"));
}
// loop = to loop through the video
@ -679,10 +678,7 @@ bool CVideoPlayer::open(std::string fname, bool loop, bool useOverlay)
refreshCount = -1;
doLoop = loop;
data = vidh->extract(fname, length);
if (!data) {
data = vidh_ab->extract(fname, length);
}
data = vidh.extract(fname, length);
if (data) {
// Create our URL name with the 'lod' protocol as a prefix and a