Author: mir3x
Date: Thu Dec 31 14:06:14 2015
New Revision: 31272
URL: http://svn.gna.org/viewcvs/freeciv?rev=31272&view=rev
Log:
Added new sound 'wakeup.ogg' and sound tag 'E_PLAYER_WAKE'
used to waking players
See patch #6648
Added:
branches/S2_6/data/stdsounds/wakeup.ogg (with props)
Modified:
branches/S2_6/client/gui-qt/chatline.cpp
branches/S2_6/data/stdsounds.soundspec
Modified: branches/S2_6/client/gui-qt/chatline.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/chatline.cpp?rev=31272&r1=31271&r2=31272&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/chatline.cpp (original)
+++ branches/S2_6/client/gui-qt/chatline.cpp Thu Dec 31 14:06:14 2015
@@ -542,8 +542,9 @@
}
/* Play sound if we encountered wakeup string */
- if (str.contains(wakeup) && client_state() < C_S_RUNNING) {
- audio_play_sound(get_event_tag(E_IMP_SOLD), NULL);
+ if (str.contains(wakeup) && client_state() < C_S_RUNNING
+ && !wakeup.isEmpty()) {
+ audio_play_sound("e_player_wake", NULL);
}
gui()->append_output_window(apply_tags(str, tags, false));
if (gui()->infotab != NULL) {
Modified: branches/S2_6/data/stdsounds.soundspec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/stdsounds.soundspec?rev=31272&r1=31271&r2=31272&view=diff
==============================================================================
--- branches/S2_6/data/stdsounds.soundspec (original)
+++ branches/S2_6/data/stdsounds.soundspec Thu Dec 31 14:06:14 2015
@@ -7,7 +7,8 @@
FreeCol - [fcol]\
OpenQuartz - Ali Jackson (alister...@hotmail.com) [ali]\
OpenQuartz - Frank Condello (p...@planetquake.com) [pox]\
- Warzone - Eidos Entertainment (GPL release) [warzone]"
+ Warzone - Eidos Entertainment (GPL release) [warzone]\
+ Eskapada - eskap...@o2.pl (Public Domain) [jt]"
; For a list of tags used see README.sound, buildings.ruleset and
; units.ruleset.
@@ -316,5 +317,6 @@
;e_worklist = ""
;e_unit_illegal_action = ""
-; This pseudo-event is only used in the sound system.
+; Those pseudo-events are only used in the sound system.
;e_game_quit = ""
+e_player_wake = "stdsounds/wakeup.ogg" ; [jt]
Added: branches/S2_6/data/stdsounds/wakeup.ogg
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/stdsounds/wakeup.ogg?rev=31272&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/S2_6/data/stdsounds/wakeup.ogg
------------------------------------------------------------------------------
svn:mime-type = audio/ogg
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
