games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity

Reverted r2382; add zvs to the game data (linux); simplified BitmapHandler::loadBitmap().

Browse Source
This commit is contained in:
Frank Zago 2011-09-14 05:27:49 +00:00
parent 479a714dbf
commit 0cfb2deeaf
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_data.sh
View File

@ -19,7 +19,7 @@
# data1.cab and data1.hdr from the original 1st CDROM # data1.cab and data1.hdr from the original 1st CDROM
# Heroes3.snd from the original 2nd CDROM # Heroes3.snd from the original 2nd CDROM
# the WoG release v3.58f: allinone_358f.zip # the WoG release v3.58f: allinone_358f.zip
# the VCMI distribution: vcmi_085b.rar # the VCMI distribution: vcmi_086.rar
# Usage: put this script and the 4 data files into the same directory # Usage: put this script and the 4 data files into the same directory
# and run the script. # and run the script.
@ -85,6 +85,9 @@ unrar x -o+ ../main4.wog
#unrar x -o+ ../main8_optional.wog #unrar x -o+ ../main8_optional.wog
#unrar x -o+ ../main9_optional.wog #unrar x -o+ ../main9_optional.wog
mkdir -p $DESTDIR/Data/zvs/
mv data/zvs/Lib1.res $DESTDIR/Data/zvs/
rm -rf picsall Documentation Data data update rm -rf picsall Documentation Data data update
rm -f action.txt h3bitmap.txt H3sprite.txt InstMult.txt rm -f action.txt h3bitmap.txt H3sprite.txt InstMult.txt
rm -f ACTION.TXT H3BITMAP.TXT H3SPRITE.TXT INSTMULT.TXT rm -f ACTION.TXT H3BITMAP.TXT H3SPRITE.TXT INSTMULT.TXT
@ -109,8 +112,7 @@ rm -rf temp
mkdir temp mkdir temp
cd temp cd temp
#unzip ../vcmi_085.zip unzip ../vcmi_086.zip
unrar ../vcmi_085b.rar
find . -name "*.dll" | xargs rm -f find . -name "*.dll" | xargs rm -f
find . -name "*.DLL" | xargs rm -f find . -name "*.DLL" | xargs rm -f

17
client/CBitmapHandler.cpp
View File

@ -203,15 +203,12 @@ SDL_Surface * BitmapHandler::loadBitmapFromLod(CLodHandler *lod, std::string fna
SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey) SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
{ {
if (bitmaph->haveFile(fname, FILE_GRAPHICS)) SDL_Surface *bitmap;
return loadBitmapFromLod(bitmaph, fname, setKey);
if (bitmaph_ab->haveFile(fname, FILE_GRAPHICS)) if (!(bitmap = loadBitmapFromLod(bitmaph, fname, setKey)) &&
return loadBitmapFromLod(bitmaph_ab, fname, setKey); !(bitmap = loadBitmapFromLod(bitmaph_ab, fname, setKey)) &&
!(bitmap = loadBitmapFromLod(spriteh, fname, setKey)))
tlog1<<"Failed to find file "<<fname<<"\n";
if (spriteh->haveFile(fname, FILE_GRAPHICS)) return bitmap;
return loadBitmapFromLod(spriteh, fname, setKey); }
tlog1<<"Failed to find file "<<fname<<"\n";
return NULL;
}

2
lib/CCreatureSet.cpp
View File

@ -856,7 +856,7 @@ std::string CStackInstance::bonusToGraphics(Bonus *bonus) const
fileName = "E_UNIC.bmp"; break; fileName = "E_UNIC.bmp"; break;
} }
if(!fileName.empty()) if(!fileName.empty())
fileName = "Data/zvs/Lib1.res/" + fileName; fileName = "zvs/Lib1.res/" + fileName;
return fileName; return fileName;
} }