gravity fixes

diff --git a/Changelog b/Changelog
index 145d4ec454f6c6cb86a89cc23afb17cf36ca99b2..fbe14bc4ef7c290936da84115f61e99d5465e813 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -380,3 +380,11 @@
        - began doxygening headers
        - fixed entity name reading
        - fixed entity sprites
+
+12/8/2015:
+==========
+
+       - continued to document header files through doxygen
+       - added border to dialogBox
+       - fix entity movement handling; npcs stop when you talk to them
+       - added sword animation?

diff --git a/src/world.cpp b/src/world.cpp
index 13605daaebee234b8a9e09d0025c8b104a868f57..2bceba555490274489f6809880092c710733be74 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -277,10 +277,9 @@ void World::update(Player *p,unsigned int delta){
        */
 
        for(auto &e : entity){
-               if(e->type != STRUCTURET){
-                       if(e->canMove)
-                               e->loc.x += e->vel.x * delta;
-                       e->loc.y += e->vel.y * delta;
+               e->loc.y += e->vel.y * delta;
+               if(e->type != STRUCTURET && e->canMove){
+                       e->loc.x += e->vel.x * delta;
                        if(e->vel.x < 0)e->left = true;
           else if(e->vel.x > 0)e->left = false;
                }