#include "clientmap.h"
#include "sky.h"
#include "sound.h"
-#if USE_AUDIO
+#if USE_SOUND
#include "sound_openal.h"
#endif
#include "event_manager.h"
}
};
-class SoundMaker
+class NodeDugEvent: public MtEvent
{
public:
- ISoundManager *m_sound;
+ v3s16 p;
+ MapNode n;
+ NodeDugEvent(v3s16 p, MapNode n):
+ p(p),
+ n(n)
+ {}
+ const char* getType() const
+ {return "NodeDug";}
+};
+
+class SoundMaker
+{
+ ISoundManager *m_sound;
+ INodeDefManager *m_ndef;
+public:
float m_player_step_timer;
SimpleSoundSpec m_player_step_sound;
SimpleSoundSpec m_player_leftpunch_sound;
SimpleSoundSpec m_player_rightpunch_sound;
- SoundMaker(ISoundManager *sound):
+ SoundMaker(ISoundManager *sound, INodeDefManager *ndef):
m_sound(sound),
+ m_ndef(ndef),
m_player_step_timer(0)
{
}
}
}
- void playPlayerLeftPunch()
- {
- if(m_player_leftpunch_sound.exists()){
- m_sound->playSound(m_player_leftpunch_sound, false);
- }
- }
-
- void playPlayerRightPunch()
- {
- if(m_player_rightpunch_sound.exists()){
- m_sound->playSound(m_player_rightpunch_sound, false);
- }
- }
-
static void viewBobbingStep(MtEvent *e, void *data)
{
SoundMaker *sm = (SoundMaker*)data;
static void cameraPunchLeft(MtEvent *e, void *data)
{
SoundMaker *sm = (SoundMaker*)data;
- sm->playPlayerLeftPunch();
+ sm->m_sound->playSound(sm->m_player_leftpunch_sound, false);
}
static void cameraPunchRight(MtEvent *e, void *data)
{
SoundMaker *sm = (SoundMaker*)data;
- sm->playPlayerRightPunch();
+ sm->m_sound->playSound(sm->m_player_rightpunch_sound, false);
+ }
+
+ static void nodeDug(MtEvent *e, void *data)
+ {
+ SoundMaker *sm = (SoundMaker*)data;
+ NodeDugEvent *nde = (NodeDugEvent*)e;
+ sm->m_sound->playSound(sm->m_ndef->get(nde->n).sound_dug, false);
}
void registerReceiver(MtEventManager *mgr)
mgr->reg("PlayerJump", SoundMaker::playerJump, this);
mgr->reg("CameraPunchLeft", SoundMaker::cameraPunchLeft, this);
mgr->reg("CameraPunchRight", SoundMaker::cameraPunchRight, this);
+ mgr->reg("NodeDug", SoundMaker::nodeDug, this);
}
void step(float dtime)
}
};
+// Locally stored sounds don't need to be preloaded because of this
+class GameOnDemandSoundFetcher: public OnDemandSoundFetcher
+{
+ std::set<std::string> m_fetched;
+public:
+
+ void fetchSounds(const std::string &name,
+ std::set<std::string> &dst_paths,
+ std::set<std::string> &dst_datas)
+ {
+ if(m_fetched.count(name))
+ return;
+ m_fetched.insert(name);
+ std::string base = porting::path_share + DIR_DELIM + "testsounds";
+ dst_paths.insert(base + DIR_DELIM + name + ".ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".0.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".1.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".2.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".3.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".4.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".5.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".6.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".7.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".8.ogg");
+ dst_paths.insert(base + DIR_DELIM + name + ".9.ogg");
+ }
+};
+
void the_game(
bool &kill,
bool random_input,
// Create node definition manager
IWritableNodeDefManager *nodedef = createNodeDefManager();
+ // Sound fetcher (useful when testing)
+ GameOnDemandSoundFetcher soundfetcher;
+
// Sound manager
ISoundManager *sound = NULL;
bool sound_is_dummy = false;
-#if USE_AUDIO
+#if USE_SOUND
infostream<<"Attempting to use OpenAL audio"<<std::endl;
- sound = createOpenALSoundManager(NULL);
+ sound = createOpenALSoundManager(&soundfetcher);
if(!sound)
infostream<<"Failed to initialize OpenAL audio"<<std::endl;
#endif
EventManager eventmgr;
// Sound maker
- SoundMaker soundmaker(sound);
+ SoundMaker soundmaker(sound, nodedef);
soundmaker.registerReceiver(&eventmgr);
- // Test sounds
- sound->loadSound("default_grass_footstep", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_grass_walk1.ogg");
- sound->loadSound("default_grass_footstep", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_grass_walk2.ogg");
- sound->loadSound("default_grass_footstep", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_grass_walk3.ogg");
-
- sound->loadSound("default_dig_crumbly", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_dig_crumbly1.ogg");
- sound->loadSound("default_dig_crumbly", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_dig_crumbly2.ogg");
-
- sound->loadSound("default_dig_cracky", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_dig_cracky1.ogg");
-
- sound->loadSound("default_place_node", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_place_node1.ogg");
- sound->loadSound("default_place_node", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_place_node2.ogg");
- sound->loadSound("default_place_node", porting::path_share + DIR_DELIM
- + "sounds" + DIR_DELIM + "default_place_node3.ogg");
-
// Add chat log output for errors to be shown in chat
LogOutputBuffer chat_log_error_buf(LMT_ERROR);
server->start(port);
}
+ try{
do{ // Client scope (breakable do-while(0))
/*
ss<<L" Item definitions\n";
ss<<(client.nodedefReceived()?L"[X]":L"[ ]");
ss<<L" Node definitions\n";
- //ss<<(client.texturesReceived()?L"[X]":L"[ ]");
- ss<<L"["<<(int)(client.textureReceiveProgress()*100+0.5)<<L"%] ";
- ss<<L" Textures\n";
+ ss<<L"["<<(int)(client.mediaReceiveProgress()*100+0.5)<<L"%] ";
+ ss<<L" Media\n";
draw_load_screen(ss.str(), driver, font);
}
bool left_punch = false;
+ soundmaker.m_player_leftpunch_sound.name = "";
if(playeritem_usable && input->getLeftState())
{
params = getDigParams(nodedef->get(n).groups, tp);
}
- soundmaker.m_player_leftpunch_sound.gain = 0.5;
- if(params.main_group == "crumbly")
- soundmaker.m_player_leftpunch_sound.name =
- "default_dig_crumbly";
- else if(params.main_group == "cracky")
- soundmaker.m_player_leftpunch_sound.name =
- "default_dig_cracky";
- else
- soundmaker.m_player_leftpunch_sound.name = "";
+ SimpleSoundSpec sound_dig = nodedef->get(n).sound_dig;
+ if(sound_dig.exists()){
+ if(sound_dig.name == "__group"){
+ if(params.main_group != ""){
+ soundmaker.m_player_leftpunch_sound.gain = 0.5;
+ soundmaker.m_player_leftpunch_sound.name =
+ std::string("default_dig_") +
+ params.main_group;
+ }
+ } else{
+ soundmaker.m_player_leftpunch_sound = sound_dig;
+ }
+ }
float dig_time_complete = 0.0;
infostream<<"Digging completed"<<std::endl;
client.interact(2, pointed);
client.setCrack(-1, v3s16(0,0,0));
+ MapNode wasnode = map.getNode(nodepos);
client.removeNode(nodepos);
dig_time = 0;
// We don't want a corresponding delay to
// very time consuming nodes
- if(nodig_delay_timer > 0.5)
- {
- nodig_delay_timer = 0.5;
- }
+ if(nodig_delay_timer > 0.3)
+ nodig_delay_timer = 0.3;
// We want a slight delay to very little
// time consuming nodes
float mindelay = 0.15;
if(nodig_delay_timer < mindelay)
- {
nodig_delay_timer = mindelay;
- }
+
+ // Send event to trigger sound
+ MtEvent *e = new NodeDugEvent(nodepos, wasnode);
+ gamedef->event()->put(e);
}
dig_time += dtime;
// Client scope (client is destructed before destructing *def and tsrc)
}while(0);
+ } // try-catch
+ catch(SerializationError &e)
+ {
+ error_message = L"A serialization error occurred:\n"
+ + narrow_to_wide(e.what()) + L"\n\nThe server is probably "
+ L" running a different version of Minetest.";
+ errorstream<<wide_to_narrow(error_message)<<std::endl;
+ }
if(!sound_is_dummy)
delete sound;
projects / oweals / minetest.git / blobdiff