File tree Expand file tree Collapse file tree 6 files changed +12
-3
lines changed Expand file tree Collapse file tree 6 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -649,7 +649,7 @@ void CEnvironment::load_weather_effects()
649649 sections_type& sections = config->sections ();
650650
651651 env.reserve (sections.size () + 2 );
652- env.push_back (create_descriptor (" 00:00:00" , false ));
652+ env.push_back (create_descriptor (" 00:00:00" , nullptr ));
653653
654654 sections_type::const_iterator i2 = sections.begin ();
655655 sections_type::const_iterator e2 = sections.end ();
@@ -661,7 +661,7 @@ void CEnvironment::load_weather_effects()
661661
662662 CInifile::Destroy (config);
663663
664- env.push_back (create_descriptor (" 24:00:00" , false ));
664+ env.push_back (create_descriptor (" 24:00:00" , nullptr ));
665665 env.back ()->exec_time_loaded = DAY_LENGTH;
666666 }
667667
Original file line number Diff line number Diff line change 1010#include " Render.h"
1111#include " CameraManager.h"
1212
13+ #if !defined(LINUX)
1314#include " xrSASH.h"
14-
15+ # endif
1516// ////////////////////////////////////////////////////////////////////
1617// Construction/Destruction
1718// ////////////////////////////////////////////////////////////////////
Original file line number Diff line number Diff line change 2525#include " Include/editor/ide.hpp"
2626#include " engine_impl.hpp"
2727
28+ #if !defined(LINUX)
2829#include " xrSASH.h"
30+ #endif
2931#include " IGame_Persistent.h"
3032#include " xrScriptEngine/ScriptExporter.hpp"
3133#include " XR_IOConsole.h"
Original file line number Diff line number Diff line change 2424#define CTextConsole CConsole
2525#pragma todo("Implement text console or it's alternative")
2626#endif
27+ #if !defined(LINUX)
2728#include " xrSASH.h"
29+ #endif
2830#include " xr_ioc_cmd.h"
2931
3032#ifdef MASTER_GOLD
Original file line number Diff line number Diff line change 1515#include " std_classes.h"
1616#include " GameFont.h"
1717#include " xrCDB/ISpatial.h"
18+ #if !defined(LINUX)
1819#include " xrSASH.h"
20+ #endif
1921#include " xrServerEntities/smart_cast.h"
2022#include " xr_input.h"
2123
Original file line number Diff line number Diff line change 44#include " x_ray.h"
55#include " XR_IOConsole.h"
66#include " xr_ioc_cmd.h"
7+ #if !defined(LINUX)
78#include " xrSASH.h"
9+ #endif
810
911#include " CameraManager.h"
1012#include " Environment.h"
You can’t perform that action at this time.
0 commit comments