Add weather control exports

Author: sodat1de

src/xrEngine/Environment.cpp

@@ -397,6 +397,20 @@ void CEnvironment::StopWFX	()
 #endif
 }
 
+void CEnvironment::SetEnvDesc(LPCSTR weather_section, CEnvDescriptor*& e)
+{
+	for (const auto& [key, descriptors] : WeatherCycles) {
+		for (CEnvDescriptor* descriptor : descriptors) {
+			if (descriptor->m_identifier == weather_section) {
+				e = descriptor;
+				return;
+			}
+		}
+	}
+
+	Msg("!Could not set env descriptor from section %s", weather_section);
+}
+
 IC bool lb_env_pred(const CEnvDescriptor* x, float val)
 {	return x->exec_time < val;	}
 

src/xrEngine/Environment.h

@@ -241,6 +241,8 @@ class ENGINE_API	CEnvironment
 
 	void					calculate_dynamic_sun_dir();
 public:
+	void SetEnvDesc(LPCSTR weather_section, CEnvDescriptor*& e);
+
 	static bool sort_env_pred	(const CEnvDescriptor* x, const CEnvDescriptor* y)
 	{	return x->exec_time < y->exec_time;	}
 	static bool sort_env_etl_pred	(const CEnvDescriptor* x, const CEnvDescriptor* y)
@@ -326,14 +328,15 @@ class ENGINE_API	CEnvironment
 	void					OnDeviceCreate		();
 	void					OnDeviceDestroy		();
 
+	float GetGameTime() { return fGameTime; }
+
 	// editor-related
 #ifdef _EDITOR
 public:
 	float					ed_from_time		;
 	float					ed_to_time			;
 public:
     void					ED_Reload			();
-    float					GetGameTime			(){return fGameTime;}
 #else // #ifdef _EDITOR
 
 	bool					m_paused;

src/xrGame/level_script.cpp

@@ -177,6 +177,47 @@ CScriptGameObject *get_object_by_id(u16 id)
 	return pGameObject->lua_game_object();
 }
 
+LPCSTR get_past_wdesc()
+{
+	return			(g_pGamePersistent->Environment().Current[0] ? g_pGamePersistent->Environment().Current[0]->m_identifier.c_str() : "null");
+}
+
+LPCSTR get_next_wdesc()
+{
+	return			(g_pGamePersistent->Environment().Current[1] ? g_pGamePersistent->Environment().Current[1]->m_identifier.c_str() : "null");
+}
+
+float get_past_wdesc_execution_time()
+{
+	return			(g_pGamePersistent->Environment().Current[0] ? g_pGamePersistent->Environment().Current[0]->exec_time : -1.f);
+}
+
+float get_next_wdesc_execution_time()
+{
+	return			(g_pGamePersistent->Environment().Current[1] ? g_pGamePersistent->Environment().Current[1]->exec_time : -1.f);
+}
+
+float get_weather_game_time()
+{
+	return			(&g_pGamePersistent->Environment() ? g_pGamePersistent->Environment().GetGameTime() : -1.f);
+}
+
+void set_past_wdesc(LPCSTR WeatherSection)
+{
+	if (&g_pGamePersistent->Environment())
+	{
+		g_pGamePersistent->Environment().SetEnvDesc(WeatherSection, g_pGamePersistent->Environment().Current[0]);
+	}
+}
+
+void set_next_wdesc(LPCSTR WeatherSection)
+{
+	if (&g_pGamePersistent->Environment())
+	{
+		g_pGamePersistent->Environment().SetEnvDesc(WeatherSection, g_pGamePersistent->Environment().Current[1]);
+	}
+}
+
 LPCSTR get_weather	()
 {
 	return			(*g_pGamePersistent->Environment().GetWeather());
@@ -960,6 +1001,13 @@ void CLevel::script_register(lua_State *L)
 		def("get_weather",						get_weather),
 		def("set_weather",						set_weather),
 		def("set_weather_fx",					set_weather_fx),
+		def("set_past_weather", set_past_wdesc),
+		def("set_next_weather", set_next_wdesc),
+		def("get_weather_game_time", get_weather_game_time),
+		def("get_past_wdesc_execution_time", get_past_wdesc_execution_time),
+		def("get_next_wdesc_execution_time", get_next_wdesc_execution_time),
+		def("get_past_weather", get_past_wdesc),
+		def("get_next_weather", get_next_wdesc),
 		def("start_weather_fx_from_time",		start_weather_fx_from_time),
 		def("is_wfx_playing",					is_wfx_playing),
 		def("get_wfx_time",						get_wfx_time),