--- deliantra/server/common/shstr.C 2009/11/04 00:02:48 1.40
+++ deliantra/server/common/shstr.C 2012/10/29 23:55:52 1.49
@@ -1,22 +1,22 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- *
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
* Deliantra is free software: you can redistribute it and/or modify it under
* the terms of the Affero GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the Affero GNU General Public License
* and the GNU General Public License along with this program. If not, see
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -38,16 +38,19 @@
static HT ht;
static int next_gc;
+#define NUM_INT 3
+
static const char *
makevec (const char *s)
{
int len = strlen (s);
- int alloc = sizeof (uint32_t) * 2 + len + 1;
+ int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
shstr_alloc += alloc;
char *v = (char *)g_slice_alloc (alloc);
- v += sizeof (uint32_t) * 2;
+ v += sizeof (uint32_t) * NUM_INT;
+ shstr::hash (v) = strhsh (s);
shstr::length (v) = len;
shstr::refcnt (v) = 1;
@@ -56,7 +59,16 @@
return v;
}
-shstr_vec shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" };
+shstr_vec shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
+
+bool
+shstr_tmp::contains (const char *substring) const
+{
+ //TODO: this is supposed to check for comma-seperation...
+ return s != null ()
+ && substring
+ && strstr (s, substring);
+}
const char *
shstr::find (const char *s)
@@ -122,9 +134,9 @@
ht.erase (o);
//printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
- int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
+ int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
shstr_alloc -= alloc;
- g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
+ g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
}
else
++i;
@@ -140,5 +152,6 @@
#undef def
#undef def2
-shstr skill_names[NUM_SKILLS];
+materialtype_t material_null;
+struct freed_map freed_map;