aboutsummaryrefslogtreecommitdiffstats
path: root/yage/entity/entitymanager.cpp
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-04-30 23:11:30 +0100
committerYann Herklotz <ymherklotz@gmail.com>2018-04-30 23:11:30 +0100
commit448e543b925ef1048b4a1a7abfc4a7a0c16a05eb (patch)
treed484d9593457143b4d4c95c9cddc42d4597707e4 /yage/entity/entitymanager.cpp
parentb9db19ca3f12932b1968a99c2213886167efed81 (diff)
downloadYAGE-448e543b925ef1048b4a1a7abfc4a7a0c16a05eb.tar.gz
YAGE-448e543b925ef1048b4a1a7abfc4a7a0c16a05eb.zip
Fixed types and removed unnecessary function
Diffstat (limited to 'yage/entity/entitymanager.cpp')
-rw-r--r--yage/entity/entitymanager.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/yage/entity/entitymanager.cpp b/yage/entity/entitymanager.cpp
index 332ed9b8..5eb17075 100644
--- a/yage/entity/entitymanager.cpp
+++ b/yage/entity/entitymanager.cpp
@@ -11,22 +11,17 @@
namespace yage
{
-EntityManager::EntityManager(Space *space) : next_handle_(0), space_(space) {}
+EntityManager::EntityManager(Space *space) : space_(space) {}
EntityManager::EntityManager(Space *space, std::size_t n)
- : next_handle_(0), space_(space)
+ : space_(space)
{
entities_.reserve(n);
}
-unsigned EntityManager::createEntity()
+Entity EntityManager::createEntity()
{
- return createEntityInstance().getHandle();
-}
-
-Entity EntityManager::createEntityInstance()
-{
- Entity entity(next_handle_++);
+ Entity entity = next_entity_++;
entities_.push_back(entity);
return entity;
}