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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.52 by root, Wed Dec 13 03:29:45 2006 UTC vs.
Revision 1.56 by root, Mon Dec 18 02:35:01 2006 UTC

… …
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
21 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at crossfire@schmorp.de
22*/ 22*/
23 23
24#ifndef OBJECT_H 24#ifndef OBJECT_H
25#define OBJECT_H 25#define OBJECT_H
26
27#include <bitset>
26 28
27#include "cfperl.h" 29#include "cfperl.h"
28#include "shstr.h" 30#include "shstr.h"
29 31
30typedef uint32 tag_t; 32typedef uint32 tag_t;
… …
59}; 61};
60 62
61struct UUID 63struct UUID
62{ 64{
63 uint64 seq; 65 uint64 seq;
66
67 UUID () { }
68 UUID (uint64 seq) : seq(seq) { }
69 operator uint64() { return seq; }
70 void operator =(uint64 seq) { this->seq = seq; }
64}; 71};
65 72
66extern void init_uuid (); 73extern void init_uuid ();
67extern UUID gen_uuid (); 74extern UUID gen_uuid ();
68extern const uint64 UUID_SKIP; 75extern const uint64 UUID_SKIP;
… …
211 sint8 ACC (RW, range); /* Range of the spell */ 218 sint8 ACC (RW, range); /* Range of the spell */
212 uint8 ACC (RW, range_modifier); /* How going up in level effects range */ 219 uint8 ACC (RW, range_modifier); /* How going up in level effects range */
213 char *ACC (RW, spellarg); 220 char *ACC (RW, spellarg);
214 221
215 /* Following are values used by any object */ 222 /* Following are values used by any object */
223 /* this objects turns into or what this object creates */
216 treasurelist *ACC (RW, randomitems); /* Items to be generated */ 224 treasurelist *ACC (RW, randomitems); /* Items to be generated */
217 arch_ptr ACC (RW, arch); /* Pointer to archetype */ 225 arch_ptr ACC (RW, arch); /* Pointer to archetype */
218 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ 226 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
219 key_value *key_values; /* Fields not explictly known by the loader. */ 227 key_value *key_values; /* Fields not explictly known by the loader. */
220 /* this objects turns into or what this object creates */ 228 std::bitset<NUM_FLAGS> flags; /* various flags */
221 uint32 flags[4]; /* various flags */
222 uint16 ACC (RW, animation_id);/* An index into the animation array */ 229 uint16 ACC (RW, animation_id);/* An index into the animation array */
223 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */ 230 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
224 uint8 ACC (RW, last_anim); /* last sequence used to draw face */ 231 uint8 ACC (RW, last_anim); /* last sequence used to draw face */
225 sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */ 232 sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */
226 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ 233 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */

Diff Legend

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