matteo/skizzle
matteo
/
skizzle
1
0
Fork 0
Code Issues Pull Requests Releases Activity

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

This commit is contained in:
maelle 2016-03-25 18:42:22 +01:00
parent 1cc107ddd3 fbc43a400b
commit b527c9b587
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/resource_manager.cpp
View File

@ -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];
wai_getExecutablePath(buffer, length, &dirname_length);
std::unique_ptr<char> buffer = std::unique_ptr<char>(new char[length + 1]);
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';
return std::string(buffer).substr(0, dirname_length);
buffer.get()[length] = '\0';
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;