Author: mir3x
Date: Thu Dec 31 14:06:26 2015
New Revision: 31273

URL: http://svn.gna.org/viewcvs/freeciv?rev=31273&view=rev
Log:
Added new sound 'wakeup.ogg' and sound tag 'E_PLAYER_WAKE'
used to waking players

See patch #6648


Added:
    trunk/data/stdsounds/wakeup.ogg   (with props)
Modified:
    trunk/client/gui-qt/chatline.cpp
    trunk/data/stdsounds.soundspec

Modified: trunk/client/gui-qt/chatline.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/chatline.cpp?rev=31273&r1=31272&r2=31273&view=diff
==============================================================================
--- trunk/client/gui-qt/chatline.cpp    (original)
+++ trunk/client/gui-qt/chatline.cpp    Thu Dec 31 14:06:26 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: trunk/data/stdsounds.soundspec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/stdsounds.soundspec?rev=31273&r1=31272&r2=31273&view=diff
==============================================================================
--- trunk/data/stdsounds.soundspec      (original)
+++ trunk/data/stdsounds.soundspec      Thu Dec 31 14:06:26 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.
@@ -324,5 +325,6 @@
 ;e_unit_illegal_action = ""
 ;e_spontaneous_extra = ""
 
-; 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: trunk/data/stdsounds/wakeup.ogg
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/stdsounds/wakeup.ogg?rev=31273&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/stdsounds/wakeup.ogg
------------------------------------------------------------------------------
    svn:mime-type = audio/ogg


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to