Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Add minutes to ingame map

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2017-05-03 20:52:02 +03:00
parent 5c56eb400e
commit e06f8b0976
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -1471,8 +1471,8 @@ void CInterfaceManager::updateFrameEvents()
// Update string if some waiting // Update string if some waiting
CEncyclopediaManager::getInstance()->updateAllFrame(); CEncyclopediaManager::getInstance()->updateAllFrame();
// Setup the weather setup in the player's map // Setup the weather setup in the player's map every 3 sec (1 ingame minute)
if ((T0 - _UpdateWeatherTime) > (1 * 5 * 1000)) if ((T0 - _UpdateWeatherTime) > (1 * 3 * 1000))
{ {
_UpdateWeatherTime = T0; _UpdateWeatherTime = T0;
ucstring str = CI18N::get ("uiTheSeasonIs") + ucstring str = CI18N::get ("uiTheSeasonIs") +
@ -1498,7 +1498,8 @@ void CInterfaceManager::updateFrameEvents()
// literal version // literal version
// str = CI18N::get("uiDate"); // str = CI18N::get("uiDate");
str += toString("%02d", (sint)RT.getRyzomTime()) + CI18N::get("uiMissionTimerHour") + " - "; uint minutes = ((RT.getRyzomTime() - (sint)RT.getRyzomTime()) * (float) RYZOM_HOUR_IN_MINUTES);
str += toString("%02d:%02d", (sint)RT.getRyzomTime(), minutes) + " - ";
str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + ", "; str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + ", ";
str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)RT.getRyzomMonthInCurrentCycle() )) + " "; str += CI18N::get("ui"+MONTH::toString( (MONTH::EMonth)RT.getRyzomMonthInCurrentCycle() )) + " ";
str += toString("%02d", RT.getRyzomDayOfMonth()+1) + ", "; str += toString("%02d", RT.getRyzomDayOfMonth()+1) + ", ";

1
code/ryzom/common/src/game_share/time_weather_season/time_and_season.h
View file

@ -23,6 +23,7 @@
const uint RYZOM_HOURS_IN_TICKS = 1800; const uint RYZOM_HOURS_IN_TICKS = 1800;
const uint RYZOM_DAY_IN_HOUR = 24; const uint RYZOM_DAY_IN_HOUR = 24;
const uint RYZOM_HOUR_IN_MINUTES = 60;
const uint RYZOM_DAY_IN_TICKS = RYZOM_HOURS_IN_TICKS * RYZOM_DAY_IN_HOUR; const uint RYZOM_DAY_IN_TICKS = RYZOM_HOURS_IN_TICKS * RYZOM_DAY_IN_HOUR;
const uint RYZOM_SEASON_IN_DAY = 90; const uint RYZOM_SEASON_IN_DAY = 90;
const uint RYZOM_MONTH_IN_DAY = 30; const uint RYZOM_MONTH_IN_DAY = 30;