X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.cpp;h=7efff10ea413b28276b053c00dfb6dee58b56db5;hb=599983e84cffd250055557d78b4d8b4af84cb092;hp=bc9e0328cdd81085e6bae5c96078cd46da60713f;hpb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;p=lugaru.git

diff --git a/Source/Game.cpp b/Source/Game.cpp
index bc9e032..7efff10 100644
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -20,31 +21,10 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Game.h"
 #include "openal_wrapper.h"
 #include "SDL_thread.h"
+#include "Dialog.h"
 
 extern int mainmenu;
 
-int numdialogues;
-int numdialogueboxes[max_dialogues];
-int dialoguetype[max_dialogues];
-int dialogueboxlocation[max_dialogues][max_dialoguelength];
-float dialogueboxcolor[max_dialogues][max_dialoguelength][3];
-int dialogueboxsound[max_dialogues][max_dialoguelength];
-char dialoguetext[max_dialogues][max_dialoguelength][128];
-char dialoguename[max_dialogues][max_dialoguelength][64];
-XYZ dialoguecamera[max_dialogues][max_dialoguelength];
-XYZ participantlocation[max_dialogues][10];
-int participantfocus[max_dialogues][max_dialoguelength];
-int participantaction[max_dialogues][max_dialoguelength];
-float participantyaw[max_dialogues][10];
-XYZ participantfacing[max_dialogues][max_dialoguelength][10];
-float dialoguecamerayaw[max_dialogues][max_dialoguelength];
-float dialoguecamerapitch[max_dialogues][max_dialoguelength];
-int indialogue;
-int whichdialogue;
-int directing;
-float dialoguetime;
-int dialoguegonethrough[20];
-
 const char *pathtypenames[] = {"keepwalking", "pause"};
 const char *editortypenames[] = {
     "active", "sitting", "sitting wall", "sleeping",
@@ -165,6 +145,10 @@ void Game::inputText(string& str, unsigned* charselected)
     }
 
     while (SDL_PollEvent(&evenement)) {
+        if (!sdlEventProc(evenement)) {
+            tryquit = 1;
+            break;
+        }
         switch (evenement.type) {
         case SDL_TEXTEDITING:
             /* FIXME - We should handle this for complete input method support */