1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00

skill names and descriptions are fully managed by CSkillHandler

This commit is contained in:
Henning Koehler
2017-08-30 22:35:23 +12:00
parent dba5186a6f
commit abdca71828
15 changed files with 74 additions and 84 deletions

View File

@ -20,6 +20,7 @@
#include "CHeroHandler.h"
#include "mapObjects/CObjectHandler.h"
#include "CModHandler.h"
#include "CSkillHandler.h"
#include "mapping/CMap.h"
#include "mapping/CMapService.h"
#include "StartInfo.h"
@ -113,6 +114,10 @@ void MetaString::getLocalString(const std::pair<ui8,ui32> &txt, std::string &dst
{
dst = VLC->objtypeh->getObjectName(ser);
}
else if(type == SEC_SKILL_NAME)
{
dst = VLC->skillh->skillName(ser);
}
else
{
std::vector<std::string> *vec;
@ -139,9 +144,6 @@ void MetaString::getLocalString(const std::pair<ui8,ui32> &txt, std::string &dst
case ADVOB_TXT:
vec = &VLC->generaltexth->advobtxt;
break;
case SEC_SKILL_NAME:
vec = &VLC->generaltexth->skillName;
break;
case COLOR:
vec = &VLC->generaltexth->capColors;
break;