Skip to content

Commit b23e54a

Browse files
akriegerakrieger
committed
Use fmt instead of string_formatter
1 parent 0f2f548 commit b23e54a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+17208
-902
lines changed

‎LICENSE.txt‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,60 @@
11
Cataclysm is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
22

3+
--------------------------------------------------------------------------------
4+
35
GNU Unifont (data/font/unifont.ttf) is licensed under SIL Open Font License version 1.1 and GNU General Public License v2+ with the GNU font embedding exception. Visit http://unifoundry.com/LICENSE.txt for details.
46

7+
--------------------------------------------------------------------------------
8+
59
Terminus Font (data/font/terminus.ttf) is licensed under the SIL Open Font License (see LICENSE-OFL-Terminus-Font.txt).
610

11+
--------------------------------------------------------------------------------
12+
713
Vecterminus Font (data/font/VecTerminus12Medium.otf) is licensed under the SIL Open Font License (see LICENSE-OFL-Terminus-Font.txt).
814

15+
--------------------------------------------------------------------------------
16+
917
Robot font (data/font/Roboto-Medium.tt) is licensed under the Apache License, version 2.0 (see LICENSE-Apache-Roboto-Font.txt).
1018

19+
--------------------------------------------------------------------------------
20+
1121
CATCH unit-test framework (tests/catch/catch.hpp) is licensed under the Boost Software License. Visit https://github.com/philsquared/Catch/blob/master/LICENSE.txt to read the license.
1222

