mirror of https://github.com/minetest/minetest
Rename sound.h to sound_spec.h
To prevent incude conflicts
This commit is contained in:
parent
dc48f98a20
commit
5a799b9b24
|
|
@ -12,7 +12,7 @@
|
||||||
#include "al_extensions.h"
|
#include "al_extensions.h"
|
||||||
#include "sound_constants.h"
|
#include "sound_constants.h"
|
||||||
#include "sound_manager_messages.h"
|
#include "sound_manager_messages.h"
|
||||||
#include "../sound.h"
|
#include "sound_spec.h"
|
||||||
#include "threading/thread.h"
|
#include "threading/thread.h"
|
||||||
#include "util/container.h" // MutexedQueue
|
#include "util/container.h" // MutexedQueue
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../sound.h"
|
#include "client/sound.h"
|
||||||
#include "../../sound.h"
|
#include "sound_spec.h"
|
||||||
#include <variant>
|
#include <variant>
|
||||||
|
|
||||||
namespace sound {
|
namespace sound {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../sound.h"
|
#include "sound_spec.h"
|
||||||
|
|
||||||
class ISoundManager;
|
class ISoundManager;
|
||||||
class NodeDefManager;
|
class NodeDefManager;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include "itemgroup.h"
|
#include "itemgroup.h"
|
||||||
#include "sound.h"
|
#include "sound_spec.h"
|
||||||
#include "texture_override.h" // TextureOverride
|
#include "texture_override.h" // TextureOverride
|
||||||
#include "tool.h"
|
#include "tool.h"
|
||||||
#include "util/pointabilities.h"
|
#include "util/pointabilities.h"
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
#include "mapnode.h"
|
#include "mapnode.h"
|
||||||
#include "nameidmapping.h"
|
#include "nameidmapping.h"
|
||||||
#include "itemgroup.h"
|
#include "itemgroup.h"
|
||||||
#include "sound.h" // SoundSpec
|
#include "sound_spec.h"
|
||||||
#include "texture_override.h" // TextureOverride
|
#include "texture_override.h" // TextureOverride
|
||||||
#include "tileanimation.h"
|
#include "tileanimation.h"
|
||||||
#include "util/pointabilities.h"
|
#include "util/pointabilities.h"
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
#include "common/c_converter.h"
|
#include "common/c_converter.h"
|
||||||
#include "client/client.h"
|
#include "client/client.h"
|
||||||
#include "client/sound.h"
|
#include "client/sound.h"
|
||||||
#include "sound.h"
|
#include "sound_spec.h"
|
||||||
|
|
||||||
/* ModApiClientSound */
|
/* ModApiClientSound */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
#include "l_internal.h"
|
#include "l_internal.h"
|
||||||
#include "common/c_content.h"
|
#include "common/c_content.h"
|
||||||
#include "gui/guiEngine.h"
|
#include "gui/guiEngine.h"
|
||||||
#include "sound.h"
|
#include "sound_spec.h"
|
||||||
|
|
||||||
/* ModApiMainMenuSound */
|
/* ModApiMainMenuSound */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
#include "server/clientiface.h"
|
#include "server/clientiface.h"
|
||||||
#include "threading/ordered_mutex.h"
|
#include "threading/ordered_mutex.h"
|
||||||
#include "translation.h"
|
#include "translation.h"
|
||||||
#include "sound.h"
|
#include "sound_spec.h"
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue