master #1

Merged
BRNSystems merged 55 commits from Mirrorlandia_minetest/minetest:master into master 2023-11-24 22:11:18 +01:00
2 changed files with 3 additions and 4 deletions
Showing only changes of commit 7213ff7a00 - Show all commits

@ -169,7 +169,6 @@ private:
LocalPlayer *m_player; LocalPlayer *m_player;
ParticleSpawnerParameters p; ParticleSpawnerParameters p;
std::vector<ClientParticleTexture> m_texpool; std::vector<ClientParticleTexture> m_texpool;
size_t m_texcount;
std::vector<float> m_spawntimes; std::vector<float> m_spawntimes;
u16 m_attached_id; u16 m_attached_id;
}; };

@ -550,8 +550,7 @@ static bool create_userdata_path()
} }
namespace { namespace {
std::string findProgram(const char *name) [[maybe_unused]] std::string findProgram(const char *name) {
{
char *path_c = getenv("PATH"); char *path_c = getenv("PATH");
if (!path_c) if (!path_c)
return ""; return "";
@ -571,8 +570,9 @@ namespace {
#ifdef _WIN32 #ifdef _WIN32
const char *debuggerNames[] = {"gdb.exe", "lldb.exe"}; const char *debuggerNames[] = {"gdb.exe", "lldb.exe"};
#else #else
const char *debuggerNames[] = {"gdb", "lldb"}; [[maybe_unused]] const char *debuggerNames[] = {"gdb", "lldb"};
#endif #endif
template <class T> template <class T>
void getDebuggerArgs(T &out, int i) { void getDebuggerArgs(T &out, int i) {
if (i == 0) { if (i == 0) {