--- deliantra/server/include/shstr.h	2010/03/26 01:04:44	1.38
+++ deliantra/server/include/shstr.h	2018/11/27 18:47:35	1.46
@@ -1,22 +1,23 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * 
+ *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -86,10 +87,7 @@
   // returns true if the substring is contained in the shstr
   // if the shstr is 0, then this always returns false.
   // the shstr is (theoretically) treated as a comma/colon/space etc. separated list.
-  bool contains (const char *substring) const
-  {
-    return s != null () && strstr (s, substring);
-  }
+  bool contains (const char *substring) const;
 
   //TODO: case sensitive should be eradicated
   bool eq_nc (const char *otherstring) const
@@ -170,12 +168,6 @@
 
   static void gc (); // garbage collect a few strings
 
-  shstr (const shstr &sh)
-  : shstr_tmp (sh)
-  {
-    ++refcnt ();
-  }
-
   shstr (const shstr_tmp &sh)
   : shstr_tmp (sh)
   {
@@ -183,7 +175,7 @@
   }
 
   explicit shstr (const char *str)
-  : shstr_tmp (0, is_constant (str) && !str ? null () : intern (str))
+  : shstr_tmp (0, ecb_is_constant (str) && !str ? null () : intern (str))
   {
   }
 
@@ -215,7 +207,7 @@
   shstr &operator =(const char *str)
   {
     --refcnt ();
-    s = is_constant (str) && !str ? null () : intern (str);
+    s = ecb_is_constant (str) && !str ? null () : intern (str);
 
     return *this;
   }