--- deliantra/server/common/shstr.C	2009/11/10 00:01:31	1.41
+++ deliantra/server/common/shstr.C	2012/01/03 11:25:31	1.48
@@ -1,7 +1,7 @@
 /*
  * 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
@@ -61,6 +61,15 @@
 
 shstr_vec<sizeof "(null)"> 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)
 {
@@ -143,5 +152,6 @@
 #undef def
 #undef def2
 
-shstr skill_names[NUM_SKILLS];
+materialtype_t material_null;
 
+struct freed_map freed_map;