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

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

4
cockatrice/src/soundengine.h
View file

@ -17,7 +17,7 @@ private:
QAudioOutput *audio;
QDateTime lastTapPlayed;
QDateTime lastEndStepPlayed;
QDateTime lastStartCombatPlayed;
QDateTime lastAttackStepPlayed;
private slots:
void cacheData();
void soundEnabledChanged();
@ -27,7 +27,7 @@ public slots:
void endStep();
void tap();
void playerJoined();
void startCombat();
void attack();
};
extern SoundEngine *soundEngine;