Merge branch 'develop' into SpellsRefactoring8

client/CMT.cpp

@@ -92,7 +92,7 @@ static po::variables_map vm;
 
 static bool ermInteractiveMode = false; //structurize when time is right
 void processCommand(const std::string &message);
-static void setScreenRes(int w, int h, int bpp, bool fullscreen, bool resetVideo=true);
+static void setScreenRes(int w, int h, int bpp, bool fullscreen, int displayIndex, bool resetVideo=true);
 void dispose();
 void playIntro();
 static void mainLoop();
@@ -407,7 +407,7 @@ int main(int argc, char** argv)
 			}
 		}
 
-		setScreenRes(res["width"].Float(), res["height"].Float(), video["bitsPerPixel"].Float(), video["fullscreen"].Bool());
+		setScreenRes(res["width"].Float(), res["height"].Float(), video["bitsPerPixel"].Float(), video["displayIndex"].Float(), video["fullscreen"].Bool());
 		logGlobal->infoStream() <<"\tInitializing screen: "<<pomtime.getDiff();
 	}
 
@@ -984,7 +984,7 @@ static void cleanupRenderer()
 	}
 }
 
-static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
+static bool recreateWindow(int w, int h, int bpp, bool fullscreen, int displayIndex)
 {
 	// VCMI will only work with 2 or 4 bytes per pixel
 	vstd::amax(bpp, 16);
@@ -992,7 +992,14 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
 	if(bpp>16)
 		bpp = 32;
 
-	if(!checkVideoMode(0,w,h))
+	if(displayIndex < 0)
+	{
+		if (mainWindow != nullptr)
+			displayIndex = SDL_GetWindowDisplayIndex(mainWindow);
+		if (displayIndex < 0)
+			displayIndex = 0;
+	}
+	if(!checkVideoMode(displayIndex, w, h))
 	{
 		logGlobal->errorStream() << "Error: SDL says that " << w << "x" << h << " resolution is not available!";
 		return false;
@@ -1005,12 +1012,12 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
 	if(fullscreen)
 	{
 		//in full-screen mode always use desktop resolution
-		mainWindow = SDL_CreateWindow(NAME.c_str(), SDL_WINDOWPOS_UNDEFINED,SDL_WINDOWPOS_UNDEFINED, 0, 0, SDL_WINDOW_FULLSCREEN_DESKTOP);
+		mainWindow = SDL_CreateWindow(NAME.c_str(), SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex),SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), 0, 0, SDL_WINDOW_FULLSCREEN_DESKTOP);
 		SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
 	}
 	else
 	{
-		mainWindow = SDL_CreateWindow(NAME.c_str(), SDL_WINDOWPOS_CENTERED,SDL_WINDOWPOS_CENTERED, w, h, 0);
+		mainWindow = SDL_CreateWindow(NAME.c_str(), SDL_WINDOWPOS_CENTERED_DISPLAY(displayIndex),SDL_WINDOWPOS_CENTERED_DISPLAY(displayIndex), w, h, 0);
 	}
 
 	if(nullptr == mainWindow)
@@ -1091,9 +1098,9 @@ static bool recreateWindow(int w, int h, int bpp, bool fullscreen)
 }
 
 //used only once during initialization
