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

Merge pull request #3649 from godric3/map-editor-fix-owner-selection

Browse Source 
Map editor fix owner selection
This commit is contained in:
Ivan Savenko
2024-03-01 13:34:47 +02:00
committed by GitHub
parent ce44f581fb da91e90a7b
commit 00058ea609
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapeditor/inspector/inspector.cpp
+19 -14
View File
@@ -233,7 +233,7 @@ void Inspector::updateProperties(CGDwelling * o)
{
if(!o) return;
addProperty("Owner", o->tempOwner, false);
addProperty("Owner", o->tempOwner, new OwnerDelegate(controller), false);
if (o->ID == Obj::RANDOM_DWELLING || o->ID == Obj::RANDOM_DWELLING_LVL)
{
@@ -245,15 +245,15 @@ void Inspector::updateProperties(CGDwelling * o)
void Inspector::updateProperties(CGLighthouse * o)
{
if(!o) return;
addProperty("Owner", o->tempOwner, false);
addProperty("Owner", o->tempOwner, new OwnerDelegate(controller), false);
}
void Inspector::updateProperties(CGGarrison * o)
{
if(!o) return;
addProperty("Owner", o->tempOwner, false);
addProperty("Owner", o->tempOwner, new OwnerDelegate(controller), false);
addProperty("Removable units", o->removableUnits, false);
}
@@ -261,14 +261,14 @@ void Inspector::updateProperties(CGShipyard * o)
{
if(!o) return;
addProperty("Owner", o->tempOwner, false);
addProperty("Owner", o->tempOwner, new OwnerDelegate(controller), false);
}
void Inspector::updateProperties(CGHeroPlaceholder * o)
{
if(!o) return;
addProperty("Owner", o->tempOwner, false);
addProperty("Owner", o->tempOwner, new OwnerDelegate(controller), false);
bool type = false;
if(o->heroType.has_value())
@@ -298,7 +298,8 @@ void Inspector::updateProperties(CGHeroInstance * o)
{
if(!o) return;
addProperty("Owner", o->tempOwner, o->ID == Obj::PRISON); //field is not editable for prison
auto isPrison = o->ID == Obj::PRISON;
addProperty("Owner", o->tempOwner, new OwnerDelegate(controller, isPrison), isPrison); //field is not editable for prison
addProperty<int>("Experience", o->exp, false);
addProperty("Hero class", o->type ? o->type->heroClass->getNameTranslated() : "", true);
@@ -368,7 +369,7 @@ void Inspector::updateProperties(CGMine * o)
{
if(!o) return;
addProperty("Owner", o->tempOwner, false);
addProperty("Owner", o->tempOwner, new OwnerDelegate(controller), false);
addProperty("Resource", o->producedResource);
addProperty("Productivity", o->producedQuantity);
}
@@ -474,12 +475,7 @@ void Inspector::updateProperties()
addProperty("IsStatic", factory->isStaticObject());
}
auto * delegate = new InspectorDelegate();
delegate->options.push_back({QObject::tr("neutral"), QVariant::fromValue(PlayerColor::NEUTRAL.getNum())});
for(int p = 0; p < controller.map()->players.size(); ++p)
if(controller.map()->players[p].canAnyonePlay())
delegate->options.push_back({QString::fromStdString(GameConstants::PLAYER_COLOR_NAMES[p]), QVariant::fromValue(PlayerColor(p).getNum())});
addProperty("Owner", obj->tempOwner, delegate, true);
addProperty("Owner", obj->tempOwner, new OwnerDelegate(controller), true);
UPDATE_OBJ_PROPERTIES(CArmedInstance);
UPDATE_OBJ_PROPERTIES(CGResource);
@@ -927,3 +923,12 @@ void InspectorDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
QStyledItemDelegate::setModelData(editor, model, index);
}
}
OwnerDelegate::OwnerDelegate(MapController & controller, bool addNeutral)
{
if(addNeutral)
options.push_back({QObject::tr("neutral"), QVariant::fromValue(PlayerColor::NEUTRAL.getNum()) });
for(int p = 0; p < controller.map()->players.size(); ++p)
if(controller.map()->players[p].canAnyonePlay())
options.push_back({QString::fromStdString(GameConstants::PLAYER_COLOR_NAMES[p]), QVariant::fromValue(PlayerColor(p).getNum()) });
}
mapeditor/inspector/inspector.h
+10 -2
View File
@@ -128,7 +128,7 @@ protected:
{
itemKey = keyItems[key];
table->setItem(table->row(itemKey), 1, itemValue);
table->setItemDelegateForRow(table->row(itemKey), delegate);
table->setItemDelegateForRow(table->row(itemKey), delegate);
}
else
{
@@ -138,7 +138,7 @@ protected:
table->setRowCount(row + 1);
table->setItem(row, 0, itemKey);
table->setItem(row, 1, itemValue);
table->setItemDelegateForRow(row, delegate);
table->setItemDelegateForRow(row, delegate);
++row;
}
itemKey->setFlags(restricted ? Qt::NoItemFlags : Qt::ItemIsEnabled);
@@ -171,3 +171,11 @@ public:
QList<std::pair<QString, QVariant>> options;
};
class OwnerDelegate : public InspectorDelegate
{
Q_OBJECT
public:
OwnerDelegate(MapController & controller, bool addNeutral = true);
};