games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Quests in map now use shared_ptr instead of const ptr

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-27 14:57:30 +03:00
parent 417ea6451a
commit 797646cc05
20 changed files with 63 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapeditor/inspector/inspector.cpp
+8 -8
View File
@@ -454,13 +454,13 @@ void Inspector::updateProperties(CGEvent * o)
void Inspector::updateProperties(CGSeerHut * o)
{
if(!o || !o->quest) return;
if(!o || !o->getQuest()) return;
addProperty(QObject::tr("First visit text"), o->quest->firstVisitText, new MessageDelegate, false);
addProperty(QObject::tr("Next visit text"), o->quest->nextVisitText, new MessageDelegate, false);
addProperty(QObject::tr("Completed text"), o->quest->completedText, new MessageDelegate, false);
addProperty(QObject::tr("Repeat quest"), o->quest->repeatedQuest, false);
addProperty(QObject::tr("Time limit"), o->quest->lastDay, false);
addProperty(QObject::tr("First visit text"), o->getQuest()->firstVisitText, new MessageDelegate, false);
addProperty(QObject::tr("Next visit text"), o->getQuest()->nextVisitText, new MessageDelegate, false);
addProperty(QObject::tr("Completed text"), o->getQuest()->completedText, new MessageDelegate, false);
addProperty(QObject::tr("Repeat quest"), o->getQuest()->repeatedQuest, false);
addProperty(QObject::tr("Time limit"), o->getQuest()->lastDay, false);
{ //Quest
auto * delegate = new QuestDelegate(controller, *o->quest);
@@ -470,10 +470,10 @@ void Inspector::updateProperties(CGSeerHut * o)
void Inspector::updateProperties(CGQuestGuard * o)
{
if(!o || !o->quest) return;
if(!o || !o->getQuest()) return;
addProperty(QObject::tr("Reward"), PropertyEditorPlaceholder(), nullptr, true);
addProperty(QObject::tr("Repeat quest"), o->quest->repeatedQuest, true);
addProperty(QObject::tr("Repeat quest"), o->getQuest()->repeatedQuest, true);
}
void Inspector::updateProperties()
mapeditor/inspector/inspector.h
+1
View File
@@ -18,6 +18,7 @@
#include "../lib/GameConstants.h"
#include "../lib/mapObjects/CGCreature.h"
#include "../lib/mapObjects/CGResource.h"
#include "../lib/mapObjects/CQuest.h"
#include "../lib/mapObjects/MapObjects.h"
#include "../lib/mapObjects/FlaggableMapObject.h"
#include "../lib/mapObjects/CRewardableObject.h"