Laserlicht 4 semanas atrás
pai
commit
1ac2dba509

+ 2 - 2
mapeditor/templateeditor/mineselector.cpp

@@ -20,7 +20,7 @@
 
 auto resourcesToShow = std::vector<EGameResID>{EGameResID::GOLD, EGameResID::WOOD, EGameResID::MERCURY, EGameResID::ORE, EGameResID::SULFUR, EGameResID::CRYSTAL, EGameResID::GEMS}; //todo: configurable resource support
 
-MineSelector::MineSelector(std::map<TResource, ui16> & mines) :
+MineSelector::MineSelector(std::map<GameResID, ui16> & mines) :
 	ui(new Ui::MineSelector),
 	minesSelected(mines)
 {
@@ -50,7 +50,7 @@ MineSelector::MineSelector(std::map<TResource, ui16> & mines) :
 	show();
 }
 
-void MineSelector::showMineSelector(std::map<TResource, ui16> & mines)
+void MineSelector::showMineSelector(std::map<GameResID, ui16> & mines)
 {
 	auto * dialog = new MineSelector(mines);
 	dialog->setAttribute(Qt::WA_DeleteOnClose);

+ 3 - 3
mapeditor/templateeditor/mineselector.h

@@ -22,9 +22,9 @@ class MineSelector : public QDialog
 	Q_OBJECT
 
 public:
-	explicit MineSelector(std::map<TResource, ui16> & mines);
+	explicit MineSelector(std::map<GameResID, ui16> & mines);
 
-	static void showMineSelector(std::map<TResource, ui16> & mines);
+	static void showMineSelector(std::map<GameResID, ui16> & mines);
 
 private slots:
 	void on_buttonBoxResult_accepted();
@@ -33,5 +33,5 @@ private slots:
 private:
 	Ui::MineSelector *ui;
 
-	std::map<TResource, ui16> & minesSelected;
+	std::map<GameResID, ui16> & minesSelected;
 };