mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 00:26:39 +00:00
Code Issues Releases Wiki Activity

Fixes #1887: Equipped items do not emit sounds

Browse source 
Corrected wrong return type of Class::getSound() method.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2014-10-12 13:38:41 +02:00
parent e1663de7cf
commit a6a3eca930
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/light.cpp
View file

@ -298,7 +298,7 @@ namespace MWClass
state2.mTime = dynamic_cast<LightCustomData&> (*ptr.getRefData().getCustomData()).mTime;
}
const std::string& Light::getSound(const MWWorld::Ptr& ptr) const
std::string Light::getSound(const MWWorld::Ptr& ptr) const
{
return ptr.get<ESM::Light>()->mBase->mSound;
}

2
apps/openmw/mwclass/light.hpp
View file

@ -83,7 +83,7 @@ namespace MWClass
const;
///< Write additional state from \a ptr into \a state.
virtual const std::string& getSound(const MWWorld::Ptr& ptr) const;
virtual std::string getSound(const MWWorld::Ptr& ptr) const;
};
}

2
apps/openmw/mwworld/class.cpp
View file

@ -421,7 +421,7 @@ namespace MWWorld
throw std::runtime_error("this is not a door");
}
const std::string& Class::getSound(const MWWorld::Ptr&) const
std::string Class::getSound(const MWWorld::Ptr&) const
{
return std::string();
}

2
apps/openmw/mwworld/class.hpp
View file

@ -338,7 +338,7 @@ namespace MWWorld
virtual void restock (const MWWorld::Ptr& ptr) const {}
/// Returns sound id
virtual const std::string& getSound(const MWWorld::Ptr& ptr) const;
virtual std::string getSound(const MWWorld::Ptr& ptr) const;
};
}