From 7af4bb69d41028b78a2490fdd58b630414546176 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 22 Dec 2014 14:10:37 +0100
Subject: [PATCH] Move to feature-light_cycle: c5207e1f862a

---
 code/ryzom/client/src/client_sheets/continent_sheet.cpp  | 5 -----
 code/ryzom/client/src/client_sheets/continent_sheet.h    | 5 +----
 code/ryzom/client/src/continent.cpp                      | 5 -----
 code/ryzom/client/src/continent_manager.cpp              | 2 +-
 code/ryzom/client/src/init_main_loop.cpp                 | 2 +-
 .../client/src/interface_v3/action_handler_debug.cpp     | 2 +-
 code/ryzom/client/src/weather.cpp                        | 9 ++-------
 code/ryzom/client/src/weather.h                          | 3 +--
 8 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/code/ryzom/client/src/client_sheets/continent_sheet.cpp b/code/ryzom/client/src/client_sheets/continent_sheet.cpp
index 6cd46b15c..17868866c 100644
--- a/code/ryzom/client/src/client_sheets/continent_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/continent_sheet.cpp
@@ -300,9 +300,6 @@ void CContinentParameters::build(const NLGEORGES::UFormElm &item)
 		if(readSeason<EGSPD::CSeason::Invalid)
 			ForceDisplayedSeason[season]= readSeason;
 	}
-
-	// Read light cycle
-	item.getValueByName(LightCycle, "LightCycle");
 }
 
 
@@ -396,8 +393,6 @@ void CContinentParameters::serial(class NLMISC::IStream &f) throw(NLMISC::EStrea
 		f.serial(SkySheet[i]);
 		f.serialEnum(ForceDisplayedSeason[i]);
 	}
-	//
-	f.serial(LightCycle);
 }
 
 //=========================================================================
diff --git a/code/ryzom/client/src/client_sheets/continent_sheet.h b/code/ryzom/client/src/client_sheets/continent_sheet.h
index 885ec30d4..22a73471f 100644
--- a/code/ryzom/client/src/client_sheets/continent_sheet.h
+++ b/code/ryzom/client/src/client_sheets/continent_sheet.h
@@ -62,12 +62,9 @@ public:
 	/// LandscapeIG filename.
 	std::string		LandscapeIG;
 
-	/// New Sky system : gives name of the sky sheet per season. If present, this bypass the SkyDay & SkyNight fields
+	// New Sky system : gives name of the sky sheet per season. If present, this bypass the SkyDay & SkyNight fields
 	std::string		SkySheet[EGSPD::CSeason::Invalid];
 
-	/// Light Cycle sheet
-	std::string		LightCycle;
-
 	/// SkyDay filename.
 	std::string		SkyDay;
 
diff --git a/code/ryzom/client/src/continent.cpp b/code/ryzom/client/src/continent.cpp
index 5c9d67f85..4bebe5749 100644
--- a/code/ryzom/client/src/continent.cpp
+++ b/code/ryzom/client/src/continent.cpp
@@ -420,11 +420,6 @@ void CContinent::select(const CVectorD &pos, NLMISC::IProgressCallback &progress
 		progress.progress (0);
 		progress.pushCropedValues (0, 1.f/3.f);
 
-		{
-			H_AUTO(InitRZWorldLightCycle)
-			loadWorldLightCycle(CSheetId(LightCycle));
-		}
-
 		{
 			H_AUTO(InitRZWorldIndoor)
 			if (!ClientCfg.Light)
diff --git a/code/ryzom/client/src/continent_manager.cpp b/code/ryzom/client/src/continent_manager.cpp
index 1ba7c2148..87172ce1a 100644
--- a/code/ryzom/client/src/continent_manager.cpp
+++ b/code/ryzom/client/src/continent_manager.cpp
@@ -587,7 +587,7 @@ void CContinentManager::reloadWeather()
 
 	WeatherManager.init();
 	// Load description of light cycles for each season.
-	loadWorldLightCycle(CSheetId::Unknown); //FIXME
+	loadWorldLightCycle();
 	// Load global weather function parameters
 	loadWeatherFunctionParams();
 
diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp
index c462faf85..390b82e15 100644
--- a/code/ryzom/client/src/init_main_loop.cpp
+++ b/code/ryzom/client/src/init_main_loop.cpp
@@ -411,7 +411,7 @@ static void initWeather()
 {
 	WeatherManager.init();
 	// Load description of light cycles for each season.
-	loadWorldLightCycle(CSheetId::Unknown); // FIXME
+	loadWorldLightCycle();
 	// Load global weather function parameters
 	loadWeatherFunctionParams();
 	//
diff --git a/code/ryzom/client/src/interface_v3/action_handler_debug.cpp b/code/ryzom/client/src/interface_v3/action_handler_debug.cpp
index ba8dc0100..616d66a1c 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_debug.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_debug.cpp
@@ -442,7 +442,7 @@ class CAHReloadSeason: public IActionHandler
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
 		// reload all parameters for weather
-		loadWorldLightCycle(CSheetId::Unknown); // FIXME
+		loadWorldLightCycle();
 		loadWeatherFunctionParams();
 		WeatherManager.init();
 		ContinentMngr.reloadWeather();
diff --git a/code/ryzom/client/src/weather.cpp b/code/ryzom/client/src/weather.cpp
index 5969f6008..91fad6f7c 100644
--- a/code/ryzom/client/src/weather.cpp
+++ b/code/ryzom/client/src/weather.cpp
@@ -87,14 +87,9 @@ void buildLightCycleDesc(CLightCycleDesc &dest,EGSPD::CSeason::TSeason season)
 	else dest.DuskRatio = 0.5f;
 }
 
-void loadWorldLightCycle(CSheetId lightCycle)
+void loadWorldLightCycle()
 {
-	nldebug("Load light cycle '%s'", lightCycle.toString().c_str());
-
-	if (lightCycle == CSheetId::Unknown)
-		lightCycle = CSheetId("ryzom.light_cycle");
-
-	CEntitySheet *sheet = SheetMngr.get(lightCycle);
+	CEntitySheet *sheet = SheetMngr.get(CSheetId("ryzom.light_cycle"));
 	nlassert(sheet);
 	if (sheet->type() != CEntitySheet::LIGHT_CYCLE)
 	{
diff --git a/code/ryzom/client/src/weather.h b/code/ryzom/client/src/weather.h
index 02a70a5a2..954b7f2c8 100644
--- a/code/ryzom/client/src/weather.h
+++ b/code/ryzom/client/src/weather.h
@@ -20,7 +20,6 @@
 #define CL_WORLD_LIGHT_CYCLE_H
 
 
-#include <nel/misc/sheet_id.h>
 #include "game_share/season.h"
 
 struct CLightCycleDesc;
@@ -48,7 +47,7 @@ extern EGSPD::CSeason::TSeason   StartupSeason;
 extern CWeatherFunctionParamsSheet  *WeatherFunctionParams;
 
 // load the world light cycle from a sheet
-void loadWorldLightCycle(NLMISC::CSheetId lightCycleSheet);
+void loadWorldLightCycle();
 
 // load the weather function params
 void loadWeatherFunctionParams();