Avoid including sfx_manager.hpp inside kart properties header
This commit is contained in:
parent
f590280431
commit
a2f72a0d13
@ -98,7 +98,7 @@ public:
|
||||
* Entries for custom SFX sounds. These are unique for each kart.
|
||||
* eg. kart->playCustomSFX(SFX_MANAGER::CUSTOM_HORN)
|
||||
*/
|
||||
enum CustomSFX
|
||||
enum CustomSFX : int
|
||||
{
|
||||
CUSTOM_HORN, //!< Replaces default horn
|
||||
CUSTOM_CRASH, //!< Played when colliding with another kart
|
||||
|
@ -19,6 +19,7 @@
|
||||
|
||||
#include "graphics/camera_normal.hpp"
|
||||
|
||||
#include "audio/sfx_manager.hpp"
|
||||
#include "config/stk_config.hpp"
|
||||
#include "config/user_config.hpp"
|
||||
#include "input/device_manager.hpp"
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
#include "guiengine/widgets/player_kart_widget.hpp"
|
||||
|
||||
#include "audio/sfx_manager.hpp"
|
||||
#include "config/player_manager.hpp"
|
||||
#include "config/user_config.hpp"
|
||||
#include "graphics/render_info.hpp"
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
#include "karts/explosion_animation.hpp"
|
||||
|
||||
#include "audio/sfx_manager.hpp"
|
||||
#include "graphics/camera.hpp"
|
||||
#include "graphics/stars.hpp"
|
||||
#include "guiengine/engine.hpp"
|
||||
|
@ -18,7 +18,9 @@
|
||||
|
||||
#include "karts/kart_properties.hpp"
|
||||
|
||||
#include "audio/sfx_manager.hpp"
|
||||
#include "addons/addon.hpp"
|
||||
#include "audio/sfx_manager.hpp"
|
||||
#include "config/stk_config.hpp"
|
||||
#include "config/player_manager.hpp"
|
||||
#include "graphics/central_settings.hpp"
|
||||
|
@ -31,7 +31,6 @@ namespace irr
|
||||
}
|
||||
using namespace irr;
|
||||
|
||||
#include "audio/sfx_manager.hpp"
|
||||
#include "io/xml_node.hpp"
|
||||
#include "race/race_manager.hpp"
|
||||
#include "utils/interpolation_array.hpp"
|
||||
@ -273,7 +272,7 @@ public:
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
/** Returns custom sound effects for this kart. */
|
||||
const int getCustomSfxId (SFXManager::CustomSFX type)
|
||||
const int getCustomSfxId (int type)
|
||||
const {return m_custom_sfx_id[type]; }
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user