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.28 by root, Tue Nov 3 23:44:21 2009 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 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/**
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{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines