aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornOOb3167 <nOOb3167@gmail.com>2018-03-26 17:44:40 +0200
committerSmallJoker <SmallJoker@users.noreply.github.com>2018-03-26 17:44:40 +0200
commitb0fef16a27b0ec28b6d3a9e9e617da173dc795af (patch)
tree99f8deb775e9a0452d71efef8f590298d9ff58e8
parent9802e59724ac05e7304f9fbd4c93204f7bd00a3d (diff)
downloadminetest-b0fef16a27b0ec28b6d3a9e9e617da173dc795af.tar.gz
minetest-b0fef16a27b0ec28b6d3a9e9e617da173dc795af.tar.bz2
minetest-b0fef16a27b0ec28b6d3a9e9e617da173dc795af.zip
Guard sound manager initialization with "enable_sound" (#7167)
Diffstat
-rw-r--r--src/gui/guiEngine.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
index 7654bf7b3..3a41df9a5 100644
--- a/src/gui/guiEngine.cpp
+++ b/src/gui/guiEngine.cpp
@@ -137,7 +137,8 @@ GUIEngine::GUIEngine(JoystickController *joystick,
//create soundmanager
MenuMusicFetcher soundfetcher;
#if USE_SOUND
- m_sound_manager = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher);
+ if (g_settings->getBool("enable_sound"))
+ m_sound_manager = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher);
#endif
if(!m_sound_manager)
m_sound_manager = &dummySoundManager;
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-12 15:00:50 +0000
href='#n133'>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 
/*
Minetest
Copyright (C) 2018 nerzhul, Loic Blot <loic.blot@unix-experience.fr>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.

This program 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 Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#include "server/activeobjectmgr.h"
#include <algorithm>
#include <queue>
#include "test.h"

#include "profiler.h"

class TestServerActiveObject : public ServerActiveObject
{
public:
	TestServerActiveObject(const v3f &p = v3f()) : ServerActiveObject(nullptr, p) {}
	~TestServerActiveObject() = default;
	ActiveObjectType getType() const override { return ACTIVEOBJECT_TYPE_TEST; }
	bool getCollisionBox(aabb3f *toset) const override { return false; }
	bool getSelectionBox(aabb3f *toset) const override { return false; }
	bool collideWithObjects() const override { return false; }
};

class TestServerActiveObjectMgr : public TestBase
{
public:
	TestServerActiveObjectMgr() { TestManager::registerTestModule(this); }
	const char *getName() { return "TestServerActiveObjectMgr"; }

	void runTests(IGameDef *gamedef);

	void testFreeID();
	void testRegisterObject();
	void testRemoveObject();
	void testGetObjectsInsideRadius();
	void testGetAddedActiveObjectsAroundPos();
};

static TestServerActiveObjectMgr g_test_instance;

void TestServerActiveObjectMgr::runTests(IGameDef *gamedef)
{
	TEST(testFreeID);
	TEST(testRegisterObject)
	TEST(testRemoveObject)
	TEST(testGetObjectsInsideRadius);
	TEST(testGetAddedActiveObjectsAroundPos);
}

void clearSAOMgr(server::ActiveObjectMgr *saomgr)
{
	auto clear_cb = [](ServerActiveObject *obj, u16 id) {
		delete obj;
		return true;
	};
	saomgr->clear(clear_cb);
}

////////////////////////////////////////////////////////////////////////////////

void TestServerActiveObjectMgr::testFreeID()
{
	server::ActiveObjectMgr saomgr;
	std::vector<u16> aoids;

	u16 aoid = saomgr.getFreeId();
	// Ensure it's not the same id
	UASSERT(saomgr.getFreeId() != aoid);

	aoids.push_back(aoid);

	// Register basic objects, ensure we never found
	for (u8 i = 0; i < UINT8_MAX; i++) {
		// Register an object
		auto tsao = new TestServerActiveObject();
		saomgr.registerObject(tsao);
		aoids.push_back(tsao->getId());

		// Ensure next id is not in registered list
		UASSERT(std::find(aoids.begin(), aoids.end(), saomgr.getFreeId()) ==
				aoids.end());
	}

	clearSAOMgr(&saomgr);
}

void TestServerActiveObjectMgr::testRegisterObject()
{
	server::ActiveObjectMgr saomgr;
	auto tsao = new TestServerActiveObject();
	UASSERT(saomgr.registerObject(tsao));

	u16 id = tsao->getId();

	auto tsaoToCompare = saomgr.getActiveObject(id);
	UASSERT(tsaoToCompare->getId() == id);
	UASSERT(tsaoToCompare == tsao);

	tsao = new TestServerActiveObject();
	UASSERT(saomgr.registerObject(tsao));
	UASSERT(saomgr.getActiveObject(tsao->getId()) == tsao);
	UASSERT(saomgr.getActiveObject(tsao->getId()) != tsaoToCompare);

	clearSAOMgr(&saomgr);
}

void TestServerActiveObjectMgr::testRemoveObject()
{
	server::ActiveObjectMgr saomgr;
	auto tsao = new TestServerActiveObject();
	UASSERT(saomgr.registerObject(tsao));

	u16 id = tsao->getId();
	UASSERT(saomgr.getActiveObject(id) != nullptr)

	saomgr.removeObject(tsao->getId());
	UASSERT(saomgr.getActiveObject(id) == nullptr);

	clearSAOMgr(&saomgr);
}

void TestServerActiveObjectMgr::testGetObjectsInsideRadius()
{
	server::ActiveObjectMgr saomgr;
	static const v3f sao_pos[] = {
			v3f(10, 40, 10),
			v3f(740, 100, -304),
			v3f(-200, 100, -304),