Merge remote-tracking branch 'intorr/intorr_dev' into xd_dev

Author: Xottab-DUTY

src/editors/xrWeatherEditor/AssemblyInfo.cpp

@@ -35,5 +35,3 @@ using namespace System::Security::Permissions;
 [assembly:ComVisible(false)];
 
 [assembly:System::CLSCompliantAttribute(true)];
-
-[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];

src/editors/xrWeatherEditor/pch.hpp

@@ -12,6 +12,7 @@
 #include "Common/Platform.hpp"
 #include "Common/Common.hpp"
 #include "xrCommon/inlining_macros.h"
+#include "xrCore/xrstring.h"
 #pragma managed(pop)
 
 #ifdef DEBUG

src/editors/xrWeatherEditor/property_float_enum_value_reference.cpp

@@ -54,4 +54,4 @@ void property_float_enum_value_reference::SetValue(Object ^ object)
     inherited::SetValue(safe_cast<ValuePair ^>(m_collection[0])->first);
 }
 
-void property_float_enum_value_reference::Increment(float const % increment) {}
+void property_float_enum_value_reference::Increment(float value) {}

src/editors/xrWeatherEditor/property_float_enum_value_reference.hpp

@@ -29,7 +29,7 @@ ref class property_float_enum_value_reference : public property_float_reference
     property_float_enum_value_reference(float& value, pair* values, u32 const& value_count);
     virtual Object ^ GetValue() override;
     virtual void SetValue(Object ^ object) override;
-    virtual void Increment(float const % increment) override;
+    virtual void Increment(float value) override;
 
 public:
     collection_type ^ m_collection;

src/xrCore/xr_ini.cpp

@@ -329,8 +329,10 @@ void CInifile::Load(IReader* F, pcstr path, allow_include_func_t allow_include_f
                 //#endif
 
                 if (m_flags.test(eReadOnly))
+                {
                     if (*I.first)
                         insert_item(Current, I);
+                }
                 else
                 {
                     if (*I.first || *I.second

src/xrEngine/editor_environment_ambients_ambient.cpp

@@ -27,7 +27,7 @@ using editor::environment::effects::effect;
 
 template <>
 void property_collection<ambient::effect_container_type, ambient>::display_name(
-    u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+    u32 const& item_index, pstr const& buffer, u32 const& buffer_size)
 {
     xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
@@ -42,7 +42,7 @@ XRay::Editor::property_holder_base* property_collection<ambient::effect_containe
 
 template <>
 void property_collection<ambient::sound_container_type, ambient>::display_name(
-    u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+    u32 const& item_index, pstr const& buffer, u32 const& buffer_size)
 {
     xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
@@ -85,7 +85,7 @@ void ambient::load(
 
     {
         VERIFY(m_effects_ids.empty());
-        LPCSTR effects_string = READ_IF_EXISTS(&ambients_config, r_string, m_load_section, "effects", "");
+        pcstr effects_string = READ_IF_EXISTS(&ambients_config, r_string, m_load_section, "effects", "");
         for (u32 i = 0, n = _GetItemCount(effects_string); i < n; ++i)
         {
             string_path temp;
@@ -97,7 +97,7 @@ void ambient::load(
 
     {
         VERIFY(m_sound_channels_ids.empty());
-        LPCSTR sounds_string = READ_IF_EXISTS(&ambients_config, r_string, m_load_section, "sound_channels", "");
+        pcstr sounds_string = READ_IF_EXISTS(&ambients_config, r_string, m_load_section, "sound_channels", "");
         for (u32 i = 0, n = _GetItemCount(sounds_string); i < n; ++i)
         {
             string_path temp;
@@ -111,25 +111,19 @@ void ambient::load(
 void ambient::save(CInifile& config)
 {
     u32 count = 1;
-    LPSTR temp = 0;
+    pstr temp = 0;
     {
-        sound_container_type::const_iterator b = m_sound_channels_ids.begin(), i = b;
-        sound_container_type::const_iterator e = m_sound_channels_ids.end();
-        for (; i != e; ++i)
-            count += (*i)->id().size() + 2;
-
-        temp = (LPSTR)_alloca(count * sizeof(char));
-        *temp = 0;
-        for (i = b; i != e; ++i)
+        for (const auto &i : m_sound_channels_ids)
+            count += i->id().size() + 2;
+
+        temp = (pstr)_alloca(count * sizeof(char));
+        *temp = '\0';
+        for (const auto &i : m_sound_channels_ids)
         {
-            if (i == b)
-            {
-                xr_strcpy(temp, count, (*i)->id().c_str());
-                continue;
-            }
-
-            xr_strcat(temp, count, ", ");
-            xr_strcat(temp, count, (*i)->id().c_str());
+            xr_strcat(temp, count, i->id().c_str());
+
+            if (&i != &m_sound_channels_ids.back())
+                xr_strcat(temp, count, ", ");
         }
     }
 
@@ -139,30 +133,23 @@ void ambient::save(CInifile& config)
 
     {
         count = 1;
-        effect_container_type::const_iterator b = m_effects_ids.begin(), i = b;
-        effect_container_type::const_iterator e = m_effects_ids.end();
-        for (; i != e; ++i)
-            count += (*i)->id().size() + 2;
-
-        temp = (LPSTR)_alloca(count * sizeof(char));
-        *temp = 0;
-        for (i = b; i != e; ++i)
+        for (const auto &i : m_effects_ids)
+            count += i->id().size() + 2;
+
+        temp = (pstr)_alloca(count * sizeof(char));
+        *temp = '\0';
+        for (const auto &i : m_effects_ids)
         {
-            if (i == b)
-            {
-                xr_strcpy(temp, count, (*i)->id().c_str());
-                continue;
-            }
-
-            xr_strcat(temp, count, ", ");
-            xr_strcat(temp, count, (*i)->id().c_str());
+            xr_strcat(temp, count, i->id().c_str());
+            if (&i != &m_effects_ids.back())
+                xr_strcat(temp, count, ", ");
         }
     }
     config.w_string(m_load_section.c_str(), "effects", temp);
 }
 
-LPCSTR ambient::id_getter() const { return (m_load_section.c_str()); }
-void ambient::id_setter(LPCSTR value_)
+pcstr ambient::id_getter() const { return (m_load_section.c_str()); }
+void ambient::id_setter(pcstr value_)
 {
     shared_str value = value_;
     if (m_load_section._get() == value._get())
@@ -211,15 +198,15 @@ ::editor::environment::sound_channels::manager const& ambient::sounds_manager()
     return (m_manager.sounds_manager());
 }
 
-ambient::SEffect* ambient::create_effect(CInifile& config, LPCSTR id)
+ambient::SEffect* ambient::create_effect(CInifile& config, pcstr id)
 {
     effect* result = new effect(m_manager.effects_manager(), id);
     result->load(config);
     result->fill(m_effects_collection);
     return (result);
 }
 
-ambient::SSndChannel* ambient::create_sound_channel(CInifile& config, LPCSTR id)
+ambient::SSndChannel* ambient::create_sound_channel(CInifile& config, pcstr id)
 {
     channel* result = new channel(m_manager.sounds_manager(), id);
     result->load(config);

src/xrEngine/editor_environment_ambients_ambient.hpp

@@ -49,14 +49,14 @@ class ambient : public CEnvAmbient, public XRay::Editor::property_holder_holder,
     void save(CInifile& config);
     void fill(XRay::Editor::property_holder_collection* collection);
     inline shared_str const& id() const { return m_load_section; }
-    virtual SEffect* create_effect(CInifile& config, LPCSTR id);
-    virtual SSndChannel* create_sound_channel(CInifile& config, LPCSTR id);
+    virtual SEffect* create_effect(CInifile& config, pcstr id);
+    virtual SSndChannel* create_sound_channel(CInifile& config, pcstr id);
     virtual EffectVec& effects();
     virtual SSndChannelVec& get_snd_channels();
 
 private:
-    LPCSTR xr_stdcall id_getter() const;
-    void xr_stdcall id_setter(LPCSTR value);
+    pcstr xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(pcstr value);
 
 public:
     effects::manager const& effects_manager() const;

src/xrEngine/editor_environment_ambients_effect_id.cpp

@@ -29,7 +29,7 @@ effect_id::~effect_id()
     ::ide().destroy(m_property_holder);
 }
 
-LPCSTR const* effect_id::collection() { return (&*m_manager.effects_ids().begin()); }
+pcstr const* effect_id::collection() { return (&*m_manager.effects_ids().begin()); }
 u32 effect_id::collection_size() { return (m_manager.effects_ids().size()); }
 void effect_id::fill(XRay::Editor::property_holder_collection* collection)
 {

src/xrEngine/editor_environment_ambients_effect_id.hpp

@@ -39,7 +39,7 @@ class effect_id : public XRay::Editor::property_holder_holder, private Noncopyab
     virtual property_holder_type* object();
 
 private:
-    LPCSTR const* xr_stdcall collection();
+    pcstr const* xr_stdcall collection();
     u32 xr_stdcall collection_size();
 
 private:

src/xrEngine/editor_environment_ambients_manager.cpp

@@ -22,7 +22,7 @@ using editor::environment::detail::logical_string_predicate;
 
 template <>
 void property_collection<manager::ambient_container_type, manager>::display_name(
-    u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+    u32 const& item_index, pstr const& buffer, u32 const& buffer_size)
 {
     xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
@@ -60,13 +60,10 @@ void manager::load()
     typedef CInifile::Root sections_type;
     sections_type& sections = m_manager.m_ambients_config->sections();
     m_ambients.reserve(sections.size());
-    sections_type::const_iterator i = sections.begin();
-    sections_type::const_iterator e = sections.end();
-    for (; i != e; ++i)
+    for (const auto &i : sections)
     {
-        ambient* object = new ambient(*this, (*i)->Name);
-        object->load(
-            *m_manager.m_ambients_config, *m_manager.m_sound_channels_config, *m_manager.m_effects_config, (*i)->Name);
+        ambient* object = new ambient(*this, i->Name);
+        object->load(*m_manager.m_ambients_config, *m_manager.m_sound_channels_config, *m_manager.m_effects_config, i->Name);
         object->fill(m_collection);
         m_ambients.push_back(object);
     }
@@ -75,13 +72,10 @@ void manager::load()
 void manager::save()
 {
     string_path file_name;
-    CInifile* config =
-        new CInifile(FS.update_path(file_name, "$game_config$", "environment\\ambients.ltx"), FALSE, FALSE, TRUE);
+    CInifile* config = new CInifile(FS.update_path(file_name, "$game_config$", "environment\\ambients.ltx"), false, false, true);
 
-    ambient_container_type::iterator i = m_ambients.begin();
-    ambient_container_type::iterator e = m_ambients.end();
-    for (; i != e; ++i)
-        (*i)->save(*config);
+    for (const auto &i : m_ambients)
+        i->save(*config);
 
     xr_delete(config);
 }
@@ -117,11 +111,9 @@ manager::ambients_ids_type const& manager::ambients_ids() const
 
     m_ambients_ids.resize(m_ambients.size());
 
-    ambient_container_type::const_iterator i = m_ambients.begin();
-    ambient_container_type::const_iterator e = m_ambients.end();
-    ambients_ids_type::iterator j = m_ambients_ids.begin();
-    for (; i != e; ++i, ++j)
-        *j = xr_strdup((*i)->id().c_str());
+    auto j = m_ambients_ids.begin();
+    for (const auto &i : m_ambients)
+        *j++ = xr_strdup(i->id().c_str());
 
     std::sort(m_ambients_ids.begin(), m_ambients_ids.end(), logical_string_predicate());
 
@@ -130,11 +122,9 @@ manager::ambients_ids_type const& manager::ambients_ids() const
 
 ambient* manager::get_ambient(shared_str const& id) const
 {
-    ambient_container_type::const_iterator i = m_ambients.begin();
-    ambient_container_type::const_iterator e = m_ambients.end();
-    for (; i != e; ++i)
-        if ((*i)->id() == id)
-            return (*i);
+    for (const auto &i : m_ambients)
+        if (i->id() == id)
+            return i;
 
     NODEFAULT;
 #ifdef DEBUG