Merge branch 'master' into 'next

Author: fallahn

README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 NOTE: Development of this project is indefinitely suspended in favour of [tmxlite](https://github.com/fallahn/tmxlite)
 which supports generic rendering across C++ frameworks such as SFML and SDL2, requires no external linkage and
 has broader platform support, including mobile devices.
@@ -35,46 +34,9 @@ it freely, subject to the following restrictions:
 
 *********************************************************************/  
 
-This class is designed to load TILED .tmx format maps, compatible with  
-TILED up to version 0.9.0
-=======
-A note on the [current status](http://trederia.blogspot.com/2016/05/sfml-tmx-map-loader-200.html)
-
-Looking for something more lightweight, yet flexible? Try [tmxlite](https://github.com/fallahn/tmxlite)!
-
-/*********************************************************************  
-
-Matt Marchant 2013 - 2015  
-SFML Tiled Map Loader - https://github.com/bjorn/tiled/wiki/TMX-Map-Format  
-
-The zlib license has been used to make this software fully compatible  
-with SFML. See http://www.sfml-dev.org/license.php  
-
-This software is provided 'as-is', without any express or  
-implied warranty. In no event will the authors be held  
-liable for any damages arising from the use of this software.  
-
-Permission is granted to anyone to use this software for any purpose,  
-including commercial applications, and to alter it and redistribute  
-it freely, subject to the following restrictions:  
-
-1. The origin of this software must not be misrepresented;  
-   you must not claim that you wrote the original software.  
-   If you use this software in a product, an acknowledgment  
-   in the product documentation would be appreciated but  
-   is not required.  
-
-2. Altered source versions must be plainly marked as such,  
-   and must not be misrepresented as being the original software.  
-  
-3. This notice may not be removed or altered from any  
-   source distribution.  
-
-*********************************************************************/  
 
 This class is designed to load TILED .tmx format maps, compatible with  
 TILED up to version 0.9.0  
->>>>>>> master
 
 http://trederia.blogspot.co.uk/2013/05/tiled-map-loader-for-sfml.html
 

include/tmx/DebugShape.hpp

@@ -56,7 +56,7 @@ class TMX_EXPORT_API DebugShape final : public sf::Drawable, public sf::Transfor
 	void closeShape();
 
 private:
-
+	sf::VertexArray m_array;
 	bool m_closed;
 	void draw(sf::RenderTarget& rt, sf::RenderStates states)const override;
 };

include/tmx/Log.hpp

@@ -111,7 +111,7 @@ namespace tmx
 #ifdef _MSC_VER
                 outstring += "\n";
                 auto stemp = std::wstring(std::begin(outstring), std::end(outstring));
-                OutputDebugString(stemp.c_str());
+                OutputDebugString((LPCSTR)stemp.c_str());
 #endif //_MSC_VER
             }
             if (output == Output::File || output == Output::All)

src/MapLayer.cpp

@@ -75,7 +75,6 @@ LayerSet::LayerSet(const sf::Texture& texture, sf::Uint8 patchSize, const sf::Ve
 	: m_texture	(texture),
 	m_patchSize	(patchSize),
 	m_mapSize	(mapSize),
-	m_patchCount(std::ceil(static_cast<float>(mapSize.x) / patchSize), std::ceil(static_cast<float>(mapSize.y) / patchSize)),
 	m_tileSize	(tileSize),
 	m_patchCount(static_cast<sf::Uint32>(std::ceil(static_cast<float>(mapSize.x) / patchSize)), static_cast<sf::Uint32>(std::ceil(static_cast<float>(mapSize.y) / patchSize))),
 	m_visible	(true)