--- deliantra/server/common/shstr.C 2006/09/13 23:39:27 1.19
+++ deliantra/server/common/shstr.C 2007/07/10 05:51:37 1.25
@@ -1,12 +1,31 @@
/*
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ *
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the 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 GNU General Public License
+ * along with this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
+ */
+
+/*
* shstr.C
*/
#include
#include
-
#include
-
#include
#include "global.h"
@@ -46,7 +65,7 @@
if (!s)
return s;
- HT::iterator i = ht.find (s);
+ auto (i, ht.find (s));
return i != ht.end ()? *i : 0;
}
@@ -75,7 +94,7 @@
{
static const char *curpos;
- HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
+ auto (i, curpos ? ht.find (curpos) : ht.begin ());
if (i == ht.end ())
i = ht.begin ();
@@ -94,7 +113,7 @@
break;
else if (!refcnt (*i))
{
- HT::iterator o = i++;
+ auto (o, i++);
const char *s = *o;
ht.erase (o);
@@ -109,17 +128,18 @@
curpos = *i;
}
-shstr skill_names[NUM_SKILLS];
+// declare these here to get correct initialisation order
+#define def(str) const shstr shstr_ ## str (# str);
+# include "shstrinc.h"
+#undef def
-// what weird misoptimisation is this again?
-const shstr undead_name ("undead");
+shstr skill_names[NUM_SKILLS];
//TODO: this should of course not be here
/* buf_overflow() - we don't want to exceed the buffer size of
* buf1 by adding on buf2! Returns true if overflow will occur.
*/
-
int
buf_overflow (const char *buf1, const char *buf2, int bufsize)
{
@@ -131,5 +151,6 @@
len2 = strlen (buf2);
if ((len1 + len2) >= bufsize)
return 1;
+
return 0;
}