--- deliantra/server/socket/sounds.C 2007/07/26 00:27:09 1.15 +++ deliantra/server/socket/sounds.C 2007/07/26 00:38:34 1.16 @@ -85,20 +85,7 @@ if (!sound) return; - if (this->sound) - { - // gcfclient compatibility - - packet sl ("sound"); - - sl << uint8 (dx) - << uint8 (dy) - << uint16 (sound) - << uint8 (SOUND_NORMAL); - - send_packet (sl); - } - else if (fx_want [FT_SOUND]) + if (fx_want [FT_SOUND]) { // cfplus send_face (sound); @@ -118,5 +105,19 @@ send_packet (sl); } + else if (this->sound) + { + // gcfclient compatibility + // fetch compatibility sound index first + + packet sl ("sound"); + + sl << uint8 (dx) + << uint8 (dy) + << uint16 (sound) + << uint8 (SOUND_NORMAL); + + send_packet (sl); + } }