From c155b43e5189e838c9988a464ca930efb242ee90 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Mon, 28 Nov 2016 08:42:05 -0500
Subject: entity stop on talk

---
 include/components.hpp |  3 ++-
 include/window.hpp     | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/components.hpp b/include/components.hpp
index 367b8a3..be967c8 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -234,10 +234,11 @@ struct Visible {
 
 struct Dialog {
 	Dialog(int idx = 0)
-		: index(idx), rindex((idx == 9999) ? randGet() : idx) {}
+		: index(idx), rindex((idx == 9999) ? randGet() : idx), talking(false) {}
 
 	int index;
 	int rindex;
+	bool talking;
 };
 
 
diff --git a/include/window.hpp b/include/window.hpp
index 55cbe1c..5cf05ea 100644
--- a/include/window.hpp
+++ b/include/window.hpp
@@ -1,3 +1,8 @@
+/**
+ * @file window.hpp
+ * Provides a system for handling the game's window.
+ */
+
 #ifndef WINDOW_HPP_
 #define WINDOW_HPP_
 
@@ -7,9 +12,22 @@
 
 #include <events.hpp>
 
+/**
+ * @class WindowSystem
+ * Contains everything needed to create and update a window, using SDL.
+ * Also handles window resizing (WIP) and screenshots (WIP).
+ */
 class WindowSystem : public entityx::System<WindowSystem>, public entityx::Receiver<WindowSystem>  {
 private:
+
+	/**
+	 * SDL's object for the window.
+	 */
     SDL_Window *window;
+
+	/**
+	 * An OpenGL context, created when OpenGL is set up for use.
+	 */
     SDL_GLContext glContext;
 
 public:
-- 
cgit v1.2.3