--- deliantra/server/include/face.h 2007/04/12 14:18:05 1.14
+++ deliantra/server/include/face.h 2018/11/17 23:33:18 1.46
@@ -1,43 +1,45 @@
/*
- * CrossFire, A Multiplayer game for X-windows
- *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 1994 Mark Wedel
- * Copyright (C) 1992 Frank Tore Johansen
- *
- * This program 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 2 of the License, or
- * (at your option) any later version.
- *
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * 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
+ * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * The author can be reached via e-mail to mark@pyramid.com
+ * 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
*/
+
#ifndef FACE_H__
#define FACE_H__
-#include
-#include
+#include
-#define CHKSUM_SIZE 6
-#define MAX_FACES 10000 // stupid gcfclient artificially limits
+#include "flat_hash_map.hpp"
-typedef uint16 faceidx;
+#define CHKSUM_MAXLEN 15
+#define MAX_FACES 65535 // we reserve face #65535
-extern faceidx blank_face, empty_face;
+extern faceidx blank_face, empty_face, magicmouth_face;
struct facedata
{
- std::string data;
- uint8 chksum[CHKSUM_SIZE];
+ uint8 chksum[CHKSUM_MAXLEN];
+ uint8 chksum_len;
+
+ facedata ()
+ : chksum_len (0)
+ { }
};
/* New face structure - this enforces the notion that data is face by
@@ -46,21 +48,38 @@
*/
struct faceinfo
{
+ faceinfo ()
+ : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0), refcnt (1)
+ {
+ }
+
shstr name;
- facedata data32, data64;
+ facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text
faceidx number; /* This is the image id. It should be the */
/* same value as its position in the array */
faceidx smooth; /* the smooth face for this face, or 0 */
+ uint8 type; // 0 normal face, otherwise other resource
uint8 smoothlevel; // smoothlevel is per-face in 2.x servers
uint8 visibility;
uint8 magicmap; /* Color to show this in magic map */
- faceinfo ()
- : number (0), smooth (0), smoothlevel (0), visibility (0), magicmap (0)
- { }
+ facedata *data (int faceset) const;
+
+ int refcnt; // reference count - 1
+ void ref () { ++refcnt; }
+ void unref ();
};
-typedef std::tr1::unordered_map >, true> facehash_t;
+inline void
+object_freezer::put (const keyword_string k, faceinfo *v)
+{
+ if (expect_true (v))
+ put (k, v->name);
+ else
+ put (k);
+}
+
+typedef ska::flat_hash_map>> facehash_t;
extern facehash_t facehash;
extern std::vector faces;
@@ -76,6 +95,7 @@
* it will be known that the face could not be found.
*/
faceidx face_find (const char *name, faceidx defidx = 0);
+faceidx face_alloc ();
faceinfo *face_info (faceidx idx);
facedata *face_data (faceidx idx, int faceset);
@@ -89,11 +109,11 @@
struct animation
{
- shstr name; /* Name of the animation sequence */
- animidx number;
- uint8 num_animations; /* How many different faces to animate */
- uint8 facings; /* How many facings (1,2,4,8) */
faceidx *faces; /* The different animations */
+ int num_animations; /* How many different faces to animate */
+ sint8 facings; /* How many facings (1,2,4,8) */
+ animidx number;
+ shstr name; /* Name of the animation sequence */
static animation &create (const char *name, uint8 frames, uint8 facings = 1);
static animation &find (const char *name);
@@ -101,9 +121,8 @@
void resize (int new_size);
};
-typedef std::tr1::unordered_map >, true> animhash_t;
+typedef ska::flat_hash_map>> animhash_t;
-extern animhash_t animhash;
extern std::vector animations;
#endif