1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
commit a4672d2e30db4e4918c8f3580236faed3c9d04c1
Author: Ghabry <gabriel+github@mastergk.de>
Date: Sun May 14 14:41:13 2023 +0200
Fix building with fmtlib 10
to_string_view is a private API since fmt10.
The new API only works properly since fmt8.
Added casts to enum formating as they are not converted automatically anymore.
Fix #3002
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8507e5d1..28d595a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,6 +345,7 @@ add_library(${PROJECT_NAME} OBJECT
src/state.cpp
src/state.h
src/std_clock.h
+ src/string_view.cpp
src/string_view.h
src/system.h
src/teleport_target.h
diff --git a/Makefile.am b/Makefile.am
index bed1b219..4c477489 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -327,6 +327,7 @@ libeasyrpg_player_a_SOURCES = \
src/state.cpp \
src/state.h \
src/std_clock.h \
+ src/string_view.cpp \
src/string_view.h \
src/system.h \
src/teleport_target.h \
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
index 7877d77f..7ae056cc 100644
--- a/src/game_interpreter.cpp
+++ b/src/game_interpreter.cpp
@@ -2187,7 +2187,7 @@ bool Game_Interpreter::CommandChangeVehicleGraphic(lcf::rpg::EventCommand const&
Game_Vehicle* vehicle = Game_Map::GetVehicle(vehicle_id);
if (!vehicle) {
- Output::Warning("ChangeVehicleGraphic: Invalid vehicle ID {}", vehicle_id);
+ Output::Warning("ChangeVehicleGraphic: Invalid vehicle ID {}", static_cast<int>(vehicle_id));
return true;
}
@@ -2261,7 +2261,7 @@ bool Game_Interpreter::CommandSetVehicleLocation(lcf::rpg::EventCommand const& c
// 0 because we adjust all vehicle IDs by +1 to match the lcf values
Output::Debug("SetVehicleLocation: Party referenced");
} else {
- Output::Warning("SetVehicleLocation: Invalid vehicle ID {}", vehicle_id);
+ Output::Warning("SetVehicleLocation: Invalid vehicle ID {}", static_cast<int>(vehicle_id));
return true;
}
}
@@ -3494,7 +3494,7 @@ bool Game_Interpreter::CommandConditionalBranch(lcf::rpg::EventCommand const& co
Game_Vehicle* vehicle = Game_Map::GetVehicle(vehicle_id);
if (!vehicle) {
- Output::Warning("ConditionalBranch: Invalid vehicle ID {}", vehicle_id);
+ Output::Warning("ConditionalBranch: Invalid vehicle ID {}", static_cast<int>(vehicle_id));
return true;
}
diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 6c193c2f..0b47a3db 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -345,7 +345,7 @@ bool Game_Interpreter_Map::CommandEndShop(lcf::rpg::EventCommand const& /* com *
bool Game_Interpreter_Map::CommandShowInn(lcf::rpg::EventCommand const& com) { // code 10730
int inn_type = com.parameters[0];
- auto inn_price = com.parameters[1];
+ int inn_price = com.parameters[1];
// Not used, but left here for documentation purposes
// bool has_inn_handlers = com.parameters[2] != 0;
diff --git a/src/output.h b/src/output.h
index 90e11189..78ff3c0c 100644
--- a/src/output.h
+++ b/src/output.h
@@ -22,17 +22,8 @@
#include <string>
#include <iosfwd>
#include <fmt/core.h>
-#include <lcf/dbstring.h>
-
#include "filesystem_stream.h"
-namespace lcf {
-// FIXME: liblcf doesn't depend on fmt, so we need to add this here to enable fmtlib support for lcf::DBString
-inline fmt::basic_string_view<char> to_string_view(const lcf::DBString& s) {
- return to_string_view(StringView(s));
-}
-}
-
enum class LogLevel {
Error,
Warning,
diff --git a/src/player.cpp b/src/player.cpp
index 0ed6bbb6..654d31e0 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1240,7 +1240,7 @@ void Player::SetupBattleTest() {
}
Output::Debug("BattleTest Mode 2k3 troop=({}) background=({}) formation=({}) condition=({}) terrain=({})",
- args.troop_id, args.background.c_str(), args.formation, args.condition, args.terrain_id);
+ args.troop_id, args.background, static_cast<int>(args.formation), static_cast<int>(args.condition), args.terrain_id);
} else {
Output::Debug("BattleTest Mode 2k troop=({}) background=({})", args.troop_id, args.background);
}
diff --git a/src/string_view.cpp b/src/string_view.cpp
new file mode 100644
index 00000000..13a52650
--- /dev/null
+++ b/src/string_view.cpp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of EasyRPG Player.
+ *
+ * EasyRPG Player is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EasyRPG Player is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "string_view.h"
+
+#if FMT_VERSION >= EP_FMT_MODERN_VERSION
+
+#include <fmt/format.h>
+
+auto fmt::formatter<lcf::DBString>::format(const lcf::DBString& s, format_context& ctx) const -> decltype(ctx.out()) {
+ string_view sv(s.data(), s.size());
+ return formatter<string_view>::format(sv, ctx);
+}
+
+auto fmt::formatter<lcf::StringView>::format(const lcf::StringView& s, format_context& ctx) const -> decltype(ctx.out()) {
+ string_view sv(s.data(), s.size());
+ return formatter<string_view>::format(sv, ctx);
+}
+
+#endif
diff --git a/src/string_view.h b/src/string_view.h
index 11e3550d..030bb09a 100644
--- a/src/string_view.h
+++ b/src/string_view.h
@@ -22,9 +22,9 @@
#include <lcf/dbstring.h>
#include <fmt/core.h>
-// FIXME: needed to allow building with fmt 5, older versions are untested.
+// Needed to allow building with fmt 5, older versions are untested.
#if FMT_VERSION < 60000
-#include <fmt/ostream.h>
+# include <fmt/ostream.h>
#endif
using StringView = lcf::StringView;
@@ -33,12 +33,33 @@ using U32StringView = lcf::U32StringView;
using lcf::ToString;
using lcf::ToStringView;
+// Version required to use the new formatting API
+#define EP_FMT_MODERN_VERSION 80000
+
// FIXME: liblcf doesn't depend on fmt, so we need to add this here to enable fmtlib support for our StringView.
+#if FMT_VERSION >= EP_FMT_MODERN_VERSION
+template<>
+struct fmt::formatter<lcf::StringView> : fmt::formatter<fmt::string_view> {
+ auto format(const lcf::StringView& s, format_context& ctx) const -> decltype(ctx.out());
+};
+
+template<>
+struct fmt::formatter<lcf::DBString> : formatter<string_view> {
+ auto format(const lcf::DBString& s, format_context& ctx) const -> decltype(ctx.out());
+};
+#else
namespace nonstd { namespace sv_lite {
template <typename C, typename T>
inline fmt::basic_string_view<C> to_string_view(basic_string_view<C,T> s) {
- return fmt::basic_string_view<C>(s.data(), s.size());
+ return fmt::basic_string_view<C>(s.data(), s.size());
}
} }
+namespace lcf {
+inline fmt::basic_string_view<char> to_string_view(const lcf::DBString& s) {
+ return to_string_view(StringView(s));
+}
+}
+#endif
+
#endif
|
GitWeb