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

Issue #440: Make day numbers start at 1 instead of 0

Browse source
This commit is contained in:
Marc Zinnschlag 2012-11-05 18:01:50 +01:00
parent accf8b2f71
commit 61942c9c4a
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,7 @@ namespace MWGui
if (hour >= 13) hour -= 12; if (hour >= 13) hour -= 12;
std::string dateTimeText = std::string dateTimeText =
boost::lexical_cast<std::string>(MWBase::Environment::get().getWorld ()->getDay ()+1) + " " boost::lexical_cast<std::string>(MWBase::Environment::get().getWorld ()->getDay ()) + " "
+ month + " (#{sDay} " + boost::lexical_cast<std::string>(MWBase::Environment::get().getWorld ()->getTimeStamp ().getDay ()+1) + month + " (#{sDay} " + boost::lexical_cast<std::string>(MWBase::Environment::get().getWorld ()->getTimeStamp ().getDay ()+1)
+ ") " + boost::lexical_cast<std::string>(hour) + " " + (pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}"); + ") " + boost::lexical_cast<std::string>(hour) + " " + (pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}");

12
apps/openmw/mwworld/worldimp.cpp
View file

@ -407,15 +407,15 @@ namespace MWWorld
void World::setDay (int day) void World::setDay (int day)
{ {
if (day<0) if (day<1)
day = 0; day = 1;
int month = mGlobalVariables->getInt ("month"); int month = mGlobalVariables->getInt ("month");
while (true) while (true)
{ {
int days = getDaysPerMonth (month); int days = getDaysPerMonth (month);
if (day<days) if (day<=days)
break; break;
if (month<11) if (month<11)
@ -437,8 +437,6 @@ namespace MWWorld
mRendering->skySetDate (day, month); mRendering->skySetDate (day, month);
mWeatherManager->setDate (day, month); mWeatherManager->setDate (day, month);
} }
void World::setMonth (int month) void World::setMonth (int month)
@ -451,8 +449,8 @@ namespace MWWorld
int days = getDaysPerMonth (month); int days = getDaysPerMonth (month);
if (mGlobalVariables->getInt ("day")>=days) if (mGlobalVariables->getInt ("day")>days)
mGlobalVariables->setInt ("day", days-1); mGlobalVariables->setInt ("day", days);
mGlobalVariables->setInt ("month", month); mGlobalVariables->setInt ("month", month);