jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed conflicts

Browse source
This commit is contained in:
Matt Lowe 2015-05-22 11:51:10 +02:00
parent d1b243481b
commit 4c1e24c214
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/soundengine.cpp
View file

@ -17,13 +17,13 @@ SoundEngine::SoundEngine(QObject *parent)
lastTapPlayed = QDateTime::currentDateTime();
lastEndStepPlayed = QDateTime::currentDateTime();
lastStartCombatPlayed = QDateTime::currentDateTime();
lastAttackStepPlayed = QDateTime::currentDateTime();
}
void SoundEngine::cacheData()
{
static const QStringList fileNames = QStringList()
<< "end_step" << "tap" << "player_joined" << "start_combat";
<< "end_step" << "tap" << "player_joined" << "attack";
for (int i = 0; i < fileNames.size(); ++i) {
QFile file(settingsCache->getSoundPath() + "/" + fileNames[i] + ".raw");
if(!file.exists())
@ -95,8 +95,8 @@ void SoundEngine::playerJoined()
}
void SoundEngine::startCombat() {
if (lastStartCombatPlayed.secsTo(QDateTime::currentDateTime()) >= 1)
playSound("start_combat");
lastStartCombatPlayed = QDateTime::currentDateTime();
void SoundEngine::attack() {
if (lastAttackStepPlayed.secsTo(QDateTime::currentDateTime()) >= 1)
playSound("attack");
lastAttackStepPlayed = QDateTime::currentDateTime();
}