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

Merge pull request #35 from rhn/rhn

Browse Source 
Fixes to sound handling.
This commit is contained in:
Ivan Savenko
2014-09-04 20:26:32 +03:00
parent 0e2cc54252 c8929b364b
commit 1647b3670c
6 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mapObjects/CObjectClassesHandler.cpp
View File

@@ -318,6 +318,11 @@ std::string CObjectClassesHandler::getObjectName(si32 type, si32 subtype) const
return getObjectName(type);
}
std::string CObjectClassesHandler::getObjectHandlerName(si32 type) const
{
return objects.at(type)->handlerName;
}
void AObjectTypeHandler::setType(si32 type, si32 subtype)
{
this->type = type;

3
lib/mapObjects/CObjectClassesHandler.h
View File

@@ -221,6 +221,9 @@ public:
std::string getObjectName(si32 type) const;
std::string getObjectName(si32 type, si32 subtype) const;
/// Returns handler string describing the handler (for use in client)
std::string getObjectHandlerName(si32 type) const;
template <typename Handler> void serialize(Handler &h, const int version)
{