--- deliantra/server/include/face.h 2007/09/15 15:58:06 1.21
+++ deliantra/server/include/face.h 2009/10/12 14:00:58 1.27
@@ -1,24 +1,25 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 1994,2007 Mark Wedel
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * 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.
+ * 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 GNU General Public License
- * along with this program. If not, see .
+ * 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
+ * The authors can be reached via e-mail to
*/
#ifndef FACE_H__
@@ -46,6 +47,11 @@
*/
struct faceinfo
{
+ faceinfo ()
+ : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
+ {
+ }
+
shstr name;
std::string meta;
facedata data32, data64; // either 32/64 face or data32 == generic resource
@@ -57,10 +63,6 @@
uint8 visibility;
uint8 magicmap; /* Color to show this in magic map */
- faceinfo ()
- : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0)
- { }
-
facedata *data (int faceset) const;
};
@@ -70,7 +72,7 @@
put (k, v ? &v->name : (const char *)0);
}
-typedef std::tr1::unordered_map >, true> facehash_t;
+typedef std::tr1::unordered_map > > facehash_t;
extern facehash_t facehash;
extern std::vector faces;
@@ -111,7 +113,7 @@
void resize (int new_size);
};
-typedef std::tr1::unordered_map >, true> animhash_t;
+typedef std::tr1::unordered_map > > animhash_t;
extern animhash_t animhash;
extern std::vector animations;