This commit is contained in:
Ben
2018-11-29 19:36:48 +00:00
parent 25baf06b3f
commit 30f0db641c
11 changed files with 55 additions and 47 deletions

View File

@@ -1,8 +1,12 @@
#pragma once
#include <string>
class EntityBase {
public:
EntityBase();
std::string texture;
virtual ~EntityBase();
};

View File

@@ -1,6 +1,7 @@
#include "entitymanager.h"
EntityManager::EntityManager() {
EntityManager::EntityManager(ResourceManger* resourceManger)
: resourceManger(resourceManger) {
}

View File

@@ -4,12 +4,16 @@
#include <map>
#include "entity.h"
#include "../resourcemanager/resourcemanager.h"
class EntityManager {
public:
EntityManager();
EntityManager(ResourceManger* resourceManager);
virtual ~EntityManager();
private:
std::map<std::string, Entity> m_activeEntities;
std::map<unsigned short int, Entity> m_activeEntities;
ResourceManger* resourceManger;
};

View File

@@ -4,7 +4,7 @@ Game::Game()
: input(&renderer)
, resourceManager(&renderer)
, textureManager(resourceManager.textureManager)
, entityManager() {
, entityManager(&resourceManager) {
}