From 5be8beddb96efd9ee8229e11b3a4c6aa954d0723 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 8 Dec 2010 13:31:56 +0000 Subject: Ignore the angle keys on map sounds, corrected audio position for model sound loops. --- src/client/soundext.cc | 2 +- src/model/mapfile.cc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/client/soundext.cc b/src/client/soundext.cc index 9ab32a6..db8f642 100644 --- a/src/client/soundext.cc +++ b/src/client/soundext.cc @@ -250,7 +250,7 @@ void SoundExt::frame(float elapsed) for (Sounds::iterator it = state_soundlist.begin(); it != state_soundlist.end(); it++) { client::Sound *sound = *it; if (sound->source()) { - audio::update_source(sound->source(), sound->location() + entity()->location(), velocity, 1.0f, 1.0f); + audio::update_source(sound->source(), entity()->location() + entity()->axis() * sound->location(), velocity, 1.0f, 1.0f); } } } diff --git a/src/model/mapfile.cc b/src/model/mapfile.cc index f21484a..5e18a0d 100644 --- a/src/model/mapfile.cc +++ b/src/model/mapfile.cc @@ -1602,6 +1602,12 @@ Model * MapFile::load(std::string const &name) } tag_sound->set_name(str); continue; + + } else if (mapfile.got_key("angle")) { + continue; + + } else if (mapfile.got_key("angles")) { + continue; } else if (mapfile.got_key()) { mapfile.unknown_key(); -- cgit v1.2.3