Use a few additional GMSTs

apps/openmw/mwgui/enchantingdialog.cpp

@@ -257,7 +257,7 @@ namespace MWGui
     {
         if (mEffects.size() <= 0)
         {
-            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage30}");
+            MWBase::Environment::get().getWindowManager()->messageBox ("#{sEnchantmentMenu11}");
             return;
         }
 

apps/openmw/mwgui/messagebox.cpp

@@ -8,13 +8,12 @@
 namespace MWGui
 {
 
-    MessageBoxManager::MessageBoxManager ()
+    MessageBoxManager::MessageBoxManager (float timePerChar)
     {
-        // TODO: fMessageTimePerChar
-        mMessageBoxSpeed = 0.1;
         mInterMessageBoxe = NULL;
         mStaticMessageBox = NULL;
         mLastButtonPressed = -1;
+        mMessageBoxSpeed = timePerChar;
     }
 
     MessageBoxManager::~MessageBoxManager ()

apps/openmw/mwgui/messagebox.hpp

@@ -22,7 +22,7 @@ namespace MWGui
     class MessageBoxManager
     {
         public:
-            MessageBoxManager ();
+            MessageBoxManager (float timePerChar);
             ~MessageBoxManager ();
             void onFrame (float frameDuration);
             void createMessageBox (const std::string& message, bool stat = false);

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -207,7 +207,8 @@ namespace MWGui
         mConsole = new Console(w,h, mConsoleOnlyScripts);
         trackWindow(mConsole, "console");
         mJournal = JournalWindow::create(JournalViewModel::create ());
-        mMessageBoxManager = new MessageBoxManager();
+        mMessageBoxManager = new MessageBoxManager(
+                    MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fMessageTimePerChar")->getFloat());
         mInventoryWindow = new InventoryWindow(mDragAndDrop);
         mTradeWindow = new TradeWindow();
         trackWindow(mTradeWindow, "barter");

apps/openmw/mwmechanics/actors.cpp

@@ -581,7 +581,8 @@ namespace MWMechanics
             if(timeLeft == 0.0f)
             {
                 // If drowning, apply 3 points of damage per second
-                ptr.getClass().setActorHealth(ptr, stats.getHealth().getCurrent() - 3.0f*duration);
+                static const float fSuffocationDamage = world->getStore().get<ESM::GameSetting>().find("fSuffocationDamage")->getFloat();
+                ptr.getClass().setActorHealth(ptr, stats.getHealth().getCurrent() - fSuffocationDamage*duration);
 
                 // Play a drowning sound as necessary for the player
                 if(ptr == world->getPlayerPtr())
@@ -593,7 +594,10 @@ namespace MWMechanics
             }
         }
         else
-            stats.setTimeToStartDrowning(20);
+        {
+            static const float fHoldBreathTime = world->getStore().get<ESM::GameSetting>().find("fHoldBreathTime")->getFloat();
+            stats.setTimeToStartDrowning(fHoldBreathTime);
+        }
     }
 
     void Actors::updateEquippedLight (const MWWorld::Ptr& ptr, float duration)

files/mygui/openmw_spell_buying_window.layout

@@ -11,7 +11,7 @@
         </Widget>
         <Widget type="TextBox" skin="NormalText" position="0 0 450 18" align="Right Top">
             <Property key="TextAlign" value="Center"/>
-            <Property key="Caption" value="#{sSpells}"/>
+            <Property key="Caption" value="#{sServiceSpellsTitle}"/>
         </Widget>
 
 

files/mygui/openmw_travel_window.layout

@@ -11,7 +11,7 @@
         </Widget>
         <Widget type="TextBox" skin="SandText" position="0 0 24 24" name="Travel" align="Right Top">
             <Property key="TextAlign" value="Right"/>
-            <Property key="Caption" value="#D8C09A#{sTravel}"/>
+            <Property key="Caption" value="#D8C09A#{sServiceTravelTitle}"/>
         </Widget>