teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Use a few additional GMSTs

Browse source
This commit is contained in:
scrawl 2014-01-10 22:27:31 +01:00
parent 3bf36515d5
commit 2744cde40f
7 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/enchantingdialog.cpp
View file

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

5
apps/openmw/mwgui/messagebox.cpp
View file

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

2
apps/openmw/mwgui/messagebox.hpp
View file

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

3
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -207,7 +207,8 @@ namespace MWGui
mConsole = new Console(w,h, mConsoleOnlyScripts); mConsole = new Console(w,h, mConsoleOnlyScripts);
trackWindow(mConsole, "console"); trackWindow(mConsole, "console");
mJournal = JournalWindow::create(JournalViewModel::create ()); 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); mInventoryWindow = new InventoryWindow(mDragAndDrop);
mTradeWindow = new TradeWindow(); mTradeWindow = new TradeWindow();
trackWindow(mTradeWindow, "barter"); trackWindow(mTradeWindow, "barter");

8
apps/openmw/mwmechanics/actors.cpp
View file

@ -581,7 +581,8 @@ namespace MWMechanics
if(timeLeft == 0.0f) if(timeLeft == 0.0f)
{ {
// If drowning, apply 3 points of damage per second // 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 // Play a drowning sound as necessary for the player
if(ptr == world->getPlayerPtr()) if(ptr == world->getPlayerPtr())
@ -593,7 +594,10 @@ namespace MWMechanics
} }
} }
else 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) void Actors::updateEquippedLight (const MWWorld::Ptr& ptr, float duration)

2
files/mygui/openmw_spell_buying_window.layout
View file

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

4
files/mygui/openmw_travel_window.layout
View file

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