From 9e8eb0d8d30a14f42d62b8f0e31034772c1f4512 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Tue, 6 Nov 2012 20:28:49 +0100 Subject: [PATCH 1/2] updated credits.txt --- credits.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/credits.txt b/credits.txt index 45611a2d6..c9f98861c 100644 --- a/credits.txt +++ b/credits.txt @@ -25,6 +25,7 @@ Jacob Essex (Yacoby) Jannik Heller (scrawl) Jason Hooks (jhooks) Karl-Felix Glatzer (k1ll) +Leon Saunders (emoose) Lukasz Gromanowski (lgro) Michael Mc Donnell Michael Papageorgiou (werdanith) From 7911f08c53c7da68f1c5283101bc5e3c7b51c5aa Mon Sep 17 00:00:00 2001 From: bwrsandman Date: Tue, 6 Nov 2012 13:19:35 -0500 Subject: [PATCH 2/2] Issue #438: set 0 a.m. to be 12 a.m. --- apps/openmw/mwgui/waitdialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp index 380fb8dd5..73b376f79 100644 --- a/apps/openmw/mwgui/waitdialog.cpp +++ b/apps/openmw/mwgui/waitdialog.cpp @@ -120,6 +120,7 @@ namespace MWGui int hour = MWBase::Environment::get().getWorld ()->getTimeStamp ().getHour (); bool pm = hour >= 12; if (hour >= 13) hour -= 12; + if (hour == 0) hour = 12; std::string dateTimeText = boost::lexical_cast(MWBase::Environment::get().getWorld ()->getDay ()+1) + " "