Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/soundext.cc2
-rw-r--r--src/model/mapfile.cc6
2 files changed, 7 insertions, 1 deletions
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();