Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@secsome
secsome committed Dec 31, 2021
1 parent 7c8ef74 commit 533cf9c
Show file tree
Hide file tree
Showing 53 changed files with 1,636 additions and 583 deletions.
27 changes: 17 additions & 10 deletions FA2sp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{3bbea2d2-97da-4b96-9516-36a6c8d3b4a3}</ProjectGuid>
<RootNamespace>FA2sp</RootNamespace>
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -66,15 +66,15 @@
<BufferSecurityCheck>
</BufferSecurityCheck>
<DisableLanguageExtensions>false</DisableLanguageExtensions>
<DisableSpecificWarnings>4065;4530;4731;4244;4114;4172;4018;4390;4091</DisableSpecificWarnings>
<DisableSpecificWarnings>4065;4530;4731;4244;4114;4172;4018;4390;4091;6269;28159;26812;28251;26495;</DisableSpecificWarnings>
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MinimalRebuild>
</MinimalRebuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalOptions>-DISOLATION_AWARE_ENABLED %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp14</LanguageStandard>
<LanguageStandard>stdcpplatest</LanguageStandard>
<EnableModules>false</EnableModules>
<Optimization>MaxSpeed</Optimization>
</ClCompile>
Expand All @@ -101,15 +101,15 @@
<BufferSecurityCheck>
</BufferSecurityCheck>
<DisableLanguageExtensions>false</DisableLanguageExtensions>
<DisableSpecificWarnings>4065;4530;4731;4244;4114;4172;4018;4390;4091</DisableSpecificWarnings>
<DisableSpecificWarnings>4065;4530;4731;4244;4114;4172;4018;4390;4091;6269;28159;26812;28251;26495;</DisableSpecificWarnings>
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MinimalRebuild>
</MinimalRebuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalOptions>-DISOLATION_AWARE_ENABLED %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp14</LanguageStandard>
<LanguageStandard>stdcpplatest</LanguageStandard>
<EnableModules>false</EnableModules>
<Optimization>Disabled</Optimization>
</ClCompile>
Expand Down Expand Up @@ -144,11 +144,17 @@
<ClCompile Include="FA2sp\Ext\CLoading\Body.LoadObjects.cpp" />
<ClCompile Include="FA2sp\Ext\CLoading\Hooks.InitPalettes.cpp" />
<ClCompile Include="FA2sp\Ext\CLoading\Hooks.LoadObjects.cpp" />
<ClCompile Include="FA2sp\Ext\CMapData\Body.cpp" />
<ClCompile Include="FA2sp\Ext\CMapData\Hooks.cpp" />
<ClCompile Include="FA2sp\Ext\CMapD\Hooks.cpp" />
<ClCompile Include="FA2sp\Ext\CPropertyAircraft\Body.cpp" />
<ClCompile Include="FA2sp\Ext\CPropertyAircraft\Hooks.cpp" />
<ClCompile Include="FA2sp\Ext\CPropertyBuilding\Body.cpp" />
<ClCompile Include="FA2sp\Ext\CPropertyBuilding\Hooks.cpp" />
<ClCompile Include="FA2sp\Ext\CPropertyInfantry\Body.cpp" />
<ClCompile Include="FA2sp\Ext\CPropertyInfantry\Hooks.cpp" />
<ClCompile Include="FA2sp\Ext\CPropertyUnit\Body.cpp" />
<ClCompile Include="FA2sp\Ext\CPropertyUnit\Hooks.cpp" />
<ClCompile Include="FA2sp\Ext\CScriptTypes\Body.CurrentScript.cpp" />
<ClCompile Include="FA2sp\Ext\CScriptTypes\Hooks.cpp" />
<ClCompile Include="FA2sp\Ext\CSingleplayerSettings\Body.cpp" />
Expand All @@ -170,7 +176,7 @@
<ClCompile Include="FA2sp\MFCWindow\Hooks.cpp" />
<ClCompile Include="FA2sp\Miscs\DrawStuff.cpp" />
<ClCompile Include="FA2sp\Miscs\Exception.cpp" />
<ClCompile Include="FA2sp\Miscs\Hooks.TheaterInfo.cpp" />
<ClCompile Include="FA2sp\Miscs\TheaterInfo.cpp" />
<ClCompile Include="FA2sp\Miscs\SaveMap.cpp" />
<ClCompile Include="FA2sp\Miscs\Palettes.cpp" />
<ClCompile Include="FA2sp\Miscs\Hooks.BugFixes.cpp" />
Expand All @@ -190,7 +196,7 @@
<ClCompile Include="FA2sp\Miscs\Hooks.LoadParams.cpp" />
<ClCompile Include="FA2sp\Miscs\Hooks.Mix.cpp" />
<ClCompile Include="FA2sp\Miscs\Hooks.Performance.cpp" />
<ClCompile Include="FA2sp\Miscs\Hooks.RemapColor.cpp" />
<ClCompile Include="FA2sp\Miscs\Hooks.Palette.cpp" />
<ClCompile Include="FA2sp\Miscs\Hooks.Stringtables.cpp" />
<ClCompile Include="FA2sp\Helpers\MutexHelper.cpp" />
<ClCompile Include="FA2sp\Helpers\Translations.cpp" />
Expand All @@ -204,6 +210,7 @@
<ClInclude Include="FA2sp\Ext\CIsoView\Body.h" />
<ClInclude Include="FA2sp\Ext\CLighting\Body.h" />
<ClInclude Include="FA2sp\Ext\CLoading\Body.h" />
<ClInclude Include="FA2sp\Ext\CMapData\Body.h" />
<ClInclude Include="FA2sp\Ext\CPropertyAircraft\Body.h" />
<ClInclude Include="FA2sp\Ext\CPropertyBuilding\Body.h" />
<ClInclude Include="FA2sp\Ext\CPropertyInfantry\Body.h" />
Expand All @@ -224,7 +231,6 @@
<ClInclude Include="FA2sp\FA2sp.Constants.h" />
<ClInclude Include="FA2sp\Helpers\ControlHelpers.h" />
<ClInclude Include="FA2sp\Helpers\Helper.h" />
<ClInclude Include="FA2sp\Helpers\INIParser.h" />
<ClInclude Include="FA2sp\Helpers\MultimapHelper.h" />
<ClInclude Include="FA2sp\Helpers\Parser.h" />
<ClInclude Include="FA2sp\Helpers\STDHelpers.h" />
Expand All @@ -234,6 +240,7 @@
<ClInclude Include="FA2sp\Miscs\Exception.h" />
<ClInclude Include="FA2sp\Miscs\Palettes.h" />
<ClInclude Include="FA2sp\Miscs\SaveMap.h" />
<ClInclude Include="FA2sp\Miscs\TheaterInfo.h" />
<ClInclude Include="FA2sp\resource.h" />
<ClInclude Include="FA2sp\RunTime.h" />
<ClInclude Include="FA2sp\Helpers\MutexHelper.h" />
Expand Down
31 changes: 26 additions & 5 deletions FA2sp.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
<ClInclude Include="FA2sp\Helpers\Parser.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="FA2sp\Helpers\INIParser.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="FA2sp\Helpers\MutexHelper.h">
<Filter>头文件</Filter>
</ClInclude>
Expand Down Expand Up @@ -144,6 +141,12 @@
<ClInclude Include="FA2sp\Miscs\SaveMap.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="FA2sp\Miscs\TheaterInfo.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="FA2sp\Ext\CMapData\Body.h">
<Filter>头文件</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="FA2sp\FA2sp.cpp">
Expand Down Expand Up @@ -254,7 +257,7 @@
<ClCompile Include="FA2sp\Ext\CScriptTypes\Body.CurrentScript.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2sp\Miscs\Hooks.RemapColor.cpp">
<ClCompile Include="FA2sp\Miscs\Hooks.Palette.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2pp\FunctionInit.cpp">
Expand Down Expand Up @@ -350,7 +353,25 @@
<ClCompile Include="FA2sp\Ext\CTileSetBrowserView\Hooks.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2sp\Miscs\Hooks.TheaterInfo.cpp">
<ClCompile Include="FA2sp\Miscs\TheaterInfo.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2sp\Ext\CMapData\Body.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2sp\Ext\CMapData\Hooks.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2sp\Ext\CPropertyBuilding\Hooks.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2sp\Ext\CPropertyAircraft\Hooks.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2sp\Ext\CPropertyUnit\Hooks.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="FA2sp\Ext\CPropertyInfantry\Hooks.cpp">
<Filter>源文件</Filter>
</ClCompile>
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion FA2sp/Ext/CAITriggerTypes/Body.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "../../Helpers/STDHelpers.h"
#include "../../Helpers/Translations.h"
#include "..\CMapData\Body.h"

void CAITriggerTypesExt::ProgramStartupInit()
{
Expand Down Expand Up @@ -54,7 +55,7 @@ BOOL CAITriggerTypesExt::OnInitDialogExt()
int i = 1;
if (auto sides = CINI::FAData->GetSection("Sides"))
{
for (auto& itr : sides->EntitiesDictionary)
for (auto& itr : sides->GetEntities())
{
ppmfc::CString buffer;
buffer.Format("%d - %s", i++, itr.second);
Expand Down
Loading

0 comments on commit 533cf9c

Please sign in to comment.