Merge branch 'master' of https://github.com/tcsullivan/gamedev

diff --cc include/components.hpp
index 774429d972d7ed96687b2eb2c07f39e6cf8c70ad,be967c8be79c878b33f7922749f8bd720f834177..551df53c153f83f33e2f579721d21ef6a14c0f86
--- 1/include/components.hpp
--- 2/include/components.hpp
+++ b/include/components.hpp
@@@ -251,8 -238,11 +251,9 @@@ struct Dialog 
  
        int index;
        int rindex;
+       bool talking;
  };
  
 -
 -
  // movement styles
  
  /**