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

- moved ParseBonus to JsonNode.cpp (linkage errors)

- fixes to CMakeLists - vcmi can be compiled and started with cmake
- gcc\clang warnings fixes
This commit is contained in:
Ivan Savenko
2012-07-19 18:52:44 +00:00
parent 4c0537c420
commit e4c88d5088
13 changed files with 246 additions and 264 deletions

View File

@@ -141,8 +141,10 @@ void CQuestMinimap::showAll(SDL_Surface * to)
CQuestLog::CQuestLog (const std::vector<QuestInfo> & Quests) :
CWindowObject(PLAYER_COLORED, "QuestLog.pcx"),
quests (Quests), slider (NULL),
questIndex(0), currentQuest(NULL)
questIndex(0),
currentQuest(NULL),
quests (Quests),
slider(NULL)
{
OBJ_CONSTRUCTION_CAPTURING_ALL;
init();
@@ -229,4 +231,4 @@ void CQuestLog::sliderMoved (int newpos)
{
recreateQuestList (newpos); //move components
redraw();
}
}