basic enemy wall behavior

Author: flipcoder

bin/settings.json

@@ -1,8 +1,8 @@
 {
    "audio" : {
-      "music-volume" : 100,
-      "sound-volume" : 100,
-      "volume" : 100
+      "music-volume" : 0,
+      "sound-volume" : 0,
+      "volume" : 0
    },
    "video" : {
       "resolution" : "1920x1080",

src/Character.cpp

@@ -25,7 +25,6 @@ Character :: Character(
     for(auto&& e: *cfg)
     {
         auto wpn = e.as<shared_ptr<Meta>>();
-        LOG("1");
         m_Weapons.emplace_back(
             e.key,
             wpn->at<string>("ammo-type"),

src/MenuState.cpp

@@ -332,13 +332,21 @@ void MenuState :: init_controls_menu()
         // TODO: add empty binds for buttons not found
 
         for(auto&& bind: m_Binds)
+        {
+            string action = bind.first;
+            vector<string> keys = bind.second;
+            auto text = make_shared<string>(
+                boost::to_upper_copy(action) + ": " +
+                boost::algorithm::join(keys, ", ")
+            );
             m_ControlsMenu.options().emplace_back(
-                boost::to_upper_copy(bind.first) + ": " +
-                    boost::algorithm::join(bind.second, ", "),
-                [this]{
-                    m_pMenuGUI->hide();
+                text,
+                [this, action, text]{
+                    *text = action + ": ...";
+                    m_pMenuGUI->visible(false);
                 }
-            );   
+            );
+        }
     }
 
     m_ControlsMenu.options().emplace_back(

src/Thing.cpp

@@ -92,8 +92,8 @@ void Thing :: init_thing()
         // adding a sprite will spawn its center on 0,0...
         // so we offset
         move(glm::vec3(
-            0.5f * m_pSprite->size().x,
-            0.5f * m_pSprite->size().y,
+            m_pSprite->origin().x * m_pSprite->size().x,
+            m_pSprite->origin().y  * m_pSprite->size().y,
             0.0f
         ));
         //m_pPlaceholder->detach(); // don't want to invalidate iterator
@@ -308,7 +308,25 @@ void Thing :: cb_to_static(Node* thing_node, Node* static_node)
     auto thing = find_thing(thing_node);
     assert(thing);
     if(thing->solid() || thing->is_monster())
+    {
+        glm::vec3 pos_before = thing->position(Space::WORLD);
         thing->world()->cb_to_static(thing_node, static_node, thing.get());
+        glm::vec3 pos_after = thing->position(Space::WORLD);
+        if(thing->velocity() != glm::vec3(0.0f)){
+            glm::vec3 vel = thing->velocity();
+            if(pos_after.x != pos_before.x){
+                vel.x = -vel.x;
+                thing->velocity(vel);
+                thing->orient(vel);
+            }
+            if(pos_after.y != pos_before.y){
+                vel.y = -vel.y;
+                thing->velocity(vel);
+                thing->orient(vel);
+            }
+            
+        }
+    }
 }
 
 std::shared_ptr<Thing> Thing :: find_thing(Node* n)