-static void setScreenRes(int w, int h, int bpp, bool fullscreen, bool resetVideo)
+static void setScreenRes(int w, int h, int bpp, bool fullscreen, int displayIndex, bool resetVideo)
 {
-	if(!recreateWindow(w,h,bpp,fullscreen))
+	if(!recreateWindow(w, h, bpp, fullscreen, displayIndex))
 	{
 		throw std::runtime_error("Requested screen resolution is not available\n");
 	}
@@ -1111,7 +1118,7 @@ static void fullScreenChanged()
 	auto w = screen->w;
 	auto h = screen->h;
 
-	if(!recreateWindow(w,h,bitsPerPixel,toFullscreen))
+	if(!recreateWindow(w, h, bitsPerPixel, toFullscreen, -1))
 	{
 		//will return false and report error if video mode is not supported
 		return;

client/CMusicHandler.cpp

@@ -128,8 +128,8 @@ void CSoundHandler::release()
 
 		for (auto &chunk : soundChunks)
 		{
-			if (chunk.second)
+			if (chunk.second.first)
-				Mix_FreeChunk(chunk.second);
+				Mix_FreeChunk(chunk.second.first);
 		}
 	}
 
@@ -142,14 +142,14 @@ Mix_Chunk *CSoundHandler::GetSoundChunk(std::string &sound, bool cache)
 	try
 	{
 		if (cache && soundChunks.find(sound) != soundChunks.end())
-			return soundChunks[sound];
+			return soundChunks[sound].first;
 
 		auto data = CResourceHandler::get()->load(ResourceID(std::string("SOUNDS/") + sound, EResType::SOUND))->readAll();
-		SDL_RWops *ops = SDL_RWFromMem(data.first.release(), data.second);
+		SDL_RWops *ops = SDL_RWFromMem(data.first.get(), data.second);
 		Mix_Chunk *chunk = Mix_LoadWAV_RW(ops, 1);	// will free ops
 
 		if (cache)
-			soundChunks.insert(std::pair<std::string, Mix_Chunk *>(sound, chunk));
+			soundChunks.insert(std::pair<std::string, CachedChunk>(sound, std::make_pair (chunk, std::move (data.first))));
 
 		return chunk;
 	}

client/CMusicHandler.h

@@ -41,7 +41,8 @@ private:
 	SettingsListener listener;
 	void onVolumeChange(const JsonNode &volumeNode);
 
-	std::map<std::string, Mix_Chunk *> soundChunks;
+	using CachedChunk = std::pair<Mix_Chunk *, std::unique_ptr<ui8[]>>;
+	std::map<std::string, CachedChunk> soundChunks;
 
 	Mix_Chunk *GetSoundChunk(std::string &sound, bool cache);
 

client/CPlayerInterface.cpp

@@ -2294,8 +2294,10 @@ void CPlayerInterface::acceptTurn()
 	{
 		adventureInt->select(heroToSelect, centerView);
 	}
-	else
+	else if(towns.size())
 		adventureInt->select(towns.front(), centerView);
+	else
+		adventureInt->select(wanderingHeroes.front());
 
 	//show new day animation and sound on infobar
 	adventureInt->infoBar.showDate();

client/CPreGame.cpp

@@ -1146,7 +1146,7 @@ void SelectionTab::parseGames(const std::unordered_set<ResourceID> &files, bool
 			// Create the map info object
 			CMapInfo mapInfo;
 			mapInfo.mapHeader = make_unique<CMapHeader>();
-			mapInfo.scenarioOpts = new StartInfo;
+			mapInfo.scenarioOpts = nullptr;//to be created by serialiser
 			lf >> *(mapInfo.mapHeader.get()) >> mapInfo.scenarioOpts;
 			mapInfo.fileURI = file.getName();
 			mapInfo.countPlayers();

client/windows/CCastleInterface.cpp

@@ -1378,7 +1378,7 @@ std::string CBuildWindow::getTextForState(int state)
 			};
 
 			ret = CGI->generaltexth->allTexts[52];
-			ret += "\n" + town->genBuildingRequirements(building->bid, false).toString(toStr);
+			ret += "\n" + town->genBuildingRequirements(building->bid).toString(toStr);
 			break;
 		}
 	case EBuildingState::MISSING_BASE:

config/schemas/settings.json

@@ -45,7 +45,7 @@
 			"type" : "object",
 			"additionalProperties" : false,
 			"default": {},
-			"required" : [ "screenRes", "bitsPerPixel", "fullscreen", "spellbookAnimation","driver", "showIntro" ],
+			"required" : [ "screenRes", "bitsPerPixel", "fullscreen", "spellbookAnimation","driver", "showIntro", "displayIndex" ],
 			"properties" : {
 				"screenRes" : {
 					"type" : "object",
@@ -77,6 +77,10 @@
 					"type" : "string",
 					"default" : "opengl",
 					"description" : "preferred graphics backend driver name for SDL2"
+				},
+				"displayIndex" : {
+					"type" : "number",
+					"default" : 0
 				}
 			}
 		},

launcher/CMakeLists.txt

