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

- a bit less memory usage during compilation with gcc, new file - RegisterTypes.cpp

Browse Source 
- fixed several issues related to visiting town by ally
- fixed #1215
This commit is contained in:
Ivan Savenko
2013-02-23 12:22:23 +00:00
parent fbb1ae1bb8
commit 74ac44662c
18 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/CMusicHandler.cpp
View File

@@ -187,31 +187,14 @@ soundBase::soundID CSoundHandler::getSoundID(const std::string &fileName)
return it->second;
}
void CSoundHandler::initCreaturesSounds(const std::vector<ConstTransitivePtr< CCreature> > &creatures)
{
//commented to avoid spurious warnings
/*
// Find creatures without sounds
for(ui32 i=0;i<creatures.size();i++)
{
// Note: this will exclude war machines, but it's better
// than nothing.
if (vstd::contains(CGI->creh->notUsedMonsters, i))
continue;
CCreature &c = creatures[i];
if (c.sounds.killed == soundBase::invalid)
tlog1 << "creature " << c.idNumber << " doesn't have sounds" << std::endl;
}*/
}
void CSoundHandler::initSpellsSounds(const std::vector< ConstTransitivePtr<CSpell> > &spells)
{
const JsonNode config(ResourceID("config/sp_sounds.json"));
if (!config["spell_sounds"].isNull()) {
BOOST_FOREACH(const JsonNode &node, config["spell_sounds"].Vector()) {
if (!config["spell_sounds"].isNull())
{
BOOST_FOREACH(const JsonNode &node, config["spell_sounds"].Vector())
{
int spellid = node["id"].Float();
const CSpell *s = CGI->spellh->spells[spellid];