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

Comparing deliantra/server/common/shstr.C (file contents):
Revision 1.43 by root, Fri Mar 26 01:04:44 2010 UTC vs.
Revision 1.51 by root, Fri Nov 18 04:44:13 2016 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
10 * 10 *
11 * 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,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the Affero GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23/* 23/*
24 * shstr.C 24 * shstr.C
25 */ 25 */
26 26
27#include <cstring> 27#include <cstring>
28#include <cstdlib> 28#include <cstdlib>
29#include <glib.h> 29#include <glib.h>
30#include <tr1/unordered_set> 30#include <unordered_set>
31 31
32#include "global.h" 32#include "global.h"
33 33
34size_t shstr_alloc; 34size_t shstr_alloc;
35 35
36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT; 36typedef std::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
37 37
38static HT ht; 38static HT ht;
39static int next_gc; 39static int next_gc;
40 40
41#define NUM_INT 3 41#define NUM_INT 3
… …
58 58
59 return v; 59 return v;
60} 60}
61 61
62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" }; 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
63
64bool
65shstr_tmp::contains (const char *substring) const
66{
67 //TODO: this is supposed to check for comma-seperation...
68 return s != null ()
69 && substring
70 && strstr (s, substring);
71}
63 72
64const char * 73const char *
65shstr::find (const char *s) 74shstr::find (const char *s)
66{ 75{
67 if (!s) 76 if (!s)
… …
141#define def(id) def2(shstr_ ## id, # id) 150#define def(id) def2(shstr_ ## id, # id)
142# include "shstrinc.h" 151# include "shstrinc.h"
143#undef def 152#undef def
144#undef def2 153#undef def2
145 154
146shstr skill_names[NUM_SKILLS];
147materialtype_t material_null; 155materialtype_t material_null;
148 156
157struct freed_map freed_map;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines