cmake & vcpkg

.clang-format

@@ -0,0 +1,41 @@
+AccessModifierOffset: -4
+AlignAfterOpenBracket: DontAlign
+#AllowShortBlocksOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+BasedOnStyle: Microsoft
+BraceWrapping:
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterCaseLabel : true
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+BreakBeforeBraces: Custom
+ColumnLimit: 0
+Cpp11BracedListStyle: false
+FixNamespaceComments: false
+IndentCaseLabels: true
+
+IndentPPDirectives: AfterHash
+
+IndentWidth: 4
+MaxEmptyLinesToKeep: 10
+NamespaceIndentation: All
+PointerAlignment: Left
+SortIncludes: false
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 4
+UseTab: true

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = crlf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.gitignore

@@ -0,0 +1,6 @@
+.vs/
+.vscode/
+
+out/
+build/
+_build/

Android.cpp

@@ -1,88 +1,96 @@
 #include "Android.h"
 
-#include <SFML/Graphics.hpp>
-#include <vector>
-#include <string>
-#include <iostream>
+Android::Android(GameDataRef p_data, const sf::Vector2f& p_startPosition, std::vector<std::string>& p_path,
+	std::unique_ptr<std::vector<std::string>>& p_level, const sf::Vector2f* p_humanPostion, float p_dtOffset)
+	: Sprite(p_data, p_startPosition, p_path, p_level, p_humanPostion, p_dtOffset),
+	  m_target(*p_humanPostion)
+{
+	m_dtMax = 0.12f + p_dtOffset;
+}
+
+Android::~Android()
+{
+}
 
 void Android::NextMotion()
 {
-	//DOWN
+	// DOWN
 	if (m_target.y > m_presentPosition.y)
 	{
-		//DOWN LEFT
+		// DOWN LEFT
 		if (m_target.x > m_presentPosition.x)
 		{
-			if (m_path[((int)m_presentPosition.y + 8) / 8][(int)m_presentPosition.x / 16] != 'w')
+			if (m_path[((size_t)m_presentPosition.y + 8) / 8][(size_t)m_presentPosition.x / 16] != 'w')
 			{
 				m_nextPosition.x = m_presentPosition.x + 16.0f;
 			}
-			if (m_path[((int)m_presentPosition.y + 8) / 8][(int)m_presentPosition.x / 16] == 'w')
+			if (m_path[((size_t)m_presentPosition.y + 8) / 8][(size_t)m_presentPosition.x / 16] == 'w')
 			{
 				m_nextPosition.y = m_presentPosition.y + 8.0f;
 			}
 		}
-		//DOWN RIGHT
+		// DOWN RIGHT
 		if (m_target.x < m_presentPosition.x)
 		{
-			if (m_path[((int)m_presentPosition.y + 8) / 8][(int)m_presentPosition.x / 16] != 'w')
+			if (m_path[((size_t)m_presentPosition.y + 8) / 8][(size_t)m_presentPosition.x / 16] != 'w')
 			{
 				m_nextPosition.x = m_presentPosition.x - 16.0f;
 			}
-			if (m_path[((int)m_presentPosition.y + 8) / 8][(int)m_presentPosition.x / 16] == 'w')
+			if (m_path[((size_t)m_presentPosition.y + 8) / 8][(size_t)m_presentPosition.x / 16] == 'w')
 			{
 				m_nextPosition.y = m_presentPosition.y + 8.0f;
 			}
 		}
 	}
-	//UP
+
+	// UP
 	if (m_target.y < m_presentPosition.y)
 	{
-		//UP RIGHT
+		// UP RIGHT
 		if (m_target.x > m_presentPosition.x)
 		{
-			if (m_path[((int)m_presentPosition.y - 8) / 8][(int)m_presentPosition.x / 16] != 'w')
+			if (m_path[((size_t)m_presentPosition.y - 8) / 8][(size_t)m_presentPosition.x / 16] != 'w')
 			{
 				m_nextPosition.x = m_presentPosition.x + 16.0f;
 			}
-			if (m_path[((int)m_presentPosition.y - 8) / 8][(int)m_presentPosition.x / 16] == 'w')
+			if (m_path[((size_t)m_presentPosition.y - 8) / 8][(size_t)m_presentPosition.x / 16] == 'w')
 			{
 				m_nextPosition.y = m_presentPosition.y - 8.0f;
 			}
 		}
-		//UP LEFT
+		// UP LEFT
 		if (m_target.x < m_presentPosition.x)
 		{
-			if (m_path[((int)m_presentPosition.y - 8) / 8][(int)m_presentPosition.x / 16] != 'w')
+			if (m_path[((size_t)m_presentPosition.y - 8) / 8][(size_t)m_presentPosition.x / 16] != 'w')
 			{
 				m_nextPosition.x = m_presentPosition.x - 16.0f;
 			}
-			if (m_path[((int)m_presentPosition.y - 8) / 8][(int)m_presentPosition.x / 16] == 'w')
+			if (m_path[((size_t)m_presentPosition.y - 8) / 8][(size_t)m_presentPosition.x / 16] == 'w')
 			{
 				m_nextPosition.y = m_presentPosition.y - 8.0f;
 			}
 		}
 	}
 
-	//LEFT
+	// LEFT
 	if (m_target.x <= m_presentPosition.x && m_target.y == m_presentPosition.y)
 	{
 		m_nextPosition.x = m_presentPosition.x - 16.0f;
 	}
 
-	//RIGHT
+	// RIGHT
 	if (m_target.x >= m_presentPosition.x && m_target.y == m_presentPosition.y)
 	{
 		m_nextPosition.x = m_presentPosition.x + 16.0f;
 	}
 
-	//up
+	// up
 	if (m_target.x == m_presentPosition.x && m_target.y <= m_presentPosition.y)
 	{
 		m_nextPosition.y = m_presentPosition.y - 8.0f;
 	}
 
-	//down
+	// down
 	if (m_target.x == m_presentPosition.x && m_target.y >= m_presentPosition.y)
 	{
 		m_nextPosition.y = m_presentPosition.y + 8.0f;
@@ -109,20 +117,20 @@ void Android::Update(float p_deltaTime)
 	m_presentPosition = m_spriteShape.getPosition();
 
 	// In hole
-	if (m_level[((int)m_presentPosition.y) / 16][((int)m_presentPosition.x) / 16] == 'x')
+	if (m_level[((size_t)m_presentPosition.y) / 16][((size_t)m_presentPosition.x) / 16] == 'x')
 	{
-		if (m_level[((int)m_presentPosition.y) / 16][((int)m_presentPosition.x + 16) / 16] == '@' && m_level[((int)m_presentPosition.y) / 16][((int)m_presentPosition.x - 16) / 16] == '@')
+		if (m_level[((size_t)m_presentPosition.y) / 16][((size_t)m_presentPosition.x + 16) / 16] == '@' && m_level[((size_t)m_presentPosition.y) / 16][((size_t)m_presentPosition.x - 16) / 16] == '@')
 		{
 			if (m_presentPosition.y < 328)
 			{
-				if (m_level[((int)m_presentPosition.y + 16) / 16][((int)m_presentPosition.x) / 16] != ' ')
+				if (m_level[((size_t)m_presentPosition.y + 16) / 16][((size_t)m_presentPosition.x) / 16] != ' ')
 				{
-					m_level[((int)m_presentPosition.y) / 16][((int)m_presentPosition.x) / 16] = 'T';
+					m_level[((size_t)m_presentPosition.y) / 16][((size_t)m_presentPosition.x) / 16] = 'T';
 				}
 			}
 			else
 			{
-				m_level[((int)m_presentPosition.y) / 16][((int)m_presentPosition.x) / 16] = 'T';
+				m_level[((size_t)m_presentPosition.y) / 16][((size_t)m_presentPosition.x) / 16] = 'T';
 			}
 		}
 	}
@@ -133,10 +141,14 @@ void Android::Update(float p_deltaTime)
 	{
 		if (!m_isFalling)
 		{
-			if (!m_isInWall) NextMotion();
-			if (!IsInBounds())m_nextPosition = m_presentPosition;
-			if (!IsOnPath())m_nextPosition = m_presentPosition;
-			if (m_isInWall && m_presentPosition.y > 8.0f) m_nextPosition.y = m_presentPosition.y - 8.0f;
+			if (!m_isInWall)
+				NextMotion();
+			if (!IsInBounds())
+				m_nextPosition = m_presentPosition;
+			if (!IsOnPath())
+				m_nextPosition = m_presentPosition;
+			if (m_isInWall && m_presentPosition.y > 8.0f)
+				m_nextPosition.y = m_presentPosition.y - 8.0f;
 		}
 		else
 		{
@@ -153,4 +165,4 @@ void Android::Update(float p_deltaTime)
 		m_totalTime = 0;
 		m_spriteShape.setPosition(m_nextPosition);
 	}
-}
+}

Android.h

@@ -10,18 +10,13 @@
 class Android : public Sprite
 {
 public:
-	Android(GameDataRef p_data, sf::Vector2f& p_startPosition, std::vector<std::string>& p_path, std::unique_ptr<std::vector<std::string>>& p_level, const sf::Vector2f* p_humanPostion, float p_dtOffset) : //Androids
-		Sprite(p_data, p_startPosition, p_path, p_level, p_humanPostion, p_dtOffset),
-		m_target(*p_humanPostion)
-	{
-		//std::cout << "Android Created\t\t\t" << this << std::endl;
-
-		m_dtMax = 0.12f + p_dtOffset;
-	}
-	~Android()
-	{
-		//std::cout << "**Android Destroyed\t\t" << this << std::endl;
-	}
+	Android(GameDataRef p_data, const sf::Vector2f& p_startPosition, std::vector<std::string>& p_path,
+		std::unique_ptr<std::vector<std::string>>& p_level, const sf::Vector2f* p_humanPostion, float p_dtOffset);
+
+	Android(Android&) = delete;
+	Android& operator=(Android&) = delete;
+
+	virtual ~Android();
 
 private:
 	const sf::Vector2f& m_target;

AndroidDemo.cpp

@@ -1,9 +1,14 @@
 #include "AndroidDemo.h"
 
-#include <SFML/Graphics.hpp>
-#include <vector>
-#include <string>
-#include <iostream>
+AndroidDemo::AndroidDemo(GameDataRef p_data, sf::Vector2f& p_startPosition, std::vector<std::string>& p_path,
+	std::unique_ptr<std::vector<std::string>>& p_level)
+	: Sprite(p_data, p_startPosition, p_path, p_level)
+{
+}
+
+AndroidDemo::~AndroidDemo()
+{
+}
 
 void AndroidDemo::NextMotion()
 {
@@ -81,9 +86,12 @@ void AndroidDemo::Update(float p_deltaTime)
 		if (!m_isFalling)
 		{
 			NextMotion();
-			if (!IsInBounds())m_nextPosition = m_presentPosition;
-			if (!IsOnPath())m_nextPosition = m_presentPosition;
-			if (m_isInWall) m_nextPosition.y = m_presentPosition.y - 8.0f;
+			if (!IsInBounds())
+				m_nextPosition = m_presentPosition;
+			if (!IsOnPath())
+				m_nextPosition = m_presentPosition;
+			if (m_isInWall)
+				m_nextPosition.y = m_presentPosition.y - 8.0f;
 		}
 		else
 		{
@@ -95,4 +103,4 @@ void AndroidDemo::Update(float p_deltaTime)
 	}
 
 	m_spriteShape.setPosition(m_nextPosition);
-}
+}

AndroidDemo.h

@@ -6,20 +6,17 @@
 #include <SFML/Graphics.hpp>
 #include <vector>
 #include <string>
-#include <iostream>
 
 class AndroidDemo : public Sprite
 {
 public:
-	AndroidDemo(GameDataRef p_data, sf::Vector2f& p_startPosition, std::vector<std::string>& p_path, std::unique_ptr<std::vector<std::string>>& p_level) :
-		Sprite(p_data, p_startPosition, p_path, p_level)
-	{
-		//std::cout << "Android Demo Created\t\t" << this << std::endl;
-	}
-	~AndroidDemo()
-	{
-		//std::cout << "**Android Demo Destroyed\t" << this << std::endl;
-	}
+	AndroidDemo(GameDataRef p_data, sf::Vector2f& p_startPosition, std::vector<std::string>& p_path,
+		std::unique_ptr<std::vector<std::string>>& p_level);
+
+	AndroidDemo(AndroidDemo&) = delete;
+	AndroidDemo& operator=(AndroidDemo&) = delete;
+
+	virtual ~AndroidDemo();
 
 private:
 	void NextMotion();
@@ -28,4 +25,4 @@ class AndroidDemo : public Sprite
 	void Update(float p_deltaTime);
 };
 
-#endif // !_ANDROID_DEMO_H_
+#endif // !_ANDROID_DEMO_H_

AssetManager.cpp

@@ -1,5 +1,14 @@
 #include "AssetManager.h"
 
+AssetManager::AssetManager()
+{
+}
+
+AssetManager::~AssetManager()
+{
+	m_sounds.clear();
+}
+
 void AssetManager::LoadTexture(std::string p_textureName, std::string p_fileName)
 {
 	sf::Texture texture;
@@ -33,15 +42,11 @@ sf::IntRect AssetManager::GetRect(std::string p_rectName)
 
 void AssetManager::LoadSound(std::string p_soundName, std::string p_fileName)
 {
-	sf::SoundBuffer buffer;
-
-	if (buffer.loadFromFile(p_fileName))
-	{
-		this->m_sounds[p_soundName] = buffer;
-	}
+	auto& buff = m_sounds[p_soundName];
+	buff.loadFromFile(p_fileName);
 }
 
-sf::SoundBuffer& AssetManager::GetSound(std::string p_soundName)
+const sf::SoundBuffer& AssetManager::GetSound(std::string p_soundName)
 {
 	return this->m_sounds.at(p_soundName);
 }
@@ -59,4 +64,4 @@ void AssetManager::LoadFont(std::string p_fontName, std::string p_fileName)
 sf::Font& AssetManager::GetFont(std::string name)
 {
 	return this->m_fonts.at(name);
-}
+}

AssetManager.h

@@ -9,8 +9,8 @@
 class AssetManager
 {
 public:
-	AssetManager() { }
-	~AssetManager() { }
+	AssetManager();
+	~AssetManager();
 
 	void LoadTexture(std::string p_textureName, std::string p_fileName);
 	sf::Texture& GetTexture(std::string p_textureName);
@@ -19,7 +19,7 @@ class AssetManager
 	sf::IntRect GetRect(std::string p_rectName);
 
 	void LoadSound(std::string p_soundName, std::string p_fileName);
-	sf::SoundBuffer& GetSound(std::string p_soundName);
+	const sf::SoundBuffer& GetSound(std::string p_soundName);
 
 	void LoadFont(std::string p_fontName, std::string p_fileName);
 	sf::Font& GetFont(std::string p_fontName);