--- deliantra/server/include/face.h 2008/05/06 16:55:25 1.25
+++ deliantra/server/include/face.h 2009/11/03 23:44:21 1.28
@@ -1,22 +1,21 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 1994,2007 Mark Wedel
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009 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 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
*/
@@ -71,7 +70,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;
@@ -112,7 +111,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;