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

Merge remote-tracking branch 'bwrsandman/master' into next

Browse source
This commit is contained in:
Marc Zinnschlag 2012-11-07 10:40:40 +01:00
commit 0805301922
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwgui/waitdialog.cpp
View file

@ -120,6 +120,7 @@ namespace MWGui
int hour = MWBase::Environment::get().getWorld ()->getTimeStamp ().getHour (); int hour = MWBase::Environment::get().getWorld ()->getTimeStamp ().getHour ();
bool pm = hour >= 12; bool pm = hour >= 12;
if (hour >= 13) hour -= 12; if (hour >= 13) hour -= 12;
if (hour == 0) hour = 12;
std::string dateTimeText = std::string dateTimeText =
boost::lexical_cast<std::string>(MWBase::Environment::get().getWorld ()->getDay ()) + " " boost::lexical_cast<std::string>(MWBase::Environment::get().getWorld ()->getDay ()) + " "

1
credits.txt
View file

@ -25,6 +25,7 @@ Jacob Essex (Yacoby)
Jannik Heller (scrawl) Jannik Heller (scrawl)
Jason Hooks (jhooks) Jason Hooks (jhooks)
Karl-Felix Glatzer (k1ll) Karl-Felix Glatzer (k1ll)
Leon Saunders (emoose)
Lukasz Gromanowski (lgro) Lukasz Gromanowski (lgro)
Michael Mc Donnell Michael Mc Donnell
Michael Papageorgiou (werdanith) Michael Papageorgiou (werdanith)