ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/face.h
(Generate patch)

Comparing deliantra/server/include/face.h (file contents):
Revision 1.40 by root, Mon Oct 29 23:55:53 2012 UTC vs.
Revision 1.45 by root, Fri Nov 18 04:44:13 2016 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
… …
22 22
23#ifndef FACE_H__ 23#ifndef FACE_H__
24#define FACE_H__ 24#define FACE_H__
25 25
26#include <util.h> 26#include <util.h>
27#include <tr1/unordered_map> 27#include <unordered_map>
28 28
29#define CHKSUM_MAXLEN 15 29#define CHKSUM_MAXLEN 15
30#define MAX_FACES 10000 // stupid gcfclient artificially limits 30#define MAX_FACES 65535 // we reserve face #65535
31
32typedef uint16 faceidx;
33 31
34extern faceidx blank_face, empty_face, magicmouth_face; 32extern faceidx blank_face, empty_face, magicmouth_face;
35 33
36struct facedata 34struct facedata
37{ 35{
38 refcnt_buf data; // no need to be refcounted actually
39 uint8 chksum[CHKSUM_MAXLEN]; 36 uint8 chksum[CHKSUM_MAXLEN];
40 uint8 chksum_len; 37 uint8 chksum_len;
41 38
42 facedata () 39 facedata ()
43 : chksum_len (0) 40 : chksum_len (0)
… …
49 * create a new face with that color. 46 * create a new face with that color.
50 */ 47 */
51struct faceinfo 48struct faceinfo
52{ 49{
53 faceinfo () 50 faceinfo ()
54 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0), refcnt (1), meta_hv (0) 51 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0), refcnt (1)
55 { 52 {
56 } 53 }
57 54
58 shstr name; 55 shstr name;
59 HV *meta_hv; /* note, no destructor of copy constructor, must never be freed, but can be moved aorund */
60 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text 56 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text
61 faceidx number; /* This is the image id. It should be the */ 57 faceidx number; /* This is the image id. It should be the */
62 /* same value as its position in the array */ 58 /* same value as its position in the array */
63 faceidx smooth; /* the smooth face for this face, or 0 */ 59 faceidx smooth; /* the smooth face for this face, or 0 */
64 uint8 type; // 0 normal face, otherwise other resource 60 uint8 type; // 0 normal face, otherwise other resource
… …
80 put (k, v->name); 76 put (k, v->name);
81 else 77 else
82 put (k); 78 put (k);
83} 79}
84 80
85typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 81typedef std::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
86 82
87extern facehash_t facehash; 83extern facehash_t facehash;
88extern std::vector<faceinfo> faces; 84extern std::vector<faceinfo> faces;
89 85
90/* This returns an the face number of face 'name'. Number is constant 86/* This returns an the face number of face 'name'. Number is constant
… …
122 static animation &find (const char *name); 118 static animation &find (const char *name);
123 119
124 void resize (int new_size); 120 void resize (int new_size);
125}; 121};
126 122
127typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t; 123typedef std::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
128 124
129extern std::vector<animation> animations; 125extern std::vector<animation> animations;
130 126
131#endif 127#endif
132 128

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines