games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-13 11:40:38 +02:00
Code Issues Releases Activity

Quest Log: update code for new graphics and fix bugs

Browse Source 
This one should fix issues 1988 and 2022
This commit is contained in:
ArseniyShestakov 2015-02-14 03:38:28 +03:00
parent 8648081f0a
commit c046f8ddc6
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
client/windows/CQuestLog.cpp
View File

@ -132,25 +132,41 @@ CQuestLog::CQuestLog (const std::vector<QuestInfo> & Quests) :
void CQuestLog::init()
{
minimap = new CQuestMinimap (Rect (33, 18, 144, 144));
description = new CTextBox ("", Rect(221, 18, 350, 355), 1, FONT_MEDIUM, TOPLEFT, Colors::WHITE);
ok = new CButton(Point(533, 386), "IOKAY.DEF", CGI->generaltexth->zelp[445], boost::bind(&CQuestLog::close,this), SDLK_RETURN);
if (quests.size() > QUEST_COUNT)
slider = new CSlider(Point(189, 184), 230, std::bind (&CQuestLog::sliderMoved, this, _1), QUEST_COUNT, quests.size(), false, CSlider::BROWN);
minimap = new CQuestMinimap (Rect (12, 12, 169, 169));
// TextBox have it's own 4 pixel padding from top at least for English. To achieve 10px from both left and top only add 6px margin
description = new CTextBox ("", Rect(205, 18, 385, DESCRIPTION_HEIGHT_MAX), CSlider::BROWN, FONT_MEDIUM, TOPLEFT, Colors::WHITE);
ok = new CButton(Point(539, 398), "IOKAY.DEF", CGI->generaltexth->zelp[445], boost::bind(&CQuestLog::close,this), SDLK_RETURN);
int currentLabel = 0;
for (int i = 0; i < quests.size(); ++i)
{
// Quests with MISSION_NONE type don't have text for them and can't be displayed
if (quests[i].quest->missionType == CQuest::MISSION_NONE)
continue;
MetaString text;
quests[i].quest->getRolloverText (text, false);
if (quests[i].obj)
text.addReplacement (quests[i].obj->getObjectName()); //get name of the object
CQuestLabel * label = new CQuestLabel (Rect(14, 184 + i * 24, 172,30), FONT_SMALL, TOPLEFT, Colors::WHITE, text.toString());
label->callback = boost::bind(&CQuestLog::selectQuest, this, i);
labels.push_back(label);
}
CQuestLabel * label = new CQuestLabel (Rect(13, 195, 149,31), FONT_SMALL, TOPLEFT, Colors::WHITE, text.toString());
label->disable();
label->callback = boost::bind(&CQuestLog::selectQuest, this, i, currentLabel);
labels.push_back(label);
// Select latest active quest
if (quests[i].quest->progress != CQuest::COMPLETE) // TODO: there need to be difference between active and completed quests
selectQuest(i, currentLabel);
currentLabel = labels.size();
}
recreateQuestList (0);
slider = new CSlider(Point(166, 195), 191, std::bind (&CQuestLog::sliderMoved, this, _1), QUEST_COUNT, currentLabel, false, CSlider::BROWN);
if (currentLabel > QUEST_COUNT)
slider->moveToMax();
else
slider->block(true);
}
void CQuestLog::showAll(SDL_Surface * to)
@ -172,28 +188,26 @@ void CQuestLog::recreateQuestList (int newpos)
{
for (int i = 0; i < labels.size(); ++i)
{
labels[i]->pos = Rect (pos.x + 14, pos.y + 192 + (i-newpos) * 25, 173, 23);
labels[i]->pos = Rect (pos.x + 14, pos.y + 195 + (i-newpos) * 32, 151, 31);
if (i >= newpos && i < newpos + QUEST_COUNT)
{
labels[i]->activate();
}
labels[i]->enable();
else
{
labels[i]->deactivate();
}
labels[i]->disable();
}
minimap->update();
}
void CQuestLog::selectQuest (int which)
void CQuestLog::selectQuest (int which, int labelId)
{
questIndex = which;
questIndex = labelId;
currentQuest = &quests[which];
minimap->currentQuest = currentQuest;
MetaString text;
std::vector<Component> components; //TODO: display them
currentQuest->quest->getVisitText (text, components , currentQuest->quest->isCustomFirst, true);
if (description->slider)
description->slider->moveToMin(); // scroll text to start position
description->setText (text.toString()); //TODO: use special log entry text
minimap->update();
redraw();

3
client/windows/CQuestLog.h
View File

@ -31,6 +31,7 @@ class CLabel;
struct QuestInfo;
const int QUEST_COUNT = 6;
const int DESCRIPTION_HEIGHT_MAX = 355;
class CQuestLabel : public LRClickableAreaWText, public CMultiLineLabel
{
@ -93,7 +94,7 @@ public:
~CQuestLog(){};
void selectQuest (int which);
void selectQuest (int which, int labelId);
void updateMinimap (int which){};
void printDescription (int which){};
void sliderMoved (int newpos);