Cleanup

* WIN64 video should work with ffmpeg
* brace-initialization syntax is now allowed (TODO get rid of boost::assign)

Global.h

@@ -16,10 +16,6 @@
 // Fixed width bool data type is important for serialization
 static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
 
-#if defined _M_X64 && defined _WIN32 //Win64 -> cannot load 32-bit DLLs for video handling
-#  define DISABLE_VIDEO
-#endif
-
 #ifdef __GNUC__
 #  define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__)
 #endif
@@ -32,16 +28,6 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
 #  error This GCC version has buggy std::array::at version and should not be used. Please update to 4.7.2 or later
 #endif
 
-/* ---------------------------------------------------------------------------- */
-/* Guarantee compiler features */
-/* ---------------------------------------------------------------------------- */
-//defining available c++11 features
-
-//initialization lists - gcc or clang
-#if defined(__clang__) || defined(__GNUC__)
-#  define CPP11_USE_INITIALIZERS_LIST
-#endif
-
 /* ---------------------------------------------------------------------------- */
 /* Suppress some compiler warnings */
 /* ---------------------------------------------------------------------------- */

scripting/erm/ERMInterpreter.cpp

@@ -2,8 +2,8 @@
 #include "ERMInterpreter.h"
 
 #include <cctype>
-#include "../../lib/mapObjects/CObjectHandler.h"
-#include "../../lib/mapObjects/MapObjects.h"
+#include "../../lib/mapObjects/CObjectHandler.h"
+#include "../../lib/mapObjects/MapObjects.h"
 #include "../../lib/CHeroHandler.h"
 #include "../../lib/CCreatureHandler.h"
 #include "../../lib/VCMIDirs.h"
@@ -2394,15 +2394,9 @@ void ERMInterpreter::heroVisit(const CGHeroInstance *visitor, const CGObjectInst
 		return;
 	setCurrentlyVisitedObj(visitedObj->pos);
 	TIDPattern tip;
-#ifdef CPP11_USE_INITIALIZERS_LIST
 	tip[1] = {visitedObj->ID};
 	tip[2] = {visitedObj->ID, visitedObj->subID};
 	tip[3] = {visitedObj->pos.x, visitedObj->pos.y, visitedObj->pos.z};
-#else
-	tip[1] = list_of(visitedObj->ID);
-	tip[2] = list_of((int)visitedObj->ID)(visitedObj->subID);
-	tip[3] = list_of(visitedObj->pos.x)(visitedObj->pos.y)(visitedObj->pos.z);
-#endif
 	executeTriggerType(VERMInterpreter::TriggerType("OB"), start, tip);
 }