@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8.7)
 
 include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${ZLIB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
+include_directories(${SDL_INCLUDE_DIR})
 
 set(launcher_modmanager_SRCS
 	modManager/cdownloadmanager_moc.cpp
@@ -25,6 +26,7 @@ set(launcher_SRCS
 	mainwindow_moc.cpp
 	launcherdirs.cpp
 	jsonutils.cpp
+	sdldisplayquery.cpp
 )
 
 set(launcher_FORMS
@@ -60,10 +62,10 @@ endif()
 
 if(MSVC)
 	# Fix _WinMain@16 linking error
-	target_link_libraries(vcmilauncher vcmi ${Qt5Core_QTMAIN_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES})
+	target_link_libraries(vcmilauncher vcmi ${Qt5Core_QTMAIN_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${SDL_LIBRARY})
 else()
 	# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
-	target_link_libraries(vcmilauncher vcmi ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES})
+	target_link_libraries(vcmilauncher vcmi ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${SDL_LIBRARY})
 endif()
 
 # temporary(?) disabled - generation of PCH takes too much time since cotire is trying to collect all Qt headers

launcher/main.cpp

@@ -1,11 +1,13 @@
 #include "StdInc.h"
 #include "mainwindow_moc.h"
 #include <QApplication>
+#include "sdldisplayquery.h"
 
 int main(int argc, char *argv[])
 {
+	auto displayList = getDisplays();
 	QApplication a(argc, argv);
-	MainWindow w;
+	MainWindow w(displayList);
 	w.show();
 	
 	return a.exec();

launcher/mainwindow_moc.cpp

@@ -26,7 +26,7 @@ void MainWindow::load()
 	settings.init();
 }
 
-MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(const QStringList& displayList, QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
 {
@@ -34,6 +34,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
 	ui->setupUi(this);
 	ui->tabListWidget->setCurrentIndex(0);
+	ui->settingsView->setDisplayList(displayList);
 
 	connect(ui->tabSelectList, SIGNAL(currentRowChanged(int)),
 	        ui->tabListWidget, SLOT(setCurrentIndex(int)));

launcher/mainwindow_moc.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <QMainWindow>
+#include <QStringList>
 
 namespace Ui {
 	class MainWindow;
@@ -14,7 +15,7 @@ class MainWindow : public QMainWindow
 	void load();
 	void startExecutable(QString name);
 public:
-	explicit MainWindow(QWidget *parent = 0);
+	explicit MainWindow(const QStringList& displayList, QWidget *parent = 0);
 	~MainWindow();
 
 private slots:

launcher/mainwindow_moc.ui

@@ -176,7 +176,7 @@
        <number>1</number>
       </property>
       <widget class="CModListView" name="stackedWidgetPage2"/>
-      <widget class="CSettingsView" name="stackedWidgetPage3"/>
+      <widget class="CSettingsView" name="settingsView"/>
      </widget>
     </item>
    </layout>

launcher/modManager/cmodlistview_moc.cpp

@@ -74,6 +74,10 @@ CModListView::CModListView(QWidget *parent) :
 	{
 		loadRepositories();
 	}
+	else
+	{
+		manager->resetRepositories();
+	}
 }
 
 void CModListView::loadRepositories()

launcher/sdldisplayquery.cpp

@@ -0,0 +1,32 @@
+#include "sdldisplayquery.h"
+
+#include <QString>
+#include <QTextStream>
+
+#include <SDL.h>
+#include <SDL_video.h>
+
+QStringList getDisplays()
+{
+  if(SDL_Init(SDL_INIT_VIDEO))
+    return QStringList("default display");
+
+  const int displays = SDL_GetNumVideoDisplays();
+  QStringList list;
+
+  for (int display = 0; display < displays; ++display)
+    {
+      SDL_Rect rect;
+
+      if (SDL_GetDisplayBounds (display, &rect))
+	continue;
+
+      QString string;
+      QTextStream(&string) << display << " - " << rect.w << "x" << rect.h << " (at " << rect.x << ", " << rect.y << ")";
+
+      list << string;
+    }
+
+  SDL_Quit();
+  return list;
+}

launcher/sdldisplayquery.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <QStringList>
+
+QStringList getDisplays();

launcher/settingsView/csettingsview_moc.cpp

@@ -20,11 +20,25 @@ static const std::string knownEncodingsList[] = //TODO: remove hardcode
     "GB2312"  // basic set for Simplified Chinese. Separate from GBK to allow proper detection of H3 fonts
 };
 
+void CSettingsView::setDisplayList(const QStringList& displayList)
+{
+	if (displayList.count() < 2)
+	  {
+	    ui->comboBoxDisplayIndex->hide ();
+	    ui->labelDisplayIndex->hide ();
+	  }
+	else
+	  {
+	    ui->comboBoxDisplayIndex->clear();
+	    ui->comboBoxDisplayIndex->addItems(displayList);
+	    ui->comboBoxDisplayIndex->setCurrentIndex(settings["video"]["displayIndex"].Float());
+	  }
+}
+
 void CSettingsView::loadSettings()
 {
 	int resX = settings["video"]["screenRes"]["width"].Float();
 	int resY = settings["video"]["screenRes"]["height"].Float();
-
 	int resIndex = ui->comboBoxResolution->findText(QString("%1x%2").arg(resX).arg(resY));
 
 	ui->comboBoxResolution->setCurrentIndex(resIndex);
@@ -92,6 +106,12 @@ void CSettingsView::on_comboBoxAutoCheck_currentIndexChanged(int index)
 	node->Bool() = index;
 }
 
+void CSettingsView::on_comboBoxDisplayIndex_currentIndexChanged(int index)
+{
+	Settings node = settings.write["video"];
+	node["displayIndex"].Float() = index;
+}
+
 void CSettingsView::on_comboBoxPlayerAI_currentIndexChanged(const QString &arg1)
 {
 	Settings node = settings.write["server"]["playerAI"];

launcher/settingsView/csettingsview_moc.h

@@ -15,6 +15,7 @@ public:
 	~CSettingsView();
 
 	void loadSettings();
+	void setDisplayList(const QStringList& displayList);
 
 private slots:
 	void on_comboBoxResolution_currentIndexChanged(const QString &arg1);
@@ -43,6 +44,8 @@ private slots:
 
 	void on_comboBoxAutoCheck_currentIndexChanged(int index);
 
+	void on_comboBoxDisplayIndex_currentIndexChanged(int index);
+
 private:
 	Ui::CSettingsView *ui;
 };

launcher/settingsView/csettingsview_moc.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>700</width>
+    <width>714</width>
-    <height>420</height>
+    <height>429</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,7 +26,7 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="9" column="1" colspan="4">
+   <item row="10" column="1" colspan="4">
     <widget class="QLabel" name="LauncherSettings">
      <property name="font">
       <font>
@@ -39,7 +39,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="6" colspan="4">
+   <item row="6" column="6" colspan="4">
     <widget class="QLabel" name="labelGeneral">
      <property name="font">
       <font>
@@ -59,7 +59,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="7" colspan="3">
+   <item row="7" column="7" colspan="3">
     <widget class="QSpinBox" name="spinBoxNetworkPort">
      <property name="minimum">
       <number>1024</number>
@@ -99,7 +99,7 @@
      </item>
     </widget>
    </item>
-   <item row="5" column="1" colspan="4">
+   <item row="6" column="1" colspan="4">
     <widget class="QLabel" name="labelAISettings">
      <property name="font">
       <font>
@@ -192,7 +192,7 @@
      </property>
     </widget>
    </item>
-   <item row="13" column="1" colspan="9">
+   <item row="14" column="1" colspan="9">
     <widget class="QPlainTextEdit" name="plainTextEditRepos">
      <property name="lineWrapMode">
       <enum>QPlainTextEdit::NoWrap</enum>
@@ -222,7 +222,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="4">
+   <item row="8" column="4">
     <widget class="QComboBox" name="comboBoxNeutralAI">
      <item>
       <property name="text">
@@ -250,21 +250,21 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
+   <item row="8" column="1">
     <widget class="QLabel" name="labelNeutralAI">
      <property name="text">
       <string>Neutral AI</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="6">
+   <item row="8" column="6">
     <widget class="QLabel" name="labelEncoding">
      <property name="text">
       <string>Heroes III character set</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="4">
+   <item row="7" column="4">
     <widget class="QComboBox" name="comboBoxPlayerAI">
      <item>
       <property name="text">
@@ -273,14 +273,14 @@
      </item>
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="7" column="1">
     <widget class="QLabel" name="labelPlayerAI">
      <property name="text">
       <string>Player AI</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="7" colspan="3">
+   <item row="8" column="7" colspan="3">
     <widget class="QComboBox" name="comboBoxEncoding">
      <item>
       <property name="text">
@@ -309,7 +309,7 @@
      </item>
     </widget>
    </item>
-   <item row="6" column="6">
+   <item row="7" column="6">
     <widget class="QLabel" name="labelNetworkPort">
      <property name="text">
       <string>Network port</string>
@@ -329,7 +329,7 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="1" colspan="4">
+   <item row="12" column="1" colspan="4">
     <widget class="QLabel" name="labelRepositories">
      <property name="font">
       <font>
@@ -411,7 +411,7 @@
      </item>
     </widget>
    </item>
-   <item row="4" column="1" colspan="4">
+   <item row="5" column="1" colspan="4">
     <spacer name="spacerSections">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -427,7 +427,7 @@
      </property>
     </spacer>
    </item>
-   <item row="8" column="1" colspan="4">
+   <item row="9" column="1" colspan="4">
     <spacer name="spacerRepos">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -472,7 +472,7 @@
      </property>
     </spacer>
    </item>
-   <item row="10" column="6">
+   <item row="11" column="6">
     <widget class="QComboBox" name="comboBoxAutoCheck">
      <property name="currentIndex">
       <number>1</number>
@@ -489,13 +489,29 @@
      </item>
     </widget>
    </item>
-   <item row="10" column="1" colspan="4">
+   <item row="11" column="1" colspan="4">
     <widget class="QLabel" name="labelAutoCheck">
      <property name="text">
       <string>Check repositories on startup</string>
      </property>
     </widget>
    </item>
+   <item row="4" column="1">
+    <widget class="QLabel" name="labelDisplayIndex">
+     <property name="text">
+      <string>Display index</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="4">
+    <widget class="QComboBox" name="comboBoxDisplayIndex">
+     <item>
+      <property name="text">
+       <string>0</string>
+      </property>
+     </item>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

lib/CGameState.cpp

@@ -1080,13 +1080,14 @@ void CGameState::initPlayerStates()
 	logGlobal->debug("\tCreating player entries in gs");
 	for(auto & elem : scenarioOps->playerInfos)
 	{
-		std::pair<PlayerColor, PlayerState> ins(elem.first,PlayerState());
+		PlayerState & p = players[elem.first];
-		ins.second.color=ins.first;
+		//std::pair<PlayerColor, PlayerState> ins(elem.first,PlayerState());
-		ins.second.human = elem.second.playerID;
+		p.color=elem.first;
-		ins.second.team = map->players[ins.first.getNum()].team;
+		p.human = elem.second.playerID;
-		teams[ins.second.team].id = ins.second.team;//init team
+		p.team = map->players[elem.first.getNum()].team;
-		teams[ins.second.team].players.insert(ins.first);//add player to team
+		teams[p.team].id = p.team;//init team
-		players.insert(ins);
+		teams[p.team].players.insert(elem.first);//add player to team
+		//players.insert(ins);
 	}
 }
 
@@ -2936,6 +2937,25 @@ PlayerState::PlayerState()
 	setNodeType(PLAYER);
 }
 
+PlayerState::PlayerState(PlayerState && other):
+	CBonusSystemNode(std::move(other)),
+	color(other.color),
+	human(other.human),
+	team(other.team),
+	resources(other.resources),
+	enteredWinningCheatCode(other.enteredWinningCheatCode),
+	enteredLosingCheatCode(other.enteredLosingCheatCode),
+	status(other.status),
+	daysWithoutCastle(other.daysWithoutCastle)
+{
+	std::swap(visitedObjects, other.visitedObjects);
+	std::swap(heroes, other.heroes);
+	std::swap(towns, other.towns);
+	std::swap(availableHeroes, other.availableHeroes);
+	std::swap(dwellings, other.dwellings);
+	std::swap(quests, other.quests);
+}
+
 std::string PlayerState::nodeName() const
 {
 	return "Player " + (color.getNum() < VLC->generaltexth->capColors.size() ? VLC->generaltexth->capColors[color.getNum()] : boost::lexical_cast<std::string>(color));
@@ -3235,6 +3255,15 @@ TeamState::TeamState()
 	setNodeType(TEAM);
 }
 
+TeamState::TeamState(TeamState && other):
+	CBonusSystemNode(std::move(other)),
+	id(other.id)
+{
+	std::swap(players, other.players);
+	std::swap(fogOfWarMap, other.fogOfWarMap);
+}
+
+
 CRandomGenerator & CGameState::getRandomGenerator()
 {
 	//logGlobal->traceStream() << "Fetching CGameState::rand with seed " << rand.nextInt();

lib/CPlayerState.h

@@ -35,6 +35,8 @@ public:
 	boost::optional<ui8> daysWithoutCastle;
 
 	PlayerState();
+	PlayerState(PlayerState && other);
+
 	std::string nodeName() const override;
 
 	template <typename Handler> void serialize(Handler &h, const int version)
@@ -56,6 +58,7 @@ public:
 	std::vector<std::vector<std::vector<ui8> > >  fogOfWarMap; //true - visible, false - hidden
 
 	TeamState();
+	TeamState(TeamState && other);
 
 	template <typename Handler> void serialize(Handler &h, const int version)
 	{

lib/HeroBonus.cpp

@@ -96,6 +96,13 @@ BonusList::BonusList(const BonusList &bonusList)
 	belongsToTree = false;
 }
 
+BonusList::BonusList(BonusList&& other):
+	belongsToTree(false)
+{
+	std::swap(belongsToTree, other.belongsToTree);
+	std::swap(bonuses, other.bonuses);
+}
+
 BonusList& BonusList::operator=(const BonusList &bonusList)
 {
 	bonuses.resize(bonusList.size());
@@ -104,6 +111,12 @@ BonusList& BonusList::operator=(const BonusList &bonusList)
 	return *this;
 }
 
+void BonusList::changed()
+{
+    if(belongsToTree)
+		CBonusSystemNode::treeHasChanged();
+}
+
 int BonusList::totalValue() const
 {
 	int base = 0;
@@ -257,24 +270,19 @@ void BonusList::eliminateDuplicates()
 void BonusList::push_back(Bonus* const &x)
 {
 	bonuses.push_back(x);
-
+	changed();
-	if (belongsToTree)
-		CBonusSystemNode::treeHasChanged();
 }
 
 std::vector<Bonus*>::iterator BonusList::erase(const int position)
 {
-	if (belongsToTree)
+	changed();
-		CBonusSystemNode::treeHasChanged();
 	return bonuses.erase(bonuses.begin() + position);
 }
 
 void BonusList::clear()
 {
 	bonuses.clear();
-
+	changed();
-	if (belongsToTree)
-		CBonusSystemNode::treeHasChanged();
 }
 
 std::vector<BonusList*>::size_type BonusList::operator-=(Bonus* const &i)
@@ -283,26 +291,20 @@ std::vector<BonusList*>::size_type BonusList::operator-=(Bonus* const &i)
 	if(itr == bonuses.end())
 		return false;
 	bonuses.erase(itr);
-
+	changed();
-	if (belongsToTree)
-		CBonusSystemNode::treeHasChanged();
 	return true;
 }
 
 void BonusList::resize(std::vector<Bonus*>::size_type sz, Bonus* c )
 {
 	bonuses.resize(sz, c);
-
+	changed();
-	if (belongsToTree)
-		CBonusSystemNode::treeHasChanged();
 }
 
 void BonusList::insert(std::vector<Bonus*>::iterator position, std::vector<Bonus*>::size_type n, Bonus* const &x)
 {
 	bonuses.insert(position, n, x);
-
+	changed();
-	if (belongsToTree)
-		CBonusSystemNode::treeHasChanged();
 }
 
 int IBonusBearer::valOfBonuses(Bonus::BonusType type, const CSelector &selector) const
@@ -708,6 +710,36 @@ CBonusSystemNode::CBonusSystemNode() : bonuses(true), exportedBonuses(true), nod
 {
 }
 
+CBonusSystemNode::CBonusSystemNode(CBonusSystemNode && other):
+	bonuses(std::move(other.bonuses)),
+	exportedBonuses(std::move(other.exportedBonuses)),
+	nodeType(other.nodeType),
+	description(other.description),
+	cachedLast(0)
+{
+	std::swap(parents, other.parents);
+	std::swap(children, other.children);
+
+	//fixing bonus tree without recalculation
+
+	for(CBonusSystemNode * n : parents)
+	{
+		n->children -= &other;
+		n->children.push_back(this);
+	}
+
+	for(CBonusSystemNode * n : children)
+	{
+		n->parents -= &other;
+		n->parents.push_back(this);
+	}
+
+	//cache ignored
+
+	//cachedBonuses
+	//cachedRequests
+}
+
 CBonusSystemNode::~CBonusSystemNode()
 {
 	detachFromAll();

lib/HeroBonus.h

@@ -412,7 +412,7 @@ private:
 
 	TInternalContainer bonuses;
 	bool belongsToTree;
-
+	void changed();
 
 public:
 	typedef TInternalContainer::const_reference const_reference;
@@ -423,6 +423,7 @@ public:
 
 	BonusList(bool BelongsToTree = false);
 	BonusList(const BonusList &bonusList);
+	BonusList(BonusList && other);
 	BonusList& operator=(const BonusList &bonusList);
 
 	// wrapper functions of the STL vector container
@@ -494,12 +495,8 @@ public:
 	{
 		return bonuses.end();
 	}
-
-	//friend inline std::vector<Bonus*>::iterator range_begin(BonusList & x);
-	//friend inline std::vector<Bonus*>::iterator range_end(BonusList & x);
 };
 
-
 // Extensions for BOOST_FOREACH to enable iterating of BonusList objects
 // Don't touch/call this functions
 inline BonusList::iterator range_begin(BonusList & x)
@@ -614,7 +611,7 @@ public:
 	const TBonusListPtr getSpellBonuses() const;
 };
 
-class DLL_LINKAGE CBonusSystemNode : public IBonusBearer
+class DLL_LINKAGE CBonusSystemNode : public IBonusBearer, public boost::noncopyable
 {
 public:
 	enum ENodeTypes
@@ -647,8 +644,8 @@ private:
 	const TBonusListPtr getAllBonusesWithoutCaching(const CSelector &selector, const CSelector &limit, const CBonusSystemNode *root = nullptr) const;
 
 public:
-
 	explicit CBonusSystemNode();
+	CBonusSystemNode(CBonusSystemNode && other);
 	virtual ~CBonusSystemNode();
 
 	void limitBonuses(const BonusList &allBonuses, BonusList &out) const; //out will bo populed with bonuses that are not limited here
@@ -1010,23 +1007,5 @@ template <class InputIterator>
 void BonusList::insert(const int position, InputIterator first, InputIterator last)
 {
 	bonuses.insert(bonuses.begin() + position, first, last);
-
+	changed();
-	if (belongsToTree)
-		CBonusSystemNode::treeHasChanged();
 }
-
-// Extensions for BOOST_FOREACH to enable iterating of BonusList objects
-/*namespace boost
-{
-	template<>
-	struct range_mutable_iterator<BonusList>
-	{
-		typedef std::vector<Bonus*>::iterator type;
-	};
-
-	template<>
-	struct range_const_iterator<BonusList>
-	{
-		typedef std::vector<Bonus*>::const_iterator type;
-	};
-}*/

lib/mapObjects/CGTownInstance.cpp

@@ -1126,7 +1126,7 @@ bool CGTownInstance::hasBuilt(BuildingID buildingID) const
 	return vstd::contains(builtBuildings, buildingID);
 }
 
-CBuilding::TRequired CGTownInstance::genBuildingRequirements(BuildingID buildID, bool includeUpgrade) const
+CBuilding::TRequired CGTownInstance::genBuildingRequirements(BuildingID buildID) const
 {
 	const CBuilding * building = town->buildings.at(buildID);
 
@@ -1138,10 +1138,14 @@ CBuilding::TRequired CGTownInstance::genBuildingRequirements(BuildingID buildID,
 		if (!hasBuilt(id))
 			return id;
 
-		if (build->upgrade != BuildingID::NONE && !hasBuilt(build->upgrade))
+		CBuilding::TRequired::OperatorAll requirements;
-			return build->upgrade;
 
-		return build->requirements.morph(dependTest);
+		if (build->upgrade != BuildingID::NONE)
+			requirements.expressions.push_back(dependTest(build->upgrade));
+
+		requirements.expressions.push_back(build->requirements.morph(dependTest));
+
+		return requirements;
 	};
 
 	CBuilding::TRequired::OperatorAll requirements;
@@ -1149,9 +1153,7 @@ CBuilding::TRequired CGTownInstance::genBuildingRequirements(BuildingID buildID,
 	{
 		const CBuilding * upgr = town->buildings.at(building->upgrade);
 
-		if (includeUpgrade)
+		requirements.expressions.push_back(dependTest(upgr->bid));
-			requirements.expressions.push_back(upgr->bid);
-		requirements.expressions.push_back(upgr->requirements.morph(dependTest));
 	}
 	requirements.expressions.push_back(building->requirements.morph(dependTest));
 

lib/mapObjects/CGTownInstance.h

@@ -238,7 +238,7 @@ public:
 	bool armedGarrison() const; //true if town has creatures in garrison or garrisoned hero
 	int getTownLevel() const;
 
-	CBuilding::TRequired genBuildingRequirements(BuildingID build, bool includeUpgrade=true) const;
+	CBuilding::TRequired genBuildingRequirements(BuildingID build) const;
 
 	void mergeGarrisonOnSiege() const; // merge garrison into army of visiting hero
 	void removeCapitols (PlayerColor owner) const;

lib/mapObjects/CRewardableObject.cpp

@@ -857,6 +857,7 @@ void CGOnceVisitable::initObj()
 			info[0].reward.bonuses.push_back(bonus);
 			info[1].reward.bonuses.push_back(bonus);
 			info[0].message.addTxt(MetaString::ADVOB_TXT, 162);
+			info[0].message.addReplacement(VLC->arth->artifacts[info[0].reward.artifacts.back()]->Name());
 			info[1].message.addTxt(MetaString::ADVOB_TXT, 163);
 		}
 		break;

lib/mapObjects/MiscObjects.cpp

@@ -1659,7 +1659,7 @@ std::string CGShrine::getHoverText(PlayerColor player) const
 std::string CGShrine::getHoverText(const CGHeroInstance * hero) const
 {
 	std::string hoverName = getHoverText(hero->tempOwner);
-	if(vstd::contains(hero->spells, spell)) //hero knows that spell
+	if(wasVisited(hero->tempOwner) && vstd::contains(hero->spells, spell)) //know what spell there is and hero knows that spell
 		hoverName += "\n\n" + VLC->generaltexth->allTexts[354]; // (Already learned)
 	return hoverName;
 }

lib/mapping/CMapInfo.cpp

@@ -35,11 +35,13 @@ CMapInfo::CMapInfo() : scenarioOpts(nullptr), playerAmnt(0), humanPlayers(0),
 
 #define STEAL(x) x = std::move(tmp.x)
 
-CMapInfo::CMapInfo(CMapInfo && tmp)
+CMapInfo::CMapInfo(CMapInfo && tmp):
+	scenarioOpts(nullptr), playerAmnt(0), humanPlayers(0),
+	actualHumanPlayers(0), isRandomMap(false)
 {
+	std::swap(scenarioOpts, tmp.scenarioOpts);
 	STEAL(mapHeader);
 	STEAL(campaignHeader);
-	STEAL(scenarioOpts);
 	STEAL(fileURI);
 	STEAL(date);
 	STEAL(playerAmnt);
@@ -48,6 +50,10 @@ CMapInfo::CMapInfo(CMapInfo && tmp)
 	STEAL(isRandomMap);
 }
 
+CMapInfo::~CMapInfo()
+{
+	vstd::clear_pointer(scenarioOpts);
+}
 
 void CMapInfo::mapInit(const std::string & fname)
 {

lib/mapping/CMapInfo.h

@@ -32,6 +32,7 @@ public:
 
 	CMapInfo();
 	CMapInfo(CMapInfo && tmp);
+	virtual ~CMapInfo();
 
 	CMapInfo &operator=(CMapInfo &&other);