ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/sounds.C
(Generate patch)

Comparing deliantra/server/socket/sounds.C (file contents):
Revision 1.23 by root, Wed Aug 1 01:53:13 2007 UTC vs.
Revision 1.36 by root, Sat Nov 17 23:33:18 2018 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 5 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24/* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */ 23/* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */
25 24
26/** 25/**
32 31
33#include <global.h> 32#include <global.h>
34#include <sproto.h> 33#include <sproto.h>
35#include <sounds.h> 34#include <sounds.h>
36 35
37#include <tr1/unordered_map> 36#include <flat_hash_map.hpp>
38 37
39// the hashtable 38// the hashtable
40typedef std::tr1::unordered_map 39typedef ska::flat_hash_map
41 < 40 <
42 const char *, 41 const char *,
43 faceidx, 42 faceidx,
44 str_hash, 43 str_hash,
45 str_equal, 44 str_equal,
54 auto (i, ht.find (str)); 53 auto (i, ht.find (str));
55 54
56 if (i != ht.end ()) 55 if (i != ht.end ())
57 return i->second; 56 return i->second;
58 57
59 //TODO: really fall back to face name? 58 if (strncmp (str, "sound/", sizeof ("sound/") - 1))
60 char face[128]; 59 str = format ("sound/%s", str);
61 snprintf (face, 128, "sound/%s", str); 60
62 return face_find (face); 61 return face_find (str);
63} 62}
64 63
65void 64void
66sound_set (const char *str, faceidx face) 65sound_set (const char *str, faceidx face)
67{ 66{
100 99
101 packet sl ("sc"); 100 packet sl ("sc");
102 101
103 uint8 *len = sl.cur; 102 uint8 *len = sl.cur;
104 103
105 sl << uint8 (0) // group length 104 sl << uint8 (0) // group length, decoded as BER in clients
106 << uint8 (0) // type == one-time effect 105 << uint8 (0) // type == one-time effect
107 << ber32 (sound) 106 << ber32 (sound)
108 << sint8 (dx) 107 << sint8 (dx)
109 << sint8 (dy) 108 << sint8 (dy)
110 << uint8 (vol); // 0 == silent, 255 max 109 << uint8 (vol); // 0 == silent, 255 max
111 110
112 *len = sl.cur - len; // patch in group length 111 *len = sl.cur - len - 1; // patch in group length
113 112
114 send_packet (sl); 113 send_packet (sl);
115 } 114 }
116 else if (this->sound) 115 else if (this->sound)
117 { 116 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines