From 99d6403e4d88c8967c035d87c0526167368c033f Mon Sep 17 00:00:00 2001
From: EyeGuy <vanya619@list.ru>
Date: Sun, 16 Feb 2025 16:23:31 +0300
Subject: [PATCH] Update common submodule
---
.../vs2013/msDSEExporter.vcxproj | 6 ---
.../vs2013/msDSEExporter.vcxproj.filters | 3 --
proj/oggplugin/vs2013/oggplugin.vcxproj | 1 -
.../vs2013/oggplugin.vcxproj.filters | 3 --
proj/sxae/vs2013/sxae.vcxproj | 1 -
proj/sxae/vs2013/sxae.vcxproj.filters | 3 --
proj/sxambient/vs2013/sxambient.vcxproj | 6 ---
.../vs2013/sxambient.vcxproj.filters | 3 --
proj/sxanim/vs2013/sxanim.vcxproj | 1 -
proj/sxanim/vs2013/sxanim.vcxproj.filters | 3 --
proj/sxcore/vs2013/sxcore.vcxproj | 1 -
proj/sxcore/vs2013/sxcore.vcxproj.filters | 3 --
proj/sxgame/vs2013/sxgame.vcxproj | 1 -
proj/sxgame/vs2013/sxgame.vcxproj.filters | 3 --
proj/sxgenpreview/vs2013/sxgenpreview.vcxproj | 1 -
.../vs2013/sxgenpreview.vcxproj.filters | 3 --
proj/sxgreen/sxgreen/sxgreen.vcxproj | 1 -
proj/sxgreen/sxgreen/sxgreen.vcxproj.filters | 3 --
proj/sxgui/vs2013/sxgui.vcxproj | 1 -
proj/sxgui/vs2013/sxgui.vcxproj.filters | 3 --
proj/sxgui2/vs2013/sxgui2.vcxproj | 1 -
proj/sxgui2/vs2013/sxgui2.vcxproj.filters | 3 --
proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj | 1 -
.../vs2013/sxguiwinapi.vcxproj.filters | 3 --
.../vs2013/sxleveleditor.vcxproj | 1 -
.../vs2013/sxleveleditor.vcxproj.filters | 3 --
.../vs2013/sxmaterialeditor.vcxproj | 1 -
.../vs2013/sxmaterialeditor.vcxproj.filters | 3 --
proj/sxmtrl/vs2013/sxmtrl.vcxproj | 1 -
proj/sxmtrl/vs2013/sxmtrl.vcxproj.filters | 3 --
proj/sxparticles/vs2013/sxparticles.vcxproj | 1 -
.../vs2013/sxparticles.vcxproj.filters | 3 --
.../vs2013/sxparticleseditor.vcxproj | 1 -
.../vs2013/sxparticleseditor.vcxproj.filters | 3 --
proj/sxphysics/vs2013/sxphysics.vcxproj | 1 -
.../vs2013/sxphysics.vcxproj.filters | 3 --
proj/sxrender/vs2013/sxrender.vcxproj | 1 -
proj/sxrender/vs2013/sxrender.vcxproj.filters | 3 --
proj/terrax/vs2013/terrax.vcxproj | 1 -
proj/terrax/vs2013/terrax.vcxproj.filters | 3 --
proj/wadplugin/vs2013/wadplugin.vcxproj | 1 -
.../vs2013/wadplugin.vcxproj.filters | 3 --
proj/wavplugin/vs2013/wavplugin.vcxproj | 1 -
.../vs2013/wavplugin.vcxproj.filters | 3 --
proj/xCSG/vs2013/xCSG.vcxproj | 1 -
proj/xCSG/vs2013/xCSG.vcxproj.filters | 3 --
proj/xEngine/vs2013/xEngine.vcxproj | 1 -
proj/xEngine/vs2013/xEngine.vcxproj.filters | 3 --
proj/xParticles/vs2013/xParticles.vcxproj | 1 -
.../vs2013/xParticles.vcxproj.filters | 3 --
proj/xSpecs/vs2013/xSpecs.vcxproj | 1 -
proj/xSpecs/vs2013/xSpecs.vcxproj.filters | 3 --
proj/xUI/vs2013/xUI.vcxproj | 1 -
proj/xUI/vs2013/xUI.vcxproj.filters | 3 --
sdks/graphix | 2 +-
sdks/mital | 2 +-
source/SkyXEngine_Build/SkyXEngine_Build.cpp | 2 +-
source/common | 2 +-
source/core/Config.cpp | 18 +++----
source/core/Config.h | 51 +++----------------
source/core/JSON.h | 4 +-
source/game/GUIInventoryController.cpp | 6 +--
source/gui/DOMdocument.cpp | 12 ++---
source/gui/Font.cpp | 2 +-
source/gui/ICSS.cpp | 4 +-
source/gui/IHTMLparser.cpp | 2 +-
source/light/LightSystem.cpp | 2 +-
source/render/ShaderPreprocessor.cpp | 6 +--
source/xSound/SoundSystem.cpp | 8 +--
source/xUI/UIControl.h | 2 +-
70 files changed, 45 insertions(+), 198 deletions(-)
diff --git a/proj/msDSEExporter/vs2013/msDSEExporter.vcxproj b/proj/msDSEExporter/vs2013/msDSEExporter.vcxproj
index 0dac5ef96..4b40fd426 100644
--- a/proj/msDSEExporter/vs2013/msDSEExporter.vcxproj
+++ b/proj/msDSEExporter/vs2013/msDSEExporter.vcxproj
@@ -19,12 +19,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
- </ClCompile>
<ClCompile Include="..\..\..\source\exporter_base\dllmain.cpp" />
<ClCompile Include="..\..\..\source\exporter_base\Exporter.cpp" />
<ClCompile Include="..\..\..\source\exporter_base\Extended.cpp" />
diff --git a/proj/msDSEExporter/vs2013/msDSEExporter.vcxproj.filters b/proj/msDSEExporter/vs2013/msDSEExporter.vcxproj.filters
index acedeb6a4..ecdf20a8d 100644
--- a/proj/msDSEExporter/vs2013/msDSEExporter.vcxproj.filters
+++ b/proj/msDSEExporter/vs2013/msDSEExporter.vcxproj.filters
@@ -27,9 +27,6 @@
<ClCompile Include="..\..\..\source\msDSEExporter\Plugin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\msDSEExporter\Provider.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/oggplugin/vs2013/oggplugin.vcxproj b/proj/oggplugin/vs2013/oggplugin.vcxproj
index f6a2a648c..f279cf87c 100644
--- a/proj/oggplugin/vs2013/oggplugin.vcxproj
+++ b/proj/oggplugin/vs2013/oggplugin.vcxproj
@@ -174,7 +174,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\oggplugin\AudioCodecOgg.cpp" />
<ClCompile Include="..\..\..\source\oggplugin\dllmain.cpp" />
<ClCompile Include="..\..\..\source\oggplugin\plugin_main.cpp" />
diff --git a/proj/oggplugin/vs2013/oggplugin.vcxproj.filters b/proj/oggplugin/vs2013/oggplugin.vcxproj.filters
index 6811cfc3b..2c8cb6fb6 100644
--- a/proj/oggplugin/vs2013/oggplugin.vcxproj.filters
+++ b/proj/oggplugin/vs2013/oggplugin.vcxproj.filters
@@ -22,9 +22,6 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\oggplugin\plugin_main.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\oggplugin\AudioCodecOgg.h">
diff --git a/proj/sxae/vs2013/sxae.vcxproj b/proj/sxae/vs2013/sxae.vcxproj
index bbc11f73b..dc75b53c2 100644
--- a/proj/sxae/vs2013/sxae.vcxproj
+++ b/proj/sxae/vs2013/sxae.vcxproj
@@ -96,7 +96,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
diff --git a/proj/sxae/vs2013/sxae.vcxproj.filters b/proj/sxae/vs2013/sxae.vcxproj.filters
index 3c5b935d6..0b9f9cf9e 100644
--- a/proj/sxae/vs2013/sxae.vcxproj.filters
+++ b/proj/sxae/vs2013/sxae.vcxproj.filters
@@ -57,9 +57,6 @@
<ClCompile Include="..\..\..\source\sxae\TabHitboxes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxambient/vs2013/sxambient.vcxproj b/proj/sxambient/vs2013/sxambient.vcxproj
index 49c13dc6f..dc8ccf2c8 100644
--- a/proj/sxambient/vs2013/sxambient.vcxproj
+++ b/proj/sxambient/vs2013/sxambient.vcxproj
@@ -186,12 +186,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\string_utils.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/proj/sxambient/vs2013/sxambient.vcxproj.filters b/proj/sxambient/vs2013/sxambient.vcxproj.filters
index 35b20d5a9..69dfb63bc 100644
--- a/proj/sxambient/vs2013/sxambient.vcxproj.filters
+++ b/proj/sxambient/vs2013/sxambient.vcxproj.filters
@@ -30,9 +30,6 @@
<ClCompile Include="..\..\..\source\level\sxlevel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\file_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxanim/vs2013/sxanim.vcxproj b/proj/sxanim/vs2013/sxanim.vcxproj
index 5db828bb3..bd4a7d117 100644
--- a/proj/sxanim/vs2013/sxanim.vcxproj
+++ b/proj/sxanim/vs2013/sxanim.vcxproj
@@ -189,7 +189,6 @@
<ClCompile Include="..\..\..\source\anim\Renderable.cpp" />
<ClCompile Include="..\..\..\source\anim\RenderableVisibility.cpp" />
<ClCompile Include="..\..\..\source\anim\Updatable.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\anim\AnimatedModel.h" />
diff --git a/proj/sxanim/vs2013/sxanim.vcxproj.filters b/proj/sxanim/vs2013/sxanim.vcxproj.filters
index 54b74f268..1db63868b 100644
--- a/proj/sxanim/vs2013/sxanim.vcxproj.filters
+++ b/proj/sxanim/vs2013/sxanim.vcxproj.filters
@@ -18,9 +18,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\anim\Renderable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxcore/vs2013/sxcore.vcxproj b/proj/sxcore/vs2013/sxcore.vcxproj
index 44886dbdd..76c5c2bbd 100644
--- a/proj/sxcore/vs2013/sxcore.vcxproj
+++ b/proj/sxcore/vs2013/sxcore.vcxproj
@@ -21,7 +21,6 @@
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
<ClCompile Include="..\..\..\source\common\guid.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\core\AsyncFileReader.cpp" />
<ClCompile Include="..\..\..\source\core\AsyncTaskRunner.cpp" />
diff --git a/proj/sxcore/vs2013/sxcore.vcxproj.filters b/proj/sxcore/vs2013/sxcore.vcxproj.filters
index 9faae7aa2..7a2f4723f 100644
--- a/proj/sxcore/vs2013/sxcore.vcxproj.filters
+++ b/proj/sxcore/vs2013/sxcore.vcxproj.filters
@@ -25,9 +25,6 @@
<ClCompile Include="..\..\..\source\core\Config.cpp">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Sources</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\file_utils.cpp">
<Filter>Sources</Filter>
</ClCompile>
diff --git a/proj/sxgame/vs2013/sxgame.vcxproj b/proj/sxgame/vs2013/sxgame.vcxproj
index ed2254be7..6b2bc8d73 100644
--- a/proj/sxgame/vs2013/sxgame.vcxproj
+++ b/proj/sxgame/vs2013/sxgame.vcxproj
@@ -177,7 +177,6 @@
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
<ClCompile Include="..\..\..\source\common\guid.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\game\BaseHandle.cpp" />
<ClCompile Include="..\..\..\source\game\BaseLight.cpp" />
diff --git a/proj/sxgame/vs2013/sxgame.vcxproj.filters b/proj/sxgame/vs2013/sxgame.vcxproj.filters
index a55e52215..ad313030c 100644
--- a/proj/sxgame/vs2013/sxgame.vcxproj.filters
+++ b/proj/sxgame/vs2013/sxgame.vcxproj.filters
@@ -138,9 +138,6 @@
<ClCompile Include="..\..\..\source\game\EntityFactory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\game\EntityManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxgenpreview/vs2013/sxgenpreview.vcxproj b/proj/sxgenpreview/vs2013/sxgenpreview.vcxproj
index 7f122d362..ab005f3e7 100644
--- a/proj/sxgenpreview/vs2013/sxgenpreview.vcxproj
+++ b/proj/sxgenpreview/vs2013/sxgenpreview.vcxproj
@@ -94,7 +94,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\skyxengine.cpp" />
<ClCompile Include="..\..\..\source\sxgenpreview\sxgenpreview.cpp" />
diff --git a/proj/sxgenpreview/vs2013/sxgenpreview.vcxproj.filters b/proj/sxgenpreview/vs2013/sxgenpreview.vcxproj.filters
index a5742b1b7..a8dd1d5fc 100644
--- a/proj/sxgenpreview/vs2013/sxgenpreview.vcxproj.filters
+++ b/proj/sxgenpreview/vs2013/sxgenpreview.vcxproj.filters
@@ -21,9 +21,6 @@
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\file_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxgreen/sxgreen/sxgreen.vcxproj b/proj/sxgreen/sxgreen/sxgreen.vcxproj
index 2eda957b8..ec21b341c 100644
--- a/proj/sxgreen/sxgreen/sxgreen.vcxproj
+++ b/proj/sxgreen/sxgreen/sxgreen.vcxproj
@@ -178,7 +178,6 @@
<ClInclude Include="..\..\..\source\green\sxgreen.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\green\green.cpp" />
<ClCompile Include="..\..\..\source\green\sxgreen.cpp" />
<ClCompile Include="..\..\..\source\green\sxgreen_dll.cpp" />
diff --git a/proj/sxgreen/sxgreen/sxgreen.vcxproj.filters b/proj/sxgreen/sxgreen/sxgreen.vcxproj.filters
index 7d086b127..3cd995993 100644
--- a/proj/sxgreen/sxgreen/sxgreen.vcxproj.filters
+++ b/proj/sxgreen/sxgreen/sxgreen.vcxproj.filters
@@ -35,8 +35,5 @@
<ClCompile Include="..\..\..\source\green\sxgreen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/proj/sxgui/vs2013/sxgui.vcxproj b/proj/sxgui/vs2013/sxgui.vcxproj
index 20a5301f4..79c65b41f 100644
--- a/proj/sxgui/vs2013/sxgui.vcxproj
+++ b/proj/sxgui/vs2013/sxgui.vcxproj
@@ -241,7 +241,6 @@
<ClInclude Include="..\..\..\source\gui\ITD.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\gui\CSSstyle.cpp" />
<ClCompile Include="..\..\..\source\gui\IBODY.cpp" />
<ClCompile Include="..\..\..\source\gui\IBR.cpp" />
diff --git a/proj/sxgui/vs2013/sxgui.vcxproj.filters b/proj/sxgui/vs2013/sxgui.vcxproj.filters
index e742664b7..2e3bc8f4b 100644
--- a/proj/sxgui/vs2013/sxgui.vcxproj.filters
+++ b/proj/sxgui/vs2013/sxgui.vcxproj.filters
@@ -308,9 +308,6 @@
<ClCompile Include="..\..\..\source\gui\VideoRenderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\gui\ICSSstyle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxgui2/vs2013/sxgui2.vcxproj b/proj/sxgui2/vs2013/sxgui2.vcxproj
index be80b15a6..4a60a42af 100644
--- a/proj/sxgui2/vs2013/sxgui2.vcxproj
+++ b/proj/sxgui2/vs2013/sxgui2.vcxproj
@@ -19,7 +19,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\gui2\CSSLexer.cpp" />
<ClCompile Include="..\..\..\source\gui2\CSSProperty.cpp" />
<ClCompile Include="..\..\..\source\gui2\Desktop.cpp" />
diff --git a/proj/sxgui2/vs2013/sxgui2.vcxproj.filters b/proj/sxgui2/vs2013/sxgui2.vcxproj.filters
index 147e6315d..d91712645 100644
--- a/proj/sxgui2/vs2013/sxgui2.vcxproj.filters
+++ b/proj/sxgui2/vs2013/sxgui2.vcxproj.filters
@@ -49,9 +49,6 @@
<ClCompile Include="..\..\..\source\gui2\FontManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\xcommon\gui\IXDesktop.h">
diff --git a/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj b/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj
index d5b37e03a..d9702a8d0 100644
--- a/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj
+++ b/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj
@@ -12,7 +12,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\SXGUIWinApi\base.cpp" />
<ClCompile Include="..\..\..\source\SXGUIWinApi\base_wnd.cpp" />
diff --git a/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj.filters b/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj.filters
index 346c7ffdd..f4bd08eb7 100644
--- a/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj.filters
+++ b/proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj.filters
@@ -84,9 +84,6 @@
<ClCompile Include="..\..\..\source\SXGUIWinApi\dialog_select_dir.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\dialog_select_file.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxleveleditor/vs2013/sxleveleditor.vcxproj b/proj/sxleveleditor/vs2013/sxleveleditor.vcxproj
index 54637a326..b761091d6 100644
--- a/proj/sxleveleditor/vs2013/sxleveleditor.vcxproj
+++ b/proj/sxleveleditor/vs2013/sxleveleditor.vcxproj
@@ -94,7 +94,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\editors_utils\axes_helper.cpp" />
<ClCompile Include="..\..\..\source\skyxengine.cpp" />
diff --git a/proj/sxleveleditor/vs2013/sxleveleditor.vcxproj.filters b/proj/sxleveleditor/vs2013/sxleveleditor.vcxproj.filters
index 2f1709240..a280298b7 100644
--- a/proj/sxleveleditor/vs2013/sxleveleditor.vcxproj.filters
+++ b/proj/sxleveleditor/vs2013/sxleveleditor.vcxproj.filters
@@ -42,9 +42,6 @@
<ClCompile Include="..\..\..\source\editors_utils\axes_helper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\file_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj b/proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj
index 4ba27d1f2..54d8769a1 100644
--- a/proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj
+++ b/proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj
@@ -94,7 +94,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\skyxengine.cpp" />
<ClCompile Include="..\..\..\source\sxmaterialeditor\buttons_callback.cpp">
diff --git a/proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj.filters b/proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj.filters
index 47a31e8a5..2e82289cd 100644
--- a/proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj.filters
+++ b/proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj.filters
@@ -42,9 +42,6 @@
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\file_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxmtrl/vs2013/sxmtrl.vcxproj b/proj/sxmtrl/vs2013/sxmtrl.vcxproj
index 2defc0c71..126b3c997 100644
--- a/proj/sxmtrl/vs2013/sxmtrl.vcxproj
+++ b/proj/sxmtrl/vs2013/sxmtrl.vcxproj
@@ -171,7 +171,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\mtrl\LogicExpression.cpp" />
<ClCompile Include="..\..\..\source\mtrl\MaterialSystem.cpp" />
<ClCompile Include="..\..\..\source\mtrl\plugin_main.cpp" />
diff --git a/proj/sxmtrl/vs2013/sxmtrl.vcxproj.filters b/proj/sxmtrl/vs2013/sxmtrl.vcxproj.filters
index 556583a88..a2a53a7ee 100644
--- a/proj/sxmtrl/vs2013/sxmtrl.vcxproj.filters
+++ b/proj/sxmtrl/vs2013/sxmtrl.vcxproj.filters
@@ -18,9 +18,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\mtrl\MaterialSystem.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxparticles/vs2013/sxparticles.vcxproj b/proj/sxparticles/vs2013/sxparticles.vcxproj
index db6a76ae8..af0ac95fe 100644
--- a/proj/sxparticles/vs2013/sxparticles.vcxproj
+++ b/proj/sxparticles/vs2013/sxparticles.vcxproj
@@ -178,7 +178,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\particles\effect.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
diff --git a/proj/sxparticles/vs2013/sxparticles.vcxproj.filters b/proj/sxparticles/vs2013/sxparticles.vcxproj.filters
index c5fa3d4d2..0759bd9e4 100644
--- a/proj/sxparticles/vs2013/sxparticles.vcxproj.filters
+++ b/proj/sxparticles/vs2013/sxparticles.vcxproj.filters
@@ -27,9 +27,6 @@
<ClCompile Include="..\..\..\source\particles\effect.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\file_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj b/proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj
index 0a8a4b732..4a34bbcef 100644
--- a/proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj
+++ b/proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj
@@ -94,7 +94,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\skyxengine.cpp" />
<ClCompile Include="..\..\..\source\sxparticleseditor\callback_common.cpp">
diff --git a/proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj.filters b/proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj.filters
index 9f8f4897b..6cac98a6e 100644
--- a/proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj.filters
+++ b/proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj.filters
@@ -33,9 +33,6 @@
<ClCompile Include="..\..\..\source\sxparticleseditor\callback_list.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxphysics/vs2013/sxphysics.vcxproj b/proj/sxphysics/vs2013/sxphysics.vcxproj
index c063e34ac..e327650bb 100644
--- a/proj/sxphysics/vs2013/sxphysics.vcxproj
+++ b/proj/sxphysics/vs2013/sxphysics.vcxproj
@@ -174,7 +174,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\physics\CharacterController.cpp" />
<ClCompile Include="..\..\..\source\physics\CollisionObject.cpp" />
diff --git a/proj/sxphysics/vs2013/sxphysics.vcxproj.filters b/proj/sxphysics/vs2013/sxphysics.vcxproj.filters
index 9d75b2bfe..cb4b3c015 100644
--- a/proj/sxphysics/vs2013/sxphysics.vcxproj.filters
+++ b/proj/sxphysics/vs2013/sxphysics.vcxproj.filters
@@ -24,9 +24,6 @@
<ClCompile Include="..\..\..\source\physics\PhyWorld.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\file_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/sxrender/vs2013/sxrender.vcxproj b/proj/sxrender/vs2013/sxrender.vcxproj
index 20a0cf879..9a60037fa 100644
--- a/proj/sxrender/vs2013/sxrender.vcxproj
+++ b/proj/sxrender/vs2013/sxrender.vcxproj
@@ -224,7 +224,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\guid.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\render\BaseTarget.cpp" />
<ClCompile Include="..\..\..\source\render\Camera.cpp" />
diff --git a/proj/sxrender/vs2013/sxrender.vcxproj.filters b/proj/sxrender/vs2013/sxrender.vcxproj.filters
index 94b82a650..48693c71c 100644
--- a/proj/sxrender/vs2013/sxrender.vcxproj.filters
+++ b/proj/sxrender/vs2013/sxrender.vcxproj.filters
@@ -116,9 +116,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\render\RenderableVisibility.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/terrax/vs2013/terrax.vcxproj b/proj/terrax/vs2013/terrax.vcxproj
index 3714e7454..fad89107a 100644
--- a/proj/terrax/vs2013/terrax.vcxproj
+++ b/proj/terrax/vs2013/terrax.vcxproj
@@ -195,7 +195,6 @@
<ItemGroup>
<ClCompile Include="..\..\..\source\common\file_utils.cpp" />
<ClCompile Include="..\..\..\source\common\guid.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\common\string_utils.cpp" />
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
diff --git a/proj/terrax/vs2013/terrax.vcxproj.filters b/proj/terrax/vs2013/terrax.vcxproj.filters
index c7f15f1fc..919fa263e 100644
--- a/proj/terrax/vs2013/terrax.vcxproj.filters
+++ b/proj/terrax/vs2013/terrax.vcxproj.filters
@@ -57,9 +57,6 @@
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\common\file_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/wadplugin/vs2013/wadplugin.vcxproj b/proj/wadplugin/vs2013/wadplugin.vcxproj
index 9d6ee1bb6..ee4f5c663 100644
--- a/proj/wadplugin/vs2013/wadplugin.vcxproj
+++ b/proj/wadplugin/vs2013/wadplugin.vcxproj
@@ -19,7 +19,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\wadplugin\dllmain.cpp" />
<ClCompile Include="..\..\..\source\wadplugin\plugin_main.cpp" />
<ClCompile Include="..\..\..\source\wadplugin\TextureLoader.cpp" />
diff --git a/proj/wadplugin/vs2013/wadplugin.vcxproj.filters b/proj/wadplugin/vs2013/wadplugin.vcxproj.filters
index 8ac55cf8a..b6a8ceb9f 100644
--- a/proj/wadplugin/vs2013/wadplugin.vcxproj.filters
+++ b/proj/wadplugin/vs2013/wadplugin.vcxproj.filters
@@ -25,9 +25,6 @@
<ClCompile Include="..\..\..\source\wadplugin\TextureProxy.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\wadplugin\TextureLoader.h">
diff --git a/proj/wavplugin/vs2013/wavplugin.vcxproj b/proj/wavplugin/vs2013/wavplugin.vcxproj
index fe9aa5dc3..4c34641e2 100644
--- a/proj/wavplugin/vs2013/wavplugin.vcxproj
+++ b/proj/wavplugin/vs2013/wavplugin.vcxproj
@@ -159,7 +159,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\wavplugin\AudioCodecWave.cpp" />
<ClCompile Include="..\..\..\source\wavplugin\dllmain.cpp" />
<ClCompile Include="..\..\..\source\wavplugin\plugin_main.cpp" />
diff --git a/proj/wavplugin/vs2013/wavplugin.vcxproj.filters b/proj/wavplugin/vs2013/wavplugin.vcxproj.filters
index d92acb389..7a0ba1c84 100644
--- a/proj/wavplugin/vs2013/wavplugin.vcxproj.filters
+++ b/proj/wavplugin/vs2013/wavplugin.vcxproj.filters
@@ -22,9 +22,6 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\wavplugin\plugin_main.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\wavplugin\AudioCodecWave.h">
diff --git a/proj/xCSG/vs2013/xCSG.vcxproj b/proj/xCSG/vs2013/xCSG.vcxproj
index 446f41f63..7b9eef946 100644
--- a/proj/xCSG/vs2013/xCSG.vcxproj
+++ b/proj/xCSG/vs2013/xCSG.vcxproj
@@ -20,7 +20,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\guid.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\xcsg\BrushCreatorBox.cpp" />
<ClCompile Include="..\..\..\source\xcsg\BrushCreatorFree.cpp" />
<ClCompile Include="..\..\..\source\xcsg\BrushMesh.cpp" />
diff --git a/proj/xCSG/vs2013/xCSG.vcxproj.filters b/proj/xCSG/vs2013/xCSG.vcxproj.filters
index 85c4409a8..a8202fa58 100644
--- a/proj/xCSG/vs2013/xCSG.vcxproj.filters
+++ b/proj/xCSG/vs2013/xCSG.vcxproj.filters
@@ -37,9 +37,6 @@
<ClCompile Include="..\..\..\source\xcsg\Editable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\xcsg\Outline.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/xEngine/vs2013/xEngine.vcxproj b/proj/xEngine/vs2013/xEngine.vcxproj
index 2595ac721..94f72003f 100644
--- a/proj/xEngine/vs2013/xEngine.vcxproj
+++ b/proj/xEngine/vs2013/xEngine.vcxproj
@@ -179,7 +179,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\xEngine\CommandLineToArgvA.cpp" />
<ClCompile Include="..\..\..\source\xEngine\dllmain.cpp" />
<ClCompile Include="..\..\..\source\xEngine\Engine.cpp" />
diff --git a/proj/xEngine/vs2013/xEngine.vcxproj.filters b/proj/xEngine/vs2013/xEngine.vcxproj.filters
index 67b9b20d6..56c14a023 100644
--- a/proj/xEngine/vs2013/xEngine.vcxproj.filters
+++ b/proj/xEngine/vs2013/xEngine.vcxproj.filters
@@ -24,9 +24,6 @@
<ClCompile Include="..\..\..\source\xEngine\CommandLineToArgvA.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\xEngine\Engine.h">
diff --git a/proj/xParticles/vs2013/xParticles.vcxproj b/proj/xParticles/vs2013/xParticles.vcxproj
index 3e9a04dee..6735b2729 100644
--- a/proj/xParticles/vs2013/xParticles.vcxproj
+++ b/proj/xParticles/vs2013/xParticles.vcxproj
@@ -19,7 +19,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\xParticles\dllmain.cpp" />
<ClCompile Include="..\..\..\source\xParticles\Editable.cpp" />
<ClCompile Include="..\..\..\source\xParticles\EditorExtension.cpp" />
diff --git a/proj/xParticles/vs2013/xParticles.vcxproj.filters b/proj/xParticles/vs2013/xParticles.vcxproj.filters
index 8eebf1833..be26e1038 100644
--- a/proj/xParticles/vs2013/xParticles.vcxproj.filters
+++ b/proj/xParticles/vs2013/xParticles.vcxproj.filters
@@ -46,9 +46,6 @@
<ClCompile Include="..\..\..\source\xParticles\EffectLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\xParticles\Updatable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/proj/xSpecs/vs2013/xSpecs.vcxproj b/proj/xSpecs/vs2013/xSpecs.vcxproj
index d27e69f1f..c3d94c88d 100644
--- a/proj/xSpecs/vs2013/xSpecs.vcxproj
+++ b/proj/xSpecs/vs2013/xSpecs.vcxproj
@@ -19,7 +19,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\xSpecs\dllmain.cpp" />
<ClCompile Include="..\..\..\source\xSpecs\MaterialLoader.cpp" />
<ClCompile Include="..\..\..\source\xSpecs\MaterialProxy.cpp" />
diff --git a/proj/xSpecs/vs2013/xSpecs.vcxproj.filters b/proj/xSpecs/vs2013/xSpecs.vcxproj.filters
index 4db0e36bc..e438dc681 100644
--- a/proj/xSpecs/vs2013/xSpecs.vcxproj.filters
+++ b/proj/xSpecs/vs2013/xSpecs.vcxproj.filters
@@ -28,9 +28,6 @@
<ClCompile Include="..\..\..\source\xSpecs\MaterialLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\xSpecs\TextureProxy.h">
diff --git a/proj/xUI/vs2013/xUI.vcxproj b/proj/xUI/vs2013/xUI.vcxproj
index f925267b0..033aaf44d 100644
--- a/proj/xUI/vs2013/xUI.vcxproj
+++ b/proj/xUI/vs2013/xUI.vcxproj
@@ -69,7 +69,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\guid.cpp" />
- <ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\xUI\CurvePreviewGraphNode.cpp" />
<ClCompile Include="..\..\..\source\xUI\CurvePreviewGraphNodeData.cpp" />
<ClCompile Include="..\..\..\source\xUI\GradientPreviewGraphNodeData.cpp" />
diff --git a/proj/xUI/vs2013/xUI.vcxproj.filters b/proj/xUI/vs2013/xUI.vcxproj.filters
index 531c6e555..5912ed89b 100644
--- a/proj/xUI/vs2013/xUI.vcxproj.filters
+++ b/proj/xUI/vs2013/xUI.vcxproj.filters
@@ -173,9 +173,6 @@
<ClCompile Include="..\..\..\source\xUI\UIButton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\common\string.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\xUI\UITextBox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/sdks/graphix b/sdks/graphix
index 27fedecbe..d8eeb9ae8 160000
--- a/sdks/graphix
+++ b/sdks/graphix
@@ -1 +1 @@
-Subproject commit 27fedecbe4e3921dd1da215c65a6886755c1a498
+Subproject commit d8eeb9ae81fae1256034680abeb5b3dc14608770
diff --git a/sdks/mital b/sdks/mital
index c814073bb..384aa665b 160000
--- a/sdks/mital
+++ b/sdks/mital
@@ -1 +1 @@
-Subproject commit c814073bb3bce76b111684d7afb7d74d303f55bf
+Subproject commit 384aa665b3e46cb12a4cc2f2e0b418f925b8bbd1
diff --git a/source/SkyXEngine_Build/SkyXEngine_Build.cpp b/source/SkyXEngine_Build/SkyXEngine_Build.cpp
index 27dd74683..f5c616e0d 100644
--- a/source/SkyXEngine_Build/SkyXEngine_Build.cpp
+++ b/source/SkyXEngine_Build/SkyXEngine_Build.cpp
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
pEngine->getCore()->getConsole()->execCommand("exec ../config_game.cfg");
pEngine->getCore()->getConsole()->execCommand("exec ../config_game_user.cfg");
-#if 1
+#if 0
IFileSystem *pFS = pEngine->getCore()->getFileSystem();
IFile *pFile1 = pFS->openFile("dir/test.txt", FILE_MODE_READ);
diff --git a/source/common b/source/common
index fab676418..8103fff48 160000
--- a/source/common
+++ b/source/common
@@ -1 +1 @@
-Subproject commit fab676418d9c07fcbb558bca8becc9e7b835f62d
+Subproject commit 8103fff484d6dd1f7006973af8bf581334d8ea1e
diff --git a/source/core/Config.cpp b/source/core/Config.cpp
index fa9a82e09..2f336a608 100644
--- a/source/core/Config.cpp
+++ b/source/core/Config.cpp
@@ -152,7 +152,7 @@ int CConfig::parse(const char* file)
{
for(AssotiativeArray<CConfigString, CValue>::Iterator i = m_mSections[s3].mValues.begin(); i; ++i)
{
- m_mSections[s2].mValues[i.first].val = i.second->val;
+ m_mSections[s2].mValues[*i.first].val = i.second->val;
}
}
}
@@ -187,7 +187,7 @@ int CConfig::parse(const char* file)
{
for(AssotiativeArray<CConfigString, CValue>::Iterator i = m_mSections[s3].mValues.begin(); i; ++i)
{
- m_mSections[s2].mValues[i.first].val = i.second->val;
+ m_mSections[s2].mValues[*i.first].val = i.second->val;
}
}
}
@@ -332,20 +332,20 @@ void CConfig::modify(AssotiativeArray<CConfigString, CSection> & sections, Assot
{
for(AssotiativeArray<CConfigString, CValue>::Iterator i = m_mFinalValues.begin(); i; ++i)
{
- values[i.first].val = i.second->val;
+ values[*i.first].val = i.second->val;
}
for(AssotiativeArray<CConfigString, CSection>::Iterator i = m_mSections.begin(); i; ++i)
{
- if(!sections.KeyExists(i.first))
+ if(!sections.KeyExists(*i.first))
{
- sections[i.first].parent = i.second->parent;
- sections[i.first].native = false;
- sections[i.first].Include = IncName;
+ sections[*i.first].parent = i.second->parent;
+ sections[*i.first].native = false;
+ sections[*i.first].Include = IncName;
}
- for(AssotiativeArray<CConfigString, CValue>::Iterator j = m_mSections[i.first].mValues.begin(); j; ++j)
+ for(AssotiativeArray<CConfigString, CValue>::Iterator j = m_mSections[*i.first].mValues.begin(); j; ++j)
{
- sections[i.first].mValues[j.first].val = j.second->val;
+ sections[*i.first].mValues[*j.first].val = j.second->val;
}
}
}
diff --git a/source/core/Config.h b/source/core/Config.h
index 8b5587560..a921ce2ca 100644
--- a/source/core/Config.h
+++ b/source/core/Config.h
@@ -18,57 +18,22 @@ See the license in LICENSE
class CConfigString: public String
{
public:
- CConfigString() : String(){}
- CConfigString(const char * str) : String(str){}
- CConfigString(const String & str) : String(str){}
- CConfigString(const CConfigString & str) : String(str){}
- CConfigString(const CConfigString * str) : String(str){}
- CConfigString(const char sym) : String(sym){}
- ~CConfigString() {}
-
- const char & operator[](const unsigned long & num) const
- {
- return(m_szString[num]);
- }
-
- char & operator[](const unsigned long & num)
- {
- return(m_szString[num]);
- }
+ CConfigString(): String(){}
+ CConfigString(const char *str): String(str){}
+ CConfigString(const String &str): String(str){}
+ CConfigString(const CConfigString &str): String(str){}
+ CConfigString(char sym): String(sym){}
- CConfigString & operator=(const CConfigString & str)
+ CConfigString& operator=(const CConfigString &str)
{
- release();
- m_szString = new char[str.length() + 1];
- memcpy(m_szString, str.c_str(), str.length() + 1);
- return(*this);
- }
+ String::operator=(str);
- CConfigString & operator=(const CConfigString * str)
- {
- release();
- m_szString = new char[str->length() + 1];
- memcpy(m_szString, str->c_str(), str->length() + 1);
return(*this);
}
bool operator==(const CConfigString &str) const
{
- return (strcasecmp(str.m_szString, m_szString) == 0);
- }
-
- bool operator==(const CConfigString * str) const
- {
- return (strcasecmp(str->m_szString, m_szString) == 0);
- }
-
- CConfigString & operator+=(const char & sym)
- {
- char * newstring = new char[length() + 2];
- sprintf(newstring, "%s%c", m_szString, sym);
- mem_delete_a(m_szString);
- m_szString = newstring;
- return(*this);
+ return(strcasecmp(str.c_str(), c_str()) == 0);
}
};
diff --git a/source/core/JSON.h b/source/core/JSON.h
index 6f72cb87c..0e04ec2ec 100644
--- a/source/core/JSON.h
+++ b/source/core/JSON.h
@@ -62,7 +62,7 @@ public:
return(true);
case XJI_STRING:
//! FIXME add some checks!
- *pOut = m_sVal.toDouble();
+ *pOut = m_sVal.toFloat();
return(true);
case XJI_NULL:
@@ -83,7 +83,7 @@ public:
case XJI_STRING:
//! FIXME add some checks!
//! FIXME fix type!
- *pOut = m_sVal.toLongInt();
+ *pOut = m_sVal.toInt64();
return(true);
case XJI_NULL:
diff --git a/source/game/GUIInventoryController.cpp b/source/game/GUIInventoryController.cpp
index 354374438..c06a4fd7b 100644
--- a/source/game/GUIInventoryController.cpp
+++ b/source/game/GUIInventoryController.cpp
@@ -38,7 +38,7 @@ CGUIInventoryController::CGUIInventoryController(CCharacterInventory *pInventory
{
m_aEquipAreas[i].type = (EQUIP_ITEM_TYPE)enumerator.getValue();
m_aEquipAreas[i].uIndex = pTypeCounts[enumerator.getValue()]++;
- m_aEquipAreas[i].pNode->setAttribute(L"equip_index", (unsigned long)m_aEquipAreas[i].uIndex);
+ m_aEquipAreas[i].pNode->setAttribute(L"equip_index", m_aEquipAreas[i].uIndex);
if(m_aEquipAreas[i].pNode->getAttribute(L"split_container").toBool())
{
@@ -52,13 +52,13 @@ CGUIInventoryController::CGUIInventoryController(CCharacterInventory *pInventory
if(j == 0 && k == 0)
{
m_aEquipAreas[i].pCellNode = aCells[k];
- m_aEquipAreas[i].pCellNode->setAttribute(L"equip_index", (unsigned long)m_aEquipAreas[i].uIndex);
+ m_aEquipAreas[i].pCellNode->setAttribute(L"equip_index", m_aEquipAreas[i].uIndex);
}
else
{
newArea.uIndex = pTypeCounts[enumerator.getValue()]++;
newArea.pCellNode = aCells[k];
- newArea.pCellNode->setAttribute(L"equip_index", (unsigned long)newArea.uIndex);
+ newArea.pCellNode->setAttribute(L"equip_index", newArea.uIndex);
m_aEquipAreas.push_back(newArea);
}
diff --git a/source/gui/DOMdocument.cpp b/source/gui/DOMdocument.cpp
index 1f99d6373..ed90d4130 100644
--- a/source/gui/DOMdocument.cpp
+++ b/source/gui/DOMdocument.cpp
@@ -133,11 +133,11 @@ namespace gui
if(cls.length())
{
- UINT pos = 0;
+ size_t pos = 0;
while(true)
{
pos = cls.find(L" ");
- if(pos != (UINT)(-1))
+ if(pos != StringW::EOS)
{
StringW c = cls.substr(0, pos);
UINT icls = doc->getIndexForClassString(cls);
@@ -1813,14 +1813,14 @@ namespace gui
else if(name == L"class")
{
StringW cls = value+L" ";
- UINT pos = 0;
+ size_t pos = 0;
Array<UINT> vNewCls;
Array<UINT> vAddCls;
Array<UINT> vRemoveCls;
while(true)
{
pos = cls.find(L" ");
- if(pos != ~0)
+ if(pos != StringW::EOS)
{
if(pos != 0)
{
@@ -2045,8 +2045,8 @@ namespace gui
BOOL CDOMnode::classExists(const StringW &cls)
{
const StringW &wsClass = getAttribute(L"class");
- int pos = wsClass.find(cls);
- if(pos >= 0)
+ size_t pos = wsClass.find(cls);
+ if(pos != StringW::EOS)
{
wchar_t wc = wsClass[pos + cls.length()];
if(wc == 0 || iswspace(wc))
diff --git a/source/gui/Font.cpp b/source/gui/Font.cpp
index 46a55fc53..76a0400a4 100644
--- a/source/gui/Font.cpp
+++ b/source/gui/Font.cpp
@@ -679,7 +679,7 @@ namespace gui
void CFont::addChar(WCHAR c, bool full)
{
- if(m_szFontChars.find(c) == (UINT)-1)
+ if(m_szFontChars.find(c) == StringW::EOS)
{
m_szFontChars += c;
if(full)
diff --git a/source/gui/ICSS.cpp b/source/gui/ICSS.cpp
index e064c5411..4d7c1017b 100644
--- a/source/gui/ICSS.cpp
+++ b/source/gui/ICSS.cpp
@@ -235,8 +235,8 @@ namespace gui
}
if(pseudoclass & (PSEUDOCLASS_NTH_CHILD | PSEUDOCLASS_NTH_LAST_CHILD | PSEUDOCLASS_NTH_OF_TYPE | PSEUDOCLASS_NTH_LAST_OF_TYPE))
{
- UINT pos = str.find(L"(");
- if(pos != (UINT)(-1))
+ size_t pos = str.find(L"(");
+ if(pos != StringW::EOS)
{
UINT d = 0, o = 0;
WCHAR cn;
diff --git a/source/gui/IHTMLparser.cpp b/source/gui/IHTMLparser.cpp
index 4ca54eaf9..164cf3b5b 100644
--- a/source/gui/IHTMLparser.cpp
+++ b/source/gui/IHTMLparser.cpp
@@ -473,7 +473,7 @@ namespace gui
}
for(AssotiativeArray<StringW, StringW>::Iterator j = attrs.begin(); j; ++j)
{
- pCur->setAttribute(j.first, j.second);
+ pCur->setAttribute(*j.first, *j.second);
}
attrs.clear();
// wprintf(L"open tag %s\n", tagname);
diff --git a/source/light/LightSystem.cpp b/source/light/LightSystem.cpp
index 94b5e1e66..a69580b4e 100644
--- a/source/light/LightSystem.cpp
+++ b/source/light/LightSystem.cpp
@@ -852,7 +852,7 @@ void CLightSystem::renderGI(CGIGraphNodeData *pNodeData, IXRenderTarget *pFinalT
pCtx->addTimestamp("lpv_inject -");
- const bool *dev_lpv_points = m_pCore->getConsole()->getPCVarBool("dev_lpv_points");
+ static const bool *dev_lpv_points = m_pCore->getConsole()->getPCVarBool("dev_lpv_points");
if(*dev_lpv_points)
{
auto pTarget = pNodeData->m_pGBufferColor->asRenderTarget();
diff --git a/source/render/ShaderPreprocessor.cpp b/source/render/ShaderPreprocessor.cpp
index 567fae0a8..cdfcc1490 100644
--- a/source/render/ShaderPreprocessor.cpp
+++ b/source/render/ShaderPreprocessor.cpp
@@ -545,7 +545,7 @@ String CShaderPreprocessor::process(const char *src, const char *file)
String sOut;
if(out.size())
{
- sOut.reserve(out.size());
+ sOut.resize(out.size());
memcpy((void*)(sOut.c_str()), &(out[0]), out.size() * sizeof(char));
((char*)(sOut.c_str()))[out.size()] = 0;
}
@@ -1097,7 +1097,7 @@ String CShaderPreprocessor::getInclude(const String &name, const char *szLocalPa
{
int iSize = (int)pFile->getSize();
String s;
- s.reserve(iSize + 2);
+ s.resize(iSize + 1);
pFile->readBin((void*)(s.c_str()), iSize);
s[iSize] = '\n';
s[iSize + 1] = 0;
@@ -1119,7 +1119,7 @@ String CShaderPreprocessor::getInclude(const String &name, const char *szLocalPa
{
int iSize = (int)pFile->getSize();
String s;
- s.reserve(iSize + 2);
+ s.resize(iSize + 1);
pFile->readBin((void*)(s.c_str()), iSize);
s[iSize] = '\n';
s[iSize + 1] = 0;
diff --git a/source/xSound/SoundSystem.cpp b/source/xSound/SoundSystem.cpp
index fbd7d88ca..7a79ed7a4 100644
--- a/source/xSound/SoundSystem.cpp
+++ b/source/xSound/SoundSystem.cpp
@@ -243,9 +243,9 @@ IXAudioCodecTarget* CSoundSystem::getCodecTarget(const char *szName)
for(MapCodec::Iterator i = m_mapCodecs.begin(); i; ++i)
{
- if(m_mapCodecs[i.first]->open(szPath, "", &pTarget, false))
+ if(m_mapCodecs[*i.first]->open(szPath, "", &pTarget, false))
{
- pCodec = m_mapCodecs[i.first];
+ pCodec = m_mapCodecs[*i.first];
break;
}
}
@@ -411,8 +411,8 @@ IXAudioCodec* CSoundSystem::getCodecSave()
{
for(MapCodec::Iterator i = m_mapCodecs.begin(); i; ++i)
{
- if(m_mapCodecs[i.first]->canSave())
- return m_mapCodecs[i.first];
+ if(m_mapCodecs[*i.first]->canSave())
+ return m_mapCodecs[*i.first];
}
return NULL;
diff --git a/source/xUI/UIControl.h b/source/xUI/UIControl.h
index 34803a3db..fab448102 100644
--- a/source/xUI/UIControl.h
+++ b/source/xUI/UIControl.h
@@ -274,7 +274,7 @@ protected:
gui::dom::IDOMnode *m_pNode = NULL;
gui::dom::IDOMnode *m_pInputNode = NULL;
gui::dom::IDOMnode *m_pContainerNode = NULL;
- const ULONG m_id;
+ const UINT m_id;
const String m_sName;
friend class CUIWindow;
--
GitLab