From: Andy <drumsetmonkey@gmail.com>
Date: Mon, 28 Nov 2016 13:43:33 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/tcsullivan/gamedev
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=1c5b4e5a0ad8b7a65fef3df48ed50f96a4b865c7;p=clyne%2Fgamedev.git

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

1c5b4e5a0ad8b7a65fef3df48ed50f96a4b865c7
diff --cc include/components.hpp
index 774429d,be967c8..551df53
--- a/include/components.hpp
+++ b/include/components.hpp
@@@ -251,8 -238,11 +251,9 @@@ struct Dialog 
  
  	int index;
  	int rindex;
+ 	bool talking;
  };
  
 -
 -
  // movement styles
  
  /**