--- deliantra/server/common/shstr.C	2008/12/31 18:25:12	1.34
+++ deliantra/server/common/shstr.C	2009/01/01 11:41:17	1.36
@@ -130,12 +130,11 @@
 }
 
 // declare these here to get correct initialisation order
-
-#define def(str) \
-  shstr_vec<sizeof (# str)> shstr_vec_ ## str = { sizeof (# str) - 1, 0xffffffff, # str }; \
-  const shstr_const shstr_ ## str (shstr_vec_ ## str.string);
+#define def2(id,str) const shstr shstr_ ## id (str);
+#define def(id)      def2(id, # id)
 # include "shstrinc.h"
 #undef def
+#undef def2
 
 shstr skill_names[NUM_SKILLS];