games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG

Browse Source
This commit is contained in:
DjWarmonger
2014-06-30 06:45:35 +02:00
parent 7dbe2f5c40 a1fff864e6
commit a556ef64e9
12 changed files with 104 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapObjects/CObjectHandler.cpp
View File

@ -263,7 +263,7 @@ void CGObjectInstance::giveDummyBonus(ObjectInstanceID heroID, ui8 duration) con
std::string CGObjectInstance::getObjectName() const
{
return VLC->objtypeh->getObjectName(ID);
return VLC->objtypeh->getObjectName(ID, subID);
}
std::string CGObjectInstance::getHoverText(PlayerColor player) const