Fix bug in EntityManager::get.

diff --git a/README.md b/README.md
index f5d8ecb975333ae5174c1a9d13c6bdfb6d4fb326..7be4eb724b409f021f1062d3c50659424d951ef5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# EntityX - A fast, type-safe C++ entityx::Entity-entityx::Component system
+# EntityX - A fast, type-safe C++ Entity Component System
 
 [![Build Status](https://travis-ci.org/alecthomas/entityx.png)](https://travis-ci.org/alecthomas/entityx)
 
-entityx::Entity-entityx::Component (EC) systems are a form of decomposition that completely decouples entity logic and data from the entity "objects" themselves. The [Evolve your Hierarchy](http://cowboyprogramming.com/2007/01/05/evolve-your-heirachy/) article provides a solid overview of EC systems and why you should use them.
+Entity Component Systems (ECS) are a form of decomposition that completely decouples entity logic and data from the entity "objects" themselves. The [Evolve your Hierarchy](http://cowboyprogramming.com/2007/01/05/evolve-your-heirachy/) article provides a solid overview of EC systems and why you should use them.
 
 EntityX is an EC system that uses C++11 features to provide type-safe component management, event delivery, etc. It was built during the creation of a 2D space shooter.
 

diff --git a/entityx/Entity.h b/entityx/Entity.h
index cfcf12c5dbac33cf0ac3ff988a1017a8c5462388..17e3be0f542a50d9757f2ad8ab4aff3e326e8f1e 100644 (file)
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -432,7 +432,7 @@ class EntityManager : boost::noncopyable, public enable_shared_from_this<EntityM
   }
 
   Entity get(Entity::Id id) {
-    assert(entity_version_[id.index()] != id.version() && "Attempt to get() with stale Entity::Id");
+    assert(entity_version_[id.index()] == id.version() && "Attempt to get() with stale Entity::Id");
     return Entity(shared_from_this(), id);
   }