1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00

- Removed pointer usage for CQuest. may look rough, but works and fixes #1051.

- Better autoSkip mode, now info windows are not displayed.
This commit is contained in:
DjWarmonger
2012-09-28 15:46:09 +00:00
parent 786bd73e67
commit 0435d5a4f1
6 changed files with 48 additions and 25 deletions

View File

@@ -139,7 +139,7 @@ void CQuestLog::init()
for (int i = 0; i < quests.size(); ++i)
{
MetaString text;
quests[i].quest->getRolloverText (text, false);
quests[i].quest.getRolloverText (text, false);
if (quests[i].obj)
text.addReplacement (quests[i].obj->getHoverText()); //get name of the object
CQuestLabel * label = new CQuestLabel (28, 199 + i * 24, FONT_SMALL, TOPLEFT, Colors::Cornsilk, text.toString());
@@ -191,7 +191,7 @@ void CQuestLog::selectQuest (int which)
MetaString text;
std::vector<Component> components; //TODO: display them
currentQuest->quest->getVisitText (text, components , currentQuest->quest->isCustomFirst, true);
currentQuest->quest.getVisitText (text, components , currentQuest->quest.isCustomFirst, true);
description->setTxt (text.toString()); //TODO: use special log entry text
redraw();
}