Merge branch 'master' of https://github.com/matteodelabre/projet-cmi

src/resource_manager.cpp

@@ -1,6 +1,7 @@
 #include "resource_manager.hpp"
 #include "whereami.h"
 #include <iostream>
+#include <memory>
 
 #ifdef _WIN32
     #define FILE_SEP '\\'
@@ -18,15 +19,15 @@ ResourceManager::~ResourceManager() {
  */
 std::string getCurrentDirectory() {
     int length = wai_getExecutablePath(NULL, 0, NULL), dirname_length;
-    char* buffer = new char[length + 1];
+    std::unique_ptr<char> buffer = std::unique_ptr<char>(new char[length + 1]);
-    wai_getExecutablePath(buffer, length, &dirname_length);
+    wai_getExecutablePath(buffer.get(), length, &dirname_length);
 
     if (dirname_length == 0) {
         throw std::runtime_error("Impossible de déterminer le chemin actuel");
     }
 
-    buffer[length] = '\0';
+    buffer.get()[length] = '\0';
-    return std::string(buffer).substr(0, dirname_length);
+    return std::string(buffer.get()).substr(0, dirname_length);
 }
 
 sf::Texture& ResourceManager::getTexture(std::string name) {
@@ -40,7 +41,7 @@ sf::Texture& ResourceManager::getTexture(std::string name) {
 
     // tente de charger la texture dans le chemin "CWD/res/name"
     if (!texture.loadFromFile(path)) {
-        throw std::runtime_error("Impossible de charger l'image: " + name);
+        throw std::runtime_error("Impossible de charger l'image : " + name);
     }
 
     textures[name] = texture;