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

- music player uses URI's instead of enum from music base

Browse Source 
- #1045 and #1046 should be fixed
- moved pregame backgrounds to config/mainmenu
- animation can be overriden with .json multiple times
This commit is contained in:
Ivan Savenko
2012-08-06 07:34:37 +00:00
parent 385be09248
commit 708ad6ac7f
24 changed files with 212 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/CPreGame.cpp
View File

@@ -259,7 +259,7 @@ void CMenuScreen::show(SDL_Surface * to)
void CMenuScreen::activate()
{
CCS->musich->playMusic(musicBase::mainMenu, -1);
CCS->musich->playMusic("Music/MainMenu", true);
if (!config["video"].isNull())
CCS->videoh->open(config["video"]["name"].String());
CIntObject::activate();
@@ -567,13 +567,15 @@ CSelectionScreen::CSelectionScreen(CMenuScreen::EState Type, CMenuScreen::EMulti
else if(Type == CMenuScreen::campaignList)
{
bordered = false;
bg = new CPicture(BitmapHandler::loadBitmap("CamCust.bmp"), 0, 0, true);
bg = new CPicture("CamCust.bmp", 0, 0);
pos = bg->center();
}
else
{
bordered = true;
bg = new CPicture(BitmapHandler::loadBitmap(rand()%2 ? "ZPIC1000.bmp" : "ZPIC1001.bmp"), 0, 0, true);
//load random background
const JsonVector & bgNames = (*CGP->pregameConfig)["game-select"].Vector();
bg = new CPicture(bgNames[rand() % bgNames.size()].String(), 0, 0);
pos = bg->center();
}