games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

tweaks

Browse Source
This commit is contained in:
AlexVinS
2021-02-15 15:03:32 +03:00
parent ecaa9f5d0b
commit a59e12ca5f
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AI/BattleAI/BattleAI.cpp
View File

@ -311,7 +311,7 @@ BattleAction CBattleAI::useCatapult(const CStack * stack)
if(cb->battleGetGateState() == EGateState::CLOSED) if(cb->battleGetGateState() == EGateState::CLOSED)
{ {
targetHex = cb->wallPartToBattleHex(EWallPart::GATE); targetHex = cb->wallPartToBattleHex(EWallPart::GATE);
} }
else else
{ {
EWallPart::EWallPart wallParts[] = { EWallPart::EWallPart wallParts[] = {

6
client/widgets/CComponent.cpp
View File

@ -10,6 +10,9 @@
#include "StdInc.h" #include "StdInc.h"
#include "CComponent.h" #include "CComponent.h"
#include <vcmi/spells/Service.h>
#include <vcmi/spells/Spell.h>
#include "../gui/CGuiHandler.h" #include "../gui/CGuiHandler.h"
#include "../gui/CCursorHandler.h" #include "../gui/CCursorHandler.h"
@ -23,7 +26,6 @@
#include "../../lib/CTownHandler.h" #include "../../lib/CTownHandler.h"
#include "../../lib/CCreatureHandler.h" #include "../../lib/CCreatureHandler.h"
#include "../../lib/CSkillHandler.h" #include "../../lib/CSkillHandler.h"
#include "../../lib/spells/CSpellHandler.h"
#include "../../lib/CGeneralTextHandler.h" #include "../../lib/CGeneralTextHandler.h"
#include "../../lib/NetPacksBase.h" #include "../../lib/NetPacksBase.h"
@ -164,7 +166,7 @@ std::string CComponent::getDescription()
return art->getEffectiveDescription(); return art->getEffectiveDescription();
} }
case experience: return CGI->generaltexth->allTexts[241]; case experience: return CGI->generaltexth->allTexts[241];
case spell: return CGI->spellh->objects[subtype]->getLevelDescription(val); case spell: return SpellID(subtype).toSpell(CGI->spells())->getLevelDescription(val);
case morale: return CGI->generaltexth->heroscrn[ 4 - (val>0) + (val<0)]; case morale: return CGI->generaltexth->heroscrn[ 4 - (val>0) + (val<0)];
case luck: return CGI->generaltexth->heroscrn[ 7 - (val>0) + (val<0)]; case luck: return CGI->generaltexth->heroscrn[ 7 - (val>0) + (val<0)];
case building: return (*CGI->townh)[subtype]->town->buildings[BuildingID(val)]->Description(); case building: return (*CGI->townh)[subtype]->town->buildings[BuildingID(val)]->Description();

6
lib/CArtHandler.cpp
View File

@ -761,13 +761,13 @@ std::string CArtifactInstance::getEffectiveDescription(const CGHeroInstance * he
// we expect scroll description to be like this: This scroll contains the [spell name] spell which is added into your spell book for as long as you carry the scroll. // we expect scroll description to be like this: This scroll contains the [spell name] spell which is added into your spell book for as long as you carry the scroll.
// so we want to replace text in [...] with a spell name // so we want to replace text in [...] with a spell name
// however other language versions don't have name placeholder at all, so we have to be careful // however other language versions don't have name placeholder at all, so we have to be careful
int32_t spellID = getGivenSpellID(); SpellID spellID = getGivenSpellID();
size_t nameStart = text.find_first_of('['); size_t nameStart = text.find_first_of('[');
size_t nameEnd = text.find_first_of(']', nameStart); size_t nameEnd = text.find_first_of(']', nameStart);
if(spellID >= 0) if(spellID.getNum() >= 0)
{ {
if(nameStart != std::string::npos && nameEnd != std::string::npos) if(nameStart != std::string::npos && nameEnd != std::string::npos)
text = text.replace(nameStart, nameEnd - nameStart + 1, VLC->spellh->objects[spellID]->name); text = text.replace(nameStart, nameEnd - nameStart + 1, spellID.toSpell(VLC->spells())->getName());
} }
} }
else if(hero && artType->constituentOf.size()) //display info about set else if(hero && artType->constituentOf.size()) //display info about set

3
lib/mapObjects/CQuest.cpp
View File

@ -11,6 +11,8 @@
#include "StdInc.h" #include "StdInc.h"
#include "CQuest.h" #include "CQuest.h"
#include <vcmi/spells/Spell.h>
#include "../NetPacks.h" #include "../NetPacks.h"
#include "../CSoundBase.h" #include "../CSoundBase.h"
#include "../CGeneralTextHandler.h" #include "../CGeneralTextHandler.h"
@ -23,7 +25,6 @@
#include "../CModHandler.h" #include "../CModHandler.h"
#include "../GameConstants.h" #include "../GameConstants.h"
#include "../StringConstants.h" #include "../StringConstants.h"
#include "../spells/CSpellHandler.h"
#include "../CSkillHandler.h" #include "../CSkillHandler.h"
#include "../mapping/CMap.h" #include "../mapping/CMap.h"

2
lib/mapObjects/MiscObjects.cpp
View File

@ -1773,7 +1773,7 @@ void CGScholar::serializeJsonOptions(JsonSerializeFormat & handler)
handler.serializeString("rewardSkill", value); handler.serializeString("rewardSkill", value);
break; break;
case SPELL: case SPELL:
value = VLC->spellh->objects.at(bonusID)->identifier; value = SpellID::encode(bonusID);
handler.serializeString("rewardSpell", value); handler.serializeString("rewardSpell", value);
break; break;
case RANDOM: case RANDOM: