From e8d61ab59c0107f94d27683831b41a6103c3a19e Mon Sep 17 00:00:00 2001
From: BERGOUNIOUX Mathieu <mathieu.bergounioux@orange.com>
Date: Sun, 5 Aug 2018 15:24:02 +0200
Subject: [PATCH 1/9] first commit

---
 GlobalScript.asc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GlobalScript.asc b/GlobalScript.asc
index 4180b31..4040ca1 100644
--- a/GlobalScript.asc
+++ b/GlobalScript.asc
@@ -5,7 +5,7 @@ import InventoryItem*ItemGiven;        // Item given to a character
 
 // =======================================================================================
 function game_start() 
-{
+{ 
 }
 
 

From 9dff8f7763fcc5bbfe4bec6ab2d467eb7dc31a12 Mon Sep 17 00:00:00 2001
From: BERGOUNIOUX Mathieu <mathieu.bergounioux@orange.com>
Date: Sun, 5 Aug 2018 15:25:22 +0200
Subject: [PATCH 2/9] first branch commit

---
 GlobalScript.asc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GlobalScript.asc b/GlobalScript.asc
index 4040ca1..4180b31 100644
--- a/GlobalScript.asc
+++ b/GlobalScript.asc
@@ -5,7 +5,7 @@ import InventoryItem*ItemGiven;        // Item given to a character
 
 // =======================================================================================
 function game_start() 
-{ 
+{
 }
 
 

From f1590895e5c9d677ba5dde881664205c4924bef2 Mon Sep 17 00:00:00 2001
From: BERGOUNIOUX Mathieu <mathieu.bergounioux@orange.com>
Date: Sun, 5 Aug 2018 16:39:48 +0200
Subject: [PATCH 3/9] moved all click and slider events from global script to
 module script, to seal them off.

---
 Game.agf             | 118 ++++++++++++-------------
 GlobalScript.asc     |  97 +++------------------
 TemplateSettings.asc |  17 +++-
 TemplateSettings.ash |   4 +-
 optiongui.asc        | 203 +++++++++++++++++++++++++++++++++++++++++++
 optiongui.ash        |  54 +++++++-----
 room1.crm            | Bin 52404 -> 52407 bytes
 room2.crm            | Bin 127177 -> 127180 bytes
 verbgui.ash          |   4 +-
 9 files changed, 330 insertions(+), 167 deletions(-)

diff --git a/Game.agf b/Game.agf
index 67cc12f..febcbf7 100644
--- a/Game.agf
+++ b/Game.agf
@@ -1003,7 +1003,7 @@
                 <Name>lblOptions</Name>
               </GUILabel>
               <GUIButton>
-                <OnClick>btnOptionsDefault_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1024,7 +1024,7 @@
                 <Name>btnOptionsDefault</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnOptions_Click</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1045,7 +1045,7 @@
                 <Name>btnOptionsSave</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnOptions_Click</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1066,7 +1066,7 @@
                 <Name>btnOptionsLoad</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnOptions_Click</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1087,7 +1087,7 @@
                 <Name>btnOptionsQuit</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnOptions_Click</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1122,7 +1122,7 @@
                 <Name>lblOptionsMusic</Name>
               </GUILabel>
               <GUISlider>
-                <OnChange>sldOptionsMusic_OnChange</OnChange>
+                <OnChange>btnOptions_OnSliderChange</OnChange>
                 <HandleImage>0</HandleImage>
                 <HandleOffset>0</HandleOffset>
                 <BackgroundImage>0</BackgroundImage>
@@ -1153,7 +1153,7 @@
                 <Name>lblOptionsSound</Name>
               </GUILabel>
               <GUISlider>
-                <OnChange>sldOptionsSound_OnChange</OnChange>
+                <OnChange>btnOptions_OnSliderChange</OnChange>
                 <HandleImage>0</HandleImage>
                 <HandleOffset>0</HandleOffset>
                 <BackgroundImage>0</BackgroundImage>
@@ -1184,7 +1184,7 @@
                 <Name>lblOptionsStyle</Name>
               </GUILabel>
               <GUISlider>
-                <OnChange>sldOptionsStyle_OnChange</OnChange>
+                <OnChange>btnOptions_OnSliderChange</OnChange>
                 <HandleImage>0</HandleImage>
                 <HandleOffset>0</HandleOffset>
                 <BackgroundImage>0</BackgroundImage>
@@ -1201,7 +1201,7 @@
                 <Name>sldOptionsStyle</Name>
               </GUISlider>
               <GUIButton>
-                <OnClick>btnOptions_Click</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1285,7 +1285,7 @@
                 <Name>lblSave</Name>
               </GUILabel>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1306,7 +1306,7 @@
                 <Name>btnSaveSlot1</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1327,7 +1327,7 @@
                 <Name>btnSaveSlot2</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1348,7 +1348,7 @@
                 <Name>btnSaveSlot3</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1369,7 +1369,7 @@
                 <Name>btnSaveSlot4</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1390,7 +1390,7 @@
                 <Name>btnSaveSlot5</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1411,7 +1411,7 @@
                 <Name>btnSaveSlot6</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1432,7 +1432,7 @@
                 <Name>btnSaveSlot7</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1453,7 +1453,7 @@
                 <Name>btnSaveSlot8</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1474,7 +1474,7 @@
                 <Name>btnSaveSlot9</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveCancel_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1495,7 +1495,7 @@
                 <Name>btnSaveCancel</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveCancel_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1537,7 +1537,7 @@
             </NormalGUI>
             <Controls>
               <GUIButton>
-                <OnClick>btnSaveOk_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1558,7 +1558,7 @@
                 <Name>btnSaveOk</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnSaveNo_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1614,7 +1614,7 @@
                 <Name>lblLoad</Name>
               </GUILabel>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1635,7 +1635,7 @@
                 <Name>btnLoadSlot1</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1656,7 +1656,7 @@
                 <Name>btnLoadSlot2</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1677,7 +1677,7 @@
                 <Name>btnLoadSlot3</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1698,7 +1698,7 @@
                 <Name>btnLoadSlot4</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1719,7 +1719,7 @@
                 <Name>btnLoadSlot5</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1740,7 +1740,7 @@
                 <Name>btnLoadSlot6</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1761,7 +1761,7 @@
                 <Name>btnLoadSlot7</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1782,7 +1782,7 @@
                 <Name>btnLoadSlot8</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadSlot_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1803,7 +1803,7 @@
                 <Name>btnLoadSlot9</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadCancel_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1824,7 +1824,7 @@
                 <Name>btnLoadCancel</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnLoadCancel_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1894,7 +1894,7 @@
                 <Name>lblQuitMessage</Name>
               </GUILabel>
               <GUIButton>
-                <OnClick>btnQuitYes_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -1915,7 +1915,7 @@
                 <Name>btnQuitYes</Name>
               </GUIButton>
               <GUIButton>
-                <OnClick>btnQuitNo_OnClick</OnClick>
+                <OnClick>btnOptions_OnClick</OnClick>
                 <ClickAction>RunScript</ClickAction>
                 <NewModeNumber>0</NewModeNumber>
                 <ClipImage>False</ClipImage>
@@ -3715,30 +3715,6 @@ stop
                   </Script>
                 </ScriptAndHeader_Script>
               </ScriptAndHeader>
-              <ScriptAndHeader>
-                <ScriptAndHeader_Header>
-                  <Script>
-                    <FileName>OptionGui.ash</FileName>
-                    <Name />
-                    <Description />
-                    <Author />
-                    <Version />
-                    <Key>1814943410</Key>
-                    <IsHeader>True</IsHeader>
-                  </Script>
-                </ScriptAndHeader_Header>
-                <ScriptAndHeader_Script>
-                  <Script>
-                    <FileName>OptionGui.asc</FileName>
-                    <Name>Save and Load</Name>
-                    <Description>Options, Save and Load Dialog functionality</Description>
-                    <Author>abstauber</Author>
-                    <Version>1.0</Version>
-                    <Key>1814943410</Key>
-                    <IsHeader>False</IsHeader>
-                  </Script>
-                </ScriptAndHeader_Script>
-              </ScriptAndHeader>
               <ScriptAndHeader>
                 <ScriptAndHeader_Header>
                   <Script>
@@ -3763,6 +3739,30 @@ stop
                   </Script>
                 </ScriptAndHeader_Script>
               </ScriptAndHeader>
+              <ScriptAndHeader>
+                <ScriptAndHeader_Header>
+                  <Script>
+                    <FileName>OptionGui.ash</FileName>
+                    <Name />
+                    <Description />
+                    <Author />
+                    <Version />
+                    <Key>1814943410</Key>
+                    <IsHeader>True</IsHeader>
+                  </Script>
+                </ScriptAndHeader_Header>
+                <ScriptAndHeader_Script>
+                  <Script>
+                    <FileName>OptionGui.asc</FileName>
+                    <Name>Save and Load</Name>
+                    <Description>Options, Save and Load Dialog functionality</Description>
+                    <Author>abstauber</Author>
+                    <Version>1.0</Version>
+                    <Key>1814943410</Key>
+                    <IsHeader>False</IsHeader>
+                  </Script>
+                </ScriptAndHeader_Script>
+              </ScriptAndHeader>
               <ScriptAndHeader>
                 <ScriptAndHeader_Header>
                   <Script>
diff --git a/GlobalScript.asc b/GlobalScript.asc
index 4180b31..80f54f7 100644
--- a/GlobalScript.asc
+++ b/GlobalScript.asc
@@ -19,13 +19,20 @@ function repeatedly_execute_always()
 {
 }
 
+void ShowOptions()
+{
+    Verbs.UpdateActionBar();
+    OptionGui.ShowOptions();
+}
+
+
+
 // called when a key is pressed. keycode holds the key's ASCII code
 function on_key_press(eKeyCode keycode) 
 {
   if (keycode == eKeyF5) {
     //gOptions.Visible=true; // F5 - OPTIONS
-    Verbs.UpdateActionBar();
-    OptionGui.ShowOptions();
+    ShowOptions();
   }
 
   if (keycode == eKeyCtrlC || keycode == eKeyCtrlQ) gQuit.Visible=true;  // Ctrl-C or CTRL-Q QUIT
@@ -68,99 +75,23 @@ function ScrollInv_Click(GUIControl *control, MouseButton button) {
 
 function btnShowOptions_OnClick(GUIControl *control, MouseButton button)
 {
-  Verbs.UpdateActionBar();
-  OptionGui.ShowOptions();
-}
-
-function btnOptionsDefault_OnClick(GUIControl *control, MouseButton button)
-{
-  sldOptionsMusic.Value = 80;
-  sldOptionsSound.Value = 90;
-  sldOptionsStyle.Value = 1;
-  Game.SetAudioTypeVolume(eAudioTypeMusic, sldOptionsMusic.Value, eVolExistingAndFuture);  
-  Game.SetAudioTypeVolume(eAudioTypeSound, sldOptionsSound.Value, eVolExistingAndFuture); 
-  Game.SetAudioTypeVolume(eAudioTypeAmbientSound, sldOptionsSound.Value, eVolExistingAndFuture); 
-}
-
-
-function btnOptions_Click(GUIControl *control, MouseButton button) 
-{
-  // Save
-	if (control==btnOptionsSave)	{
-		gOptions.Visible=false;
-		OptionGui.ShowSaveDialog();
-	}
-  // Load
-	else if (control==btnOptionsLoad)	{
-		gOptions.Visible=false;
-		OptionGui.ShowLoadDialog();
-	}
-  // Resume
-	else if (control==btnOptionsResume || control == btnOptionsClose)	{
-		gOptions.Visible=false;
-	}
-  // Quit
-	else if (control==btnOptionsQuit)	{
-    gOptions.Visible=false;
-		gQuit.Visible=true;
-	} 
-}
-
-function sldOptionsMusic_OnChange(GUIControl *control)
-{
-  Game.SetAudioTypeVolume(eAudioTypeMusic, sldOptionsMusic.Value, eVolExistingAndFuture);
+  ShowOptions();
 }
 
-function sldOptionsSound_OnChange(GUIControl *control)
-{
-  Game.SetAudioTypeVolume(eAudioTypeSound, sldOptionsSound.Value, eVolExistingAndFuture); 
-  Game.SetAudioTypeVolume(eAudioTypeAmbientSound, sldOptionsSound.Value, eVolExistingAndFuture); 
-}
 
-function sldOptionsStyle_OnChange(GUIControl *control)
-{
-  Verbs.ToogleGuiStyle(sldOptionsStyle.Value);
-}
 
-function btnSaveSlot_OnClick(GUIControl *control, MouseButton button)
+function btnOptions_OnClick(GUIControl *control, MouseButton button)
 {
-  OptionGui.SelectSaveSlot(control.ID);
+    OptionGui.OnClick(control, button);
 }
 
-function btnSaveOk_OnClick(GUIControl *control, MouseButton button)
+function btnOptions_OnSliderChange(GUIControl *control)
 {
-  OptionGui.SaveYes();
+    OptionGui.OnSliderChange(control);
 }
 
-function btnSaveNo_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.SaveNo();
-}
 
-function btnSaveCancel_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.SaveCancel();
-}
 
-function btnLoadSlot_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.SelectLoadSlot(control.ID);
-}
-
-function btnLoadCancel_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.LoadCancel();
-}
-
-function btnQuitYes_OnClick(GUIControl *control, MouseButton button)
-{
-  QuitGame(0);
-}
-
-function btnQuitNo_OnClick(GUIControl *control, MouseButton button)
-{
-  gQuit.Visible = false;
-}
 ////////////////////////////////////////////////////////////////////////////////////
 // End of GUI handling
 ////////////////////////////////////////////////////////////////////////////////////
diff --git a/TemplateSettings.asc b/TemplateSettings.asc
index 0a765ad..f375339 100644
--- a/TemplateSettings.asc
+++ b/TemplateSettings.asc
@@ -1,3 +1,5 @@
+#ifdef __OPTION_GUI_MODULE__ //make sure module's dependencies are here
+
 function set_options()
 {
   /***********************************************************************
@@ -68,7 +70,7 @@ function set_options()
   // 1 = no speedup at all, 2 = double speed and so on
   Verbs.VerbGuiOptions[eVerbGuiRunSpeedupRate] = 2; 
   
-  
+
   /***********************************************************************
    * Setup unhandled event messages 
    * %s is a placeholder for the location (characters, hotspots etc.)
@@ -250,4 +252,15 @@ function game_start()
   Verbs.SetDefaultAction(eGA_WalkTo);    
   Verbs.HandleInvArrows();
   
-}
\ No newline at end of file
+}
+
+#endif
+
+#ifndef __OPTION_GUI_MODULE__ //a dependency is missing
+
+    void game_start()
+    {
+        AbortGame("Missing module 'OptionGui'");
+    }
+
+#endif
\ No newline at end of file
diff --git a/TemplateSettings.ash b/TemplateSettings.ash
index 999bd51..353861b 100644
--- a/TemplateSettings.ash
+++ b/TemplateSettings.ash
@@ -1 +1,3 @@
-// new module header
+#ifdef __OPTION_GUI_MODULE__ //make sure module's dependencies are here
+    #define __TEMPLATESETTINGS_MODULE__ //Tell the other modules that this module is available
+#endif
diff --git a/optiongui.asc b/optiongui.asc
index 1885972..b61cd9c 100644
--- a/optiongui.asc
+++ b/optiongui.asc
@@ -1,3 +1,6 @@
+#ifdef __VERB_GUI_MODULE__ //check module's dependencies
+
+
 // Save Load GUI functionality
 
 int slotSprite;
@@ -393,6 +396,197 @@ static void OptionGui::ShowOptions()
 }
 
 
+
+
+
+function btnOptionsDefault_OnClick(GUIControl *control, MouseButton button)
+{
+  sldOptionsMusic.Value = 80;
+  sldOptionsSound.Value = 90;
+  sldOptionsStyle.Value = 1;
+  Game.SetAudioTypeVolume(eAudioTypeMusic, sldOptionsMusic.Value, eVolExistingAndFuture);  
+  Game.SetAudioTypeVolume(eAudioTypeSound, sldOptionsSound.Value, eVolExistingAndFuture); 
+  Game.SetAudioTypeVolume(eAudioTypeAmbientSound, sldOptionsSound.Value, eVolExistingAndFuture); 
+}
+
+
+
+
+function btnSaveSlot_OnClick(GUIControl *control, MouseButton button)
+{
+  OptionGui.SelectSaveSlot(control.ID);
+}
+
+function btnSaveOk_OnClick(GUIControl *control, MouseButton button)
+{
+  OptionGui.SaveYes();
+}
+
+function btnSaveNo_OnClick(GUIControl *control, MouseButton button)
+{
+  OptionGui.SaveNo();
+}
+
+function btnSaveCancel_OnClick(GUIControl *control, MouseButton button)
+{
+  OptionGui.SaveCancel();
+}
+
+function btnSaveClose_OnClick(GUIControl *control, MouseButton button)
+{
+  //Same effect
+  btnSaveCancel_OnClick(control, button);
+}
+
+function btnLoadSlot_OnClick(GUIControl *control, MouseButton button)
+{
+  OptionGui.SelectLoadSlot(control.ID);
+}
+
+function btnLoadCancel_OnClick(GUIControl *control, MouseButton button)
+{
+  OptionGui.LoadCancel();
+}
+
+function btnLoadClose_OnClick(GUIControl *control, MouseButton button)
+{
+  //Same effect
+  btnLoadCancel_OnClick(control, button);
+}
+
+function btnQuitYes_OnClick(GUIControl *control, MouseButton button)
+{
+  QuitGame(0);
+}
+
+function btnQuitNo_OnClick(GUIControl *control, MouseButton button)
+{
+  gQuit.Visible = false;
+}
+
+bool IsSaveSlot(GUIControl *control) {
+    return (control.OwningGUI.ID == gSave.ID && control.ID >= btnSaveSlot1.ID && control.ID <= btnSaveSlot9.ID);
+}
+
+bool IsRestoreSlot(GUIControl *control) {
+    return (control.OwningGUI.ID == gLoad.ID && control.ID >= btnLoadSlot1.ID && control.ID <= btnLoadSlot9.ID);
+}
+
+
+static void OptionGui::OnClick(GUIControl *control, MouseButton button)
+{
+  //== MAIN OPTIONS DIALOG ==
+    // Default
+	if (control==btnOptionsDefault)	{
+		btnOptionsDefault_OnClick(control, button);
+	}
+    // Save
+	if (control==btnOptionsSave)	{
+		gOptions.Visible=false;
+		OptionGui.ShowSaveDialog();
+	}
+    // Load
+	else if (control==btnOptionsLoad)	{
+		gOptions.Visible=false;
+		OptionGui.ShowLoadDialog();
+	}
+    // Resume
+	else if (control==btnOptionsResume || control == btnOptionsClose)	{
+		gOptions.Visible=false;
+	}
+    // Quit
+	else if (control==btnOptionsQuit)	{
+        gOptions.Visible=false;
+		gQuit.Visible=true;
+	} 
+    
+  //== 'SAVE' DIALOG ==
+    //Slot click
+	else if (IsSaveSlot(control))	{
+        btnSaveSlot_OnClick(control, button);
+	} 
+    //OK
+	else if (control==btnSaveOk)	{
+        btnSaveOk_OnClick(control, button);
+	} 
+    //No
+	else if (control==btnSaveNo)	{
+        btnSaveNo_OnClick(control, button);
+	} 
+    //Cancel
+	else if (control==btnSaveCancel)	{
+        btnSaveCancel_OnClick(control, button);
+	} 
+    //Close
+	else if (control==btnSaveClose)	{
+        btnSaveClose_OnClick(control, button);
+	} 
+    
+  //== 'LOAD' DIALOG ==
+    //Slot click
+	else if (IsRestoreSlot(control))	{
+        btnLoadSlot_OnClick(control, button);
+	} 
+    //Cancel
+	else if (control==btnLoadCancel)	{
+        btnLoadCancel_OnClick(control, button);
+	} 
+    //Close
+	else if (control==btnLoadClose)	{
+        btnLoadClose_OnClick(control, button);
+	} 
+    
+  //== 'QUIT' DIALOG ==
+    //Yes
+	else if (control==btnQuitYes)	{
+        btnQuitYes_OnClick(control, button);
+	} 
+    //No
+	else if (control==btnQuitNo)	{
+        btnQuitNo_OnClick(control, button);
+	} 
+
+}
+
+function sldOptionsMusic_OnChange(GUIControl *control)
+{
+  Game.SetAudioTypeVolume(eAudioTypeMusic, sldOptionsMusic.Value, eVolExistingAndFuture);
+}
+
+function sldOptionsSound_OnChange(GUIControl *control)
+{
+  Game.SetAudioTypeVolume(eAudioTypeSound, sldOptionsSound.Value, eVolExistingAndFuture); 
+  Game.SetAudioTypeVolume(eAudioTypeAmbientSound, sldOptionsSound.Value, eVolExistingAndFuture); 
+}
+
+function sldOptionsStyle_OnChange(GUIControl *control)
+{
+  Verbs.ToogleGuiStyle(sldOptionsStyle.Value);
+}
+
+
+static void OptionGui::OnSliderChange(GUIControl *control)
+{
+    //Music slider
+	if (control==sldOptionsMusic)	{
+        sldOptionsMusic_OnChange(control);
+    }
+    //Sound slider
+    else if (control==sldOptionsSound)	{
+        sldOptionsSound_OnChange(control);
+    }
+    //GUI Style slider
+    else if (control==sldOptionsStyle)	{
+        sldOptionsStyle_OnChange(control);
+    }
+    
+}
+
+
+
+
+
+
 // Remember when the game was started
 function game_start()
 {
@@ -420,3 +614,12 @@ function repeatedly_execute()
     save_scheduled = false;
   }
 }
+
+
+#endif
+
+#ifndef __VERB_GUI_MODULE__ //A dependency is missing
+void game_start() {
+    AbortGame("Missing module 'verbgui'");
+}
+#endif
diff --git a/optiongui.ash b/optiongui.ash
index d135101..37ac371 100644
--- a/optiongui.ash
+++ b/optiongui.ash
@@ -24,25 +24,37 @@
 // SOFTWARE.
 
 // ============================= Load/Save game ===========================================
-#define SAVE_SLOTS 9 
 
-struct OptionGui {
-  import static attribute int slotSprite;
-  import static attribute int slotSpriteHi;
-  import static void InitSaveDialog();
-  import static void ShowSaveDialog();
-  import static void DisableSaveButtons();
-  import static void EnableSaveButtons();
-  import static void SelectSaveSlot(int control_id);
-  
-  import static void SaveNo();
-  import static void SaveYes();
-  import static void SaveCancel();
-  import static void InitLoadDialog();
-  import static void ShowLoadDialog();
-  import static void LoadCancel();
-  import static void SelectLoadSlot(int control_id);
-  import static void ShowOptions();
-  import static void CreateScreenshot();
-  import static void clicked_OptionsClose();
-};
\ No newline at end of file
+
+#ifdef __VERB_GUI_MODULE__ //make sure module's dependencies are here
+
+    #define __OPTION_GUI_MODULE__ //Tell the other modules that this module is available
+    
+    #define SAVE_SLOTS 9 
+
+    struct OptionGui {
+      import static attribute int slotSprite;
+      import static attribute int slotSpriteHi;
+      
+      import static void InitSaveDialog();
+      import static void ShowSaveDialog();
+      import static void DisableSaveButtons();
+      import static void EnableSaveButtons();
+      import static void SelectSaveSlot(int control_id);
+      
+      import static void SaveNo();
+      import static void SaveYes();
+      import static void SaveCancel();
+      import static void InitLoadDialog();
+      import static void ShowLoadDialog();
+      import static void LoadCancel();
+      import static void SelectLoadSlot(int control_id);
+      import static void CreateScreenshot();
+      import static void clicked_OptionsClose();
+      
+      
+      import static void ShowOptions();
+      import static void OnClick(GUIControl *control, MouseButton button);
+      import static void OnSliderChange(GUIControl *control);
+    };
+#endif
\ No newline at end of file
diff --git a/room1.crm b/room1.crm
index 844f418decf8d9ee7d77889199f57dd57fa96754..26afb6135979de58d1cb12d12b3e0fd77e0f9434 100644
GIT binary patch
delta 241
zcmdlolX?40<_+H4MP~>zFa$gM`$jP^Ft7meH6{jzO`8+8zh`DNm>jVCG~>C+GJD(^
z_f3AVPkgffUXIDldqfx`fHLWm|L?JYi_0)(g2gWHMTl`s*4`(=*f7~)-+Zt-cg7o&
zHTL^M_4Mzb!#H8G&VhKwYm<8pKt$yy|307rRHbszA4rxQOoyudd~gQihRHpLu1;<^
zEIT>zu)IJ>YHmSJVo7RnYDr0EUV8E5bBDz?A3EH}$oPG8;L#+O$-F1HCto}{VWPF@
J=EPIMOaRn0Z5IFl

delta 249
zcmdl!lX=Tb<_+H4MW+fgFa$gM`$jP^Ft7meH6{jzjhhp;zh`FDpB%9JG~>g`GJD(^
zFHU~2PkgffUXIDldqfz+fimfn|L?JYi_0)(fW<EFMTl`s*4`(=SU=fe-+Zt-cgEL~
zHTL^M_4Mzb!`MGr=RiE;%gH?lAfob<e;?2Qs!}=V4<t(trbE?!J~)H%@Z_FDS0~pU
zmY<w>Se8F5wJ6EGG&4B0q$D#hy?FBZ!(y8cAMRsh`pUdH@u)A;L<hdj>yEPlY2nFy
QC%7l?KRID@%Bf%`0H9KEdjJ3c

diff --git a/room2.crm b/room2.crm
index 24624bb42e8a25fd7b889bc2c63a5216e3327b82..7d9ac9490746d11e943d6f473fa3b0987c6d6c73 100644
GIT binary patch
delta 149
zcmX^4kp0X<_J%EtFCU8vaWgOkJNx@aF+hMABLhSE^nZ^TgBe#(4|>8lnQ`s*XHOWX
zGcvB9UiXZ#nDNGRy%&t)(>b3r1~BfM9`&5jn9*Q*-*d+K5Sg>nrCu`1PXGOaQJy0t
xHMbxqu_Sf6-Al%6Oy8NeE52e3V4A4Fy}j@aV=d6kcZ_o<T8nO<_l{AU2>>|>IOYHV

delta 151
zcmX@}kp1LC_J%EtFCUBYb2BgmJNx@aF+hMABLhR(^nZ^TgQrJ6XB3#8_=K^A@xb<H
zPZ*~&G9H><_l&Wa@%41Q7mVW5IiE8IFkYM<^_<a|QGa^hbH@1)nX}U+UNXv0|NVkd
zmOU)BD9ODvbGrRY#%oMpnYSyxVhm)OsKB+o=nZ2n<3tDH>F?h%&fUK79iuiA0L+#;
A<NyEw

diff --git a/verbgui.ash b/verbgui.ash
index 7836ec4..3c9dd93 100644
--- a/verbgui.ash
+++ b/verbgui.ash
@@ -63,7 +63,9 @@
 
 //----------------------------------------------------------------------------
 
-        
+#define __VERB_GUI_MODULE__ //Tell the other modules that this module is available
+
+
 enum eGlobCond {
   eGlob_MouseInvWalk,
   eGlob_MouseInvPickup, 

From 6f4ca51d141e23bf25b5494f8d35a12996b707ae Mon Sep 17 00:00:00 2001
From: Mathieu Bergounioux <mathieu.bergounioux@orange.com>
Date: Wed, 8 Aug 2018 12:58:54 +0200
Subject: [PATCH 4/9] - moved module internal variables to a struct - removed
 all global variables (GUIs and fonts). They must now be set once using a
 function. - removed export on ItemGiven and created an accessor instead. -
 Similarly, added an accessor on UsedAction

---
 Game.agf             |    8 +-
 TemplateSettings.asc |    8 +-
 room1.crm            |  Bin 52407 -> 52411 bytes
 room2.crm            |  Bin 127180 -> 127184 bytes
 verbgui.asc          | 1085 +++++++++++++++++++++++-------------------
 verbgui.ash          |   11 +-
 6 files changed, 614 insertions(+), 498 deletions(-)

diff --git a/Game.agf b/Game.agf
index febcbf7..1ce512d 100644
--- a/Game.agf
+++ b/Game.agf
@@ -2515,7 +2515,7 @@ stop
       <Font>
         <ID>0</ID>
         <PointSize>9</PointSize>
-        <Name>Text</Name>
+        <Name>TumbleText</Name>
         <OutlineFont>0</OutlineFont>
         <OutlineStyle>None</OutlineStyle>
         <SourceFilename>assets/xpaider2.ttf</SourceFilename>
@@ -2525,7 +2525,7 @@ stop
       <Font>
         <ID>1</ID>
         <PointSize>10</PointSize>
-        <Name>Speech</Name>
+        <Name>TumbleSpeech</Name>
         <OutlineFont>2</OutlineFont>
         <OutlineStyle>UseOutlineFont</OutlineStyle>
         <SourceFilename>assets/adventure2.ttf</SourceFilename>
@@ -2535,7 +2535,7 @@ stop
       <Font>
         <ID>2</ID>
         <PointSize>10</PointSize>
-        <Name>OutlineSpeech</Name>
+        <Name>TumbleOutlineSpeech</Name>
         <OutlineFont>0</OutlineFont>
         <OutlineStyle>None</OutlineStyle>
         <SourceFilename>assets/arcade.ttf</SourceFilename>
@@ -2555,7 +2555,7 @@ stop
       <Font>
         <ID>4</ID>
         <PointSize>9</PointSize>
-        <Name>TextOut</Name>
+        <Name>TumbleTextOut</Name>
         <OutlineFont>0</OutlineFont>
         <OutlineStyle>Automatic</OutlineStyle>
         <SourceFilename>assets/xpaider2.ttf</SourceFilename>
diff --git a/TemplateSettings.asc b/TemplateSettings.asc
index f375339..1729bbb 100644
--- a/TemplateSettings.asc
+++ b/TemplateSettings.asc
@@ -6,6 +6,12 @@ function set_options()
    * Setup all the template options for the Verb GUI
    ***********************************************************************/
  
+  // Tell what global Guis to use
+  Verbs.BindGuis(gAction, gMain, gPause, gQuit);
+  
+  // Tell what fonts to use
+  Verbs.SetFonts(eFontTumbleText, eFontTumbleTextOut, eFontTumbleSpeech, eFontTumbleOutlineSpeech);
+  
   // Default template Language, currently supported languages: 
   //   eLangEN (English), eLangDE (German), eLangES (Spanish), eLangFR (French)
   //   eLangIT (Italian), eLangPT (Portuguese), eLangNL (Dutch)  
@@ -134,7 +140,7 @@ function set_options()
   CustomDialogGui.DialogGuiOptions[eDialogGui_xscreenborder]      = 0;   
 
   // The font
-  CustomDialogGui.DialogGuiOptions[eDialogGui_text_font]         = eFontText;
+  CustomDialogGui.DialogGuiOptions[eDialogGui_text_font]         = eFontTumbleText;
   CustomDialogGui.DialogGuiOptions[eDialogGui_text_alignment]    = eAlignLeft;
   CustomDialogGui.DialogGuiOptions[eDialogGui_text_color]        = 23420;
   CustomDialogGui.DialogGuiOptions[eDialogGui_text_color_active] = 24188;
diff --git a/room1.crm b/room1.crm
index 26afb6135979de58d1cb12d12b3e0fd77e0f9434..c77e1fe619d80ddb527b00acb514d417f8351d0c 100644
GIT binary patch
delta 146
zcmdl!lX>?{<_+H48Ru;F*?yjd@zP|OJ?@MLCO_CGKG}aS$K>WcTj0Dsa2Cg8?R^k&
zcg8!DHTL^MW%~F3VZ1fD=KzE+Kl%3o4WPWrL4P1waxfjDYV+rVam-A=nKvgM^<|pq
Vz_)qbaSf))S5B&K{(kZR69C+aNjm@l

delta 150
zcmdlzlX?40<_+H48E0(v*?yjd@!VvYJ?@PACO_CGKG}aS$K>WcTj0Dsa2Cg8?R^k&
zcg7o&HTL^MW%~F3VZ1iE=KzE+Kl%3o4WPWrL4P1waxfjDYV+rVam-BLnKvgM^<|pq
Zz_)qbaSf))e^0VczJF3?^WT&Em;m~WOLqVO

diff --git a/room2.crm b/room2.crm
index 7d9ac9490746d11e943d6f473fa3b0987c6d6c73..ab0c5e51d0f26b4e8d6dcc77e064958b8a23c401 100644
GIT binary patch
delta 80
zcmV-W0I&bd;Rn#+2Y|Ez>Ei(wx9Z~o2Ll1zmoDf57ncd=0Z;+Jms;lm(*fMKF6aU0
m0RsC2w;}2QQ38=53b%6X0nq`MZtejJmrL#eCAV(w0bT-_5h1St

delta 75
zcmV-R0JQ(m;Rnp&2Y|Ez>Ei(sx9Z~o2Ll1vmoDf57ncd=0Z;+Hms;lm(*fAGF6aU0
h0Rr~}w;}2QQ38=53b%6X0nq`MMeYGDw{-3STmtVXAEf{Q

diff --git a/verbgui.asc b/verbgui.asc
index a98edde..ee30d04 100644
--- a/verbgui.asc
+++ b/verbgui.asc
@@ -7,77 +7,96 @@
 // ========================== internal variables =============================
 // Please do not edit these option directly anymore, but use the VerbGuiSettings settings script instead!
 
-int lang;           
-int actionLabelColorNormal;  
-int actionLabelColorHighlighted;
-int invUparrowONsprite;
-int invUparrowOFFsprite;
-int invUparrowHIsprite;
-int invDownarrowONsprite;      
-int invDownarrowOFFsprite;
-int invDownarrowHIsprite;
-int walkOffScreenOffset;
-bool approachCharInteract;
-bool NPCfacingPlayer;  
-bool objHotTalk;
-bool classicInvHandling;   
-bool classicGui;
-
-bool exitDoorDoubleclick; 
-bool exitExtensionDoubleclick; 
-bool runOnDoubleClick;
-int runCursorDistance;
-int runSpeedupRate = 1;
-
-int global_action;        // containing the current clicked action
-int default_action;       // default action (most likely walk-to)
-int alternative_action;   // right-click action
-int used_action;          // used_action = global_action, if not cancelled
-int AGSCursorMode;        // used mouse cursor mode
-
-String location_ex;       // hovered  location name including extension
-String location;          // hovered  location name excluding extension
-String location_clicked;  // clicked location name including extension
-String inv_ex_location;   // inventory name including extension
-String inv_location;      // inventory name location excluding extension
-
-String temp_location;     // needed to compare location & clicked location
-
-int location_type;        // the result of GetLocationType
-int location_id;          // on_mouse_click -> location id
-
-int player_walk_x_speed;  // Initial walking speed x coordinate
-int player_walk_y_speed;  // Initial walking speed y coordinate
-int player_ani_speed;     // Initial animation speed
-bool player_is_running;   // if character is currently running
-
-
-bool player_frozen;       // player can't move
-bool disabled_gui;        // GUI disabled
-int action_button[ACT_COUNT];            // Array containing the verb button Ids
-int action_button_normal[ACT_COUNT];     // contains the verb button sprites
-int action_button_highlight[ACT_COUNT];  // Contains the highlighted verb button sprites
-int button_action[ACT_COUNT];            // Array containg the related actions like eGA_LookAt
-
-String tresult;           // translated result of the action mode, eg. "Look at %s"
-String act_object;        // action_object - object used in action
-String act_item;          // inventory item to be used or given 
-int actionLabelWidth; // Width of the action label in the status bar
-
-int action_l_keycode[ACT_COUNT]; // lower case keycodes for the verbs
-int action_u_keycode[ACT_COUNT]; // upper case keycodes for the verbs
-InventoryItem*ItemGiven;        // Item given to a character
-char key_l_yes, key_u_yes, key_l_no, key_u_no; // translated keys for yes and no
-
-int door_state[MAX_DOORS];// Array for the door script
-String door_strings[DOORSTRING_COUNT];   // default messages for the door script
-
-String unhandled_strings[UNHANDLED_MSG_COUNT]; // default unhandled messages
-
-// Default door sounds
-AudioClip*  openDoorSound,   
-            closeDoorSound, 
-            unlockDoorSound; 
+struct VerbsData {
+    
+    int lang;           
+    int actionLabelColorNormal;  
+    int actionLabelColorHighlighted;
+    int invUparrowONsprite;
+    int invUparrowOFFsprite;
+    int invUparrowHIsprite;
+    int invDownarrowONsprite;      
+    int invDownarrowOFFsprite;
+    int invDownarrowHIsprite;
+    int walkOffScreenOffset;
+    bool approachCharInteract;
+    bool NPCfacingPlayer;  
+    bool objHotTalk;
+    bool classicInvHandling;   
+    bool classicGui;
+
+    bool exitDoorDoubleclick; 
+    bool exitExtensionDoubleclick; 
+    bool runOnDoubleClick;
+    int runCursorDistance;
+    int runSpeedupRate;       //initialized in game_start
+
+    int global_action;        // containing the current clicked action
+    int default_action;       // default action (most likely walk-to)
+    int alternative_action;   // right-click action
+    int used_action;          // used_action = global_action, if not cancelled
+    int AGSCursorMode;        // used mouse cursor mode
+
+    String location_ex;       // hovered  location name including extension
+    String location;          // hovered  location name excluding extension
+    String location_clicked;  // clicked location name including extension
+    String inv_ex_location;   // inventory name including extension
+    String inv_location;      // inventory name location excluding extension
+
+    String temp_location;     // needed to compare location & clicked location
+
+    int location_type;        // the result of GetLocationType
+    int location_id;          // on_mouse_click -> location id
+
+    int player_walk_x_speed;  // Initial walking speed x coordinate
+    int player_walk_y_speed;  // Initial walking speed y coordinate
+    int player_ani_speed;     // Initial animation speed
+    bool player_is_running;   // if character is currently running
+
+
+    bool player_frozen;       // player can't move
+    bool disabled_gui;        // GUI disabled
+    int action_button[ACT_COUNT];            // Array containing the verb button Ids
+    int action_button_normal[ACT_COUNT];     // contains the verb button sprites
+    int action_button_highlight[ACT_COUNT];  // Contains the highlighted verb button sprites
+    int button_action[ACT_COUNT];            // Array containg the related actions like eGA_LookAt
+
+    String tresult;           // translated result of the action mode, eg. "Look at %s"
+    String act_object;        // action_object - object used in action
+    String act_item;          // inventory item to be used or given 
+    int actionLabelWidth; // Width of the action label in the status bar
+
+    int action_l_keycode[ACT_COUNT]; // lower case keycodes for the verbs
+    int action_u_keycode[ACT_COUNT]; // upper case keycodes for the verbs
+    InventoryItem*ItemGiven;        // Item given to a character
+    char key_l_yes, key_u_yes, key_l_no, key_u_no; // translated keys for yes and no
+
+    int door_state[MAX_DOORS];// Array for the door script
+    String door_strings[DOORSTRING_COUNT];   // default messages for the door script
+
+    String unhandled_strings[UNHANDLED_MSG_COUNT]; // default unhandled messages
+
+    // Default door sounds
+    AudioClip*  openDoorSound,   
+                closeDoorSound, 
+                unlockDoorSound; 
+    
+    // Guis used by the module (we don't want to use global variables)
+    GUI* guiAction;
+    GUI* guiMain;
+    GUI* guiPause;
+    GUI* guiQuit;
+    
+    FontType fontText;
+    FontType fontTextOut;
+    FontType fontSpeech;
+    FontType fontOutlineSpeech;
+    
+  
+    
+};
+VerbsData verbsData;
+
             
 // ============================= Helper functions ===========================================
 
@@ -89,64 +108,64 @@ AudioClip*  openDoorSound,
 bool seti_VerbGuiOptions(static Verbs, eVerbGuiOptions index,  int value) 
 {
   // Template Language
-  if (index == eVerbGuiTemplateLanguage) lang = value;
+  if (index == eVerbGuiTemplateLanguage) verbsData.lang = value;
   
   // colour used in action bar
-  if (index == eVerbGuiActionLabelColorNormal) actionLabelColorNormal = value;
+  if (index == eVerbGuiActionLabelColorNormal) verbsData.actionLabelColorNormal = value;
   
   // highlighted colour used in action bar
-  if (index == eVerbGuiActionLabelColorHighlighted) actionLabelColorHighlighted = value;
+  if (index == eVerbGuiActionLabelColorHighlighted) verbsData.actionLabelColorHighlighted = value;
  
   
   // sprite slot of the upper inv arrow / normal
-  if (index == eVerbGuiInvUparrowONsprite) invUparrowONsprite = value;
+  if (index == eVerbGuiInvUparrowONsprite) verbsData.invUparrowONsprite = value;
   // sprite slot of the upper inv arrow / disabled
-  if (index == eVerbGuiInvUparrowOFFsprite) invUparrowOFFsprite = value;
+  if (index == eVerbGuiInvUparrowOFFsprite) verbsData.invUparrowOFFsprite = value;
   // sprite slot of the upper inv arrow / highlighted
-  if (index == eVerbGuiInvUparrowHIsprite) invUparrowHIsprite = value;
+  if (index == eVerbGuiInvUparrowHIsprite) verbsData.invUparrowHIsprite = value;
   
   
   // sprite slot of the lower inv arrow / normal
-  if (index == eVerbGuiInvDownarrowONsprite) invDownarrowONsprite = value;
+  if (index == eVerbGuiInvDownarrowONsprite) verbsData.invDownarrowONsprite = value;
   // sprite slot of the lower inv arrow / disabled
-  if (index == eVerbGuiInvDownarrowOFFsprite) invDownarrowOFFsprite = value;
+  if (index == eVerbGuiInvDownarrowOFFsprite) verbsData.invDownarrowOFFsprite = value;
   // sprite slot of the lower inv arrow / highlighted
-  if (index == eVerbGuiInvDownarrowHIsprite) invDownarrowHIsprite = value;
+  if (index == eVerbGuiInvDownarrowHIsprite) verbsData.invDownarrowHIsprite = value;
   
   // offset used by WalkOffScreen and exit extensions
-  if (index == eVerbGuiWalkOffScreenOffset) walkOffScreenOffset = value;
+  if (index == eVerbGuiWalkOffScreenOffset) verbsData.walkOffScreenOffset = value;
   
   // walk to character before starting interaction
-  if (index == eVerbGuiApproachCharInteract) approachCharInteract = value;
+  if (index == eVerbGuiApproachCharInteract) verbsData.approachCharInteract = value;
   
   // Non playable characters are facing the player before talk-to and give-to
-  if (index == eVerbGuiNPCfacingPlayer) NPCfacingPlayer = value;
+  if (index == eVerbGuiNPCfacingPlayer) verbsData.NPCfacingPlayer = value;
   
   // Enable Talk to Objects and Hotspots
-  if (index == eVerbGuiObjHotTalk) objHotTalk = value;
+  if (index == eVerbGuiObjHotTalk)  verbsData.objHotTalk = value;
   
   // turned on: right-click on inv items is lookat, left-click is use
   // all other extensions will be ignored
-  if (index == eVerbGuiClassicInvHandling) classicInvHandling = value;
+  if (index == eVerbGuiClassicInvHandling)  verbsData.classicInvHandling = value;
   
   // action bar is fixed like in classic SCUMM games among other things
-  if (index == eVerbGuiClassicGui) classicGui = value;
+  if (index == eVerbGuiClassicGui)  verbsData.classicGui = value;
   
   // Doubleclick on open doors changes room instantly
-  if (index == eVerbGuiExitDoorDoubleclick) exitDoorDoubleclick = value;
+  if (index == eVerbGuiExitDoorDoubleclick)  verbsData.exitDoorDoubleclick = value;
   
   // Doubleclick on anything with an exit extension
-  if (index == eVerbGuiExitExtensionDoubleclick) exitExtensionDoubleclick = value;
+  if (index == eVerbGuiExitExtensionDoubleclick)  verbsData.exitExtensionDoubleclick = value;
   
   // Character speed is doubled on doubleclick
-  if (index == eVerbGuiRunOnDoubleClick) runOnDoubleClick = value;
+  if (index == eVerbGuiRunOnDoubleClick)  verbsData.runOnDoubleClick = value;
   
   // Distance between mouse cursor and player until running begins
-  if (index == eVerbGuiRunCursorDistance) runCursorDistance = value;
+  if (index == eVerbGuiRunCursorDistance)  verbsData.runCursorDistance = value;
   
   // multiplied to the player movement speed, while running
   // 1 = no speedup at all, 2 = double speed and so on
-  if (index == eVerbGuiRunSpeedupRate) runSpeedupRate = value;
+  if (index == eVerbGuiRunSpeedupRate)  verbsData.runSpeedupRate = value;
 
 }
 
@@ -157,26 +176,26 @@ bool seti_VerbGuiOptions(static Verbs, eVerbGuiOptions index,  int value)
  ***********************************************************************/
 int geti_VerbGuiOptions(static Verbs, eVerbGuiOptions index) 
 {
-  if (index == eVerbGuiTemplateLanguage) return lang;
-  if (index == eVerbGuiActionLabelColorNormal) return actionLabelColorNormal;
-  if (index == eVerbGuiActionLabelColorHighlighted) return actionLabelColorHighlighted;
-  if (index == eVerbGuiInvUparrowONsprite) return invUparrowONsprite;
-  if (index == eVerbGuiInvUparrowOFFsprite) return invUparrowOFFsprite;
-  if (index == eVerbGuiInvUparrowHIsprite) return invUparrowHIsprite;
-  if (index == eVerbGuiInvDownarrowONsprite) return invDownarrowONsprite;
-  if (index == eVerbGuiInvDownarrowOFFsprite) return invDownarrowOFFsprite;
-  if (index == eVerbGuiInvDownarrowHIsprite) return invDownarrowHIsprite;
-  if (index == eVerbGuiWalkOffScreenOffset) return walkOffScreenOffset;
-  if (index == eVerbGuiApproachCharInteract) return approachCharInteract;
-  if (index == eVerbGuiNPCfacingPlayer) return NPCfacingPlayer;
-  if (index == eVerbGuiObjHotTalk) return objHotTalk;
-  if (index == eVerbGuiClassicInvHandling) return classicInvHandling;
-  if (index == eVerbGuiClassicGui) return classicGui;
-  if (index == eVerbGuiExitDoorDoubleclick) return exitDoorDoubleclick;
-  if (index == eVerbGuiExitExtensionDoubleclick) return exitExtensionDoubleclick;
-  if (index == eVerbGuiRunOnDoubleClick) return runOnDoubleClick;
-  if (index == eVerbGuiRunCursorDistance) return runCursorDistance;
-  if (index == eVerbGuiRunSpeedupRate) return runSpeedupRate;
+  if (index == eVerbGuiTemplateLanguage) return verbsData.lang;
+  if (index == eVerbGuiActionLabelColorNormal) return verbsData.actionLabelColorNormal;
+  if (index == eVerbGuiActionLabelColorHighlighted) return verbsData.actionLabelColorHighlighted;
+  if (index == eVerbGuiInvUparrowONsprite) return verbsData.invUparrowONsprite;
+  if (index == eVerbGuiInvUparrowOFFsprite) return verbsData.invUparrowOFFsprite;
+  if (index == eVerbGuiInvUparrowHIsprite) return verbsData.invUparrowHIsprite;
+  if (index == eVerbGuiInvDownarrowONsprite) return verbsData.invDownarrowONsprite;
+  if (index == eVerbGuiInvDownarrowOFFsprite) return verbsData.invDownarrowOFFsprite;
+  if (index == eVerbGuiInvDownarrowHIsprite) return verbsData.invDownarrowHIsprite;
+  if (index == eVerbGuiWalkOffScreenOffset) return verbsData.walkOffScreenOffset;
+  if (index == eVerbGuiApproachCharInteract) return verbsData.approachCharInteract;
+  if (index == eVerbGuiNPCfacingPlayer) return verbsData.NPCfacingPlayer;
+  if (index == eVerbGuiObjHotTalk) return  verbsData.objHotTalk;
+  if (index == eVerbGuiClassicInvHandling) return  verbsData.classicInvHandling;
+  if (index == eVerbGuiClassicGui) return  verbsData.classicGui;
+  if (index == eVerbGuiExitDoorDoubleclick) return  verbsData.exitDoorDoubleclick;
+  if (index == eVerbGuiExitExtensionDoubleclick) return  verbsData.exitExtensionDoubleclick;
+  if (index == eVerbGuiRunOnDoubleClick) return  verbsData.runOnDoubleClick;
+  if (index == eVerbGuiRunCursorDistance) return  verbsData.runCursorDistance;
+  if (index == eVerbGuiRunSpeedupRate) return  verbsData.runSpeedupRate;
   return 0;
 }
 
@@ -187,7 +206,7 @@ int geti_VerbGuiOptions(static Verbs, eVerbGuiOptions index)
  ***********************************************************************/
 bool seti_VerbGuiUnhandled(static Verbs, eVerbGuiUnhandled index, String value) 
 {
-  unhandled_strings[index] = value;
+  verbsData.unhandled_strings[index] = value;
 }
 
 /***********************************************************************
@@ -197,10 +216,29 @@ bool seti_VerbGuiUnhandled(static Verbs, eVerbGuiUnhandled index, String value)
  ***********************************************************************/
 String geti_VerbGuiUnhandled(static Verbs, eVerbGuiUnhandled index) 
 {
-  return unhandled_strings[index];
+  return verbsData.unhandled_strings[index];
+}
+
+
+
+static void Verbs::BindGuis(GUI* _gAction, GUI* _gMain, GUI* _gPause, GUI* _gQuit)
+{
+    verbsData.guiAction     = _gAction;
+    verbsData.guiMain       = _gMain;
+    verbsData.guiPause      = _gPause;
+    verbsData.guiQuit       = _gQuit;
+}
+
+static void Verbs::SetFonts(FontType fontText, FontType fontTextOut, FontType fontSpeech, FontType fontOutlineSpeech)
+{
+    verbsData.fontText          = fontText;
+    verbsData.fontTextOut       = fontTextOut;
+    verbsData.fontSpeech        = fontSpeech;
+    verbsData.fontOutlineSpeech = fontOutlineSpeech;
 }
 
 
+
 /***********************************************************************
  * Distance(int x1, int y1, int x2, int y2)
  * Returns the distance between two coordinates
@@ -233,7 +271,7 @@ static int Verbs::Offset(int point1, int point2)
  ***********************************************************************/
 static int Verbs::GetButtonAction(int action) 
 {
-  return button_action[action];
+  return verbsData.button_action[action];
 }
 
 /***********************************************************************
@@ -243,9 +281,9 @@ static int Verbs::GetButtonAction(int action)
  ***********************************************************************/
 static void Verbs::DisableGui()
 {
-  disabled_gui=true;
-  gMain.Visible=false;
-  gAction.Visible=false;
+  verbsData.disabled_gui=true;
+  verbsData.guiMain.Visible=false;
+  verbsData.guiAction.Visible=false;
 }
 
 /***********************************************************************
@@ -255,9 +293,9 @@ static void Verbs::DisableGui()
  ***********************************************************************/
 static void Verbs::EnableGui()
 {
-  disabled_gui=false;
-  gMain.Visible=true;
-  gAction.Visible=true;
+  verbsData.disabled_gui=false;
+  verbsData.guiMain.Visible=true;
+  verbsData.guiAction.Visible=true;
   Wait(1);
 }
 
@@ -268,7 +306,7 @@ static void Verbs::EnableGui()
  ***********************************************************************/
 static bool Verbs::IsGuiDisabled() 
 {
-  return disabled_gui;
+  return verbsData.disabled_gui;
 }
 
 /***********************************************************************
@@ -282,23 +320,23 @@ static void Verbs::HandleInvArrows()
   // can scroll the inventory:
   if (invMain.TopItem > 0) {
     // if inventory can scroll up
-    btnInvUp.NormalGraphic    = invUparrowONsprite;
-    btnInvUp.MouseOverGraphic = invUparrowHIsprite;
+    btnInvUp.NormalGraphic    = verbsData.invUparrowONsprite;
+    btnInvUp.MouseOverGraphic = verbsData.invUparrowHIsprite;
     
-    if (InventoryItem.GetAtScreenXY(gMain.X + invMain.X + 1, gMain.Y + invMain.Y + 1) == null) invMain.TopItem -= invMain.ItemsPerRow;
+    if (InventoryItem.GetAtScreenXY(verbsData.guiMain.X + invMain.X + 1, verbsData.guiMain.Y + invMain.Y + 1) == null) invMain.TopItem -= invMain.ItemsPerRow;
   }
   else { 
-    btnInvUp.NormalGraphic    = invUparrowOFFsprite;
-    btnInvUp.MouseOverGraphic = invUparrowOFFsprite;
+    btnInvUp.NormalGraphic    = verbsData.invUparrowOFFsprite;
+    btnInvUp.MouseOverGraphic = verbsData.invUparrowOFFsprite;
   }
   //if inv can scroll down
   if (invMain.TopItem < invMain.ItemCount-(invMain.ItemsPerRow * invMain.RowCount)) { 
-    btnInvDown.NormalGraphic    = invDownarrowONsprite;
-    btnInvDown.MouseOverGraphic = invDownarrowHIsprite;
+    btnInvDown.NormalGraphic    = verbsData.invDownarrowONsprite;
+    btnInvDown.MouseOverGraphic = verbsData.invDownarrowHIsprite;
   }
   else{
-    btnInvDown.NormalGraphic    = invDownarrowOFFsprite;
-    btnInvDown.MouseOverGraphic = invDownarrowOFFsprite;
+    btnInvDown.NormalGraphic    = verbsData.invDownarrowOFFsprite;
+    btnInvDown.MouseOverGraphic = verbsData.invDownarrowOFFsprite;
   }
 }
 
@@ -310,7 +348,7 @@ static void Verbs::HandleInvArrows()
  ***********************************************************************/
 bool seti_DoorStrings(static Doors, eDoorStrings index, String value) 
 {
-  if (!String.IsNullOrEmpty(value)) door_strings[index] = value;
+  if (!String.IsNullOrEmpty(value)) verbsData.door_strings[index] = value;
 }
 
 /***********************************************************************
@@ -320,7 +358,7 @@ bool seti_DoorStrings(static Doors, eDoorStrings index, String value)
  ***********************************************************************/
 String geti_DoorStrings(static Doors, eDoorStrings index) 
 {
-  return door_strings[index];
+  return verbsData.door_strings[index];
 }
 /***********************************************************************
  * SetDoorState(int door_id, int value) 
@@ -332,7 +370,7 @@ String geti_DoorStrings(static Doors, eDoorStrings index)
  ***********************************************************************/
 static void Doors::SetDoorState(int door_id, int value) 
 {
-  door_state[door_id] = value;
+  verbsData.door_state[door_id] = value;
 }
 
 /***********************************************************************
@@ -342,7 +380,7 @@ static void Doors::SetDoorState(int door_id, int value)
  ***********************************************************************/
 static int Doors::GetDoorState(int door_id) 
 {
-  return door_state[door_id];
+  return verbsData.door_state[door_id];
 }
 
 /***********************************************************************
@@ -377,150 +415,150 @@ static void Doors::InitObject (int door_id, int obj)
 static void Verbs::TranslateAction(int action, int tr_lang) 
 {
   if (tr_lang == eLangDE) {
-    if (action == eGA_WalkTo)        tresult="Gehe zu %s";
-    else if (action == eGA_LookAt)   tresult="Schau %s an";
-    else if (action == eGA_TalkTo)   tresult="Rede mit %s";
+    if (action == eGA_WalkTo)        verbsData.tresult="Gehe zu %s";
+    else if (action == eGA_LookAt)   verbsData.tresult="Schau %s an";
+    else if (action == eGA_TalkTo)   verbsData.tresult="Rede mit %s";
     else if (action == eGA_GiveTo) {
-      if (act_item.Length > 0)       tresult="Gib !s an %s";
-      else                           tresult="Gib %s";
+      if (verbsData.act_item.Length > 0)       verbsData.tresult="Gib !s an %s";
+      else                           verbsData.tresult="Gib %s";
     }
-    else if (action == eGA_PickUp)   tresult="Nimm %s";
+    else if (action == eGA_PickUp)   verbsData.tresult="Nimm %s";
     else if (action == eGA_Use) {
-      if (act_item.Length > 0)       tresult="Benutze !s mit %s";
-      else                           tresult="Benutze %s";
+      if (verbsData.act_item.Length > 0)       verbsData.tresult="Benutze !s mit %s";
+      else                           verbsData.tresult="Benutze %s";
     }
-    else if (action == eGA_Open)     tresult="Öffne %s";
-    else if (action == eGA_Close)    tresult="Schließe %s";
-    else if (action == eGA_Push)     tresult="Drücke %s";
-    else if (action == eGA_Pull)     tresult="Ziehe %s";
-    else tresult=" ";   
+    else if (action == eGA_Open)     verbsData.tresult="Öffne %s";
+    else if (action == eGA_Close)    verbsData.tresult="Schließe %s";
+    else if (action == eGA_Push)     verbsData.tresult="Drücke %s";
+    else if (action == eGA_Pull)     verbsData.tresult="Ziehe %s";
+    else verbsData.tresult=" ";   
   }
   else if (tr_lang == eLangES) {
-    if (action == eGA_WalkTo)        tresult="Ir a %s";
-    else if (action == eGA_LookAt)   tresult="Mirar %s";
-    else if (action == eGA_TalkTo)   tresult="Hablar con %s";
+    if (action == eGA_WalkTo)        verbsData.tresult="Ir a %s";
+    else if (action == eGA_LookAt)   verbsData.tresult="Mirar %s";
+    else if (action == eGA_TalkTo)   verbsData.tresult="Hablar con %s";
     else if (action == eGA_GiveTo) {
-      if (act_item.Length > 0)       tresult="Dar !s a %s";
-      else                           tresult="Dar %s";
+      if (verbsData.act_item.Length > 0)       verbsData.tresult="Dar !s a %s";
+      else                           verbsData.tresult="Dar %s";
     }
-    else if (action == eGA_PickUp)   tresult="Coger %s";
+    else if (action == eGA_PickUp)   verbsData.tresult="Coger %s";
     else if (action == eGA_Use) {
-      if (act_item.Length > 0)       tresult="Usar !s con %s";
-      else                           tresult="Usar %s";
+      if (verbsData.act_item.Length > 0)       verbsData.tresult="Usar !s con %s";
+      else                           verbsData.tresult="Usar %s";
     }
-    else if (action == eGA_Open)     tresult="Abrir %s";
-    else if (action == eGA_Close)    tresult="Cerrar %s";
-    else if (action == eGA_Push)     tresult="Empujar %s";
-    else if (action == eGA_Pull)     tresult="Tirar de %s";
-    else tresult=" ";    
+    else if (action == eGA_Open)     verbsData.tresult="Abrir %s";
+    else if (action == eGA_Close)    verbsData.tresult="Cerrar %s";
+    else if (action == eGA_Push)     verbsData.tresult="Empujar %s";
+    else if (action == eGA_Pull)     verbsData.tresult="Tirar de %s";
+    else verbsData.tresult=" ";    
   }
   else if (tr_lang == eLangFR) {
-    if (action == eGA_WalkTo)        tresult="Aller vers %s";
-    else if (action == eGA_LookAt)   tresult="Regarder %s";
-    else if (action == eGA_TalkTo)   tresult="Parler à %s";
+    if (action == eGA_WalkTo)        verbsData.tresult="Aller vers %s";
+    else if (action == eGA_LookAt)   verbsData.tresult="Regarder %s";
+    else if (action == eGA_TalkTo)   verbsData.tresult="Parler à %s";
     else if (action == eGA_GiveTo) {
-      if (act_item.Length>0)         tresult="Donner !s à %s";
-      else                           tresult="Donner %s";
+      if (verbsData.act_item.Length>0)         verbsData.tresult="Donner !s à %s";
+      else                           verbsData.tresult="Donner %s";
     }
-    else if (action == eGA_PickUp)   tresult="Prendre %s";
+    else if (action == eGA_PickUp)   verbsData.tresult="Prendre %s";
     else if (action == eGA_Use) {
-      if (act_item.Length>0)         tresult="Utiliser !s sur %s";
-      else                           tresult="Utiliser %s";
+      if (verbsData.act_item.Length>0)         verbsData.tresult="Utiliser !s sur %s";
+      else                           verbsData.tresult="Utiliser %s";
     }
-    else if (action == eGA_Open)     tresult="Ouvrir %s";
-    else if (action == eGA_Close)    tresult="Fermer %s";
-    else if (action == eGA_Push)     tresult="Pousser %s";
-    else if (action == eGA_Pull)     tresult="Tirer %s";
-    else tresult=" "; 
+    else if (action == eGA_Open)     verbsData.tresult="Ouvrir %s";
+    else if (action == eGA_Close)    verbsData.tresult="Fermer %s";
+    else if (action == eGA_Push)     verbsData.tresult="Pousser %s";
+    else if (action == eGA_Pull)     verbsData.tresult="Tirer %s";
+    else verbsData.tresult=" "; 
   }  
   else if (tr_lang == eLangIT) {
-    if (action == eGA_WalkTo)        tresult="Vai a %s";
-    else if (action == eGA_LookAt)   tresult="Esamina %s";
-    else if (action == eGA_TalkTo)   tresult="Parla con %s";
+    if (action == eGA_WalkTo)        verbsData.tresult="Vai a %s";
+    else if (action == eGA_LookAt)   verbsData.tresult="Esamina %s";
+    else if (action == eGA_TalkTo)   verbsData.tresult="Parla con %s";
     else if (action == eGA_GiveTo) {
-    if (act_item.Length > 0)         tresult="Dai !s a %s";
-    else                             tresult="Dai %s";
+    if (verbsData.act_item.Length > 0)         verbsData.tresult="Dai !s a %s";
+    else                             verbsData.tresult="Dai %s";
     }
-    else if (action == eGA_PickUp)   tresult="Raccogli %s";
+    else if (action == eGA_PickUp)   verbsData.tresult="Raccogli %s";
     else if (action == eGA_Use) {
-    if (act_item.Length > 0)         tresult="Usa !s con %s";
-    else                             tresult="Usa %s";
+    if (verbsData.act_item.Length > 0)         verbsData.tresult="Usa !s con %s";
+    else                             verbsData.tresult="Usa %s";
     }
-    else if (action == eGA_Open)     tresult="Apri %s";
-    else if (action == eGA_Close)    tresult="Ferma %s";
-    else if (action == eGA_Push)     tresult="Premi %s";
-    else if (action == eGA_Pull)     tresult="Tira %s";
-    else tresult=" "; 
+    else if (action == eGA_Open)     verbsData.tresult="Apri %s";
+    else if (action == eGA_Close)    verbsData.tresult="Ferma %s";
+    else if (action == eGA_Push)     verbsData.tresult="Premi %s";
+    else if (action == eGA_Pull)     verbsData.tresult="Tira %s";
+    else verbsData.tresult=" "; 
   }
   else if (tr_lang == eLangPT) {
-    if (action == eGA_WalkTo)        tresult="Ir para %s";
-    else if (action == eGA_LookAt)   tresult="Olhar para %s";
-    else if (action == eGA_TalkTo)   tresult="Falar com %s";
+    if (action == eGA_WalkTo)        verbsData.tresult="Ir para %s";
+    else if (action == eGA_LookAt)   verbsData.tresult="Olhar para %s";
+    else if (action == eGA_TalkTo)   verbsData.tresult="Falar com %s";
     else if (action == eGA_GiveTo) {
-    if (act_item.Length > 0)         tresult="Dar !s a %s";
-    else                             tresult="Dar %s";
+    if (verbsData.act_item.Length > 0)         verbsData.tresult="Dar !s a %s";
+    else                             verbsData.tresult="Dar %s";
     }
-    else if (action == eGA_PickUp)   tresult="Apanhar %s";
+    else if (action == eGA_PickUp)   verbsData.tresult="Apanhar %s";
     else if (action == eGA_Use) {
-    if (act_item.Length > 0)         tresult="Usar !s com %s";
-    else                             tresult="Usar %s";
+    if (verbsData.act_item.Length > 0)         verbsData.tresult="Usar !s com %s";
+    else                             verbsData.tresult="Usar %s";
     }
-    else if (action == eGA_Open)     tresult="Abrir %s";
-    else if (action == eGA_Close)    tresult="Fechar %s";
-    else if (action == eGA_Push)     tresult="Empurrar %s";
-    else if (action == eGA_Pull)     tresult="Puxar %s";
-    else tresult=" "; 
+    else if (action == eGA_Open)     verbsData.tresult="Abrir %s";
+    else if (action == eGA_Close)    verbsData.tresult="Fechar %s";
+    else if (action == eGA_Push)     verbsData.tresult="Empurrar %s";
+    else if (action == eGA_Pull)     verbsData.tresult="Puxar %s";
+    else verbsData.tresult=" "; 
   }
   else if (tr_lang == eLangNL) {
-    if (action == eGA_WalkTo)        tresult="Ga naar %s";
-    else if (action == eGA_LookAt)   tresult="Bekijk %s";
-    else if (action == eGA_TalkTo)   tresult="Praat met %s";
+    if (action == eGA_WalkTo)        verbsData.tresult="Ga naar %s";
+    else if (action == eGA_LookAt)   verbsData.tresult="Bekijk %s";
+    else if (action == eGA_TalkTo)   verbsData.tresult="Praat met %s";
     else if (action == eGA_GiveTo) {
-    if (act_item.Length>0)           tresult="Geef !s aan %s";
-    else                             tresult="Geef %s";
+    if (verbsData.act_item.Length>0)           verbsData.tresult="Geef !s aan %s";
+    else                             verbsData.tresult="Geef %s";
     }
-    else if (action == eGA_PickUp)   tresult="Pak %s";
+    else if (action == eGA_PickUp)   verbsData.tresult="Pak %s";
     else if (action == eGA_Use) {
-    if (act_item.Length>0)           tresult="Gebruik !s met %s";
-    else                             tresult="Gebruik %s";
+    if (verbsData.act_item.Length>0)           verbsData.tresult="Gebruik !s met %s";
+    else                             verbsData.tresult="Gebruik %s";
     }
-    else if (action == eGA_Open)     tresult="Open %s";
-    else if (action == eGA_Close)    tresult="Sluit %s";
-    else if (action == eGA_Push)     tresult="Duw %s";
-    else if (action == eGA_Pull)     tresult="Trek %s";
-    else tresult=" "; 
+    else if (action == eGA_Open)     verbsData.tresult="Open %s";
+    else if (action == eGA_Close)    verbsData.tresult="Sluit %s";
+    else if (action == eGA_Push)     verbsData.tresult="Duw %s";
+    else if (action == eGA_Pull)     verbsData.tresult="Trek %s";
+    else verbsData.tresult=" "; 
   }   
   else {
-    if (action == eGA_WalkTo)        tresult="Walk to %s";
-    else if (action == eGA_LookAt)   tresult="Look at %s";
-    else if (action == eGA_TalkTo)   tresult="Talk to %s";
+    if (action == eGA_WalkTo)        verbsData.tresult="Walk to %s";
+    else if (action == eGA_LookAt)   verbsData.tresult="Look at %s";
+    else if (action == eGA_TalkTo)   verbsData.tresult="Talk to %s";
     else if (action == eGA_GiveTo) {
-      if (act_item.Length > 0)       tresult="Give !s to %s";
-      else                           tresult="Give %s";
+      if (verbsData.act_item.Length > 0)       verbsData.tresult="Give !s to %s";
+      else                           verbsData.tresult="Give %s";
     }
-    else if (action == eGA_PickUp)   tresult="Pick up %s";
+    else if (action == eGA_PickUp)   verbsData.tresult="Pick up %s";
     else if (action == eGA_Use) {
-      if (act_item.Length > 0)       tresult="Use !s with %s";
-      else                           tresult="Use %s";
+      if (verbsData.act_item.Length > 0)       verbsData.tresult="Use !s with %s";
+      else                           verbsData.tresult="Use %s";
     }
-    else if (action == eGA_Open)     tresult="Open %s";
-    else if (action == eGA_Close)    tresult="Close %s";
-    else if (action == eGA_Push)     tresult="Push %s";
-    else if (action == eGA_Pull)     tresult="Pull %s";
-    else tresult=" ";    
+    else if (action == eGA_Open)     verbsData.tresult="Open %s";
+    else if (action == eGA_Close)    verbsData.tresult="Close %s";
+    else if (action == eGA_Push)     verbsData.tresult="Push %s";
+    else if (action == eGA_Pull)     verbsData.tresult="Pull %s";
+    else verbsData.tresult=" ";    
   }
   // fill object and item into action template
-  tresult = GetTranslation(tresult);
-  int ip = tresult.IndexOf("!s");
+  verbsData.tresult = GetTranslation(verbsData.tresult);
+  int ip = verbsData.tresult.IndexOf("!s");
   if (ip >= 0) {
-    int op  = tresult.Contains("%s");
-    tresult = tresult.ReplaceCharAt(ip, '%');
-    if (ip < op) tresult=String.Format(tresult, act_item, act_object);
-    else         tresult=String.Format(tresult, act_object, act_item);
+    int op  = verbsData.tresult.Contains("%s");
+    verbsData.tresult = verbsData.tresult.ReplaceCharAt(ip, '%');
+    if (ip < op) verbsData.tresult=String.Format(verbsData.tresult, verbsData.act_item, verbsData.act_object);
+    else         verbsData.tresult=String.Format(verbsData.tresult, verbsData.act_object, verbsData.act_item);
   }
   else {
-    if (act_object == null) act_object = "";
-    tresult=String.Format(tresult, act_object);
+    if (verbsData.act_object == null) verbsData.act_object = "";
+    verbsData.tresult=String.Format(verbsData.tresult, verbsData.act_object);
   }
 }
 
@@ -531,7 +569,7 @@ static void Verbs::TranslateAction(int action, int tr_lang)
  ***********************************************************************/
 static bool Verbs::IsAction(Action test_action) 
 {
-  return global_action == test_action;
+  return  verbsData.global_action == test_action;
 }
 
 /***********************************************************************
@@ -542,9 +580,9 @@ static bool Verbs::IsAction(Action test_action)
  ***********************************************************************/
 static bool Verbs::UsedAction(Action test_action) 
 {
-  return ((used_action == test_action) && (AGSCursorMode != eModeUseinv)) || 
-         ((test_action == eGA_UseInv)  && (used_action == eGA_Use) && (AGSCursorMode == eModeUseinv)) || 
-         ((test_action == eGA_GiveTo)  && (used_action == eGA_GiveTo) && (AGSCursorMode == eModeUseinv) && ItemGiven!=null);
+  return (( verbsData.used_action == test_action) && ( verbsData.AGSCursorMode != eModeUseinv)) || 
+         ((test_action == eGA_UseInv)  && ( verbsData.used_action == eGA_Use) && ( verbsData.AGSCursorMode == eModeUseinv)) || 
+         ((test_action == eGA_GiveTo)  && ( verbsData.used_action == eGA_GiveTo) && ( verbsData.AGSCursorMode == eModeUseinv) && verbsData.ItemGiven!=null);
 }
 
 /***********************************************************************
@@ -556,7 +594,7 @@ static bool Verbs::UsedAction(Action test_action)
 static void Verbs::SetAction(Action new_action) 
 {
   // set default action
-  if (new_action == eGA_Default) new_action=default_action;
+  if (new_action == eGA_Default) new_action= verbsData.default_action;
   // set corresponding cursormode
        if (new_action == eGA_WalkTo) mouse.Mode=eModeUsermode2;
   else if (new_action == eGA_LookAt) mouse.Mode=eModeLookat;
@@ -569,7 +607,7 @@ static void Verbs::SetAction(Action new_action)
   else if (new_action == eGA_Push)   mouse.Mode=eModeUsermode1;
   else if (new_action == eGA_Pull)   mouse.Mode=eModeUsermode1;
   // save action
-  global_action=new_action;
+   verbsData.global_action=new_action;
 }
 
 /***********************************************************************
@@ -580,11 +618,73 @@ static void Verbs::SetAction(Action new_action)
  ***********************************************************************/
 static void Verbs::SetDefaultAction(Action def_action) 
 {
-  default_action = def_action;
+   verbsData.default_action = def_action;
   Verbs.SetAction(eGA_Default);
 }
 
 
+//START Monsieur Ouxx modifications
+//(new code)
+/***********************************************************************
+ * Action GetUsedAction() 
+ * Returns directly which action was selected by the player
+ * 
+ ***********************************************************************/
+
+static Action Verbs::GetUsedAction() {
+  if(Verbs.UsedAction(eGA_WalkTo)){
+    return eGA_WalkTo;
+  }
+  else if(Verbs.UsedAction(eGA_LookAt)){
+    return eGA_LookAt;
+  }
+  else if(Verbs.UsedAction(eGA_TalkTo)){
+    return eGA_TalkTo;
+  }
+  else if(Verbs.UsedAction(eGA_GiveTo)){
+    return eGA_GiveTo;
+  }
+  else if(Verbs.UsedAction(eGA_PickUp)){
+    return eGA_PickUp;
+  }
+  else if(Verbs.UsedAction(eGA_Use)){
+    return eGA_Use;
+  }
+  else if(Verbs.UsedAction(eGA_UseInv)){
+    return eGA_UseInv;
+  }
+  else if(Verbs.UsedAction(eGA_Open)){
+    return eGA_Open;
+  }
+  else if(Verbs.UsedAction(eGA_Close)){
+    return eGA_Close;
+  }
+  else if(Verbs.UsedAction(eGA_Push)){
+    return eGA_Push;
+  }
+  else if(Verbs.UsedAction(eGA_Pull)){
+    return eGA_Pull;
+  }
+  return -1;
+}
+
+/***********************************************************************
+ * Action GetItemGiven() 
+ * Returns the item that has been given by the player. It's more or less player.ActiveInventory with more subtle logic
+ * 
+ ***********************************************************************/
+ 
+
+static InventoryItem* Verbs::GetItemGiven()
+{
+    return verbsData.ItemGiven;
+}
+  
+  
+//END Monsieur Ouxx modifications
+
+
+
 // ============================= GlobalCondition ===========================================
 
 /***********************************************************************
@@ -618,7 +718,7 @@ static int Verbs::GlobalCondition(eGlobCond condition)
   // if the mode is talk or "Give", and the mouse isnt over a character
   else if (condition == eGlob_GiveTalkNoChar) {
     
-    if (objHotTalk && Verbs.IsAction(eGA_TalkTo) ) {
+    if ( verbsData.objHotTalk && Verbs.IsAction(eGA_TalkTo) ) {
       cond = false;     
     }  
     else {
@@ -664,7 +764,7 @@ static char Verbs::ExtensionEx(int index, String name)
 static char Verbs::Extension()
 {
   // Check the (first) extension (>*) of a string
-  return Verbs.ExtensionEx(1, location);
+  return Verbs.ExtensionEx(1, verbsData.location);
 }
 
 /***********************************************************************
@@ -675,9 +775,9 @@ static char Verbs::Extension()
 static int Verbs::RemoveExtension()
 {
   //removes the extension of a string  
-  int pos = location.IndexOf(">");
-  int length = location.Length;
-  if (Verbs.Extension() != 0) location = location.Truncate(pos);
+  int pos = verbsData.location.IndexOf(">");
+  int length = verbsData.location.Length;
+  if (Verbs.Extension() != 0) verbsData.location = verbsData.location.Truncate(pos);
   return pos;
 }
 
@@ -689,10 +789,10 @@ static int Verbs::RemoveExtension()
 static void Verbs::AddExtension(char extension) 
 {
   //adds an extension to a thing that doesn't have one
-  int length=location.Length;
+  int length=verbsData.location.Length;
   if (Verbs.Extension() == 0) {
-    location=location.Append(">n");
-    location=location.ReplaceCharAt(length+1, extension);
+    verbsData.location=verbsData.location.Append(">n");
+    verbsData.location=verbsData.location.ReplaceCharAt(length+1, extension);
   }
 }
 
@@ -706,20 +806,20 @@ static void Verbs::SetAlternativeAction(char extension, Action alt_action)
 {
   if (alt_action == eGA_Default) {
     if (Verbs.Extension() == extension)
-      alternative_action = alt_action;
+       verbsData.alternative_action = alt_action;
   }
   else {
-    int button          = action_button[alt_action];
-    int normalbuttonpic = action_button_normal[alt_action];
-    int overbuttonpic   = action_button_highlight[alt_action];
+    int button          = verbsData.action_button[alt_action];
+    int normalbuttonpic = verbsData.action_button_normal[alt_action];
+    int overbuttonpic   = verbsData.action_button_highlight[alt_action];
     
     // used for setting the default action given the extension.
-    GUIControl*gc = gMain.Controls[button];
+    GUIControl*gc = verbsData.guiMain.Controls[button];
     Button*b = gc.AsButton;
     
     if (Verbs.Extension() == extension) {
       b.NormalGraphic = overbuttonpic;
-      alternative_action = alt_action;
+       verbsData.alternative_action = alt_action;
     }
     else b.NormalGraphic = normalbuttonpic;
     b.MouseOverGraphic = overbuttonpic;
@@ -777,8 +877,8 @@ static void Verbs::CheckDefaultAction()
   int x = mouse.x;
   int y = mouse.y;
   
-  location = Game.GetLocationName(x, y);
-  location_ex = location;
+  verbsData.location = Game.GetLocationName(x, y);
+   verbsData.location_ex = verbsData.location;
   
   
   // Setting default modes if the thing has no extension:
@@ -795,12 +895,12 @@ static void Verbs::CheckDefaultAction()
     Verbs.RemoveExtension();
     Verbs.VariableExtensions();
   }
-  if (Verbs.GlobalCondition(eGlob_InvOnInv) || (!objHotTalk && Verbs.GlobalCondition(eGlob_GiveTalkNoChar)) || Verbs.GlobalCondition(eGlob_GiveNoInv) ) {
+  if (Verbs.GlobalCondition(eGlob_InvOnInv) || (! verbsData.objHotTalk && Verbs.GlobalCondition(eGlob_GiveTalkNoChar)) || Verbs.GlobalCondition(eGlob_GiveNoInv) ) {
     //Dont send the name of the hotspt/obj/char/inv to the action bar and set default action "none"
-    if (!Verbs.GlobalCondition(eGlob_InvTalk)) location=">n";
+    if (!Verbs.GlobalCondition(eGlob_InvTalk)) verbsData.location=">n";
   }
   
-  inv_ex_location=location;
+  verbsData.inv_ex_location=verbsData.location;
   
   // Set "Look" as default action for Inv items
   if ((Verbs.Extension()=='u') && (InventoryItem.GetAtScreenXY(x, y) != null)) {
@@ -820,7 +920,7 @@ static void Verbs::CheckDefaultAction()
   Verbs.SetAlternativeAction('t', eGA_TalkTo);
   Verbs.SetAlternativeAction('y', eGA_Pull);  
   Verbs.RemoveExtension();
-  inv_location = location;
+  verbsData.inv_location = verbsData.location;
 }
 // ============================= ActionBar ===========================================
 
@@ -832,18 +932,18 @@ static void Verbs::CheckDefaultAction()
  ***********************************************************************/
 static void Verbs::AdjustActionBarPosition()
 {
-  int actionLabelHalf = actionLabelWidth / 2;
+  int actionLabelHalf = verbsData.actionLabelWidth / 2;
   int xpos = mouse.x - actionLabelHalf ;
   int ypos = mouse.y - Game.SpriteHeight[mouse.GetModeGraphic(mouse.Mode)] - 4;
   
-  if (xpos + actionLabelWidth >= System.ScreenWidth) xpos = System.ScreenWidth - actionLabelWidth;
+  if (xpos + verbsData.actionLabelWidth >= System.ScreenWidth) xpos = System.ScreenWidth - verbsData.actionLabelWidth;
   else if (xpos < 0) xpos = 0;
   
   if (ypos < 0 ) ypos = 0;
   
   lblAction.X = xpos;
   lblAction.Y = ypos;
-  lblAction.Width = actionLabelWidth;
+  lblAction.Width = verbsData.actionLabelWidth;
   
 }
 
@@ -856,41 +956,41 @@ static void Verbs::AdjustActionBarPosition()
 static void Verbs::UpdateActionBar() 
 {
   // set the text in the action bar
-  int action = global_action;
-  act_object = inv_location;  
-  act_item = "";
+  int action =  verbsData.global_action;
+  verbsData.act_object = verbsData.inv_location;  
+  verbsData.act_item = "";
   
   if (Mouse.Mode==eModeUseinv) { // use or give inventory item
-    act_item = player.ActiveInventory.Name;
-    location = act_item;
+    verbsData.act_item = player.ActiveInventory.Name;
+    verbsData.location = verbsData.act_item;
     Verbs.RemoveExtension();
-    act_item = location;
+    verbsData.act_item = verbsData.location;
   }
   // if the mouse is in the inventory and modes Walk or pickup are selected
   else if (Verbs.GlobalCondition(eGlob_MouseInvWalk)) { 
       action = eGA_Use;
   }
   
-  Verbs.TranslateAction(action, lang);
+  Verbs.TranslateAction(action, verbsData.lang);
   // show action text
-  if (!classicGui && act_object == "" && action == eGA_WalkTo) lblAction.Text = " ";
-  else lblAction.Text=tresult;
+  if (! verbsData.classicGui && verbsData.act_object == "" && action == eGA_WalkTo) lblAction.Text = " ";
+  else lblAction.Text=verbsData.tresult;
   
-  lblAction.TextColor = actionLabelColorNormal;
-  actionLabelWidth = GetTextWidth(lblAction.Text, eFontTextOut) + 4; //+4 because GetTextWidth doesn't work too well with automatic outlined fonts
+  lblAction.TextColor = verbsData.actionLabelColorNormal;
+  verbsData.actionLabelWidth = GetTextWidth(lblAction.Text, verbsData.fontTextOut) + 4; //+4 because GetTextWidth doesn't work too well with automatic outlined fonts
   
   if (lblAction.Width != System.ScreenWidth) {   
     lblAction.Width = System.ScreenWidth;
-    lblAction.Y = gMain.Y - lblAction.Height;
+    lblAction.Y = verbsData.guiMain.Y - lblAction.Height;
   }
   
   // Show option button
   if ( mouse.x > System.ScreenWidth - btnShowOptions.Width +1 && mouse.y < btnShowOptions.Height +1 ) {
     btnShowOptions.Visible = true;
-    gAction.Clickable = true;
+    verbsData.guiAction.Clickable = true;
   }
   else {
-    gAction.Clickable = false;
+    verbsData.guiAction.Clickable = false;
     btnShowOptions.Visible = false;
   }
   
@@ -904,14 +1004,14 @@ static void Verbs::UpdateActionBar()
 static void Verbs::ToogleGuiStyle(int enable_new)
 {
   if (enable_new == 1) {
-    classicGui = false;
+     verbsData.classicGui = false;
     Verbs.AdjustActionBarPosition();
   }
   else {
-    classicGui = true;
+     verbsData.classicGui = true;
     lblAction.Width = System.ScreenWidth;
     lblAction.X = 0;
-    lblAction.Y = gMain.Y - lblAction.Height ;
+    lblAction.Y = verbsData.guiMain.Y - lblAction.Height ;
   }
   Verbs.UpdateActionBar();
 }
@@ -929,12 +1029,12 @@ static void Verbs::SetActionButtons(Action action, int btn_ID, int sprite, int s
   String upperkey = String.Format("%c", key);
   upperkey = upperkey.UpperCase();
   
-  action_button[action] = btn_ID;
-  action_button_normal[action] = sprite;
-  action_button_highlight[action] = sprite_highlight;
-  action_l_keycode[action] = key;
-  action_u_keycode[action] = upperkey.Chars[0];
-  button_action[action_button[action]]=action;
+  verbsData.action_button[action] = btn_ID;
+  verbsData.action_button_normal[action] = sprite;
+  verbsData.action_button_highlight[action] = sprite_highlight;
+  verbsData.action_l_keycode[action] = key;
+  verbsData.action_u_keycode[action] = upperkey.Chars[0];
+  verbsData.button_action[verbsData.action_button[action]]=action;
 }
 
 
@@ -946,12 +1046,12 @@ static void Verbs::SetActionButtons(Action action, int btn_ID, int sprite, int s
 static void Verbs::AdjustLanguage() 
 {
   // English
-  if (lang == eLangEN) {
+  if (verbsData.lang == eLangEN) {
     // yes/no-keys
-    key_u_yes= 'Y';
-    key_l_yes= 'y';
-    key_u_no= 'N';
-    key_l_no= 'n';
+    verbsData.key_u_yes= 'Y';
+    verbsData.key_l_yes= 'y';
+    verbsData.key_u_no= 'N';
+    verbsData.key_l_no= 'n';
     
     Verbs.SetActionButtons(eGA_Open,    0, 59, 60, 'q');
     Verbs.SetActionButtons(eGA_Close,   1, 61, 62, 'a');
@@ -966,12 +1066,12 @@ static void Verbs::AdjustLanguage()
   }
   
   // German
-  else if (lang == eLangDE) {
+  else if (verbsData.lang == eLangDE) {
     // yes/no-keys
-    key_u_yes= 'J';
-    key_l_yes= 'j';
-    key_u_no= 'N';
-    key_l_no= 'n';    
+    verbsData.key_u_yes= 'J';
+    verbsData.key_l_yes= 'j';
+    verbsData.key_u_no= 'N';
+    verbsData.key_l_no= 'n';    
     Verbs.SetActionButtons(eGA_Open,    0, 94, 101, 'q');
     Verbs.SetActionButtons(eGA_Close,   1, 102, 103, 'a');
     Verbs.SetActionButtons(eGA_GiveTo,  2, 104, 105, 'y');
@@ -984,12 +1084,12 @@ static void Verbs::AdjustLanguage()
   }
   
   // Spanish
-  else if (lang == eLangES) {
+  else if (verbsData.lang == eLangES) {
     // yes/no-keys
-    key_u_yes= 'S';
-    key_l_yes= 's';
-    key_u_no= 'N';
-    key_l_no= 'n';     
+    verbsData.key_u_yes= 'S';
+    verbsData.key_l_yes= 's';
+    verbsData.key_u_no= 'N';
+    verbsData.key_l_no= 'n';     
 
     Verbs.SetActionButtons(eGA_Open,    0, 141, 142, 'q');
     Verbs.SetActionButtons(eGA_Close,   1, 143, 144, 'a');
@@ -1002,12 +1102,12 @@ static void Verbs::AdjustLanguage()
     Verbs.SetActionButtons(eGA_Use,     8, 151, 152, 'c');
   }  
   // French
-  else if (lang == eLangFR) {
+  else if (verbsData.lang == eLangFR) {
     // yes/no-keys
-    key_u_yes= 'O';
-    key_l_yes= 'o';
-    key_u_no= 'N';
-    key_l_no= 'n';   
+    verbsData.key_u_yes= 'O';
+    verbsData.key_l_yes= 'o';
+    verbsData.key_u_no= 'N';
+    verbsData.key_l_no= 'n';   
     
     Verbs.SetActionButtons(eGA_Open,    0, 123, 124, 'q');
     Verbs.SetActionButtons(eGA_Close,   1, 125, 126, 'a');
@@ -1020,12 +1120,12 @@ static void Verbs::AdjustLanguage()
     Verbs.SetActionButtons(eGA_Use,     8, 133, 134, 'c'); 
   }    
   // Italian
-  else if (lang == eLangIT) {
+  else if (verbsData.lang == eLangIT) {
     // yes/no-keys
-    key_u_yes= 'S';
-    key_l_yes= 's';
-    key_u_no= 'N';
-    key_l_no= 'n';     
+    verbsData.key_u_yes= 'S';
+    verbsData.key_l_yes= 's';
+    verbsData.key_u_no= 'N';
+    verbsData.key_l_no= 'n';     
 
     Verbs.SetActionButtons(eGA_Open,    0, 159, 160, 'q');
     Verbs.SetActionButtons(eGA_Close,   1, 161, 162, 'a');
@@ -1037,12 +1137,12 @@ static void Verbs::AdjustLanguage()
     Verbs.SetActionButtons(eGA_Pull,    7, 167, 168, 'd');
     Verbs.SetActionButtons(eGA_Use,     8, 169, 170, 'c'); 
   }
-  else if (lang == eLangPT) {
+  else if (verbsData.lang == eLangPT) {
     // yes/no-keys
-    key_u_yes= 'S';
-    key_l_yes= 's';
-    key_u_no= 'N';
-    key_l_no= 'n';     
+    verbsData.key_u_yes= 'S';
+    verbsData.key_l_yes= 's';
+    verbsData.key_u_no= 'N';
+    verbsData.key_l_no= 'n';     
 
     Verbs.SetActionButtons(eGA_Open,    0, 177, 178, 'q');
     Verbs.SetActionButtons(eGA_Close,   1, 179, 180, 'a');
@@ -1055,12 +1155,12 @@ static void Verbs::AdjustLanguage()
     Verbs.SetActionButtons(eGA_Use,     8, 187, 188, 'c'); 
   }
   // Dutch
-  else if (lang == eLangNL) {
+  else if (verbsData.lang == eLangNL) {
     // yes/no-keys
-    key_u_yes= 'J';
-    key_l_yes= 'j';
-    key_u_no= 'N';
-    key_l_no= 'n';    
+    verbsData.key_u_yes= 'J';
+    verbsData.key_l_yes= 'j';
+    verbsData.key_u_no= 'N';
+    verbsData.key_l_no= 'n';    
     Verbs.SetActionButtons(eGA_Open,    0, 195, 196, 'q');
     Verbs.SetActionButtons(eGA_Close,   1, 197, 198, 'a');
     Verbs.SetActionButtons(eGA_GiveTo,  2, 199, 200, 'y');
@@ -1083,17 +1183,17 @@ static void Verbs::AdjustLanguage()
 static void Verbs::AdjustGUIText() 
 {
   bool custom_font;
-  int fontText    = eFontText;
-  int fontTextOut = eFontTextOut;
-  int fontSpeech  = eFontSpeech;
-  int fontSpeechOut = eFontOutlineSpeech;
+  int fontText    = verbsData.fontText;
+  int fontTextOut = verbsData.fontTextOut;
+  int fontSpeech  = verbsData.fontSpeech;
+  int fontSpeechOut = verbsData.fontOutlineSpeech;
   
   // English
-  if (lang == eLangEN){
+  if (verbsData.lang == eLangEN){
     // english is the default language, nothing to adjust
   }
   
-  else if (lang == eLangDE) {
+  else if (verbsData.lang == eLangDE) {
     // German
     custom_font = false;
     /*
@@ -1124,7 +1224,7 @@ static void Verbs::AdjustGUIText()
     btnQuitYes.Text        = "Ja";
     btnQuitNo.Text         = "Nein";
   }
-  else if (lang == eLangES) {
+  else if (verbsData.lang == eLangES) {
     // Spanish
     custom_font = false;
     lblOptions.Text        = "Opciones";
@@ -1149,7 +1249,7 @@ static void Verbs::AdjustGUIText()
     btnQuitYes.Text     = "Si";
     btnQuitNo.Text      = "No";    
   }
-  else if (lang == eLangFR) {
+  else if (verbsData.lang == eLangFR) {
     // French
     custom_font = false;
     lblOptions.Text   = "Paramètres";
@@ -1174,7 +1274,7 @@ static void Verbs::AdjustGUIText()
     btnQuitYes.Text     = "Oui";
     btnQuitNo.Text      = "No";    
   }  
-  else if (lang == eLangIT) {
+  else if (verbsData.lang == eLangIT) {
     // Italian
     custom_font = false;
     lblOptions.Text   = "Opzioni";
@@ -1199,7 +1299,7 @@ static void Verbs::AdjustGUIText()
     btnQuitYes.Text      = "Si";
     btnQuitNo.Text       = "No";     
   }
-  else if (lang == eLangPT) {
+  else if (verbsData.lang == eLangPT) {
     // Portuguese
     custom_font = false;
     lblOptions.Text   = "Opções";
@@ -1224,7 +1324,7 @@ static void Verbs::AdjustGUIText()
     btnQuitYes.Text      = "Si";
     btnQuitNo.Text       = "No";       
   }
-  else if (lang == eLangNL) {
+  else if (verbsData.lang == eLangNL) {
     // Dutch
     custom_font = false;
     lblOptions.Text   = "Opties";
@@ -1292,9 +1392,9 @@ static void Verbs::InitGuiLanguage()
   Button*b;
   
   while (i < ACT_COUNT) {
-    gc = gMain.Controls[action_button[i]];
+    gc = verbsData.guiMain.Controls[verbsData.action_button[i]];
     b =  gc.AsButton;
-    b.NormalGraphic=action_button_normal[i];
+    b.NormalGraphic=verbsData.action_button_normal[i];
     i++;
   }
 }
@@ -1309,7 +1409,7 @@ static void Verbs::InitGuiLanguage()
  ***********************************************************************/
 static void Verbs::FreezePlayer()
 {
-  player_frozen = true;
+  verbsData.player_frozen = true;
 }
 
 /***********************************************************************
@@ -1319,7 +1419,7 @@ static void Verbs::FreezePlayer()
  ***********************************************************************/
 static void Verbs::UnfreezePlayer()
 {
-  player_frozen = false;
+  verbsData.player_frozen = false;
 }
   
 /***********************************************************************
@@ -1337,13 +1437,13 @@ static void Verbs::SetPlayer(Character*ch)
     else if (tx > Room.Width - 320) tx = Room.Width-320;
     SetViewport(x, GetViewportY());
     while (x<tx) {
-      x += player_walk_x_speed;
+      x += verbsData.player_walk_x_speed;
       if (x > tx) x=tx;
       SetViewport(x, GetViewportY());
       Wait(1);
     }
     while (x > tx) {
-      x -= player_walk_x_speed;
+      x -= verbsData.player_walk_x_speed;
       if (x < tx) x=tx;
       SetViewport(x, GetViewportY());
       Wait (1);
@@ -1372,7 +1472,7 @@ static int Verbs::MovePlayerEx(int x, int y, WalkWhere direct)
   bool movement_canceled = false;
   // Move the player character to x,y coords, waiting until he/she gets there,
   // but allowing to cancel the action by pressing a mouse button.
-  if (player_frozen == false) {
+  if (verbsData.player_frozen == false) {
     player.Walk(x, y, eNoBlock, direct);
     // wait for release of mouse button
     while (player.Moving && (mouse.IsButtonDown(eMouseLeft) || mouse.IsButtonDown(eMouseRight))) {
@@ -1555,7 +1655,7 @@ static int Verbs::GoTo(int blocking)
 static void Verbs::SetApproachingChar(bool enable)
 {
   // If set to true, the player walks to other chars before talking or giving items.
-  approachCharInteract = enable;
+  verbsData.approachCharInteract = enable;
 }
 
 /***********************************************************************
@@ -1569,12 +1669,10 @@ static void Verbs::WalkOffScreen()
   
   // doubleclick
   if (Verbs.UsedAction(eGA_WalkTo)) {
-    if (exitExtensionDoubleclick && DoubleClick.Event[eMouseLeft]) 
+    if ( verbsData.exitExtensionDoubleclick && DoubleClick.Event[eMouseLeft]) 
     {
-
-      
-      if (location_type == eLocationHotspot) hotspot[location_id].RunInteraction(eModeUsermode1);
-      else if (location_type == eLocationObject) object[location_id].RunInteraction(eModeUsermode1);
+      if (verbsData.location_type == eLocationHotspot) hotspot[verbsData.location_id].RunInteraction(eModeUsermode1);
+      else if (verbsData.location_type == eLocationObject) object[verbsData.location_id].RunInteraction(eModeUsermode1);
       
     }
     else
@@ -1583,8 +1681,8 @@ static void Verbs::WalkOffScreen()
         int x = player.x, 
             y = player.y;
             
-        int offset = walkOffScreenOffset;
-        int dir = Verbs.ExtensionEx(2,location_clicked);
+        int offset = verbsData.walkOffScreenOffset;
+        int dir = Verbs.ExtensionEx(2,verbsData.location_clicked);
         
         if      (dir=='u') y -= offset;
         else if (dir=='d') y += offset;
@@ -1593,8 +1691,8 @@ static void Verbs::WalkOffScreen()
      
         
         if (Verbs.MovePlayerEx(x, y, eAnywhere) >0){
-          if (location_type == eLocationHotspot) hotspot[location_id].RunInteraction(eModeUsermode1);
-          else if (location_type == eLocationObject) object[location_id].RunInteraction(eModeUsermode1);        
+          if (verbsData.location_type == eLocationHotspot) hotspot[verbsData.location_id].RunInteraction(eModeUsermode1);
+          else if (verbsData.location_type == eLocationObject) object[verbsData.location_id].RunInteraction(eModeUsermode1);        
         }
         
       }    
@@ -1629,97 +1727,97 @@ static void Verbs::Unhandled(int door_script)
 {
   InventoryItem*ii = InventoryItem.GetAtScreenXY(mouse.x, mouse.y);
   int type=0;
-  if (location_type == eLocationHotspot)   type = 1;
-  if (location_type == eLocationCharacter) type = 2;
-  if (location_type == eLocationObject)    type = 3;
+  if (verbsData.location_type == eLocationHotspot)   type = 1;
+  if (verbsData.location_type == eLocationCharacter) type = 2;
+  if (verbsData.location_type == eLocationObject)    type = 3;
   
   String locationname;
   String usedinvname;
   
-  location = location_clicked;
+  verbsData.location = verbsData.location_clicked;
   Verbs.RemoveExtension();
-  locationname=location;
+  locationname= verbsData.location;
   
   if (ii!=null) type = 4;
   
-  if (AGSCursorMode == eModeUseinv) {
+  if ( verbsData.AGSCursorMode == eModeUseinv) {
     if (ii!=null) {
       usedinvname = ii.Name;
-      location = usedinvname;
+      verbsData.location = usedinvname;
       Verbs.RemoveExtension();
-      usedinvname = location;
+      usedinvname = verbsData.location;
       if (type>0) type+=4;
     }
   }
-  if (AGSCursorMode != eModeUsermode2 && type != 0) {
-    if (type==2 || type==6) player.FaceCharacter(character[location_id], eBlock);
+  if ( verbsData.AGSCursorMode != eModeUsermode2 && type != 0) {
+    if (type==2 || type==6) player.FaceCharacter(character[verbsData.location_id], eBlock);
 
     // unhandled USE
     if (Verbs.UsedAction(eGA_Use)) {
       // use inv on inv
-      if (type >= 5) player.Say(unhandled_strings[eVerbGuiUnhandledUseInv]);
+      if (type >= 5) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledUseInv]);
       // use
-      else player.Say(unhandled_strings[eVerbGuiUnhandledUse]);
+      else player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledUse]);
     }
     
     // unhandled LOOK AT  
     else if (Verbs.UsedAction(eGA_LookAt)) {
       // look at hotspots, objects etc.
-      if (type!=2) player.Say(String.Format(unhandled_strings[eVerbGuiUnhandledLook], locationname));
+      if (type!=2) player.Say(String.Format(verbsData.unhandled_strings[eVerbGuiUnhandledLook], locationname));
       // look at characters
-      else player.Say(String.Format(unhandled_strings[eVerbGuiUnhandledLookChar], locationname)); 
+      else player.Say(String.Format(verbsData.unhandled_strings[eVerbGuiUnhandledLookChar], locationname)); 
     }
     
     // unhandled PUSH
     else if (Verbs.UsedAction(eGA_Push)) {
       // push everything except characters
-      if (type!=2) player.Say(unhandled_strings[eVerbGuiUnhandledPush]);
+      if (type!=2) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledPush]);
       // push characters
-      else player.Say(String.Format(unhandled_strings[eVerbGuiUnhandledPushChar], locationname));
+      else player.Say(String.Format(verbsData.unhandled_strings[eVerbGuiUnhandledPushChar], locationname));
     }
     
     // unhandled PULL
     else if (Verbs.UsedAction(eGA_Pull)){
       // pull everything except characters
-      if (type!=2) player.Say(unhandled_strings[eVerbGuiUnhandledPull]);
+      if (type!=2) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledPull]);
       // pull characters
-      else player.Say(String.Format(unhandled_strings[eVerbGuiUnhandledPullChar], locationname));
+      else player.Say(String.Format(verbsData.unhandled_strings[eVerbGuiUnhandledPullChar], locationname));
     }
     
     // unhandled CLOSE
     else if (Verbs.UsedAction(eGA_Close)){
-      if (door_script == 1) player.Say(unhandled_strings[eVerbGuiUnhandledCloseDoor]);
-      else if (type == 2) player.Say(String.Format(unhandled_strings[eVerbGuiUnhandledCloseChar], locationname));
-      else player.Say(unhandled_strings[eVerbGuiUnhandledClose]);
+      if (door_script == 1) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledCloseDoor]);
+      else if (type == 2) player.Say(String.Format(verbsData.unhandled_strings[eVerbGuiUnhandledCloseChar], locationname));
+      else player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledClose]);
     }
     
     // unhandled OPEN
     else if (Verbs.UsedAction(eGA_Open)) {
-      if (door_script == 1) player.Say(unhandled_strings[eVerbGuiUnhandledOpenDoor]);
-      else if (type ==2) player.Say(String.Format(unhandled_strings[eVerbGuiUnhandledOpenChar], locationname));
-      else player.Say(unhandled_strings[eVerbGuiUnhandledOpen]);
+      if (door_script == 1) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledOpenDoor]);
+      else if (type ==2) player.Say(String.Format(verbsData.unhandled_strings[eVerbGuiUnhandledOpenChar], locationname));
+      else player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledOpen]);
     }
     
     // unhandled PICKUP
     else if (Verbs.UsedAction(eGA_PickUp)) {
-      if (type!=2) player.Say(unhandled_strings[eVerbGuiUnhandledPickup]);
-      else player.Say(String.Format(unhandled_strings[eVerbGuiUnhandledPickupChar], locationname) );
+      if (type!=2) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledPickup]);
+      else player.Say(String.Format(verbsData.unhandled_strings[eVerbGuiUnhandledPickupChar], locationname) );
     }
 
     // unhandled TALK TO
     else if (Verbs.UsedAction(eGA_TalkTo)) {
-      if (type==2) player.Say(String.Format(unhandled_strings[eVerbGuiUnhandledTalkToChar], locationname));
-      else player.Say(unhandled_strings[eVerbGuiUnhandledTalkTo]);
+      if (type==2) player.Say(String.Format(verbsData.unhandled_strings[eVerbGuiUnhandledTalkToChar], locationname));
+      else player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledTalkTo]);
     }
     
     // unhandled USE INV
-    else if (Verbs.UsedAction(eGA_UseInv)) player.Say(unhandled_strings[eVerbGuiUnhandledUseInv]);
+    else if (Verbs.UsedAction(eGA_UseInv)) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledUseInv]);
     
     // unhandled GIVE
-    else if (ItemGiven != null) player.Say(unhandled_strings[eVerbGuiUnhandledGive]);   
+    else if (verbsData.ItemGiven != null) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledGive]);   
     
     // unhandled DEFAULT
-    else if (type==4) player.Say(unhandled_strings[eVerbGuiUnhandledDefault]);
+    else if (type==4) player.Say(verbsData.unhandled_strings[eVerbGuiUnhandledDefault]);
 
   }
 }
@@ -1854,7 +1952,7 @@ static int Doors::AnyClickSpecial(int door_id, int obj, int x, int y, CharacterD
       if (Verbs.AnyClickMove(x, y, dir)) {
         if (closesound != null) chan = closesound.Play();
         // Play default sound
-        else if (closeDoorSound != null) chan = closeDoorSound.Play();
+        else if (verbsData.closeDoorSound != null) chan = verbsData.closeDoorSound.Play();
         object[obj].Visible=false;
         Doors.SetDoorState(door_id, closevalue);
       }
@@ -1866,7 +1964,7 @@ static int Doors::AnyClickSpecial(int door_id, int obj, int x, int y, CharacterD
       {
         if (opensound != null) chan = opensound.Play();
         // Play default sound
-        else if (openDoorSound != null) chan = openDoorSound.Play();     
+        else if (verbsData.openDoorSound != null) chan = verbsData.openDoorSound.Play();     
         
         object[obj].Visible=true;
         Doors.SetDoorState(door_id, 1);
@@ -1874,12 +1972,12 @@ static int Doors::AnyClickSpecial(int door_id, int obj, int x, int y, CharacterD
     }
     else if (Doors.GetDoorState(door_id) == 1 ) Verbs.Unhandled(1);
     else if (Doors.GetDoorState(door_id) == 2 ) {
-      if (Verbs.AnyClickMove(x, y, dir)) if (!String.IsNullOrEmpty(door_strings[eDoorStringLocked])) player.Say(door_strings[eDoorStringLocked]);
+      if (Verbs.AnyClickMove(x, y, dir)) if (!String.IsNullOrEmpty(verbsData.door_strings[eDoorStringLocked])) player.Say(verbsData.door_strings[eDoorStringLocked]);
     }
   }
   else if (Verbs.UsedAction(eGA_WalkTo)) {
     if (Doors.GetDoorState(door_id) == 1) {
-      if (exitDoorDoubleclick && DoubleClick.Event[eMouseLeft] ) 
+      if ( verbsData.exitDoorDoubleclick && DoubleClick.Event[eMouseLeft] ) 
       {
         if (Verbs.MovePlayerEx(player.x, player.y, eWalkableAreas) > 0 ) player.EnterRoom(nr_room, nr_x, nr_y, nr_dir);
         result = 2;
@@ -1896,27 +1994,27 @@ static int Doors::AnyClickSpecial(int door_id, int obj, int x, int y, CharacterD
     else Verbs.AnyClickMove(x, y, dir);
 
   }
-  else if (Verbs.UsedAction (eGA_LookAt) && !String.IsNullOrEmpty(door_strings[eDoorStringLookAt]) ) {
-    if (Verbs.AnyClickMove (x, y, dir)) player.Say(door_strings[eDoorStringLookAt]);
+  else if (Verbs.UsedAction (eGA_LookAt) && !String.IsNullOrEmpty(verbsData.door_strings[eDoorStringLookAt]) ) {
+    if (Verbs.AnyClickMove (x, y, dir)) player.Say(verbsData.door_strings[eDoorStringLookAt]);
   }
   else if (Verbs.UsedAction(eGA_UseInv) && key >= 0) {
     if (Verbs.AnyClickMove(x, y, dir)) {
       if (player.ActiveInventory == inventory[key] ) {
         if (Doors.GetDoorState(door_id) == 1 ) { 
-          if (!String.IsNullOrEmpty(door_strings[eDoorStringCloseFirst]) ) player.Say(door_strings[eDoorStringCloseFirst]);
+          if (!String.IsNullOrEmpty(verbsData.door_strings[eDoorStringCloseFirst]) ) player.Say(verbsData.door_strings[eDoorStringCloseFirst]);
         }
         else if (Doors.GetDoorState(door_id) == 2 ) {
-          if (unlockDoorSound != null) chan = unlockDoorSound.Play();
-          if (!String.IsNullOrEmpty(door_strings[eDoorStringUnlock])) player.Say(door_strings[eDoorStringUnlock]);
+          if (verbsData.unlockDoorSound != null) chan = verbsData.unlockDoorSound.Play();
+          if (!String.IsNullOrEmpty(verbsData.door_strings[eDoorStringUnlock])) player.Say(verbsData.door_strings[eDoorStringUnlock]);
           Doors.SetDoorState(door_id, closevalue);
         } 
         else if (Doors.GetDoorState(door_id) == 0 ) {
           object[obj].Visible=false;
           Doors.SetDoorState(door_id, 2);
-          if (!String.IsNullOrEmpty(door_strings[eDoorStringRelock])) player.Say(door_strings[eDoorStringRelock]);
+          if (!String.IsNullOrEmpty(verbsData.door_strings[eDoorStringRelock])) player.Say(verbsData.door_strings[eDoorStringRelock]);
         }
       }
-      else if (!String.IsNullOrEmpty(door_strings[eDoorStringWrongItem])) player.Say(door_strings[eDoorStringWrongItem]);
+      else if (!String.IsNullOrEmpty(verbsData.door_strings[eDoorStringWrongItem])) player.Say(verbsData.door_strings[eDoorStringWrongItem]);
     }
   }
   else result=0;
@@ -1932,7 +2030,7 @@ static int Doors::AnyClickSpecial(int door_id, int obj, int x, int y, CharacterD
  * This function is used in the room script in combination with the door hotspot. Parameters:
  * 
  *   door_id: The door id, you have defined 
- *   act_object: The object, containing the open sprite 
+ *   verbsData.act_object: The object, containing the open sprite 
  *   x,y: the walk-to point of the door (please don’t use the built in "walk-to coordinates" feature of the room editor. 
  *   dir: the direction, the player’s character should face, after it reached x,y 
  *   nr_room: if the door is opened and walking through it, the player is being send to this room 
@@ -1956,9 +2054,10 @@ static int Doors::AnyClick(int door_id, int obj, int x, int y, CharacterDirectio
  ***********************************************************************/
 function game_start()
 {
-  player_ani_speed =  player.AnimationSpeed;
-  player_walk_x_speed = player.WalkSpeedX;
-  player_walk_y_speed = player.WalkSpeedY;  
+  verbsData.runSpeedupRate = 1;
+  verbsData.player_ani_speed =  player.AnimationSpeed;
+  verbsData.player_walk_x_speed = player.WalkSpeedX;
+  verbsData.player_walk_y_speed = player.WalkSpeedY;  
 }
 
 /***********************************************************************
@@ -1986,28 +2085,28 @@ function on_key_press(eKeyCode keycode)
     if (!IsGamePaused()) {
       PauseGame();
       Verbs.AdjustGUIText();
-      gPause.Visible=true;
+      verbsData.guiPause.Visible=true;
     }
     else {
-      gPause.Visible=false;
+      verbsData.guiPause.Visible=false;
       UnPauseGame();
       Verbs.SetAction(eGA_Default);
-      lblAction.TextColor=actionLabelColorHighlighted;      
+      lblAction.TextColor=verbsData.actionLabelColorHighlighted;      
       Verbs.CheckDefaultAction();
       Verbs.UpdateActionBar();
     }
   }
 
-  if (gQuit.Visible) {
-    if (keycode==key_u_no || keycode==key_l_no) gQuit.Visible=false; 
-    if (keycode==key_u_yes || keycode==key_l_yes) QuitGame(0);
+  if (verbsData.guiQuit.Visible) {
+    if (keycode==verbsData.key_u_no || keycode==verbsData.key_l_no) verbsData.guiQuit.Visible=false; 
+    if (keycode==verbsData.key_u_yes || keycode==verbsData.key_l_yes) QuitGame(0);
   }
   
   //  triggering actions by keyboard
   if (!IsGamePaused()) {
     int act_i=0;
     while (act_i < ACT_COUNT) {
-      if (keycode == action_l_keycode[act_i] || keycode==action_u_keycode[act_i]) {
+      if (keycode == verbsData.action_l_keycode[act_i] || keycode==verbsData.action_u_keycode[act_i]) {
         Verbs.SetAction(act_i);
         act_i = ACT_COUNT;
       }
@@ -2029,35 +2128,35 @@ function on_mouse_click(MouseButton button) {
     int y = mouse.y;
     
     // get location under mouse cursor
-    location_type = GetLocationType(x, y);
-    location_clicked = Game.GetLocationName(x, y);
+    verbsData.location_type = GetLocationType(x, y);
+    verbsData.location_clicked = Game.GetLocationName(x, y);
 
-    AGSCursorMode = Mouse.Mode;
-    used_action = global_action;
+     verbsData.AGSCursorMode = Mouse.Mode;
+     verbsData.used_action =  verbsData.global_action;
     
     InventoryItem*ii = InventoryItem.GetAtScreenXY(x, y);
-    if (location_type == eLocationHotspot) {
+    if (verbsData.location_type == eLocationHotspot) {
       Hotspot*h = Hotspot.GetAtScreenXY(x, y);
-      location_id=h.ID;
+      verbsData.location_id=h.ID;
       
     }
-    else if (location_type == eLocationCharacter) {
+    else if (verbsData.location_type == eLocationCharacter) {
       Character*c=Character.GetAtScreenXY(x, y);
-      location_id=c.ID;
+      verbsData.location_id=c.ID;
     }
-    else if (location_type==eLocationObject) {
+    else if (verbsData.location_type==eLocationObject) {
       Object*o=Object.GetAtScreenXY(x, y);
-      location_id=o.ID;
+      verbsData.location_id=o.ID;
     }
-    else if (ii!=null) location_id=ii.ID;
+    else if (ii!=null) verbsData.location_id=ii.ID;
     
     //dont allow endless running
-    if (player_is_running) {
-      player_is_running = false;
+    if (verbsData.player_is_running) {
+      verbsData.player_is_running = false;
       
       player.StopMoving();
-      player.SetWalkSpeed(player_walk_x_speed,  player_walk_y_speed);
-      player.AnimationSpeed = player_ani_speed;          
+      player.SetWalkSpeed(verbsData.player_walk_x_speed,  verbsData.player_walk_y_speed);
+      player.AnimationSpeed = verbsData.player_ani_speed;          
     }
     
     
@@ -2073,44 +2172,44 @@ function on_mouse_click(MouseButton button) {
         // the mode is useinv and the mouse is over the active inv (like "use knife on knife")
         // or the mode is talk, or "Give", and the mouse isnt over a character
         // or its GIVE and the mouse isnt over a inv.item        
-        if (classicGui) {
+        if ( verbsData.classicGui) {
         }
         // the modern GUI Style turns TalkTo and Give into the Default mode.
         else {
-          if (AGSCursorMode==eModeTalkto || AGSCursorMode == eModeInteract ) {
+          if ( verbsData.AGSCursorMode==eModeTalkto ||  verbsData.AGSCursorMode == eModeInteract ) {
             Verbs.UpdateActionBar();
-            lblAction.TextColor = actionLabelColorHighlighted;
+            lblAction.TextColor = verbsData.actionLabelColorHighlighted;
             Verbs.SetAction(eGA_Default);
-            ItemGiven=null;            
+            verbsData.ItemGiven=null;            
           }
           else {
           }
         }
       }
-      else if (Verbs.ExtensionEx(1, location_clicked)=='e') {
+      else if (Verbs.ExtensionEx(1, verbsData.location_clicked)=='e') {
         Verbs.UpdateActionBar();
-        lblAction.TextColor = actionLabelColorHighlighted;
+        lblAction.TextColor = verbsData.actionLabelColorHighlighted;
         Verbs.WalkOffScreen();
       }
       // walk to
-      else if (AGSCursorMode == eModeUsermode2) {
-        lblAction.TextColor=actionLabelColorHighlighted;
+      else if ( verbsData.AGSCursorMode == eModeUsermode2) {
+        lblAction.TextColor=verbsData.actionLabelColorHighlighted;
 
         // Run on doubleclick
-        if (runOnDoubleClick && DoubleClick.Event[eMouseLeft]) {
+        if ( verbsData.runOnDoubleClick && DoubleClick.Event[eMouseLeft]) {
 
-          player_is_running = true;
+          verbsData.player_is_running = true;
 
-          if (player_ani_speed < runSpeedupRate) player.AnimationSpeed  = 0;
-          else player.AnimationSpeed = player_ani_speed / runSpeedupRate;
+          if (verbsData.player_ani_speed <  verbsData.runSpeedupRate) player.AnimationSpeed  = 0;
+          else player.AnimationSpeed = verbsData.player_ani_speed /  verbsData.runSpeedupRate;
           player.StopMoving();
           
-          player.SetWalkSpeed(player_walk_x_speed * runSpeedupRate, player_walk_y_speed * runSpeedupRate);
+          player.SetWalkSpeed(verbsData.player_walk_x_speed *  verbsData.runSpeedupRate, verbsData.player_walk_y_speed *  verbsData.runSpeedupRate);
 
         }
 
-        if (IsInteractionAvailable(x, y, AGSCursorMode) ) {
-          Room.ProcessClick (x, y, AGSCursorMode);
+        if (IsInteractionAvailable(x, y,  verbsData.AGSCursorMode) ) {
+          Room.ProcessClick (x, y,  verbsData.AGSCursorMode);
         }
         else {
           Room.ProcessClick (x, y, eModeWalkto);
@@ -2118,29 +2217,29 @@ function on_mouse_click(MouseButton button) {
 
       }   
       // talkto
-      else if (AGSCursorMode==eModeTalkto && IsInteractionAvailable(x, y, AGSCursorMode) && location_type==eLocationCharacter) {
-        lblAction.TextColor=actionLabelColorHighlighted;
+      else if ( verbsData.AGSCursorMode==eModeTalkto && IsInteractionAvailable(x, y,  verbsData.AGSCursorMode) && verbsData.location_type==eLocationCharacter) {
+        lblAction.TextColor=verbsData.actionLabelColorHighlighted;
         Verbs.SetAction(eGA_Default);
-        if (approachCharInteract == false) character[location_id].RunInteraction(AGSCursorMode); 
+        if (verbsData.approachCharInteract == false) character[verbsData.location_id].RunInteraction( verbsData.AGSCursorMode); 
         else {
-          if (Verbs.GoToCharacter(character[location_id], 0, NPCfacingPlayer, 2)) character[location_id].RunInteraction(AGSCursorMode);
+          if (Verbs.GoToCharacter(character[verbsData.location_id], 0, verbsData.NPCfacingPlayer, 2)) character[verbsData.location_id].RunInteraction( verbsData.AGSCursorMode);
         }
             
       }
       // Giveto
-      else if ((AGSCursorMode == eModeUseinv) && location_type==eLocationCharacter && Verbs.IsAction(eGA_GiveTo)) {
-        lblAction.TextColor = actionLabelColorHighlighted;
-        ItemGiven=player.ActiveInventory;
+      else if (( verbsData.AGSCursorMode == eModeUseinv) && verbsData.location_type==eLocationCharacter && Verbs.IsAction(eGA_GiveTo)) {
+        lblAction.TextColor = verbsData.actionLabelColorHighlighted;
+        verbsData.ItemGiven=player.ActiveInventory;
         Verbs.SetAction (eGA_Default);
-        if (approachCharInteract == false) {
+        if (verbsData.approachCharInteract == false) {
           if (IsInteractionAvailable (x, y, eModeUseinv) == 1) {
-            character[location_id].RunInteraction(eModeUseinv);
+            character[verbsData.location_id].RunInteraction(eModeUseinv);
           }
         }
         else {
-          if (Verbs.GoToCharacter(character[location_id], 0, NPCfacingPlayer, 2)) {
+          if (Verbs.GoToCharacter(character[verbsData.location_id], 0, verbsData.NPCfacingPlayer, 2)) {
             if (IsInteractionAvailable (x, y, eModeUseinv) == 1) {
-              character[location_id].RunInteraction(eModeUseinv);        
+              character[verbsData.location_id].RunInteraction(eModeUseinv);        
             }
           }
         }
@@ -2148,22 +2247,22 @@ function on_mouse_click(MouseButton button) {
       }     
       else {
         Verbs.UpdateActionBar();
-        lblAction.TextColor = actionLabelColorHighlighted;
-        Room.ProcessClick(x, y, AGSCursorMode);
+        lblAction.TextColor = verbsData.actionLabelColorHighlighted;
+        Room.ProcessClick(x, y,  verbsData.AGSCursorMode);
         Verbs.SetAction(eGA_Default);
-        ItemGiven=null;
+        verbsData.ItemGiven=null;
       }
     }
     // Mousebutton Right
     else if (button==eMouseRight) {
-      if (alternative_action==eGA_Default) {
+      if ( verbsData.alternative_action==eGA_Default) {
         Verbs.SetAction(eGA_Default);
-        lblAction.TextColor=actionLabelColorHighlighted;
+        lblAction.TextColor=verbsData.actionLabelColorHighlighted;
         
         if (Mouse.Mode==eModeUsermode2) {
-          if (Verbs.ExtensionEx(1, location_clicked)=='e') {
+          if (Verbs.ExtensionEx(1, verbsData.location_clicked)=='e') {
             Verbs.UpdateActionBar();
-            lblAction.TextColor=actionLabelColorHighlighted;
+            lblAction.TextColor=verbsData.actionLabelColorHighlighted;
             Verbs.WalkOffScreen();
           }          
           else {
@@ -2176,22 +2275,22 @@ function on_mouse_click(MouseButton button) {
         }
       }
       else {
-        Verbs.SetAction(alternative_action);
-        used_action=global_action;
+        Verbs.SetAction( verbsData.alternative_action);
+         verbsData.used_action= verbsData.global_action;
         Verbs.UpdateActionBar();
-        lblAction.TextColor=actionLabelColorHighlighted;
-        AGSCursorMode=Mouse.Mode;
-        if (AGSCursorMode == eModeTalkto && IsInteractionAvailable(x, y, AGSCursorMode) && location_type == eLocationCharacter) {
-          if (approachCharInteract == false) {
-            character[location_id].RunInteraction(AGSCursorMode);
+        lblAction.TextColor=verbsData.actionLabelColorHighlighted;
+         verbsData.AGSCursorMode=Mouse.Mode;
+        if ( verbsData.AGSCursorMode == eModeTalkto && IsInteractionAvailable(x, y,  verbsData.AGSCursorMode) && verbsData.location_type == eLocationCharacter) {
+          if (verbsData.approachCharInteract == false) {
+            character[verbsData.location_id].RunInteraction( verbsData.AGSCursorMode);
           }
           else {
-            if (Verbs.GoToCharacter(character[location_id], 0, NPCfacingPlayer,2 )) character[location_id].RunInteraction(AGSCursorMode);   
+            if (Verbs.GoToCharacter(character[verbsData.location_id], 0, verbsData.NPCfacingPlayer,2 )) character[verbsData.location_id].RunInteraction( verbsData.AGSCursorMode);   
           }
         }
         else {
 
-          Room.ProcessClick(x, y, AGSCursorMode);
+          Room.ProcessClick(x, y,  verbsData.AGSCursorMode);
         }
         Verbs.SetAction(eGA_Default);
       }
@@ -2199,15 +2298,15 @@ function on_mouse_click(MouseButton button) {
     }
     //left click in inventory
     else if (button==eMouseLeftInv) {
-      if (!Verbs.IsAction(eGA_GiveTo))ItemGiven= null;
+      if (!Verbs.IsAction(eGA_GiveTo))verbsData.ItemGiven= null;
    
       if (Verbs.GlobalCondition (eGlob_MouseInvWalk)) {
         // if the mouse is in the inventory and modes Walk is selected
         Verbs.SetAction (eGA_Use);
-        location = inv_ex_location;    
+        verbsData.location = verbsData.inv_ex_location;    
         if (Verbs.Extension()=='u' && ii.IsInteractionAvailable(eModeInteract)) {
           // use it immediately (not with anything else)
-          used_action = global_action;
+           verbsData.used_action =  verbsData.global_action;
           ii.RunInteraction(eModeInteract);
           Verbs.SetAction(eGA_Default);
         }
@@ -2220,10 +2319,10 @@ function on_mouse_click(MouseButton button) {
         // so do nothing again
       }
       else {
-        used_action = global_action;
+         verbsData.used_action =  verbsData.global_action;
         if (Mouse.Mode == eModeInteract && ii != null) {
           if (Verbs.IsAction(eGA_Use) && ii.IsInteractionAvailable(eModeInteract)) {
-            lblAction.TextColor=actionLabelColorHighlighted;
+            lblAction.TextColor=verbsData.actionLabelColorHighlighted;
             ii.RunInteraction(eModeInteract);
             Verbs.SetAction(eGA_Default);
           }
@@ -2231,8 +2330,8 @@ function on_mouse_click(MouseButton button) {
         }
         else {
           if ( (Mouse.Mode >0 && Mouse.Mode <10 )&& ii != null) {
-            AGSCursorMode=Mouse.Mode;
-            lblAction.TextColor = actionLabelColorHighlighted;
+             verbsData.AGSCursorMode=Mouse.Mode;
+            lblAction.TextColor = verbsData.actionLabelColorHighlighted;
             ii.RunInteraction(Mouse.Mode);
             Verbs.SetAction(eGA_Default);
           }
@@ -2241,17 +2340,17 @@ function on_mouse_click(MouseButton button) {
     }
     //right click in inventory
     else if (button==eMouseRightInv) {
-      if (alternative_action==eGA_Default) {
+      if ( verbsData.alternative_action==eGA_Default) {
         Verbs.SetAction(eGA_Default);
       }
       else {
-        Verbs.SetAction(alternative_action);
-        used_action=global_action;
-        AGSCursorMode=Mouse.Mode;
+        Verbs.SetAction( verbsData.alternative_action);
+         verbsData.used_action= verbsData.global_action;
+         verbsData.AGSCursorMode=Mouse.Mode;
         if (Mouse.Mode==eModeInteract && ii != null) {
           if (Verbs.IsAction(eGA_Use) && ii.IsInteractionAvailable(eModeInteract)) {
             Verbs.UpdateActionBar();
-            lblAction.TextColor = actionLabelColorHighlighted;
+            lblAction.TextColor = verbsData.actionLabelColorHighlighted;
             ii.RunInteraction(eModeInteract);
             Verbs.SetAction(eGA_Default);
           }
@@ -2259,7 +2358,7 @@ function on_mouse_click(MouseButton button) {
         }
         else {
           Verbs.UpdateActionBar();
-          lblAction.TextColor = actionLabelColorHighlighted;
+          lblAction.TextColor = verbsData.actionLabelColorHighlighted;
           inventory[game.inv_activated].RunInteraction(Mouse.Mode);
           Verbs.SetAction(eGA_Default);
         }
@@ -2280,7 +2379,7 @@ function repeatedly_execute() {
   if (!IsGamePaused() && !Verbs.IsGuiDisabled())
   {
     
-    if (classicGui == true) {
+    if ( verbsData.classicGui == true) {
       Verbs.CheckDefaultAction();
       Verbs.UpdateActionBar(); 
     }
@@ -2288,7 +2387,7 @@ function repeatedly_execute() {
   
   
     // Keep running, if mouse is pressed
-    if (player_is_running && mouse.IsButtonDown(eMouseLeft)) {
+    if (verbsData.player_is_running && mouse.IsButtonDown(eMouseLeft)) {
 
       int mx = mouse.x + GetViewportX();
       int my = mouse.y + GetViewportY();
@@ -2298,28 +2397,28 @@ function repeatedly_execute() {
       
       if (!player.Moving) {
         // Running on an exit or door
-        if (dist <= runCursorDistance && (Verbs.ExtensionEx(1, location_ex)=='e' || Verbs.ExtensionEx(1, location_ex)=='v')) {
-          player_is_running = false;
+        if (dist <=  verbsData.runCursorDistance && (Verbs.ExtensionEx(1,  verbsData.location_ex)=='e' || Verbs.ExtensionEx(1,  verbsData.location_ex)=='v')) {
+          verbsData.player_is_running = false;
           player.StopMoving();
-          player.SetWalkSpeed(player_walk_x_speed,  player_walk_y_speed);
-          player.AnimationSpeed = player_ani_speed;          
+          player.SetWalkSpeed(verbsData.player_walk_x_speed,  verbsData.player_walk_y_speed);
+          player.AnimationSpeed = verbsData.player_ani_speed;          
           Verbs.UpdateActionBar();
-          lblAction.TextColor = actionLabelColorHighlighted;
+          lblAction.TextColor = verbsData.actionLabelColorHighlighted;
           Room.ProcessClick(mouse.x, mouse.y, eModeUsermode1);      
         }
         // else keep running while left mouse button pressed
-        else if (dist > runCursorDistance ) {
+        else if (dist >  verbsData.runCursorDistance ) {
           player.Walk(mx, my, eNoBlock);
         }
       }
     }
     // turn off running if player stops walking
-    else if (player_is_running && !player.Moving && !mouse.IsButtonDown(eMouseLeft)) {
-      player_is_running = false;
+    else if (verbsData.player_is_running && !player.Moving && !mouse.IsButtonDown(eMouseLeft)) {
+      verbsData.player_is_running = false;
       
       player.StopMoving();
-      player.SetWalkSpeed(player_walk_x_speed,  player_walk_y_speed);
-      player.AnimationSpeed = player_ani_speed;          
+      player.SetWalkSpeed(verbsData.player_walk_x_speed,  verbsData.player_walk_y_speed);
+      player.AnimationSpeed = verbsData.player_ani_speed;          
     }
   }
 }
@@ -2334,23 +2433,25 @@ function repeatedly_execute_always() {
   if (!IsGamePaused() && !Verbs.IsGuiDisabled()) {
   
     // Update Actionbar
-    if (classicGui == false) {
+    if ( verbsData.classicGui == false) {
       Verbs.CheckDefaultAction();
 
       // Update Actionbar after command is executed
-      if (location_clicked != null && location_clicked.Length > 0) {
-        if (location_clicked.IndexOf(">") > 0) temp_location = location_clicked.Truncate(location_clicked.IndexOf(">"));
-        else temp_location = location_clicked;
+      if (verbsData.location_clicked != null && verbsData.location_clicked.Length > 0) {
+        if (verbsData.location_clicked.IndexOf(">") > 0) verbsData.temp_location = verbsData.location_clicked.Truncate(verbsData.location_clicked.IndexOf(">"));
+        else verbsData.temp_location = verbsData.location_clicked;
       }
-      else temp_location = "";
+      else verbsData.temp_location = "";
 
-      if (IsInterfaceEnabled() || temp_location != location || location == "") {
+      if (IsInterfaceEnabled() || verbsData.temp_location != verbsData.location || verbsData.location == "") {
         Verbs.UpdateActionBar();
-        location_clicked = "";
+        verbsData.location_clicked = "";
       }
       Verbs.AdjustActionBarPosition();
     }
   }
 }
 
-export ItemGiven;
\ No newline at end of file
+//START Monsieur Ouxx modifications
+//export ItemGiven; //Use Verbs.GetItemGiven() instead
+//END Monsieur Ouxx modifications
\ No newline at end of file
diff --git a/verbgui.ash b/verbgui.ash
index 3c9dd93..9344571 100644
--- a/verbgui.ash
+++ b/verbgui.ash
@@ -171,9 +171,11 @@ import void EnterRoom(this Character*, int newRoom, int x, int y, CharacterDirec
 
 // ============================= Verb GUI functions ============================================
 struct Verbs {
+// ============================= Module Configuration ==========================================
   import static attribute int VerbGuiOptions[];
   import static attribute String VerbGuiUnhandled[];
-  
+  import static void BindGuis(GUI* _gAction, GUI* _gMain, GUI* _gPause, GUI* _gQuit);
+  import static void SetFonts(FontType fontText, FontType fontTextOut, FontType fontSpeech, FontType fontOutlineSpeech);
 // ============================= Helper functions ==============================================
   import static float Distance(int x1, int y1, int x2, int y2);
   import static int  Offset(int point1, int point2);
@@ -197,6 +199,12 @@ struct Verbs {
   import static void AdjustActionBarPosition();
   import static void ToogleGuiStyle(int enable_new);
 
+//START Monsieur Ouxx modifications
+  //(new functions)
+  import static Action GetUsedAction();
+  import static InventoryItem* GetItemGiven();
+//END  Monsieur Ouxx modifications
+
   // ============================= Player/character functions =======================================
   import static void FreezePlayer();
   import static void UnfreezePlayer();
@@ -232,6 +240,7 @@ struct Verbs {
   import static char Extension();
   import static void OpenCloseExtension(int door_id);
   import static void VariableExtensions();  
+  
 };
 
 

From 308c9a283fc1dad7e150edad4e1c245e842c4625 Mon Sep 17 00:00:00 2001
From: Mathieu Bergounioux <mathieu.bergounioux@orange.com>
Date: Wed, 8 Aug 2018 14:29:07 +0200
Subject: [PATCH 5/9] - I have split the controllers of GUIs. There's now one
 controller for Save, one for Load and one for Options - I have removed global
 variables from the Options script : the fonts and the GUIs must now be set
 externally, in TemplateSettings - I have moved "Offset" and "Distance" to a
 utility class

---
 dialogscript.asc => CustomDialogGui.asc |   0
 dialogscript.ash => CustomDialogGui.ash |   0
 Game.agf                                |   4 +-
 TemplateSettings.asc                    |  12 +-
 optiongui.asc                           | 436 +++++++++++++-----------
 optiongui.ash                           |  28 +-
 room1.crm                               | Bin 52411 -> 52424 bytes
 room2.crm                               | Bin 127184 -> 127197 bytes
 verbgui.asc                             |  71 ++--
 verbgui.ash                             |  14 +-
 10 files changed, 313 insertions(+), 252 deletions(-)
 rename dialogscript.asc => CustomDialogGui.asc (100%)
 rename dialogscript.ash => CustomDialogGui.ash (100%)

diff --git a/dialogscript.asc b/CustomDialogGui.asc
similarity index 100%
rename from dialogscript.asc
rename to CustomDialogGui.asc
diff --git a/dialogscript.ash b/CustomDialogGui.ash
similarity index 100%
rename from dialogscript.ash
rename to CustomDialogGui.ash
diff --git a/Game.agf b/Game.agf
index 1ce512d..2c98062 100644
--- a/Game.agf
+++ b/Game.agf
@@ -3694,7 +3694,7 @@ stop
               <ScriptAndHeader>
                 <ScriptAndHeader_Header>
                   <Script>
-                    <FileName>DialogScript.ash</FileName>
+                    <FileName>CustomDialogGui.ash</FileName>
                     <Name>Dialogscript</Name>
                     <Description>simplified fork of CDG</Description>
                     <Author>abstauber</Author>
@@ -3705,7 +3705,7 @@ stop
                 </ScriptAndHeader_Header>
                 <ScriptAndHeader_Script>
                   <Script>
-                    <FileName>DialogScript.asc</FileName>
+                    <FileName>CustomDialogGui.asc</FileName>
                     <Name>Dialogscript</Name>
                     <Description>simplified fork of CDG</Description>
                     <Author>abstauber</Author>
diff --git a/TemplateSettings.asc b/TemplateSettings.asc
index 1729bbb..4477309 100644
--- a/TemplateSettings.asc
+++ b/TemplateSettings.asc
@@ -116,9 +116,15 @@ function set_options()
   /***********************************************************************
    * Setup background graphic for save slots
    ***********************************************************************/
-  OptionGui.slotSprite = 81;
-  OptionGui.slotSpriteHi = 96;
-
+  CustomSave.SetGui(gSave,  gSaveConfirm);
+  CustomSave.slotSprite = 81;
+  CustomSave.slotSpriteHi = 96;
+  CustomSave.font = eFontTiny;
+  
+  CustomLoad.SetGui(gLoad,  null); //null because this Load GUI does not have a "confirm" button
+  CustomLoad.slotSprite = 81;
+  CustomLoad.slotSpriteHi = 96;
+  CustomLoad.font = eFontTiny;
   /***********************************************************************
    * Setup all the template options for the dialog GUI
    ***********************************************************************/
diff --git a/optiongui.asc b/optiongui.asc
index b61cd9c..987b504 100644
--- a/optiongui.asc
+++ b/optiongui.asc
@@ -1,10 +1,47 @@
 #ifdef __VERB_GUI_MODULE__ //check module's dependencies
 
 
-// Save Load GUI functionality
+// Options GUI
+
+struct OptionsGuiData {
+    
+};
+OptionsGuiData optionsGuiData;
+
+// Time count utility
+struct TimeCount {
+    //members below would be better as static attributes
+    int playTimeSeconds;
+    int timeNow;
+    int timeThen;
+    DateTime *dt;
+    
+    import static void GameStart();
+    import static void RepExec();
+};
+TimeCount timeCount;
+
+
+static void TimeCount::GameStart() {
+  timeCount.dt = DateTime.Now;
+  timeCount.timeNow = timeCount.dt.RawTime;
+  timeCount.timeThen = timeCount.timeNow;
+  timeCount.playTimeSeconds = 0;
+}
+
+static void TimeCount::RepExec() {
+  timeCount.dt = DateTime.Now;
+  timeCount.timeNow = timeCount.dt.RawTime;
+  
+  if (timeCount.timeNow > timeCount.timeThen) {
+    timeCount.timeThen = timeCount.timeNow;
+    timeCount.playTimeSeconds ++;
+  }
+  
+}
 
-int slotSprite;
-int slotSpriteHi;
+
+// Save Load GUI functionality
 
 DynamicSprite *saveScreenshot;  
 DynamicSprite *slotSprites[SAVE_SLOTS];  
@@ -12,57 +49,116 @@ DynamicSprite *slotSprites_hi[SAVE_SLOTS];
 DynamicSprite *old_slotSprites[SAVE_SLOTS];
 DynamicSprite *old_slotSprites_hi[SAVE_SLOTS];
 
-int saveSlotId;
-int loadSlotId;
-String saveSlotString;
-int playTimeSeconds;
+struct CustomLoadData {
+    GUI* gui;
+    GUI* confirmGui;
+    int slotSprite;
+    int slotSpriteHi;
+    Button  *loadSlotButtons[SAVE_SLOTS];
+    FontType font;
+    int loadSlotId;
+};
+CustomLoadData customLoadData;
+
+struct CustomSaveData {
+    GUI* gui;
+    GUI* confirmGui;
+    int slotSprite;
+    int slotSpriteHi;
+    Button  *saveSlotButtons[SAVE_SLOTS];
+    FontType font;
+    int saveSlotId;
+    String saveSlotString;
+    bool save_scheduled;
+};
+CustomSaveData customSaveData;
+
+
+// Accessors for static attributes of CustomLoad
+void set_slotSprite(static CustomLoad, int value)
+{
+  customLoadData.slotSprite = value;
+}
 
-Button  *saveSlotButtons[SAVE_SLOTS];
-Button  *loadSlotButtons[SAVE_SLOTS];
+int get_slotSprite(static CustomLoad)
+{
+  return customLoadData.slotSprite;
+}
 
-bool save_scheduled;
+void set_slotSpriteHi(static CustomLoad, int value)
+{
+  customLoadData.slotSpriteHi = value;
+}
 
-int timeNow;
-int timeThen;
-DateTime *dt;
+int get_slotSpriteHi(static CustomLoad)
+{
+  return customLoadData.slotSpriteHi;
+}
+
+void set_font(static CustomLoad, int value)
+{
+  customLoadData.font = value;
+}
 
-void set_slotSprite(static OptionGui, int value)
+int get_font(static CustomLoad)
 {
-  slotSprite = value;
+  return customLoadData.font;
 }
 
-int get_slotSprite(static OptionGui)
+// Accessors for static attributes of CustomSave
+void set_slotSprite(static CustomSave, int value)
 {
-  return slotSprite;
+  customSaveData.slotSprite = value;
 }
 
-void set_slotSpriteHi(static OptionGui, int value)
+int get_slotSprite(static CustomSave)
 {
-  slotSpriteHi = value;
+  return customSaveData.slotSprite;
 }
 
-int get_slotSpriteHi(static OptionGui)
+void set_slotSpriteHi(static CustomSave, int value)
 {
-  return slotSpriteHi;
+  customSaveData.slotSpriteHi = value;
+}
+
+int get_slotSpriteHi(static CustomSave)
+{
+  return customSaveData.slotSpriteHi;
+}
+
+void set_font(static CustomSave, int value)
+{
+  customSaveData.font = value;
+}
+
+int get_font(static CustomSave)
+{
+  return customSaveData.font;
+}
+
+// Set GUI
+static void CustomSave::SetGui(GUI* _gui,  GUI* confirmGui) {
+  customSaveData.gui = _gui;  
+  customSaveData.confirmGui = confirmGui;  
 }
 
 // InitSaveDialog
-static void OptionGui::InitSaveDialog() {
+static void CustomSave::InitSaveDialog() {
   int i = 0;
   
   while (i < SAVE_SLOTS) {
-    saveSlotButtons[i] = gSave.Controls[i+1].AsButton;
+    customSaveData.saveSlotButtons[i] = customSaveData.gui.Controls[i+1].AsButton;
     i++;
   }   
 }
 
 
 // DisableSaveButtons
-static void OptionGui::DisableSaveButtons() {
+static void CustomSave::DisableSaveButtons() {
   int i = 0;
   while (i < SAVE_SLOTS) {
-    if (i+1 != saveSlotId) {
-      saveSlotButtons[i].Enabled=false;
+    if (i+1 != customSaveData.saveSlotId) {
+      customSaveData.saveSlotButtons[i].Enabled=false;
     }
     i++;
   }
@@ -70,23 +166,23 @@ static void OptionGui::DisableSaveButtons() {
 }
 
 // EnableSaveButtons
-static void OptionGui::EnableSaveButtons() {
+static void CustomSave::EnableSaveButtons() {
   int i;
   while (i < SAVE_SLOTS) {
-    saveSlotButtons[i].Enabled=true;
+    customSaveData.saveSlotButtons[i].Enabled=true;
     i++;
   }  
   btnSaveCancel.Enabled = true;
 }
 
 // Show the Save dialog
-static void OptionGui::ShowSaveDialog() {
-  if (!save_scheduled) {
-    OptionGui.InitSaveDialog();
+static void CustomSave::ShowSaveDialog() {
+  if (!customSaveData.save_scheduled) {
+    CustomSave.InitSaveDialog();
     
     int i=0;
-    int btnHeight = Game.SpriteHeight[slotSprite];
-    int btnWidth  = Game.SpriteWidth[slotSprite];
+    int btnHeight = Game.SpriteHeight[customSaveData.slotSprite];
+    int btnWidth  = Game.SpriteWidth[customSaveData.slotSprite];
     String tempSlotDesc = "";
     // Check the slots
     while (i < SAVE_SLOTS) {
@@ -97,8 +193,8 @@ static void OptionGui::ShowSaveDialog() {
       DrawingSurface *normGraphic= slotSprites[i].GetDrawingSurface();
       DrawingSurface *hiGraphic= slotSprites_hi[i].GetDrawingSurface();
       
-      normGraphic.DrawImage(0, 0, slotSprite);
-      hiGraphic.DrawImage(0, 0, slotSpriteHi);
+      normGraphic.DrawImage(0, 0, customSaveData.slotSprite);
+      hiGraphic.DrawImage(0, 0, customSaveData.slotSpriteHi);
       
       if (Game.GetSaveSlotDescription(i+1)!=null) {
         DynamicSprite *tempSprite = DynamicSprite.CreateFromSaveGame(i+1, System.ScreenWidth, System.ScreenHeight);
@@ -110,8 +206,8 @@ static void OptionGui::ShowSaveDialog() {
           tempSurf.DrawingColor = 15;
           tempSlotDesc = Game.GetSaveSlotDescription(i+1);
           if (tempSlotDesc != null && tempSlotDesc.IndexOf(";") > 0) {
-            tempSurf.DrawString(0, 1, eFontTiny, tempSlotDesc.Substring(0, tempSlotDesc.IndexOf(";")));
-            tempSurf.DrawString(0, btnHeight-15, eFontTiny, tempSlotDesc.Substring(tempSlotDesc.IndexOf(";")+1, tempSlotDesc.Length));
+            tempSurf.DrawString(0, 1, customSaveData.font, tempSlotDesc.Substring(0, tempSlotDesc.IndexOf(";")));
+            tempSurf.DrawString(0, btnHeight-15, customSaveData.font, tempSlotDesc.Substring(tempSlotDesc.IndexOf(";")+1, tempSlotDesc.Length));
           }
           tempSurf.Release();
         }
@@ -122,8 +218,8 @@ static void OptionGui::ShowSaveDialog() {
           tempSurf.DrawingColor = 15;
           tempSlotDesc = Game.GetSaveSlotDescription(i+1);
           if (tempSlotDesc != null && tempSlotDesc.IndexOf(";") > 0) {
-            tempSurf.DrawString(0, 1, eFontTiny, tempSlotDesc.Substring(0, tempSlotDesc.IndexOf(";")));
-            tempSurf.DrawString(0, btnHeight-15, eFontTiny, tempSlotDesc.Substring(tempSlotDesc.IndexOf(";")+1, tempSlotDesc.Length));
+            tempSurf.DrawString(0, 1, customSaveData.font, tempSlotDesc.Substring(0, tempSlotDesc.IndexOf(";")));
+            tempSurf.DrawString(0, btnHeight-15, customSaveData.font, tempSlotDesc.Substring(tempSlotDesc.IndexOf(";")+1, tempSlotDesc.Length));
           }
           tempSurf.Release();        
           
@@ -135,33 +231,33 @@ static void OptionGui::ShowSaveDialog() {
       normGraphic.Release();
       hiGraphic.Release();
 
-      saveSlotButtons[i].NormalGraphic=slotSprites[i].Graphic;
-      saveSlotButtons[i].MouseOverGraphic=slotSprites_hi[i].Graphic;
+      customSaveData.saveSlotButtons[i].NormalGraphic=slotSprites[i].Graphic;
+      customSaveData.saveSlotButtons[i].MouseOverGraphic=slotSprites_hi[i].Graphic;
       i++;
     }
-    gSave.Visible=true;
+    customSaveData.gui.Visible=true;
     gOptions.Visible = false;
   }
 }
 
 
 // clicked on a save slot
-static void OptionGui::SelectSaveSlot(int control_id) 
+static void CustomSave::SelectSaveSlot(int control_id) 
 {
-  int btnWidth  = Game.SpriteWidth[saveSlotButtons[0].Graphic];
-  int btnHeight = Game.SpriteHeight[saveSlotButtons[0].Graphic];  
+  int btnWidth  = Game.SpriteWidth[customSaveData.saveSlotButtons[0].Graphic];
+  int btnHeight = Game.SpriteHeight[customSaveData.saveSlotButtons[0].Graphic];  
   
   int slot;
   int i;
   
   while (i < SAVE_SLOTS) {
-    if (control_id == saveSlotButtons[i].ID) slot = i+1;    
+    if (control_id == customSaveData.saveSlotButtons[i].ID) slot = i+1;    
     i++;
   }
   
   // backup old setting in case of cancel
-  old_slotSprites[slot-1] = DynamicSprite.CreateFromExistingSprite(saveSlotButtons[slot-1].NormalGraphic);
-  old_slotSprites_hi[slot-1] = DynamicSprite.CreateFromExistingSprite(saveSlotButtons[slot-1].MouseOverGraphic);
+  old_slotSprites[slot-1] = DynamicSprite.CreateFromExistingSprite(customSaveData.saveSlotButtons[slot-1].NormalGraphic);
+  old_slotSprites_hi[slot-1] = DynamicSprite.CreateFromExistingSprite(customSaveData.saveSlotButtons[slot-1].MouseOverGraphic);
   
   // Create new sprites
   slotSprites[slot-1] = DynamicSprite.Create(btnWidth, btnHeight);
@@ -170,8 +266,8 @@ static void OptionGui::SelectSaveSlot(int control_id)
   DrawingSurface *normGraphic= slotSprites[slot-1].GetDrawingSurface();
   DrawingSurface *hiGraphic= slotSprites_hi[slot-1].GetDrawingSurface();
   
-  normGraphic.DrawImage(0, 0, slotSprite);
-  hiGraphic.DrawImage(0, 0, slotSpriteHi);
+  normGraphic.DrawImage(0, 0, customSaveData.slotSprite);
+  hiGraphic.DrawImage(0, 0, customSaveData.slotSpriteHi);
   
   if(saveScreenshot != null) {
     normGraphic.DrawImage(2, 3, saveScreenshot.Graphic);
@@ -179,45 +275,45 @@ static void OptionGui::SelectSaveSlot(int control_id)
   }
 
   // pass these to Okay and Cancel
-  saveSlotId = slot;
+  customSaveData.saveSlotId = slot;
   
-  saveSlotButtons[slot-1].NormalGraphic=slotSprites[slot-1].Graphic;
-  saveSlotButtons[slot-1].MouseOverGraphic=slotSprites_hi[slot-1].Graphic;  
+  customSaveData.saveSlotButtons[slot-1].NormalGraphic=slotSprites[slot-1].Graphic;
+  customSaveData.saveSlotButtons[slot-1].MouseOverGraphic=slotSprites_hi[slot-1].Graphic;  
   normGraphic.Release();
   hiGraphic.Release();
   
   // Show Confirm
   
-  btnSaveOk.X = saveSlotButtons[slot-1].X+saveSlotButtons[slot-1].Width-7;
-  btnSaveOk.Y = saveSlotButtons[slot-1].Y + 4;
+  btnSaveOk.X = customSaveData.saveSlotButtons[slot-1].X+customSaveData.saveSlotButtons[slot-1].Width-7;
+  btnSaveOk.Y = customSaveData.saveSlotButtons[slot-1].Y + 4;
   btnSaveNo.X = btnSaveOk.X;
   btnSaveNo.Y = btnSaveOk.Y + btnSaveOk.Height;
-  OptionGui.DisableSaveButtons();
-  gSaveConfirm.Visible=true;    
+  CustomSave.DisableSaveButtons();
+  customSaveData.confirmGui.Visible=true;    
 
 }
 
 
 // Red Button clicked: don't save
-static void OptionGui::SaveNo()
+static void CustomSave::SaveNo()
 {
-  int slot = saveSlotId;
-  saveSlotButtons[slot-1].NormalGraphic=old_slotSprites[slot-1].Graphic;
-  saveSlotButtons[slot-1].MouseOverGraphic=old_slotSprites_hi[slot-1].Graphic;
-  gSaveConfirm.Visible=false;
-  OptionGui.EnableSaveButtons();
+  int slot = customSaveData.saveSlotId;
+  customSaveData.saveSlotButtons[slot-1].NormalGraphic=old_slotSprites[slot-1].Graphic;
+  customSaveData.saveSlotButtons[slot-1].MouseOverGraphic=old_slotSprites_hi[slot-1].Graphic;
+  customSaveData.confirmGui.Visible=false;
+  CustomSave.EnableSaveButtons();
 }
 
 // Green Button clicked: Okay
-static void OptionGui::SaveYes()
+static void CustomSave::SaveYes()
 {
-  int slot = saveSlotId;
+  int slot = customSaveData.saveSlotId;
   int i;
   
-  if (gSaveConfirm.Visible==true) gSaveConfirm.Visible=false;
-  gSave.Visible=false;
+  if (customSaveData.confirmGui.Visible==true) customSaveData.confirmGui.Visible=false;
+  customSaveData.gui.Visible=false;
   gOptions.Visible = false;
-  save_scheduled = true;
+  customSaveData.save_scheduled = true; //We don't save right now. We schedule it for after the GUI gets closed.
   if (saveScreenshot != null) saveScreenshot.Delete();
   
   while (i < SAVE_SLOTS) {
@@ -228,57 +324,63 @@ static void OptionGui::SaveYes()
     i++;
   }
  
-  OptionGui.EnableSaveButtons();
+  CustomSave.EnableSaveButtons();
   
 }
 
 // Close Save GUI
-static void OptionGui::SaveCancel()
+static void CustomSave::SaveCancel()
 {
   int i;
-  saveSlotId = 0;
-  saveSlotString = "";
-  if (gSaveConfirm.Visible==true) {
-    gSaveConfirm.Visible=false;
+  customSaveData.saveSlotId = 0;
+  customSaveData.saveSlotString = "";
+  if (customSaveData.confirmGui.Visible==true) {
+    customSaveData.confirmGui.Visible=false;
   }
-  gSave.Visible=false;
+  customSaveData.gui.Visible=false;
   gOptions.Visible = true;
 }
 
 
-static void OptionGui::InitLoadDialog() 
+// Set GUI
+static void CustomLoad::SetGui(GUI* _gui,  GUI* confirmGui) {
+  customLoadData.gui = _gui;  
+  customLoadData.confirmGui = confirmGui;  
+}
+
+static void CustomLoad::InitLoadDialog() 
 {
   int i = 0;
   
   while (i < SAVE_SLOTS) {
-    loadSlotButtons[i] = gLoad.Controls[i+1].AsButton;
+    customLoadData.loadSlotButtons[i] = customLoadData.gui.Controls[i+1].AsButton;
     i++;
   }    
 }
 
 
 // Display load dialog
-static void OptionGui::ShowLoadDialog() {
-  if (!save_scheduled) {
+static void CustomLoad::ShowLoadDialog() {
+  if (!customSaveData.save_scheduled) {
     int i=0;
-    int btnHeight = Game.SpriteHeight[slotSprite];
-    int btnWidth  = Game.SpriteWidth[slotSprite];
+    int btnHeight = Game.SpriteHeight[customLoadData.slotSprite];
+    int btnWidth  = Game.SpriteWidth[customLoadData.slotSprite];
     
     String tempSlotDesc;
-    OptionGui.InitLoadDialog();
+    CustomLoad.InitLoadDialog();
     
     // Check the slots
     while (i < SAVE_SLOTS) {
       
-      loadSlotButtons[i].Enabled=false;
+      customLoadData.loadSlotButtons[i].Enabled=false;
       slotSprites[i] = DynamicSprite.Create(btnWidth, btnHeight);
       slotSprites_hi[i] = DynamicSprite.Create(btnWidth, btnHeight);
       
       DrawingSurface *normGraphic= slotSprites[i].GetDrawingSurface();
       DrawingSurface *hiGraphic= slotSprites_hi[i].GetDrawingSurface();
       
-      normGraphic.DrawImage(0, 0, slotSprite);
-      hiGraphic.DrawImage(0, 0, slotSpriteHi);
+      normGraphic.DrawImage(0, 0, customLoadData.slotSprite);
+      hiGraphic.DrawImage(0, 0, customLoadData.slotSpriteHi);
       
       if (Game.GetSaveSlotDescription(i+1)!=null) {
         DynamicSprite *tempSprite = DynamicSprite.CreateFromSaveGame(i+1, System.ScreenWidth, System.ScreenHeight);
@@ -290,8 +392,8 @@ static void OptionGui::ShowLoadDialog() {
           tempSurf.DrawingColor = 15;
           tempSlotDesc = Game.GetSaveSlotDescription(i+1);
           if (tempSlotDesc != null && tempSlotDesc.IndexOf(";") > 0) {
-            tempSurf.DrawString(0, 1, eFontTiny, tempSlotDesc.Substring(0, tempSlotDesc.IndexOf(";")));
-            tempSurf.DrawString(0, btnHeight-15, eFontTiny, tempSlotDesc.Substring(tempSlotDesc.IndexOf(";")+1, tempSlotDesc.Length));
+            tempSurf.DrawString(0, 1, customLoadData.font, tempSlotDesc.Substring(0, tempSlotDesc.IndexOf(";")));
+            tempSurf.DrawString(0, btnHeight-15, customLoadData.font, tempSlotDesc.Substring(tempSlotDesc.IndexOf(";")+1, tempSlotDesc.Length));
           }
           
           tempSurf.Release();
@@ -303,8 +405,8 @@ static void OptionGui::ShowLoadDialog() {
           tempSurf.DrawingColor = 15;
           tempSlotDesc = Game.GetSaveSlotDescription(i+1);
           if (tempSlotDesc != null && tempSlotDesc.IndexOf(";") > 0) {
-            tempSurf.DrawString(0, 1, eFontTiny, tempSlotDesc.Substring(0, tempSlotDesc.IndexOf(";")));
-            tempSurf.DrawString(0, btnHeight-15, eFontTiny, tempSlotDesc.Substring(tempSlotDesc.IndexOf(";")+1, tempSlotDesc.Length));
+            tempSurf.DrawString(0, 1, customLoadData.font, tempSlotDesc.Substring(0, tempSlotDesc.IndexOf(";")));
+            tempSurf.DrawString(0, btnHeight-15, customLoadData.font, tempSlotDesc.Substring(tempSlotDesc.IndexOf(";")+1, tempSlotDesc.Length));
           }
           tempSurf.Release();        
           
@@ -312,29 +414,29 @@ static void OptionGui::ShowLoadDialog() {
         normGraphic.DrawImage(2, 3, tempSprite.Graphic);
         hiGraphic.DrawImage(2, 3, tempSprite.Graphic);
         tempSprite.Delete();
-        loadSlotButtons[i].Enabled = true;
+        customLoadData.loadSlotButtons[i].Enabled = true;
       
       }
       normGraphic.Release();
       hiGraphic.Release();
 
-      loadSlotButtons[i].NormalGraphic=slotSprites[i].Graphic;
-      loadSlotButtons[i].MouseOverGraphic=slotSprites_hi[i].Graphic;
+      customLoadData.loadSlotButtons[i].NormalGraphic=slotSprites[i].Graphic;
+      customLoadData.loadSlotButtons[i].MouseOverGraphic=slotSprites_hi[i].Graphic;
       i++;
     }
-    gLoad.Visible = true;
+    customLoadData.gui.Visible = true;
     gOptions.Visible = false;
   }
 }
 
 // click on a slot button
-static void OptionGui::SelectLoadSlot(int control_id) 
+static void CustomLoad::SelectLoadSlot(int control_id) 
 {
   int slot;
   int i;
   
   while (i < SAVE_SLOTS) {
-    if (control_id == loadSlotButtons[i].ID) slot = i+1;    
+    if (control_id == customLoadData.loadSlotButtons[i].ID) slot = i+1;    
     i++;
   }
   if (slot > 0 ) {
@@ -350,28 +452,28 @@ static void OptionGui::SelectLoadSlot(int control_id)
 
 
 // Cancel loading
-static void OptionGui::LoadCancel() {
-  gLoad.Visible=false;
+static void CustomLoad::LoadCancel() {
+  customLoadData.gui.Visible=false;
   gOptions.Visible = true;
 }
 
 
 //  Prepare a screenshot
-static void OptionGui::CreateScreenshot()
+static void OptionGui::CreateScreenshot(FontType font)
 {
 
   String playTimeResult = "";
   
-  int playMinutes = FloatToInt(IntToFloat(playTimeSeconds) / 60.0, eRoundDown); 
-  int playHours = FloatToInt(IntToFloat(playTimeSeconds) / 3600.0, eRoundDown); 
+  int playMinutes = FloatToInt(IntToFloat(timeCount.playTimeSeconds) / 60.0, eRoundDown); 
+  int playHours = FloatToInt(IntToFloat(timeCount.playTimeSeconds) / 3600.0, eRoundDown); 
   
   if (playHours == 0) playTimeResult = String.Format ("%dm", playMinutes);
   else playTimeResult = String.Format ("%dh %dm", playHours, playMinutes);
   
-  saveSlotString = String.Format("%s;%04d/%02d/%02d %02d:%02d", playTimeResult, dt.Year, dt.Month, dt.DayOfMonth,  dt.Hour, dt.Minute);
+  customSaveData.saveSlotString = String.Format("%s;%04d/%02d/%02d %02d:%02d", playTimeResult, timeCount.dt.Year, timeCount.dt.Month, timeCount.dt.DayOfMonth,  timeCount.dt.Hour, timeCount.dt.Minute);
   
-  int btnWidth  = Game.SpriteWidth[slotSprite];
-  int btnHeight = Game.SpriteHeight[slotSprite];  
+  int btnWidth  = Game.SpriteWidth[customLoadData.slotSprite];
+  int btnHeight = Game.SpriteHeight[customLoadData.slotSprite];  
   
   saveScreenshot = DynamicSprite.CreateFromScreenShot();
   
@@ -380,26 +482,25 @@ static void OptionGui::CreateScreenshot()
   
   DrawingSurface *tempSurf = saveScreenshot.GetDrawingSurface();
   tempSurf.DrawingColor = 15;
-  tempSurf.DrawString(0, 1, eFontTiny, saveSlotString.Substring(0, saveSlotString.IndexOf(";")));
+  tempSurf.DrawString(0, 1, font, customSaveData.saveSlotString.Substring(0, customSaveData.saveSlotString.IndexOf(";")));
   
-  tempSurf.DrawString(0, btnHeight-15, eFontTiny, saveSlotString.Substring(saveSlotString.IndexOf(";")+1, saveSlotString.Length));
+  String st = customSaveData.saveSlotString;
+  tempSurf.DrawString(0, btnHeight-15, font, st.Substring(st.IndexOf(";")+1, st.Length));
   tempSurf.Release();  
 }
 
 // Show control panel
 static void OptionGui::ShowOptions() 
 {
-  if (!save_scheduled) {
-    OptionGui.CreateScreenshot();
+  if (!customSaveData.save_scheduled) {
+    OptionGui.CreateScreenshot(customSaveData.font);
     gOptions.Visible = true;
   }
 }
 
 
-
-
-
-function btnOptionsDefault_OnClick(GUIControl *control, MouseButton button)
+// Click on "default" button
+static void OptionGui::Default() 
 {
   sldOptionsMusic.Value = 80;
   sldOptionsSound.Value = 90;
@@ -412,64 +513,14 @@ function btnOptionsDefault_OnClick(GUIControl *control, MouseButton button)
 
 
 
-function btnSaveSlot_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.SelectSaveSlot(control.ID);
-}
-
-function btnSaveOk_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.SaveYes();
-}
-
-function btnSaveNo_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.SaveNo();
-}
-
-function btnSaveCancel_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.SaveCancel();
-}
-
-function btnSaveClose_OnClick(GUIControl *control, MouseButton button)
-{
-  //Same effect
-  btnSaveCancel_OnClick(control, button);
-}
-
-function btnLoadSlot_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.SelectLoadSlot(control.ID);
-}
-
-function btnLoadCancel_OnClick(GUIControl *control, MouseButton button)
-{
-  OptionGui.LoadCancel();
-}
-
-function btnLoadClose_OnClick(GUIControl *control, MouseButton button)
-{
-  //Same effect
-  btnLoadCancel_OnClick(control, button);
-}
-
-function btnQuitYes_OnClick(GUIControl *control, MouseButton button)
-{
-  QuitGame(0);
-}
-
-function btnQuitNo_OnClick(GUIControl *control, MouseButton button)
-{
-  gQuit.Visible = false;
-}
-
+//Returns true if 'control' is one of the 9 save slots controls in the Save Gui
 bool IsSaveSlot(GUIControl *control) {
-    return (control.OwningGUI.ID == gSave.ID && control.ID >= btnSaveSlot1.ID && control.ID <= btnSaveSlot9.ID);
+    return (control.OwningGUI.ID == customSaveData.gui.ID && control.ID >= btnSaveSlot1.ID && control.ID <= btnSaveSlot9.ID);
 }
 
+//Returns true if 'control' is one of the 9 restore slots controls in the Load Gui
 bool IsRestoreSlot(GUIControl *control) {
-    return (control.OwningGUI.ID == gLoad.ID && control.ID >= btnLoadSlot1.ID && control.ID <= btnLoadSlot9.ID);
+    return (control.OwningGUI.ID == customLoadData.gui.ID && control.ID >= btnLoadSlot1.ID && control.ID <= btnLoadSlot9.ID);
 }
 
 
@@ -478,17 +529,17 @@ static void OptionGui::OnClick(GUIControl *control, MouseButton button)
   //== MAIN OPTIONS DIALOG ==
     // Default
 	if (control==btnOptionsDefault)	{
-		btnOptionsDefault_OnClick(control, button);
+		OptionGui.Default();
 	}
     // Save
 	if (control==btnOptionsSave)	{
 		gOptions.Visible=false;
-		OptionGui.ShowSaveDialog();
+		CustomSave.ShowSaveDialog();
 	}
     // Load
 	else if (control==btnOptionsLoad)	{
 		gOptions.Visible=false;
-		OptionGui.ShowLoadDialog();
+		CustomLoad.ShowLoadDialog();
 	}
     // Resume
 	else if (control==btnOptionsResume || control == btnOptionsClose)	{
@@ -503,47 +554,47 @@ static void OptionGui::OnClick(GUIControl *control, MouseButton button)
   //== 'SAVE' DIALOG ==
     //Slot click
 	else if (IsSaveSlot(control))	{
-        btnSaveSlot_OnClick(control, button);
+        CustomSave.SelectSaveSlot(control.ID);
 	} 
     //OK
 	else if (control==btnSaveOk)	{
-        btnSaveOk_OnClick(control, button);
+        CustomSave.SaveYes();
 	} 
     //No
 	else if (control==btnSaveNo)	{
-        btnSaveNo_OnClick(control, button);
+        CustomSave.SaveNo();
 	} 
     //Cancel
 	else if (control==btnSaveCancel)	{
-        btnSaveCancel_OnClick(control, button);
+        CustomSave.SaveCancel();
 	} 
     //Close
 	else if (control==btnSaveClose)	{
-        btnSaveClose_OnClick(control, button);
+        CustomSave.SaveCancel();
 	} 
     
   //== 'LOAD' DIALOG ==
     //Slot click
 	else if (IsRestoreSlot(control))	{
-        btnLoadSlot_OnClick(control, button);
+        CustomLoad.SelectLoadSlot(control.ID);
 	} 
     //Cancel
 	else if (control==btnLoadCancel)	{
-        btnLoadCancel_OnClick(control, button);
+        CustomLoad.LoadCancel();
 	} 
     //Close
 	else if (control==btnLoadClose)	{
-        btnLoadClose_OnClick(control, button);
+        CustomLoad.LoadCancel();
 	} 
     
   //== 'QUIT' DIALOG ==
     //Yes
 	else if (control==btnQuitYes)	{
-        btnQuitYes_OnClick(control, button);
+        QuitGame(0);
 	} 
     //No
 	else if (control==btnQuitNo)	{
-        btnQuitNo_OnClick(control, button);
+        gQuit.Visible = false;
 	} 
 
 }
@@ -585,34 +636,23 @@ static void OptionGui::OnSliderChange(GUIControl *control)
 
 
 
-
-
 // Remember when the game was started
 function game_start()
 {
-  dt = DateTime.Now;
-  timeNow = dt.RawTime;
-  timeThen = timeNow;
-  playTimeSeconds = 0;
+  //timeCount.font = eFontTiny;
+    TimeCount.GameStart();
 }
 
 // workaround to take a savegame screenshot without the gui
 function repeatedly_execute() 
 {
-  dt = DateTime.Now;
-  timeNow = dt.RawTime;
-  
-  if (timeNow > timeThen) {
-    timeThen = timeNow;
-    playTimeSeconds ++;
-  }
-  
-  if (save_scheduled) {
-    SaveGameSlot(saveSlotId, saveSlotString);
-    saveSlotId = 0;
-    saveSlotString = "";       
-    save_scheduled = false;
-  }
+  TimeCount.RepExec();
+  if (customSaveData.save_scheduled) {
+    SaveGameSlot(customSaveData.saveSlotId, customSaveData.saveSlotString);
+    customSaveData.saveSlotId = 0;
+    customSaveData.saveSlotString = "";       
+    customSaveData.save_scheduled = false;
+  } 
 }
 
 
diff --git a/optiongui.ash b/optiongui.ash
index 37ac371..1bef75b 100644
--- a/optiongui.ash
+++ b/optiongui.ash
@@ -32,9 +32,12 @@
     
     #define SAVE_SLOTS 9 
 
-    struct OptionGui {
+    struct CustomSave {
       import static attribute int slotSprite;
       import static attribute int slotSpriteHi;
+      import static attribute FontType font;
+      
+      import static void SetGui(GUI* gui,  GUI* confirmGui = 0);
       
       import static void InitSaveDialog();
       import static void ShowSaveDialog();
@@ -45,13 +48,28 @@
       import static void SaveNo();
       import static void SaveYes();
       import static void SaveCancel();
+    };
+    
+    struct CustomLoad {
+      import static attribute int slotSprite;
+      import static attribute int slotSpriteHi;
+      import static attribute FontType font;
+      
+      import static void SetGui(GUI* gui,  GUI* confirmGui = 0);
+      
       import static void InitLoadDialog();
       import static void ShowLoadDialog();
-      import static void LoadCancel();
       import static void SelectLoadSlot(int control_id);
-      import static void CreateScreenshot();
-      import static void clicked_OptionsClose();
-      
+  
+      import static void LoadCancel();
+    };
+    
+    
+    struct OptionGui {
+   
+      import static void Default();
+
+      import static void CreateScreenshot(FontType font);
       
       import static void ShowOptions();
       import static void OnClick(GUIControl *control, MouseButton button);
diff --git a/room1.crm b/room1.crm
index c77e1fe619d80ddb527b00acb514d417f8351d0c..ff84919318d055dff9db9049b5603ca8480b0771 100644
GIT binary patch
delta 242
zcmdlzlljC<<_+H4MOO+lFa$gM`$jP^Ft7meH6{jzt(z0Jzh`DNo*c0IG~<QIGJD(^
z_f3AVPkgffUXIDldqfzcfimfn|L?JYi_0+PfW<EFMTl`s*4`(=*gV-`-+Zt-_sQJ{
z1SXsBcYx~Z-#>?O@?@O@@r*Yn_Z;vCi^@;_eLw@O&iJ4Mm~K880a3sC^Fbd*e&^ES
zlKfnk%*34hbobKC$>$G?ZB9J=fsu)oWpm<DU#5u;e4E!D*I=6b_ayt|`zJdmD)4O1
II2FtU02z*JvH$=8

delta 230
zcmX>xlX>?{<_+H4Mdt`JFa$gM`$jP^Ft7meH6{jzO`8+8zh`DNm>jVCG~=boGJD(^
z4@`crPkgffUXIDldqfx`fHLWm|L?JYi_0)(g2gWHMTl`s*4`(=*f7~)-+Zt-cg8!D
zHTL^M_4Mzb!#H8G&Vl&J>iY#I&pzM)7MGv=`+x>eoytLfAX#!S9in>k=Yu|sY%ZCJ
zIr-_6&m5N7oO1XBBhzo@&51_?m?kQ4Pd;;;XY=0UGE9^IoaCJR;AH3K(o?}q01`N7
A*#H0l

diff --git a/room2.crm b/room2.crm
index ab0c5e51d0f26b4e8d6dcc77e064958b8a23c401..4b3b2e648ccaa45c77bb13a16ff8a7c0c66a82d4 100644
GIT binary patch
delta 128
zcmccckp1pM_J%EtFCU94b2BgmJNx@aF+hMABLhR#_J5BVKQl4jny&YPQG7b*bH)J1
zebb|!Ga54*Pw#uqI3FUjn#Z}cxFkQ<B{MN6KYjZD7mSkIf4^XqVq{`v*{=ACF_3AZ
b0@wDUH;fk<r@OvmOqi&^vwi71Mr|eln*1*f

delta 125
zcmccnkp03#_J%EtFCUAFaWgOkJNx@aF+hMABLhSE_J5BVKQl4jnXdPOQG7b*bH)J1
z1Jk3PGa54*Oz(TnI3FUjn#UzGF(*GgIJqdZpk#X83r4Z+|6VXkF*5yT-mdtHF@$NN
Y0{iyTH;fk<r@OpkOxnKb9iuiA01)3U!T<mO

diff --git a/verbgui.asc b/verbgui.asc
index ee30d04..03f56a2 100644
--- a/verbgui.asc
+++ b/verbgui.asc
@@ -4,6 +4,32 @@
 #define UNHANDLED_MSG_COUNT 21 // Amount of unhandled messages
 #define DOORSTRING_COUNT 7     // Amount of door strings
 
+
+/***********************************************************************
+ * Distance(int x1, int y1, int x2, int y2)
+ * Returns the distance between two coordinates
+ * 
+ ***********************************************************************/
+static float Geometry::Distance(int x1, int y1, int x2, int y2)
+{
+  int dx = x1 - x2;
+  int dy = y1 - y2;
+  return Maths.Sqrt(IntToFloat(dx*dx+dy*dy));
+}
+
+/***********************************************************************
+ * Offset(int point1, int point2)
+ * Returns the offset between to two given values.
+ * 
+ ***********************************************************************/
+static int Geometry::Offset(int point1, int point2)
+{
+  int value = point1 - point2;
+  
+  if (value<0) return -value;
+  else return value;
+}
+
 // ========================== internal variables =============================
 // Please do not edit these option directly anymore, but use the VerbGuiSettings settings script instead!
 
@@ -97,6 +123,9 @@ struct VerbsData {
 };
 VerbsData verbsData;
 
+
+
+
             
 // ============================= Helper functions ===========================================
 
@@ -239,31 +268,6 @@ static void Verbs::SetFonts(FontType fontText, FontType fontTextOut, FontType fo
 
 
 
-/***********************************************************************
- * Distance(int x1, int y1, int x2, int y2)
- * Returns the distance between two coordinates
- * 
- ***********************************************************************/
-static float Verbs::Distance(int x1, int y1, int x2, int y2)
-{
-  int dx = x1 - x2;
-  int dy = y1 - y2;
-  return Maths.Sqrt(IntToFloat(dx*dx+dy*dy));
-}
-
-/***********************************************************************
- * Offset(int point1, int point2)
- * Returns the offset between to two given values.
- * 
- ***********************************************************************/
-static int Verbs::Offset(int point1, int point2)
-{
-  int value = point1 - point2;
-  
-  if (value<0) return -value;
-  else return value;
-}
-
 /***********************************************************************
  * GetButtonAction(int action)
  * Returns the connected action of a verb button.
@@ -623,8 +627,6 @@ static void Verbs::SetDefaultAction(Action def_action)
 }
 
 
-//START Monsieur Ouxx modifications
-//(new code)
 /***********************************************************************
  * Action GetUsedAction() 
  * Returns directly which action was selected by the player
@@ -681,9 +683,6 @@ static InventoryItem* Verbs::GetItemGiven()
 }
   
   
-//END Monsieur Ouxx modifications
-
-
 
 // ============================= GlobalCondition ===========================================
 
@@ -1535,10 +1534,10 @@ static int Verbs::GoToCharacterEx(Character*chwhogoes, Character*ch, CharacterDi
   chx = ch.x;
   chy = ch.y;
   int arrived=1;
-  if (Verbs.Offset(pl.x, chx) > xoffset || Verbs.Offset(pl.y, chy) > yoffset) {
+  if (Geometry.Offset(pl.x, chx) > xoffset || Geometry.Offset(pl.y, chy) > yoffset) {
     if (dir == 0) {
       // get the nearest position
-      if (Verbs.Offset (chx, pl.x) >= Verbs.Offset(chy, pl.y)) {
+      if (Geometry.Offset (chx, pl.x) >= Geometry.Offset(chy, pl.y)) {
         // right or left
         if (pl.x >= chx) dir = eDirectionRight;
         else dir = eDirectionLeft;
@@ -2393,7 +2392,7 @@ function repeatedly_execute() {
       int my = mouse.y + GetViewportY();
       int px = player.x;
       int py = player.y;
-      int dist  = FloatToInt(Verbs.Distance(mx, my, px, py), eRoundDown);
+      int dist  = FloatToInt(Geometry.Distance(mx, my, px, py), eRoundDown);
       
       if (!player.Moving) {
         // Running on an exit or door
@@ -2450,8 +2449,4 @@ function repeatedly_execute_always() {
       Verbs.AdjustActionBarPosition();
     }
   }
-}
-
-//START Monsieur Ouxx modifications
-//export ItemGiven; //Use Verbs.GetItemGiven() instead
-//END Monsieur Ouxx modifications
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/verbgui.ash b/verbgui.ash
index 9344571..1eab815 100644
--- a/verbgui.ash
+++ b/verbgui.ash
@@ -177,8 +177,6 @@ struct Verbs {
   import static void BindGuis(GUI* _gAction, GUI* _gMain, GUI* _gPause, GUI* _gQuit);
   import static void SetFonts(FontType fontText, FontType fontTextOut, FontType fontSpeech, FontType fontOutlineSpeech);
 // ============================= Helper functions ==============================================
-  import static float Distance(int x1, int y1, int x2, int y2);
-  import static int  Offset(int point1, int point2);
   import static int  GetButtonAction(int action);
   import static void DisableGui();
   import static void EnableGui();
@@ -198,12 +196,8 @@ struct Verbs {
   import static void UpdateActionBar();
   import static void AdjustActionBarPosition();
   import static void ToogleGuiStyle(int enable_new);
-
-//START Monsieur Ouxx modifications
-  //(new functions)
   import static Action GetUsedAction();
   import static InventoryItem* GetItemGiven();
-//END  Monsieur Ouxx modifications
 
   // ============================= Player/character functions =======================================
   import static void FreezePlayer();
@@ -244,3 +238,11 @@ struct Verbs {
 };
 
 
+// ============================= Geometry functions (utility) ============================================
+struct Geometry {
+  import static float Distance(int x1, int y1, int x2, int y2);
+  import static int  Offset(int point1, int point2);
+};
+
+  
+

From ffdacd1338f4e8e8f158ebb975efe0cdce39fc7d Mon Sep 17 00:00:00 2001
From: Mathieu Bergounioux <mathieu.bergounioux@orange.com>
Date: Thu, 9 Aug 2018 15:00:18 +0200
Subject: [PATCH 6/9] Separated hiding from disabling, and showing from
 enabling.

---
 Game.agf             |   2 +-
 TemplateSettings.asc |   4 ++--
 room1.crm            | Bin 52424 -> 52427 bytes
 room2.crm            | Bin 127197 -> 127200 bytes
 verbgui.asc          |  46 ++++++++++++++++++++++++++++++++++++-------
 verbgui.ash          |   7 +++++--
 6 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/Game.agf b/Game.agf
index 2c98062..1d6a608 100644
--- a/Game.agf
+++ b/Game.agf
@@ -2545,7 +2545,7 @@ stop
       <Font>
         <ID>3</ID>
         <PointSize>9</PointSize>
-        <Name>Tiny</Name>
+        <Name>TumbleTiny</Name>
         <OutlineFont>0</OutlineFont>
         <OutlineStyle>Automatic</OutlineStyle>
         <SourceFilename>assets/xpaider2.ttf</SourceFilename>
diff --git a/TemplateSettings.asc b/TemplateSettings.asc
index 4477309..6c7f259 100644
--- a/TemplateSettings.asc
+++ b/TemplateSettings.asc
@@ -119,12 +119,12 @@ function set_options()
   CustomSave.SetGui(gSave,  gSaveConfirm);
   CustomSave.slotSprite = 81;
   CustomSave.slotSpriteHi = 96;
-  CustomSave.font = eFontTiny;
+  CustomSave.font = eFontTumbleTiny;
   
   CustomLoad.SetGui(gLoad,  null); //null because this Load GUI does not have a "confirm" button
   CustomLoad.slotSprite = 81;
   CustomLoad.slotSpriteHi = 96;
-  CustomLoad.font = eFontTiny;
+  CustomLoad.font = eFontTumbleTiny;
   /***********************************************************************
    * Setup all the template options for the dialog GUI
    ***********************************************************************/
diff --git a/room1.crm b/room1.crm
index ff84919318d055dff9db9049b5603ca8480b0771..978756a27536dfbd94df2952366973a794ac91cf 100644
GIT binary patch
delta 150
zcmX>xllk;a<_+H48P{y~*?yjd@$zJuJ?@MLCqLLHKG}aS$K>WcTj0Dsa2Cg8?R^k&
zcgDMuHTL^MW%~F3VZ1%L=KzE+Kl%3o4WPWrL4P1waxfjDYV+rViOftKESnRL1~5%j
Z;GTTuIM3$2$7Pr%|31mJ`N7E-OaKccO1l66

delta 146
zcmX>-lljC<<_+H48CP!h*?yjd@xo-8J?@PACO_CGKG}aS$K>WcTj0Dsa2Cg8?R^k&
zcg9<jHTL^MW%~F3VZ1T9=KzE+Kl%3o4WPWrL4P1waxfjDYV+rViOfu_ESnRL1~5%j
V;GTTuIM3$2$7Pr{-#Pi72>{m{NHYKc

diff --git a/room2.crm b/room2.crm
index 4b3b2e648ccaa45c77bb13a16ff8a7c0c66a82d4..d337e1bfd3ab6f2bfa2cc8e52bdb48fdb1a439ab 100644
GIT binary patch
delta 70
zcmV-M0J;C&;RoR12Y|Ez>Ei(=x9Z~o2Ll1!moDf57ncd=0Z;+Kms;lm(*fPLF6aU3
c0RjjFw;}2QR05G82e)<X0nq`sL+$~Z0!~LA6aWAK

delta 70
zcmV-M0J;C*;RoH}2Y|Ez>Ei(-x9Z~o2Ll1xmoDf57ncd=0Z;+Hms;lm(*fGIF6aU3
c0RjaCw;}2QR05G82e)<X0nq`sN$vrc0!$Dc2mk;8

diff --git a/verbgui.asc b/verbgui.asc
index 03f56a2..4643f8c 100644
--- a/verbgui.asc
+++ b/verbgui.asc
@@ -280,27 +280,22 @@ static int Verbs::GetButtonAction(int action)
 
 /***********************************************************************
  * DisableGui()
- * This functions disables the GUI and hides it.
+ * This functions disables the GUI (but does not necessarily hides it)
  * 
  ***********************************************************************/
 static void Verbs::DisableGui()
 {
   verbsData.disabled_gui=true;
-  verbsData.guiMain.Visible=false;
-  verbsData.guiAction.Visible=false;
 }
 
 /***********************************************************************
  * EnableGui()
- * This functions enables the GUI and makes it visible.
+ * This functions enables the GUI (but does not necessarily makes it visible).
  * 
  ***********************************************************************/
 static void Verbs::EnableGui()
 {
   verbsData.disabled_gui=false;
-  verbsData.guiMain.Visible=true;
-  verbsData.guiAction.Visible=true;
-  Wait(1);
 }
 
 /***********************************************************************
@@ -313,6 +308,43 @@ static bool Verbs::IsGuiDisabled()
   return verbsData.disabled_gui;
 }
 
+
+/***********************************************************************
+ * ShowGui()
+ * Shows the verbs GUI and enables it
+ * 
+ ***********************************************************************/
+static void Verbs::ShowGui()
+{
+  Verbs.EnableGui();
+  gMain.Visible=true;
+  gAction.Visible=true;
+  Wait(1);
+}
+
+/***********************************************************************
+ * ShowGui()
+ * Hides the verbs GUI and disables it
+ * 
+ ***********************************************************************/
+static void Verbs::HideGui()
+{
+  Verbs.DisableGui();
+  gMain.Visible=false;
+  gAction.Visible=false;
+}
+
+/***********************************************************************
+ * IsGuiDisabled()
+ * Returns true, if the GUI is currently visibale, false otherwise
+ * 
+ ***********************************************************************/
+static bool Verbs::IsGuiVisible()
+{
+   return gMain.Visible;
+}
+
+
 /***********************************************************************
  * HandleInvArrows() 
  * Takes care of showing or hiding the inventory scroll sprites
diff --git a/verbgui.ash b/verbgui.ash
index 1eab815..2be1ad4 100644
--- a/verbgui.ash
+++ b/verbgui.ash
@@ -178,9 +178,12 @@ struct Verbs {
   import static void SetFonts(FontType fontText, FontType fontTextOut, FontType fontSpeech, FontType fontOutlineSpeech);
 // ============================= Helper functions ==============================================
   import static int  GetButtonAction(int action);
-  import static void DisableGui();
-  import static void EnableGui();
+  import static void DisableGui(); //Disables but does not hide
+  import static void EnableGui(); //Enables but does not show
   import static bool IsGuiDisabled();
+  import static void ShowGui(); //Shows and enables
+  import static void HideGui(); //Hides and disables
+  import static bool IsGuiVisible();
   import static int  GlobalCondition(eGlobCond condition);
   import static void InitGuiLanguage();  
   import static void HandleInvArrows();  

From db816ffe02014a147dd4b6178078b6d54090facc Mon Sep 17 00:00:00 2001
From: Mathieu Bergounioux <mathieu.bergounioux@orange.com>
Date: Fri, 10 Aug 2018 13:08:31 +0200
Subject: [PATCH 7/9] - moved more time-related code to the time-related struct
 - added reminders to remove references to gMain - fixed some references to
 global variables that I overlooked in previous commits

---
 optiongui.asc | 29 +++++++++++---------
 verbgui.asc   | 76 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/optiongui.asc b/optiongui.asc
index 987b504..f279741 100644
--- a/optiongui.asc
+++ b/optiongui.asc
@@ -18,6 +18,7 @@ struct TimeCount {
     
     import static void GameStart();
     import static void RepExec();
+    import static String GeneratePlayTimeString();
 };
 TimeCount timeCount;
 
@@ -40,6 +41,17 @@ static void TimeCount::RepExec() {
   
 }
 
+static String TimeCount::GeneratePlayTimeString() {
+  String playTimeResult = "";
+  
+  int playMinutes = FloatToInt(IntToFloat(timeCount.playTimeSeconds) / 60.0, eRoundDown); 
+  int playHours = FloatToInt(IntToFloat(timeCount.playTimeSeconds) / 3600.0, eRoundDown); 
+  
+  if (playHours == 0) playTimeResult = String.Format ("%dm", playMinutes);
+  else playTimeResult = String.Format ("%dh %dm", playHours, playMinutes);
+  return String.Format("%s;%04d/%02d/%02d %02d:%02d", playTimeResult, timeCount.dt.Year, timeCount.dt.Month, timeCount.dt.DayOfMonth,  timeCount.dt.Hour, timeCount.dt.Minute);
+    
+}
 
 // Save Load GUI functionality
 
@@ -199,7 +211,7 @@ static void CustomSave::ShowSaveDialog() {
       if (Game.GetSaveSlotDescription(i+1)!=null) {
         DynamicSprite *tempSprite = DynamicSprite.CreateFromSaveGame(i+1, System.ScreenWidth, System.ScreenHeight);
         if (tempSprite != null) {
-          tempSprite.Crop(0, 0, System.ScreenWidth, System.ScreenHeight - gMain.Height);
+          tempSprite.Crop(0, 0, System.ScreenWidth, System.ScreenHeight - gMain.Height); //TODO : remove reference to gMain
           tempSprite.Resize(btnWidth-4, btnHeight-6);
           
           DrawingSurface *tempSurf = tempSprite.GetDrawingSurface();
@@ -385,7 +397,7 @@ static void CustomLoad::ShowLoadDialog() {
       if (Game.GetSaveSlotDescription(i+1)!=null) {
         DynamicSprite *tempSprite = DynamicSprite.CreateFromSaveGame(i+1, System.ScreenWidth, System.ScreenHeight);
         if (tempSprite != null) {
-          tempSprite.Crop(0, 0, System.ScreenWidth, System.ScreenHeight - gMain.Height);
+          tempSprite.Crop(0, 0, System.ScreenWidth, System.ScreenHeight - gMain.Height); //TODO : remove reference to gMain
           tempSprite.Resize(btnWidth-4, btnHeight-6);
           
           DrawingSurface *tempSurf = tempSprite.GetDrawingSurface();
@@ -461,23 +473,14 @@ static void CustomLoad::LoadCancel() {
 //  Prepare a screenshot
 static void OptionGui::CreateScreenshot(FontType font)
 {
-
-  String playTimeResult = "";
-  
-  int playMinutes = FloatToInt(IntToFloat(timeCount.playTimeSeconds) / 60.0, eRoundDown); 
-  int playHours = FloatToInt(IntToFloat(timeCount.playTimeSeconds) / 3600.0, eRoundDown); 
-  
-  if (playHours == 0) playTimeResult = String.Format ("%dm", playMinutes);
-  else playTimeResult = String.Format ("%dh %dm", playHours, playMinutes);
-  
-  customSaveData.saveSlotString = String.Format("%s;%04d/%02d/%02d %02d:%02d", playTimeResult, timeCount.dt.Year, timeCount.dt.Month, timeCount.dt.DayOfMonth,  timeCount.dt.Hour, timeCount.dt.Minute);
+  customSaveData.saveSlotString = TimeCount.GeneratePlayTimeString();
   
   int btnWidth  = Game.SpriteWidth[customLoadData.slotSprite];
   int btnHeight = Game.SpriteHeight[customLoadData.slotSprite];  
   
   saveScreenshot = DynamicSprite.CreateFromScreenShot();
   
-  saveScreenshot.Crop(0, 0,  System.ScreenWidth, System.ScreenHeight - gMain.Height);
+  saveScreenshot.Crop(0, 0,  System.ScreenWidth, System.ScreenHeight - gMain.Height); //TODO : remove reference to gMain
   saveScreenshot.Resize(btnWidth-4, btnHeight-6);
   
   DrawingSurface *tempSurf = saveScreenshot.GetDrawingSurface();
diff --git a/verbgui.asc b/verbgui.asc
index 4643f8c..bf543aa 100644
--- a/verbgui.asc
+++ b/verbgui.asc
@@ -317,8 +317,8 @@ static bool Verbs::IsGuiDisabled()
 static void Verbs::ShowGui()
 {
   Verbs.EnableGui();
-  gMain.Visible=true;
-  gAction.Visible=true;
+  verbsData.guiMain.Visible=true;
+  verbsData.guiAction.Visible=true;
   Wait(1);
 }
 
@@ -330,8 +330,8 @@ static void Verbs::ShowGui()
 static void Verbs::HideGui()
 {
   Verbs.DisableGui();
-  gMain.Visible=false;
-  gAction.Visible=false;
+  verbsData.guiMain.Visible=false;
+  verbsData.guiAction.Visible=false;
 }
 
 /***********************************************************************
@@ -341,7 +341,7 @@ static void Verbs::HideGui()
  ***********************************************************************/
 static bool Verbs::IsGuiVisible()
 {
-   return gMain.Visible;
+   return verbsData.guiMain.Visible;
 }
 
 
@@ -1214,10 +1214,10 @@ static void Verbs::AdjustLanguage()
 static void Verbs::AdjustGUIText() 
 {
   bool custom_font;
-  int fontText    = verbsData.fontText;
-  int fontTextOut = verbsData.fontTextOut;
-  int fontSpeech  = verbsData.fontSpeech;
-  int fontSpeechOut = verbsData.fontOutlineSpeech;
+  //int fontText    = verbsData.fontText;
+  //int fontTextOut = verbsData.fontTextOut;
+  //int fontSpeech  = verbsData.fontSpeech;
+  //int fontSpeechOut = verbsData.fontOutlineSpeech;
   
   // English
   if (verbsData.lang == eLangEN){
@@ -1383,30 +1383,30 @@ static void Verbs::AdjustGUIText()
   
   // Apply language dependend custom fonts if needed
   if (custom_font) {
-    Game.SpeechFont   = fontSpeech;
-    Game.NormalFont   = fontText;
-    lblAction.Font    = fontTextOut;
-    lblOptions.Font   = fontText;
-    lblOptionsMusic.Font   = fontText;
-    lblOptionsSound.Font   = fontText;
-    lblOptionsStyle.Font   = fontText;
-    lblOptionsGuiClassic.Font   = fontTextOut;
-    lblOptionsGuiModern.Font    = fontTextOut;
-    btnOptionsDefault.Font = fontText;
-    btnOptionsSave.Font    = fontText;
-    btnOptionsLoad.Font    = fontText;
-    btnOptionsQuit.Font    = fontText;
-    btnOptionsResume.Font  = fontText;
-    lblPauseHeadline.Font  = fontText;
-    lblPauseMessage.Font   = fontText;
-    lblLoad.Font           = fontText;
-    btnLoadCancel.Font     = fontText;
-    lblSave.Font           = fontText;
-    btnSaveCancel.Font     = fontText;
-    lblQuitHeadline.Font   = fontText;
-    lblQuitMessage.Font    = fontText;
-    btnQuitYes.Font        = fontText;
-    btnQuitNo.Font         = fontText;
+    Game.SpeechFont   = verbsData.fontSpeech;
+    Game.NormalFont   = verbsData.fontText;
+    lblAction.Font    = verbsData.fontTextOut;
+    lblOptions.Font   = verbsData.fontText;
+    lblOptionsMusic.Font   = verbsData.fontText;
+    lblOptionsSound.Font   = verbsData.fontText;
+    lblOptionsStyle.Font   = verbsData.fontText;
+    lblOptionsGuiClassic.Font   = verbsData.fontTextOut;
+    lblOptionsGuiModern.Font    = verbsData.fontTextOut;
+    btnOptionsDefault.Font = verbsData.fontText;
+    btnOptionsSave.Font    = verbsData.fontText;
+    btnOptionsLoad.Font    = verbsData.fontText;
+    btnOptionsQuit.Font    = verbsData.fontText;
+    btnOptionsResume.Font  = verbsData.fontText;
+    lblPauseHeadline.Font  = verbsData.fontText;
+    lblPauseMessage.Font   = verbsData.fontText;
+    lblLoad.Font           = verbsData.fontText;
+    btnLoadCancel.Font     = verbsData.fontText;
+    lblSave.Font           = verbsData.fontText;
+    btnSaveCancel.Font     = verbsData.fontText;
+    lblQuitHeadline.Font   = verbsData.fontText;
+    lblQuitMessage.Font    = verbsData.fontText;
+    btnQuitYes.Font        = verbsData.fontText;
+    btnQuitNo.Font         = verbsData.fontText;
   }
 }
 
@@ -2101,6 +2101,10 @@ function on_event(EventType event, int data)
     Verbs.CheckDefaultAction();
     Verbs.UpdateActionBar();
   }
+  
+  else if (event==eEventRestoreGame) {
+    Verbs.AdjustLanguage();
+  }
 }
 
 /***********************************************************************
@@ -2481,4 +2485,8 @@ function repeatedly_execute_always() {
       Verbs.AdjustActionBarPosition();
     }
   }
-}
\ No newline at end of file
+}
+
+
+
+

From 8461036c299a01c45a35716824f490d2266ebf4f Mon Sep 17 00:00:00 2001
From: BERGOUNIOUX Mathieu <mathieu.bergounioux@orange.com>
Date: Wed, 15 Aug 2018 20:06:52 +0200
Subject: [PATCH 8/9] - created a structure to manage translatable buttons and
 store their data independently frm their current state - made it possible to
 setup the buttons and their graphics outside of the module for better
 integration with larger code base

---
 TemplateSettings.asc |  18 +++
 verbgui.asc          | 338 ++++++++++++++++++++++++-------------------
 verbgui.ash          |   7 +-
 3 files changed, 216 insertions(+), 147 deletions(-)

diff --git a/TemplateSettings.asc b/TemplateSettings.asc
index 6c7f259..c032c88 100644
--- a/TemplateSettings.asc
+++ b/TemplateSettings.asc
@@ -9,6 +9,24 @@ function set_options()
   // Tell what global Guis to use
   Verbs.BindGuis(gAction, gMain, gPause, gQuit);
   
+  // Tell what buttons match what verb actions
+  Verbs.MapButtons(); 
+  //Alternatively you can go into details : 
+  /*
+    Verbs.SetActionButton(eGA_Open,    verbsData.guiMain.Controls[0].AsButton);
+    Verbs.SetActionButton(eGA_Close,   verbsData.guiMain.Controls[1].AsButton);
+    Verbs.SetActionButton(eGA_GiveTo,  verbsData.guiMain.Controls[2].AsButton);
+    Verbs.SetActionButton(eGA_PickUp,  verbsData.guiMain.Controls[3].AsButton);
+    Verbs.SetActionButton(eGA_LookAt,  verbsData.guiMain.Controls[4].AsButton);
+    Verbs.SetActionButton(eGA_TalkTo,  verbsData.guiMain.Controls[5].AsButton);
+    Verbs.SetActionButton(eGA_Push,    verbsData.guiMain.Controls[6].AsButton);
+    Verbs.SetActionButton(eGA_Pull,    verbsData.guiMain.Controls[7].AsButton);
+    Verbs.SetActionButton(eGA_Use,     verbsData.guiMain.Controls[8].AsButton);
+  */
+  
+  //Customize verbs buttons grapics and shortcuts
+  Verbs.Localize(); //Alternatively you may call Verbs.LocalizeActionButton separately for each button, to set custom graphics and shortcuts.
+  
   // Tell what fonts to use
   Verbs.SetFonts(eFontTumbleText, eFontTumbleTextOut, eFontTumbleSpeech, eFontTumbleOutlineSpeech);
   
diff --git a/verbgui.asc b/verbgui.asc
index bf543aa..a92f0d4 100644
--- a/verbgui.asc
+++ b/verbgui.asc
@@ -33,8 +33,25 @@ static int Geometry::Offset(int point1, int point2)
 // ========================== internal variables =============================
 // Please do not edit these option directly anymore, but use the VerbGuiSettings settings script instead!
 
-struct VerbsData {
+
+#define LANGUAGE_COUNT 8
+struct ActionButtonData {
+    Action button_action;  // Array containg the related actions like eGA_LookAt
+    int action_button; // Array containing the verb button Ids
     
+    int action_button_normal[LANGUAGE_COUNT];     // contains the verb button sprites
+    int action_button_highlight[LANGUAGE_COUNT];  // Contains the highlighted verb button sprites
+    int action_l_keycode[LANGUAGE_COUNT]; // lower case keycodes for the verbs
+    int action_u_keycode[LANGUAGE_COUNT]; // upper case keycodes for the verbs
+    
+};
+
+ActionButtonData actionButtonData[ACT_COUNT];
+  
+  
+struct VerbsData {
+       
+     
     int lang;           
     int actionLabelColorNormal;  
     int actionLabelColorHighlighted;
@@ -82,20 +99,20 @@ struct VerbsData {
 
     bool player_frozen;       // player can't move
     bool disabled_gui;        // GUI disabled
-    int action_button[ACT_COUNT];            // Array containing the verb button Ids
-    int action_button_normal[ACT_COUNT];     // contains the verb button sprites
-    int action_button_highlight[ACT_COUNT];  // Contains the highlighted verb button sprites
-    int button_action[ACT_COUNT];            // Array containg the related actions like eGA_LookAt
+    
 
+    
     String tresult;           // translated result of the action mode, eg. "Look at %s"
     String act_object;        // action_object - object used in action
     String act_item;          // inventory item to be used or given 
     int actionLabelWidth; // Width of the action label in the status bar
 
-    int action_l_keycode[ACT_COUNT]; // lower case keycodes for the verbs
-    int action_u_keycode[ACT_COUNT]; // upper case keycodes for the verbs
+
     InventoryItem*ItemGiven;        // Item given to a character
-    char key_l_yes, key_u_yes, key_l_no, key_u_no; // translated keys for yes and no
+    char key_l_yes[LANGUAGE_COUNT]; // translated keys for yes (lower)
+    char key_u_yes[LANGUAGE_COUNT]; // translated keys for yes (upper)
+    char key_l_no[LANGUAGE_COUNT]; // translated keys for no (lower)
+    char key_u_no[LANGUAGE_COUNT];  // translated keys for no (upper)
 
     int door_state[MAX_DOORS];// Array for the door script
     String door_strings[DOORSTRING_COUNT];   // default messages for the door script
@@ -275,7 +292,7 @@ static void Verbs::SetFonts(FontType fontText, FontType fontTextOut, FontType fo
  ***********************************************************************/
 static int Verbs::GetButtonAction(int action) 
 {
-  return verbsData.button_action[action];
+  return actionButtonData[action].button_action;
 }
 
 /***********************************************************************
@@ -840,9 +857,9 @@ static void Verbs::SetAlternativeAction(char extension, Action alt_action)
        verbsData.alternative_action = alt_action;
   }
   else {
-    int button          = verbsData.action_button[alt_action];
-    int normalbuttonpic = verbsData.action_button_normal[alt_action];
-    int overbuttonpic   = verbsData.action_button_highlight[alt_action];
+    int button          = actionButtonData[alt_action].action_button;
+    int normalbuttonpic = actionButtonData[alt_action].action_button_normal[verbsData.lang];
+    int overbuttonpic   = actionButtonData[alt_action].action_button_highlight[verbsData.lang];
     
     // used for setting the default action given the extension.
     GUIControl*gc = verbsData.guiMain.Controls[button];
@@ -1051,157 +1068,186 @@ static void Verbs::ToogleGuiStyle(int enable_new)
 // ============================= translation ===========================================
 
 /***********************************************************************
- * SetActionButtons(Action action, int btn_ID, int sprite, int sprite_highlight, char key)
- * This functions connects the verb buttons with the action and is also used to assign / change the graphics of the verb buttons.
+ * SetActionButtons(Action action, int btn_ID)
+ * This functions connects the verb buttons with the action
  * 
  ***********************************************************************/
-static void Verbs::SetActionButtons(Action action, int btn_ID, int sprite, int sprite_highlight, char key)
+static void Verbs::SetActionButton(Action action, Button* btn)
+{
+  if (btn.OwningGUI.ID != verbsData.guiMain.ID) {
+      AbortGame("This button is not part of the Verbs GUI.");
+  }
+  actionButtonData[action].button_action=action;
+  actionButtonData[action].action_button=btn.ID;
+}
+
+
+/***********************************************************************
+ * LocalizeActionButtons(int lang,  Action action, int sprite, int sprite_highlight, char key)
+ * This fisused to assign / change the graphics of the verb buttons.
+ * 
+ ***********************************************************************/
+static void Verbs::LocalizeActionButton(eLanguage lang,  Action action, int sprite, int sprite_highlight, char key)
 {
   String upperkey = String.Format("%c", key);
   upperkey = upperkey.UpperCase();
   
-  verbsData.action_button[action] = btn_ID;
-  verbsData.action_button_normal[action] = sprite;
-  verbsData.action_button_highlight[action] = sprite_highlight;
-  verbsData.action_l_keycode[action] = key;
-  verbsData.action_u_keycode[action] = upperkey.Chars[0];
-  verbsData.button_action[verbsData.action_button[action]]=action;
+  actionButtonData[action].action_button_normal[lang] = sprite;
+  actionButtonData[action].action_button_highlight[lang] = sprite_highlight;
+  actionButtonData[action].action_l_keycode[lang] = key;
+  actionButtonData[action].action_u_keycode[lang] = upperkey.Chars[0];
+
 }
 
 
 /***********************************************************************
- * AdjustLanguage() 
+ * MapButtons() 
  * This sets up everything related to the verb buttons, so you need to take a look at this, if you want to customize your GUI. 
+ * You can call SetActionButton in your own scripts to customize the default buttons mapping.
  * 
  ***********************************************************************/
-static void Verbs::AdjustLanguage() 
+static void Verbs::MapButtons() 
 {
-  // English
-  if (verbsData.lang == eLangEN) {
+    Verbs.SetActionButton(eGA_Open,    verbsData.guiMain.Controls[0].AsButton);
+    Verbs.SetActionButton(eGA_Close,   verbsData.guiMain.Controls[1].AsButton);
+    Verbs.SetActionButton(eGA_GiveTo,  verbsData.guiMain.Controls[2].AsButton);
+    Verbs.SetActionButton(eGA_PickUp,  verbsData.guiMain.Controls[3].AsButton);
+    Verbs.SetActionButton(eGA_LookAt,  verbsData.guiMain.Controls[4].AsButton);
+    Verbs.SetActionButton(eGA_TalkTo,  verbsData.guiMain.Controls[5].AsButton);
+    Verbs.SetActionButton(eGA_Push,    verbsData.guiMain.Controls[6].AsButton);
+    Verbs.SetActionButton(eGA_Pull,    verbsData.guiMain.Controls[7].AsButton);
+    Verbs.SetActionButton(eGA_Use,     verbsData.guiMain.Controls[8].AsButton);
+}
+
+
+/***********************************************************************
+ * SetKeys(int lang,  char key_yes, char key_no)
+ * Lets you tell the module what should be the shortcuts for 'yes' and 'no'
+ * 
+ ***********************************************************************/
+static void Verbs::SetKeys(eLanguage lang,  char key_yes, char key_no)
+{
+    String sYes = String.Format("%c", key_yes);
+    String sNo = String.Format("%c", key_no);
+    sYes = sYes.UpperCase();
+    sNo = sNo.UpperCase();
+    verbsData.key_u_yes[lang] = sYes.Chars[0];
+    verbsData.key_u_no[lang] = sNo.Chars[0];
+    sYes = sYes.LowerCase();
+    sNo = sNo.LowerCase();
+    verbsData.key_l_yes[lang] = sYes.Chars[0];
+    verbsData.key_l_no[lang] = sNo.Chars[0];
+}
+
+  
+  
+/***********************************************************************
+ * AdjustLanguage() 
+ * This re-applies the buttons graphics and shortcuts accordingly to the language if you switch languages
+ * 
+ ***********************************************************************/
+static void Verbs::Localize() 
+{
+  
+  // English - eLangEN
     // yes/no-keys
-    verbsData.key_u_yes= 'Y';
-    verbsData.key_l_yes= 'y';
-    verbsData.key_u_no= 'N';
-    verbsData.key_l_no= 'n';
+    Verbs.SetKeys(eLangEN,  'y',  'n');
     
-    Verbs.SetActionButtons(eGA_Open,    0, 59, 60, 'q');
-    Verbs.SetActionButtons(eGA_Close,   1, 61, 62, 'a');
-    Verbs.SetActionButtons(eGA_GiveTo,  2, 63, 64, 'z');
-    Verbs.SetActionButtons(eGA_PickUp,  3, 71, 72, 'w');
-    Verbs.SetActionButtons(eGA_LookAt,  4, 73, 74, 's');
-    Verbs.SetActionButtons(eGA_TalkTo,  5, 75, 76, 'x');
-    Verbs.SetActionButtons(eGA_Push,    6, 65, 66, 'e');
-    Verbs.SetActionButtons(eGA_Pull,    7, 67, 68, 'd');
-    Verbs.SetActionButtons(eGA_Use,     8, 69, 70, 'c');
+    Verbs.LocalizeActionButton(eLangEN,eGA_Open,    59, 60, 'q');
+    Verbs.LocalizeActionButton(eLangEN,eGA_Close,   61, 62, 'a');
+    Verbs.LocalizeActionButton(eLangEN,eGA_GiveTo,  63, 64, 'z');
+    Verbs.LocalizeActionButton(eLangEN,eGA_PickUp,  71, 72, 'w');
+    Verbs.LocalizeActionButton(eLangEN,eGA_LookAt,  73, 74, 's');
+    Verbs.LocalizeActionButton(eLangEN,eGA_TalkTo,  75, 76, 'x');
+    Verbs.LocalizeActionButton(eLangEN,eGA_Push,    65, 66, 'e');
+    Verbs.LocalizeActionButton(eLangEN,eGA_Pull,    67, 68, 'd');
+    Verbs.LocalizeActionButton(eLangEN,eGA_Use,     69, 70, 'c');
     
-  }
   
-  // German
-  else if (verbsData.lang == eLangDE) {
+  // German - eLangDE 
     // yes/no-keys
-    verbsData.key_u_yes= 'J';
-    verbsData.key_l_yes= 'j';
-    verbsData.key_u_no= 'N';
-    verbsData.key_l_no= 'n';    
-    Verbs.SetActionButtons(eGA_Open,    0, 94, 101, 'q');
-    Verbs.SetActionButtons(eGA_Close,   1, 102, 103, 'a');
-    Verbs.SetActionButtons(eGA_GiveTo,  2, 104, 105, 'y');
-    Verbs.SetActionButtons(eGA_PickUp,  3, 112, 113, 'w');
-    Verbs.SetActionButtons(eGA_LookAt,  4, 114, 115, 's');
-    Verbs.SetActionButtons(eGA_TalkTo,  5, 116, 117, 'x');
-    Verbs.SetActionButtons(eGA_Push,    6, 106, 107, 'e');
-    Verbs.SetActionButtons(eGA_Pull,    7, 108, 109, 'd');
-    Verbs.SetActionButtons(eGA_Use,     8, 110, 111, 'c');
-  }
-  
-  // Spanish
-  else if (verbsData.lang == eLangES) {
+    Verbs.SetKeys(eLangDE,  'j',  'n');
+    
+    Verbs.LocalizeActionButton(eLangDE,eGA_Open,    94, 101, 'q');
+    Verbs.LocalizeActionButton(eLangDE,eGA_Close,   102, 103, 'a');
+    Verbs.LocalizeActionButton(eLangDE,eGA_GiveTo,  104, 105, 'y');
+    Verbs.LocalizeActionButton(eLangDE,eGA_PickUp,  112, 113, 'w');
+    Verbs.LocalizeActionButton(eLangDE,eGA_LookAt,  114, 115, 's');
+    Verbs.LocalizeActionButton(eLangDE,eGA_TalkTo,  116, 117, 'x');
+    Verbs.LocalizeActionButton(eLangDE,eGA_Push,    106, 107, 'e');
+    Verbs.LocalizeActionButton(eLangDE,eGA_Pull,    108, 109, 'd');
+    Verbs.LocalizeActionButton(eLangDE,eGA_Use,     110, 111, 'c');
+  
+  // Spanish - eLangES
     // yes/no-keys
-    verbsData.key_u_yes= 'S';
-    verbsData.key_l_yes= 's';
-    verbsData.key_u_no= 'N';
-    verbsData.key_l_no= 'n';     
-
-    Verbs.SetActionButtons(eGA_Open,    0, 141, 142, 'q');
-    Verbs.SetActionButtons(eGA_Close,   1, 143, 144, 'a');
-    Verbs.SetActionButtons(eGA_GiveTo,  2, 145, 146, 'y');
-    Verbs.SetActionButtons(eGA_PickUp,  3, 153, 154, 'w');
-    Verbs.SetActionButtons(eGA_LookAt,  4, 155, 156, 's');
-    Verbs.SetActionButtons(eGA_TalkTo,  5, 157, 158, 'x');
-    Verbs.SetActionButtons(eGA_Push,    6, 148, 147, 'e');
-    Verbs.SetActionButtons(eGA_Pull,    7, 149, 150, 'd');
-    Verbs.SetActionButtons(eGA_Use,     8, 151, 152, 'c');
-  }  
-  // French
-  else if (verbsData.lang == eLangFR) {
+    Verbs.SetKeys(eLangES,  's',  'n');
+    
+    Verbs.LocalizeActionButton(eLangES,eGA_Open,    141, 142, 'q');
+    Verbs.LocalizeActionButton(eLangES,eGA_Close,   143, 144, 'a');
+    Verbs.LocalizeActionButton(eLangES,eGA_GiveTo,  145, 146, 'y');
+    Verbs.LocalizeActionButton(eLangES,eGA_PickUp,  153, 154, 'w');
+    Verbs.LocalizeActionButton(eLangES,eGA_LookAt,  155, 156, 's');
+    Verbs.LocalizeActionButton(eLangES,eGA_TalkTo,  157, 158, 'x');
+    Verbs.LocalizeActionButton(eLangES,eGA_Push,    148, 147, 'e');
+    Verbs.LocalizeActionButton(eLangES,eGA_Pull,    149, 150, 'd');
+    Verbs.LocalizeActionButton(eLangES, eGA_Use,    151, 152, 'c');
+
+  // French - eLangFR
     // yes/no-keys
-    verbsData.key_u_yes= 'O';
-    verbsData.key_l_yes= 'o';
-    verbsData.key_u_no= 'N';
-    verbsData.key_l_no= 'n';   
+    Verbs.SetKeys(eLangFR,  'o',  'n');
     
-    Verbs.SetActionButtons(eGA_Open,    0, 123, 124, 'q');
-    Verbs.SetActionButtons(eGA_Close,   1, 125, 126, 'a');
-    Verbs.SetActionButtons(eGA_GiveTo,  2, 127, 128, 'y');
-    Verbs.SetActionButtons(eGA_PickUp,  3, 135, 136, 'w');
-    Verbs.SetActionButtons(eGA_LookAt,  4, 137, 138, 's');
-    Verbs.SetActionButtons(eGA_TalkTo,  5, 139, 140, 'x');
-    Verbs.SetActionButtons(eGA_Push,    6, 129, 130, 'e');
-    Verbs.SetActionButtons(eGA_Pull,    7, 131, 132, 'd');
-    Verbs.SetActionButtons(eGA_Use,     8, 133, 134, 'c'); 
-  }    
-  // Italian
-  else if (verbsData.lang == eLangIT) {
+    Verbs.LocalizeActionButton(eLangFR, eGA_Open,    123, 124, 'q');
+    Verbs.LocalizeActionButton(eLangFR, eGA_Close,   125, 126, 'a');
+    Verbs.LocalizeActionButton(eLangFR, eGA_GiveTo,  127, 128, 'y');
+    Verbs.LocalizeActionButton(eLangFR, eGA_PickUp,  135, 136, 'w');
+    Verbs.LocalizeActionButton(eLangFR, eGA_LookAt,  137, 138, 's');
+    Verbs.LocalizeActionButton(eLangFR, eGA_TalkTo,  139, 140, 'x');
+    Verbs.LocalizeActionButton(eLangFR, eGA_Push,    129, 130, 'e');
+    Verbs.LocalizeActionButton(eLangFR, eGA_Pull,    131, 132, 'd');
+    Verbs.LocalizeActionButton(eLangFR, eGA_Use,     133, 134, 'c'); 
+  
+  // Italian - eLangIT
     // yes/no-keys
-    verbsData.key_u_yes= 'S';
-    verbsData.key_l_yes= 's';
-    verbsData.key_u_no= 'N';
-    verbsData.key_l_no= 'n';     
-
-    Verbs.SetActionButtons(eGA_Open,    0, 159, 160, 'q');
-    Verbs.SetActionButtons(eGA_Close,   1, 161, 162, 'a');
-    Verbs.SetActionButtons(eGA_GiveTo,  2, 163, 164, 'y');
-    Verbs.SetActionButtons(eGA_PickUp,  3, 171, 172, 'w');
-    Verbs.SetActionButtons(eGA_LookAt,  4, 173, 174, 's');
-    Verbs.SetActionButtons(eGA_TalkTo,  5, 175, 176, 'x');
-    Verbs.SetActionButtons(eGA_Push,    6, 165, 166, 'e');
-    Verbs.SetActionButtons(eGA_Pull,    7, 167, 168, 'd');
-    Verbs.SetActionButtons(eGA_Use,     8, 169, 170, 'c'); 
-  }
-  else if (verbsData.lang == eLangPT) {
+    Verbs.SetKeys(eLangIT,  's',  'n');   
+
+    Verbs.LocalizeActionButton(eLangIT, eGA_Open,    159, 160, 'q');
+    Verbs.LocalizeActionButton(eLangIT, eGA_Close,   161, 162, 'a');
+    Verbs.LocalizeActionButton(eLangIT, eGA_GiveTo,  163, 164, 'y');
+    Verbs.LocalizeActionButton(eLangIT, eGA_PickUp,  171, 172, 'w');
+    Verbs.LocalizeActionButton(eLangIT, eGA_LookAt,  173, 174, 's');
+    Verbs.LocalizeActionButton(eLangIT, eGA_TalkTo,  175, 176, 'x');
+    Verbs.LocalizeActionButton(eLangIT, eGA_Push,    165, 166, 'e');
+    Verbs.LocalizeActionButton(eLangIT, eGA_Pull,    167, 168, 'd');
+    Verbs.LocalizeActionButton(eLangIT, eGA_Use,     169, 170, 'c'); 
+
+  // Portuguese -  eLangPT
     // yes/no-keys
-    verbsData.key_u_yes= 'S';
-    verbsData.key_l_yes= 's';
-    verbsData.key_u_no= 'N';
-    verbsData.key_l_no= 'n';     
-
-    Verbs.SetActionButtons(eGA_Open,    0, 177, 178, 'q');
-    Verbs.SetActionButtons(eGA_Close,   1, 179, 180, 'a');
-    Verbs.SetActionButtons(eGA_GiveTo,  2, 181, 182, 'y');
-    Verbs.SetActionButtons(eGA_PickUp,  3, 189, 190, 'w');
-    Verbs.SetActionButtons(eGA_LookAt,  4, 191, 192, 's');
-    Verbs.SetActionButtons(eGA_TalkTo,  5, 193, 194, 'x');
-    Verbs.SetActionButtons(eGA_Push,    6, 183, 184, 'e');
-    Verbs.SetActionButtons(eGA_Pull,    7, 185, 186, 'd');
-    Verbs.SetActionButtons(eGA_Use,     8, 187, 188, 'c'); 
-  }
-  // Dutch
-  else if (verbsData.lang == eLangNL) {
+    Verbs.SetKeys(eLangPT,  's',  'n');   
+
+    Verbs.LocalizeActionButton(eLangPT, eGA_Open,    177, 178, 'q');
+    Verbs.LocalizeActionButton(eLangPT, eGA_Close,   179, 180, 'a');
+    Verbs.LocalizeActionButton(eLangPT, eGA_GiveTo,  181, 182, 'y');
+    Verbs.LocalizeActionButton(eLangPT, eGA_PickUp,  189, 190, 'w');
+    Verbs.LocalizeActionButton(eLangPT, eGA_LookAt,  191, 192, 's');
+    Verbs.LocalizeActionButton(eLangPT, eGA_TalkTo,  193, 194, 'x');
+    Verbs.LocalizeActionButton(eLangPT, eGA_Push,    183, 184, 'e');
+    Verbs.LocalizeActionButton(eLangPT, eGA_Pull,    185, 186, 'd');
+    Verbs.LocalizeActionButton(eLangPT, eGA_Use,     187, 188, 'c'); 
+
+  // Dutch - eLangNL
     // yes/no-keys
-    verbsData.key_u_yes= 'J';
-    verbsData.key_l_yes= 'j';
-    verbsData.key_u_no= 'N';
-    verbsData.key_l_no= 'n';    
-    Verbs.SetActionButtons(eGA_Open,    0, 195, 196, 'q');
-    Verbs.SetActionButtons(eGA_Close,   1, 197, 198, 'a');
-    Verbs.SetActionButtons(eGA_GiveTo,  2, 199, 200, 'y');
-    Verbs.SetActionButtons(eGA_PickUp,  3, 207, 208, 'w');
-    Verbs.SetActionButtons(eGA_LookAt,  4, 209, 210, 's');
-    Verbs.SetActionButtons(eGA_TalkTo,  5, 211, 212, 'x');
-    Verbs.SetActionButtons(eGA_Push,    6, 201, 202, 'e');
-    Verbs.SetActionButtons(eGA_Pull,    7, 203, 204, 'd');
-    Verbs.SetActionButtons(eGA_Use,     8, 205, 206, 'c');
-  }  
+    Verbs.SetKeys(eLangNL,  'j',  'n');
+    
+    Verbs.LocalizeActionButton(eLangNL, eGA_Open,    195, 196, 'q');
+    Verbs.LocalizeActionButton(eLangNL, eGA_Close,   197, 198, 'a');
+    Verbs.LocalizeActionButton(eLangNL, eGA_GiveTo,  199, 200, 'y');
+    Verbs.LocalizeActionButton(eLangNL, eGA_PickUp,  207, 208, 'w');
+    Verbs.LocalizeActionButton(eLangNL, eGA_LookAt,  209, 210, 's');
+    Verbs.LocalizeActionButton(eLangNL, eGA_TalkTo,  211, 212, 'x');
+    Verbs.LocalizeActionButton(eLangNL, eGA_Push,    201, 202, 'e');
+    Verbs.LocalizeActionButton(eLangNL, eGA_Pull,    203, 204, 'd');
+    Verbs.LocalizeActionButton(eLangNL, eGA_Use,     205, 206, 'c');
+
   
 }
 
@@ -1417,15 +1463,16 @@ static void Verbs::AdjustGUIText()
  ***********************************************************************/
 static void Verbs::InitGuiLanguage() 
 {
-  Verbs.AdjustLanguage();
+  int lang = verbsData.lang;
+  //Verbs.AdjustLanguage();
   int i;
   GUIControl*gc;
   Button*b;
   
   while (i < ACT_COUNT) {
-    gc = verbsData.guiMain.Controls[verbsData.action_button[i]];
+    gc = verbsData.guiMain.Controls[actionButtonData[i].action_button];
     b =  gc.AsButton;
-    b.NormalGraphic=verbsData.action_button_normal[i];
+    b.NormalGraphic=actionButtonData[i].action_button_normal[lang];
     i++;
   }
 }
@@ -2103,7 +2150,8 @@ function on_event(EventType event, int data)
   }
   
   else if (event==eEventRestoreGame) {
-    Verbs.AdjustLanguage();
+    //Verbs.AdjustLanguage();
+    Verbs.InitGuiLanguage();
   }
 }
 
@@ -2133,15 +2181,15 @@ function on_key_press(eKeyCode keycode)
   }
 
   if (verbsData.guiQuit.Visible) {
-    if (keycode==verbsData.key_u_no || keycode==verbsData.key_l_no) verbsData.guiQuit.Visible=false; 
-    if (keycode==verbsData.key_u_yes || keycode==verbsData.key_l_yes) QuitGame(0);
+    if (keycode==verbsData.key_u_no[verbsData.lang] || keycode==verbsData.key_l_no[verbsData.lang]) verbsData.guiQuit.Visible=false; 
+    if (keycode==verbsData.key_u_yes[verbsData.lang] || keycode==verbsData.key_l_yes[verbsData.lang]) QuitGame(0);
   }
   
   //  triggering actions by keyboard
   if (!IsGamePaused()) {
     int act_i=0;
     while (act_i < ACT_COUNT) {
-      if (keycode == verbsData.action_l_keycode[act_i] || keycode==verbsData.action_u_keycode[act_i]) {
+      if (keycode == actionButtonData[act_i].action_l_keycode[verbsData.lang] || keycode==actionButtonData[act_i].action_u_keycode[verbsData.lang]) {
         Verbs.SetAction(act_i);
         act_i = ACT_COUNT;
       }
diff --git a/verbgui.ash b/verbgui.ash
index 2be1ad4..ca82cb9 100644
--- a/verbgui.ash
+++ b/verbgui.ash
@@ -176,6 +176,8 @@ struct Verbs {
   import static attribute String VerbGuiUnhandled[];
   import static void BindGuis(GUI* _gAction, GUI* _gMain, GUI* _gPause, GUI* _gQuit);
   import static void SetFonts(FontType fontText, FontType fontTextOut, FontType fontSpeech, FontType fontOutlineSpeech);
+  import static void SetKeys(eLanguage lang,  char key_yes, char key_no);
+  import static void MapButtons() ;
 // ============================= Helper functions ==============================================
   import static int  GetButtonAction(int action);
   import static void DisableGui(); //Disables but does not hide
@@ -191,7 +193,8 @@ struct Verbs {
   // ============================= Verb Action functions ===========================================
   import static bool UsedAction (Action test_action);
   import static bool IsAction(Action test_action);
-  import static void SetActionButtons(Action action, int btn_ID, int sprite, int sprite_highlight, char key);
+  import static void SetActionButton(Action action, Button* btn);
+  import static void LocalizeActionButton(eLanguage lang,  Action action, int sprite, int sprite_highlight, char key);
   import static void SetDefaultAction(Action def_action);
   import static void SetAction(Action new_action);
   import static void SetAlternativeAction(char extension, Action alt_action);
@@ -227,7 +230,7 @@ struct Verbs {
 
   // ============================= translation ====================================================
   import static void TranslateAction(int action, int tr_lang=eLangEN);
-  import static void AdjustLanguage();
+  import static void Localize();
   import static void AdjustGUIText();
 
   // ============================= Extensions  ==========================================

From dedfd488392cf46dad0af3dbe2ddde97eb44c1df Mon Sep 17 00:00:00 2001
From: BERGOUNIOUX Mathieu <mathieu.bergounioux@orange.com>
Date: Thu, 16 Aug 2018 00:16:29 +0200
Subject: [PATCH 9/9] - now that the values are object members, I have
 shortened their names - Made function Verbs::GetButtonAction more robust (had
 issues dealing with action 0) - Made most enums start at value 0 instead of
 1, to avoid a "dead" value at the beginning of iterations

---
 verbgui.asc | 46 +++++++++++++++++++++++++++++-----------------
 verbgui.ash | 12 ++++++------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/verbgui.asc b/verbgui.asc
index a92f0d4..b1ec0a0 100644
--- a/verbgui.asc
+++ b/verbgui.asc
@@ -1,4 +1,5 @@
 // Gui Script
+#define LANGUAGE_COUNT 8
 #define ACT_COUNT 10  // Action Button Count (gMain)
 #define MAX_DOORS 99  // How many doors accessed by door script
 #define UNHANDLED_MSG_COUNT 21 // Amount of unhandled messages
@@ -34,13 +35,13 @@ static int Geometry::Offset(int point1, int point2)
 // Please do not edit these option directly anymore, but use the VerbGuiSettings settings script instead!
 
 
-#define LANGUAGE_COUNT 8
+
 struct ActionButtonData {
-    Action button_action;  // Array containg the related actions like eGA_LookAt
-    int action_button; // Array containing the verb button Ids
+    Action action;  // Array containg the related actions like eGA_LookAt
+    int button; // Array containing the verb button Ids
     
-    int action_button_normal[LANGUAGE_COUNT];     // contains the verb button sprites
-    int action_button_highlight[LANGUAGE_COUNT];  // Contains the highlighted verb button sprites
+    int button_graphic_normal[LANGUAGE_COUNT];     // contains the verb button sprites
+    int button_graphic_highlight[LANGUAGE_COUNT];  // Contains the highlighted verb button sprites
     int action_l_keycode[LANGUAGE_COUNT]; // lower case keycodes for the verbs
     int action_u_keycode[LANGUAGE_COUNT]; // upper case keycodes for the verbs
     
@@ -52,7 +53,7 @@ ActionButtonData actionButtonData[ACT_COUNT];
 struct VerbsData {
        
      
-    int lang;           
+    eLanguage lang;           
     int actionLabelColorNormal;  
     int actionLabelColorHighlighted;
     int invUparrowONsprite;
@@ -130,6 +131,7 @@ struct VerbsData {
     GUI* guiPause;
     GUI* guiQuit;
     
+    // Fonts used by the module (we don't want to use global names)
     FontType fontText;
     FontType fontTextOut;
     FontType fontSpeech;
@@ -290,9 +292,18 @@ static void Verbs::SetFonts(FontType fontText, FontType fontTextOut, FontType fo
  * Returns the connected action of a verb button.
  * 
  ***********************************************************************/
-static int Verbs::GetButtonAction(int action) 
+static int Verbs::GetButtonAction(Button* button) 
 {
-  return actionButtonData[action].button_action;
+  if (button.OwningGUI != verbsData.guiMain) {
+      AbortGame("This button is not part of the Tumbleweed verbs GUI");
+  }
+  
+  for (int action=0; action< ACT_COUNT; action++) {
+      if (actionButtonData[action].button == button.ID) {
+            return actionButtonData[action].action;
+      }
+  }
+  AbortGame("Could not find the action corresonding to this button.");
 }
 
 /***********************************************************************
@@ -857,9 +868,9 @@ static void Verbs::SetAlternativeAction(char extension, Action alt_action)
        verbsData.alternative_action = alt_action;
   }
   else {
-    int button          = actionButtonData[alt_action].action_button;
-    int normalbuttonpic = actionButtonData[alt_action].action_button_normal[verbsData.lang];
-    int overbuttonpic   = actionButtonData[alt_action].action_button_highlight[verbsData.lang];
+    int button          = actionButtonData[alt_action].button;
+    int normalbuttonpic = actionButtonData[alt_action].button_graphic_normal[verbsData.lang];
+    int overbuttonpic   = actionButtonData[alt_action].button_graphic_highlight[verbsData.lang];
     
     // used for setting the default action given the extension.
     GUIControl*gc = verbsData.guiMain.Controls[button];
@@ -1074,11 +1085,12 @@ static void Verbs::ToogleGuiStyle(int enable_new)
  ***********************************************************************/
 static void Verbs::SetActionButton(Action action, Button* btn)
 {
+  //Display("Mapping button %d of gui %d to action %d", btn.ID, btn.OwningGUI.ID, action);
   if (btn.OwningGUI.ID != verbsData.guiMain.ID) {
       AbortGame("This button is not part of the Verbs GUI.");
   }
-  actionButtonData[action].button_action=action;
-  actionButtonData[action].action_button=btn.ID;
+  actionButtonData[action].action=action;
+  actionButtonData[action].button=btn.ID;
 }
 
 
@@ -1092,8 +1104,8 @@ static void Verbs::LocalizeActionButton(eLanguage lang,  Action action, int spri
   String upperkey = String.Format("%c", key);
   upperkey = upperkey.UpperCase();
   
-  actionButtonData[action].action_button_normal[lang] = sprite;
-  actionButtonData[action].action_button_highlight[lang] = sprite_highlight;
+  actionButtonData[action].button_graphic_normal[lang] = sprite;
+  actionButtonData[action].button_graphic_highlight[lang] = sprite_highlight;
   actionButtonData[action].action_l_keycode[lang] = key;
   actionButtonData[action].action_u_keycode[lang] = upperkey.Chars[0];
 
@@ -1470,9 +1482,9 @@ static void Verbs::InitGuiLanguage()
   Button*b;
   
   while (i < ACT_COUNT) {
-    gc = verbsData.guiMain.Controls[actionButtonData[i].action_button];
+    gc = verbsData.guiMain.Controls[actionButtonData[i].button];
     b =  gc.AsButton;
-    b.NormalGraphic=actionButtonData[i].action_button_normal[lang];
+    b.NormalGraphic=actionButtonData[i].button_graphic_normal[lang];
     i++;
   }
 }
diff --git a/verbgui.ash b/verbgui.ash
index ca82cb9..0a9cf3a 100644
--- a/verbgui.ash
+++ b/verbgui.ash
@@ -76,7 +76,7 @@ enum eGlobCond {
 };
 
 enum Action {
-  eGA_LookAt,
+  eGA_LookAt = 0, //Starting at zero helps avoiding human mistakes when iterating on the enum
   eGA_TalkTo,
   eGA_GiveTo,
   eGA_PickUp,
@@ -91,7 +91,7 @@ enum Action {
 };
 
 enum eLanguage {
-  eLangEN, 
+  eLangEN = 0, //Starting at zero helps avoiding human mistakes when iterating on the enum
   eLangDE,
   eLangES, 
   eLangIT, 
@@ -101,7 +101,7 @@ enum eLanguage {
 };
 
 enum eVerbGuiOptions {
-  eVerbGuiTemplateLanguage,
+  eVerbGuiTemplateLanguage = 0, //Starting at zero helps avoiding human mistakes when iterating on the enum
   eVerbGuiActionLabelColorNormal,
   eVerbGuiActionLabelColorHighlighted,
   eVerbGuiInvUparrowONsprite,
@@ -124,7 +124,7 @@ enum eVerbGuiOptions {
 };
 
 enum eVerbGuiUnhandled {
-  eVerbGuiUnhandledUse, 
+  eVerbGuiUnhandledUse = 0,  //Starting at zero helps avoiding human mistakes when iterating on the enum
   eVerbGuiUnhandledUseInv, 
   eVerbGuiUnhandledLook, 
   eVerbGuiUnhandledLookChar, 
@@ -147,7 +147,7 @@ enum eVerbGuiUnhandled {
 };
 
 enum eDoorStrings{
-  eDoorStringLookAt, 
+  eDoorStringLookAt = 0, //Starting at zero helps avoiding human mistakes when iterating on the enum
   eDoorStringLocked, 
   eDoorStringWrongItem,
   eDoorStringCloseFirst,
@@ -179,7 +179,7 @@ struct Verbs {
   import static void SetKeys(eLanguage lang,  char key_yes, char key_no);
   import static void MapButtons() ;
 // ============================= Helper functions ==============================================
-  import static int  GetButtonAction(int action);
+  import static int  GetButtonAction(Button* button);
   import static void DisableGui(); //Disables but does not hide
   import static void EnableGui(); //Enables but does not show
   import static bool IsGuiDisabled();