0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid playing the same sound twice if multiple options

Browse source
This commit is contained in:
Rusty Russell 2006-04-11 06:03:44 +00:00
parent c65d466167
commit e768383629
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/sound.cpp
View file

@ -167,7 +167,24 @@ std::string pick_one(const std::string &files)
if (names.size() == 0)
return "";
return names[rand()%names.size()];
if (names.size() == 1)
return names[0];
// We avoid returning same choice twice if we can avoid it.
static std::map<std::string,unsigned int> prev_choices;
unsigned int choice;
if (prev_choices.find(files) != prev_choices.end()) {
choice = rand()%(names.size()-1);
if (choice >= prev_choices[files])
choice++;
prev_choices[files] = choice;
} else {
choice = rand()%names.size();
prev_choices.insert(std::pair<std::string,unsigned int>(files,choice));
}
return names[choice];
}
};