23+
--------------------------------------------------------------------------------
24+
1325
PLF List and PLF Colony (src/list.h, src/colony.h) are licensed under the zLib license (https://www.zlib.net/zlib_license.html).
1426

27+
--------------------------------------------------------------------------------
28+
1529
getpost (tools/json_tools/format/getpost.h) is licensed under the MIT license, see file for text of license.
1630

31+
--------------------------------------------------------------------------------
32+
33+
fmt is licensed under the MIT license. The full license text is as follows:
34+
35+
Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors
36+
37+
Permission is hereby granted, free of charge, to any person obtaining
38+
a copy of this software and associated documentation files (the
39+
"Software"), to deal in the Software without restriction, including
40+
without limitation the rights to use, copy, modify, merge, publish,
41+
distribute, sublicense, and/or sell copies of the Software, and to
42+
permit persons to whom the Software is furnished to do so, subject to
43+
the following conditions:
44+
45+
The above copyright notice and this permission notice shall be
46+
included in all copies or substantial portions of the Software.
47+
48+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
49+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
50+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
51+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
52+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
53+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
54+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
55+
56+
--------------------------------------------------------------------------------
57+
1758
libbacktrace is licensed under a BSD license (https://github.com/ianlancetaylor/libbacktrace/blob/master/LICENSE). The full license text is as follows:
1859

1960
# Copyright (C) 2012-2016 Free Software Foundation, Inc.
@@ -46,6 +87,8 @@ libbacktrace is licensed under a BSD license (https://github.com/ianlancetaylor/
4687
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4788
# POSSIBILITY OF SUCH DAMAGE.
4889

90+
--------------------------------------------------------------------------------
91+
4992
zstd is licensed under a BSD license. The full license text is as follows:
5093

5194
BSD License
@@ -78,3 +121,6 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
78121
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
79122
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
80123
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
124+
125+
--------------------------------------------------------------------------------
126+

‎Makefile‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ ifeq ($(HEADERPOPULARITY), 1)
980980
else
981981
SOURCES := $(wildcard $(SRC_DIR)/*.cpp)
982982
endif
983-
THIRD_PARTY_SOURCES := $(wildcard $(SRC_DIR)/third-party/flatbuffers/*.cpp)
983+
THIRD_PARTY_SOURCES := $(wildcard $(SRC_DIR)/third-party/flatbuffers/*.cpp $(SRC_DIR)/third-party/fmt/*.cc)
984984
THIRD_PARTY_C_SOURCES := $(wildcard $(SRC_DIR)/third-party/zstd/common/*.c $(SRC_DIR)/third-party/zstd/compress/*.c $(SRC_DIR)/third-party/zstd/decompress/*.c)
985985
HEADERS := $(wildcard $(SRC_DIR)/*.h)
986986
TESTSRC := $(wildcard tests/*.cpp)
@@ -1022,7 +1022,10 @@ endif
10221022

10231023
SOURCES += $(IMGUI_SOURCES)
10241024

1025-
_OBJS = $(SOURCES:$(SRC_DIR)/%.cpp=%.o)
1025+
CPP_SOURCES := $(filter %.cpp,$(SOURCES))
1026+
CC_SOURCES := $(filter %.cc,$(SOURCES))
1027+
_OBJS = $(CPP_SOURCES:$(SRC_DIR)/%.cpp=%.o)
1028+
_OBJS += $(CC_SOURCES:$(SRC_DIR)/%.cc=%.o)
10261029
_OBJS += $(C_SOURCES:$(SRC_DIR)/%.c=%.o)
10271030
ifeq ($(TARGETSYSTEM),WINDOWS)
10281031
RSRC = $(wildcard $(SRC_DIR)/*.rc)
@@ -1141,6 +1144,9 @@ $(shell mkdir -p $(DIRS))
11411144
$(ODIR)/%.inc: $(SRC_DIR)/%.cpp
11421145
$(COMPILE.cc) -o /dev/null -Wno-error -H -E $< 2> $@
11431146

1147+
$(ODIR)/%.inc: $(SRC_DIR)/%.cc
1148+
$(COMPILE.cc) -o /dev/null -Wno-error -H -E $< 2> $@
1149+
11441150
$(ODIR)/%.inc: $(SRC_DIR)/%.c
11451151
$(COMPILE.c) -o /dev/null -Wno-error -H -E $< 2> $@
11461152

@@ -1151,6 +1157,9 @@ includes: $(OBJS:.o=.inc)
11511157
$(ODIR)/third-party/%.o: $(SRC_DIR)/third-party/%.cpp
11521158
$(COMPILE.cc) $(OUTPUT_OPTION) -w -MMD -MP $<
11531159

1160+
$(ODIR)/third-party/%.o: $(SRC_DIR)/third-party/%.cc
1161+
$(COMPILE.cc) $(OUTPUT_OPTION) -w -MMD -MP $<
1162+
11541163
$(ODIR)/third-party/%.o: $(SRC_DIR)/third-party/%.c
11551164
$(COMPILE.c) $(OUTPUT_OPTION) -x c $(CFLAGS) -w -MMD -MP $<
11561165

‎android/app/jni/src/third-party/Android.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ LOCAL_CPP_FEATURES := exceptions rtti
1010

1111
# Add your application source files here...
1212
FLATBUFFERS_SRCS := $(sort $(wildcard $(LOCAL_PATH)/third-party/flatbuffers/*.cpp))
13+
FMT_SRCS := $(sort $(wildcard $(LOCAL_PATH)/third-party/fmt/*.cc))
1314
ZSTD_SRCS := $(sort $(wildcard $(LOCAL_PATH)/third-party/zstd/common/*.c) $(wildcard $(LOCAL_PATH)/third-party/zstd/compress/*.c) $(wildcard $(LOCAL_PATH)/third-party/zstd/decompress/*.c))
14-
LOCAL_SRC_FILES := $(sort $(FLATBUFFERS_SRCS:$(LOCAL_PATH)/%=%) $(ZSTD_SRCS:$(LOCAL_PATH)/%=%))
15+
LOCAL_SRC_FILES := $(sort $(FLATBUFFERS_SRCS:$(LOCAL_PATH)/%=%) $(FMT_SRCS:$(LOCAL_PATH)/%=%) $(ZSTD_SRCS:$(LOCAL_PATH)/%=%))
1516

1617
LOCAL_CFLAGS += -DBACKTRACE=1 -DLOCALIZE=1 -DZSTD_STATIC_LINKING_ONLY -DZSTD_DISABLE_ASM -Wextra -Wall -fsigned-char
1718

‎data/json/vehicleparts/vp_flags.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"id": "ALTERNATOR",
44
"type": "json_flag",
5-
"info": "When mounted on an engine and the engine is on it will provide up to <color_green>%sW</color> of electrical power to the vehicle.",
5+
"info": "When mounted on an engine and the engine is on it will provide up to <color_green>%dW</color> of electrical power to the vehicle.",
66
"requires_flag": "E_ALTERNATOR"
77
},
88
{
@@ -87,12 +87,12 @@
8787
{
8888
"id": "ENABLED_DRAINS_EPOWER",
8989
"type": "json_flag",
90-
"info": "When turned on, this device drains <color_red>%sW</color> from the vehicle's batteries."
90+
"info": "When turned on, this device drains <color_red>%dW</color> from the vehicle's batteries."
9191
},
9292
{
9393
"id": "SOLAR_PANEL",
9494
"type": "json_flag",
95-
"info": "Provides up to <color_green>%sW</color> of electrical power to the vehicle when exposed to the sun. Weather and clouds will affect power generation."
95+
"info": "Provides up to <color_green>%dW</color> of electrical power to the vehicle when exposed to the sun. Weather and clouds will affect power generation."
9696
},
9797
{
9898
"id": "ENGINE",
@@ -195,12 +195,12 @@
195195
{
196196
"id": "WIND_TURBINE",
197197
"type": "json_flag",
198-
"info": "Provides <color_green>%sW</color> of electrical power to the vehicle for every 1 m/s of wind the vehicle is exposed to."
198+
"info": "Provides <color_green>%dW</color> of electrical power to the vehicle for every 1 m/s of wind the vehicle is exposed to."
199199
},
200200
{
201201
"id": "WATER_WHEEL",
202202
"type": "json_flag",
203-
"info": "Provides up to <color_green>%sW</color> of electrical power to the vehicle when built over shallow moving water."
203+
"info": "Provides up to <color_green>%dW</color> of electrical power to the vehicle when built over shallow moving water."
204204
},
205205
{
206206
"id": "FLAT_SURF",

‎msvc-full-features/Cataclysm-lib-vcpkg-static.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@
181181
<Project>{8a533a64-435d-4d4f-9ff0-1e97aace9374}</Project>
182182
<LinkLibraryDependencies>false</LinkLibraryDependencies>
183183
</ProjectReference>
184+
<ProjectReference Include="fmt.vcxproj">
185+
<Project>{f2098959-aad9-4210-a64c-fc4a09a45556}</Project>
186+
<LinkLibraryDependencies>false</LinkLibraryDependencies>
187+
</ProjectReference>
184188
<ProjectReference Include="zstd.vcxproj">
185189
<Project>{f49f14c6-b046-41c7-b707-03366f4b1578}</Project>
186190
<LinkLibraryDependencies>false</LinkLibraryDependencies>

‎msvc-full-features/Cataclysm-vcpkg-static.sln‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.1.32104.313
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.3.11312.210 d18.3
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{04F55049-F0DE-4AE6-9D10-3DB97DFF2E2F}"
77
ProjectSection(SolutionItems) = preProject
@@ -32,6 +32,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd.vcxproj", "{F4
3232
EndProject
3333
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzip", "zzip.vcxproj", "{1232212E-8B83-40E9-B502-F25DBC4DB6CF}"
3434
EndProject
35+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "fmt.vcxproj", "{F2098959-AAD9-4210-A64C-FC4A09A45556}"
36+
EndProject
3537
Global
3638
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3739
Debug|ARM64EC = Debug|ARM64EC
@@ -352,6 +354,42 @@ Global
352354
{1232212E-8B83-40E9-B502-F25DBC4DB6CF}.Release-NoTiles|x64.Build.0 = Release|x64
353355
{1232212E-8B83-40E9-B502-F25DBC4DB6CF}.Release-NoTiles|x86.ActiveCfg = Release|Win32
354356
{1232212E-8B83-40E9-B502-F25DBC4DB6CF}.Release-NoTiles|x86.Build.0 = Release|Win32
357+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
358+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
359+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug|x64.ActiveCfg = Debug|x64
360+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug|x64.Build.0 = Debug|x64
361+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug|x86.ActiveCfg = Debug|Win32
362+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug|x86.Build.0 = Debug|Win32
363+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug-NoTiles|ARM64EC.ActiveCfg = Debug|ARM64EC
364+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug-NoTiles|ARM64EC.Build.0 = Debug|ARM64EC
365+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug-NoTiles|x64.ActiveCfg = Debug|x64
366+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug-NoTiles|x64.Build.0 = Debug|x64
367+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug-NoTiles|x86.ActiveCfg = Debug|Win32
368+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Debug-NoTiles|x86.Build.0 = Debug|Win32
369+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick|ARM64EC.ActiveCfg = Release|ARM64EC
370+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick|ARM64EC.Build.0 = Release|ARM64EC
371+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick|x64.ActiveCfg = Release|x64
372+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick|x64.Build.0 = Release|x64
373+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick|x86.ActiveCfg = Debug|Win32
374+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick|x86.Build.0 = Debug|Win32
375+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick-NoTiles|ARM64EC.ActiveCfg = Release|ARM64EC
376+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick-NoTiles|ARM64EC.Build.0 = Release|ARM64EC
377+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick-NoTiles|x64.ActiveCfg = Release|x64
378+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick-NoTiles|x64.Build.0 = Release|x64
379+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick-NoTiles|x86.ActiveCfg = Release|Win32
380+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Quick-NoTiles|x86.Build.0 = Release|Win32
381+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
382+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release|ARM64EC.Build.0 = Release|ARM64EC
383+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release|x64.ActiveCfg = Release|x64
384+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release|x64.Build.0 = Release|x64
385+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release|x86.ActiveCfg = Release|Win32
386+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release|x86.Build.0 = Release|Win32
387+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release-NoTiles|ARM64EC.ActiveCfg = Release|ARM64EC
388+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release-NoTiles|ARM64EC.Build.0 = Release|ARM64EC
389+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release-NoTiles|x64.ActiveCfg = Release|x64
390+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release-NoTiles|x64.Build.0 = Release|x64
391+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release-NoTiles|x86.ActiveCfg = Release|Win32
392+
{F2098959-AAD9-4210-A64C-FC4A09A45556}.Release-NoTiles|x86.Build.0 = Release|Win32
355393
EndGlobalSection
356394
GlobalSection(SolutionProperties) = preSolution
357395
HideSolutionNode = FALSE

‎msvc-full-features/fmt.vcxproj‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM64EC">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM64EC</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|Win32">
9+
<Configuration>Debug</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|ARM64EC">
13+
<Configuration>Release</Configuration>
14+
<Platform>ARM64EC</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|Win32">
17+
<Configuration>Release</Configuration>
18+
<Platform>Win32</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="Debug|x64">
21+
<Configuration>Debug</Configuration>
22+
<Platform>x64</Platform>
23+
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|x64">
25+
<Configuration>Release</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
28+
</ItemGroup>
29+
<ItemGroup>
30+
<ClInclude Include="..\src\third-party\fmt\args.h" />
31+
<ClInclude Include="..\src\third-party\fmt\base.h" />
32+
<ClInclude Include="..\src\third-party\fmt\chrono.h" />
33+
<ClInclude Include="..\src\third-party\fmt\color.h" />
34+
<ClInclude Include="..\src\third-party\fmt\compile.h" />
35+
<ClInclude Include="..\src\third-party\fmt\core.h" />
36+
<ClInclude Include="..\src\third-party\fmt\format-inl.h" />
37+
<ClInclude Include="..\src\third-party\fmt\format.h" />
38+
<ClInclude Include="..\src\third-party\fmt\os.h" />
39+
<ClInclude Include="..\src\third-party\fmt\ostream.h" />
40+
<ClInclude Include="..\src\third-party\fmt\printf.h" />
41+
<ClInclude Include="..\src\third-party\fmt\ranges.h" />
42+
<ClInclude Include="..\src\third-party\fmt\std.h" />
43+
<ClInclude Include="..\src\third-party\fmt\xchar.h" />
44+
</ItemGroup>
45+
<ItemGroup>
46+
<ClCompile Include="..\src\third-party\fmt\format.cc" />
47+
<ClCompile Include="..\src\third-party\fmt\os.cc" />
48+
</ItemGroup>
49+
<PropertyGroup Label="Globals">
50+
<VCProjectVersion>16.0</VCProjectVersion>
51+
<Keyword>Win32Proj</Keyword>
52+
<ProjectGuid>{f2098959-aad9-4210-a64c-fc4a09a45556}</ProjectGuid>
53+
<RootNamespace>flatbuffers</RootNamespace>
54+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
55+
</PropertyGroup>
56+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
57+
<PropertyGroup Label="Configuration">
58+
<ConfigurationType>StaticLibrary</ConfigurationType>
59+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
60+
<CharacterSet>Unicode</CharacterSet>
61+
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
62+
</PropertyGroup>
63+
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
64+
<UseDebugLibraries>true</UseDebugLibraries>
65+
</PropertyGroup>
66+
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
67+
<UseDebugLibraries>false</UseDebugLibraries>
68+
<WholeProgramOptimization>false</WholeProgramOptimization>
69+
</PropertyGroup>
70+
<Import Project="Cataclysm.Cpp.props" />
71+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
72+
<ImportGroup Label="ExtensionSettings">
73+
</ImportGroup>
74+
<ImportGroup Label="Shared">
75+
</ImportGroup>
76+
<ImportGroup Label="PropertySheets">
77+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
78+
<Import Project="Cataclysm-common.props" />
79+
</ImportGroup>
80+
<PropertyGroup Label="UserMacros" />
81+
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
82+
<LinkIncremental>true</LinkIncremental>
83+
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
85+
<LinkIncremental>false</LinkIncremental>
86+
</PropertyGroup>
87+
<PropertyGroup Label="Vcpkg">
88+
<VcpkgEnabled>false</VcpkgEnabled>
89+
</PropertyGroup>
90+
<ItemDefinitionGroup>
91+
<ClCompile>
92+
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
</ClCompile>
94+
</ItemDefinitionGroup>
95+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
96+
<ClCompile>
97+
<WarningLevel>Level3</WarningLevel>
98+
<FunctionLevelLinking>true</FunctionLevelLinking>
99+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
101+
</ClCompile>
102+
<Link>
103+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
104+
<OptimizeReferences>true</OptimizeReferences>
105+
</Link>
106+
</ItemDefinitionGroup>
107+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
108+
<ClCompile>
109+
<WarningLevel>Level3</WarningLevel>
110+
<FunctionLevelLinking>true</FunctionLevelLinking>
111+
<IntrinsicFunctions>true</IntrinsicFunctions>
112+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
114+
</ClCompile>
115+
<Link>
116+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
117+
<OptimizeReferences>true</OptimizeReferences>
118+
</Link>
119+
</ItemDefinitionGroup>
120+
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
121+
<ClCompile>
122+
<PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123+
</ClCompile>
124+
</ItemDefinitionGroup>
125+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
126+
<ImportGroup Label="ExtensionTargets">
127+
</ImportGroup>
128+
</Project>

‎src/achievement.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ static std::optional<std::string> text_for_requirement(
500500
} else if( current_value.type() == cata_variant_type::int_ ) {
501501
int current = current_value.get<int>();
502502
int target = req.target.get<int>();
503-
result = string_format( _( "%s/%s %s" ), current, target,
503+
result = string_format( _( "%d/%d %s" ), current, target,
504504
req.statistic->description().translated( target ) );
505505
} else {
506506
// The tricky part here is formatting an arbitrary cata_variant value.

‎src/bionics.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2098,7 +2098,8 @@ bool Character::can_uninstall_bionic( const bionic &bio, Character &installer, b
20982098
}
20992099

21002100
if( bio.id->cant_remove_reason.has_value() ) {
2101-
popup( string_format( bio.id->cant_remove_reason.value(), disp_name( true ), disp_name() ) );
2101+
popup( string_format( bio.id->cant_remove_reason.value().translated(), disp_name( true ),
2102+
disp_name() ) );
21022103
return false;
21032104
}
21042105

0 commit comments

Comments
 (0)