Quick little fix to add a blank sound for placeholders.

master
Zed A. Shaw 2 weeks ago
parent 3720340ab7
commit 6e56de08c5
  1. BIN
      assets/blank.ogg
  2. 3
      assets/config.json
  3. 3
      gui_fsm.cpp
  4. 25
      sound.cpp

Binary file not shown.

@ -3,7 +3,8 @@
"sword_1": "assets/sword.1.ogg",
"monster_16": "assets/monster-16.ogg",
"monster_1": "assets/monster-1.ogg",
"step_leather_1": "assets/step_leather_1.ogg"
"walk": "assets/blank.ogg",
"blank": "assets/blank.ogg"
},
"sprites": {
"armored_knight": "assets/armored_knight_1-256.png",

@ -202,8 +202,7 @@ namespace gui {
Point move_to = $main_ui.plan_move(dir, strafe);
if($level.map->can_move(move_to) && !$level.collision->occupied(move_to)) {
fmt::println("PLAYING WALK");
sound::play("step_leather_1");
sound::play("walk");
state(MOVING);
} else {
state(IDLE);

@ -38,17 +38,26 @@ namespace sound {
void play(const std::string name) {
dbc::check(initialized, "You need to call sound::init() first");
dbc::check(SMGR.sounds.contains(name), fmt::format("sound {} is not loaded in map", name));
// get the sound from the sound map
auto pair = SMGR.sounds.at(name);
// play it
pair.sound->play();
if(SMGR.sounds.contains(name)) {
// get the sound from the sound map
auto pair = SMGR.sounds.at(name);
// play it
pair.sound->play();
} else {
dbc::log(fmt::format("Attempted to play {} sound but not available.",
name));
}
}
void play_at(const std::string name, float x, float y, float z) {
dbc::check(initialized, "You need to call sound::init() first");
auto pair = SMGR.sounds.at(name);
pair.sound->setPosition({x, y, z});
pair.sound->play();
if(SMGR.sounds.contains(name)) {
auto pair = SMGR.sounds.at(name);
pair.sound->setPosition({x, y, z});
pair.sound->play();
} else {
dbc::log(fmt::format("Attempted to play_at {} sound but not available.",
name));
}
}
}

Loading…
Cancel
Save