oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-01 17:38:41 +00:00
Code Wiki Activity

Change the preprocessor macro that differs server/client builds

Browse source
This commit is contained in:
sfan5 2024-10-15 15:47:23 +02:00
parent e2ea359925
commit 37095f3e49
45 changed files with 137 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/util/string.cpp
View file

@ -935,7 +935,7 @@ std::wstring translate_string(std::wstring_view s, Translations *translations)
// Translate string client side
std::wstring translate_string(std::wstring_view s)
{
#ifdef SERVER
#if !CHECK_CLIENT_BUILD()
return translate_string(s, nullptr);
#else
return translate_string(s, g_client_translations);

5
src/util/string.h
View file

@ -20,7 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once
#include "irrlichttypes_bloated.h"
#ifndef SERVER
#include "config.h" // IS_CLIENT_BUILD
#if IS_CLIENT_BUILD
#include "irrString.h"
#endif
#include <cstdlib>
@ -755,7 +756,7 @@ inline std::string str_join(const std::vector<std::string> &list,
return oss.str();
}
#ifndef SERVER
#if IS_CLIENT_BUILD
/**
* Create a UTF8 std::string from an irr::core::stringw.
*/