Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/extern/fmt/core.h5
-rw-r--r--source/server/main.cpp7
2 files changed, 9 insertions, 3 deletions
diff --git a/source/extern/fmt/core.h b/source/extern/fmt/core.h
index 46723d5..9062026 100644
--- a/source/extern/fmt/core.h
+++ b/source/extern/fmt/core.h
@@ -1671,8 +1671,7 @@ constexpr auto encode_types() -> unsigned long long {
template <typename Context, typename T>
FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> {
- auto&& arg = arg_mapper<Context>().map(FMT_FORWARD(val));
- using arg_type = remove_cvref_t<decltype(arg)>;
+ using arg_type = remove_cvref_t<decltype(arg_mapper<Context>().map(val))>;
constexpr bool formattable_char =
!std::is_same<arg_type, unformattable_char>::value;
@@ -1691,7 +1690,7 @@ FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> {
formattable,
"Cannot format an argument. To make type T formattable provide a "
"formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
- return {arg};
+ return {arg_mapper<Context>().map(val)};
}
template <typename Context, typename T>
diff --git a/source/server/main.cpp b/source/server/main.cpp
index 8d734e0..08b55dd 100644
--- a/source/server/main.cpp
+++ b/source/server/main.cpp
@@ -47,6 +47,13 @@ int main(int argc, char** argv) {
{
Logger::info("Server Version {} ({}) Source ID: {} Protocol: {}", StarVersionString, StarArchitectureString, StarSourceIdentifierString, StarProtocolVersion);
+ float updateRate = 1.0f / WorldTimestep;
+ if (auto jUpdateRate = configuration->get("updateRate")) {
+ updateRate = jUpdateRate.toFloat();
+ WorldTimestep = 1.0f / updateRate;
+ Logger::info("Configured tickrate is {:4.2f}hz", updateRate);
+ }
+
UniverseServerUPtr server = make_unique<UniverseServer>(root->toStoragePath("universe"));
server->setListeningTcp(true);
server->start();