From e06f8b0976856cbad1928892c1669de73f3522d7 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Wed, 3 May 2017 20:52:02 +0300 Subject: [PATCH] Changed: Add minutes to ingame map --HG-- branch : develop --- code/ryzom/client/src/interface_v3/interface_manager.cpp | 7 ++++--- .../src/game_share/time_weather_season/time_and_season.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp index d939df144..c526149f8 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.cpp +++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp @@ -1471,8 +1471,8 @@ void CInterfaceManager::updateFrameEvents() // Update string if some waiting CEncyclopediaManager::getInstance()->updateAllFrame(); - // Setup the weather setup in the player's map - if ((T0 - _UpdateWeatherTime) > (1 * 5 * 1000)) + // Setup the weather setup in the player's map every 3 sec (1 ingame minute) + if ((T0 - _UpdateWeatherTime) > (1 * 3 * 1000)) { _UpdateWeatherTime = T0; ucstring str = CI18N::get ("uiTheSeasonIs") + @@ -1498,7 +1498,8 @@ void CInterfaceManager::updateFrameEvents() // literal version // 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"+MONTH::toString( (MONTH::EMonth)RT.getRyzomMonthInCurrentCycle() )) + " "; str += toString("%02d", RT.getRyzomDayOfMonth()+1) + ", "; diff --git a/code/ryzom/common/src/game_share/time_weather_season/time_and_season.h b/code/ryzom/common/src/game_share/time_weather_season/time_and_season.h index 62f144119..d712302aa 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/time_and_season.h +++ b/code/ryzom/common/src/game_share/time_weather_season/time_and_season.h @@ -23,6 +23,7 @@ const uint RYZOM_HOURS_IN_TICKS = 1800; 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_SEASON_IN_DAY = 90; const uint RYZOM_MONTH_IN_DAY = 30;