upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 01:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't update volume of global sound sources when scrolling.

Browse Source
This commit is contained in:
Karol Nowak 2009-07-11 21:41:35 +00:00
parent 9d2dd5f362
commit b1f514e47a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/soundsource.cpp
View File

@ -145,6 +145,11 @@ positional_source::~positional_source()
sound::reposition_sound(id_, DISTANCE_SILENT); sound::reposition_sound(id_, DISTANCE_SILENT);
} }
bool positional_source::is_global()
{
return locations_.empty();
}
void positional_source::update(unsigned int time, const display &disp) void positional_source::update(unsigned int time, const display &disp)
{ {
if(time - last_played_ < min_delay_ || sound::is_sound_playing(id_)) if(time - last_played_ < min_delay_ || sound::is_sound_playing(id_))
@ -179,6 +184,10 @@ void positional_source::update(unsigned int time, const display &disp)
void positional_source::update_positions(unsigned int time, const display &disp) void positional_source::update_positions(unsigned int time, const display &disp)
{ {
if(is_global()) {
return;
}
int distance_volume = DISTANCE_SILENT; int distance_volume = DISTANCE_SILENT;
for(std::vector<map_location>::iterator i = locations_.begin(); i != locations_.end(); ++i) { for(std::vector<map_location>::iterator i = locations_.begin(); i != locations_.end(); ++i) {
if(disp.shrouded(*i) || (check_fogged_ && disp.fogged(*i))) if(disp.shrouded(*i) || (check_fogged_ && disp.fogged(*i)))

3
src/soundsource.hpp
View File

@ -52,7 +52,6 @@ class positional_source {
static unsigned int last_id; static unsigned int last_id;
public: public:
// min_delay is a minimum time in seconds, which must pass before // min_delay is a minimum time in seconds, which must pass before
// this sound source can be played again if it remains visible // this sound source can be played again if it remains visible
// //
@ -62,6 +61,8 @@ public:
positional_source(const sourcespec &spec); positional_source(const sourcespec &spec);
~positional_source(); ~positional_source();
bool is_global();
void update(unsigned int time, const display &disp); void update(unsigned int time, const display &disp);
void update_positions(unsigned int time, const display &disp); void update_positions(unsigned int time, const display &disp);