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.50 by root, Wed Dec 13 00:42:04 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 */
… …
250 void destroy (bool destroy_inventory = false); 257 void destroy (bool destroy_inventory = false);
251 void remove (); 258 void remove ();
252 object *insert (object *item); // insert into inventory 259 object *insert (object *item); // insert into inventory
253 260
254 static void free_mortals (); 261 static void free_mortals ();
262 static bool can_merge_slow (object *op1, object *op2);
263
264 // this is often used in time-critical code, so optimise
255 static bool can_merge (object *op1, object *op2); 265 static bool can_merge (object *op1, object *op2)
266 {
267 return op1->value == op2->value
268 && op1->name == op2->name
269 && can_merge_slow (op1, op2);
270 }
256 271
257 void clear (); 272 void clear ();
258 273
259 bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); } 274 bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
275
276 void set_owner (object *owner);
260 277
261 void instantiate () 278 void instantiate ()
262 { 279 {
263 if (!uuid.seq) // HACK 280 if (!uuid.seq) // HACK
264 uuid = gen_uuid (); 281 uuid = gen_uuid ();
265 282
266 attachable<object>::instantiate (); 283 attachable<object>::instantiate ();
267 } 284 }
268
269 void set_owner (object *owner);
270 285
271 // info must hold 256 * 3 bytes currently 286 // info must hold 256 * 3 bytes currently
272 const char *debug_desc (char *info) const; 287 const char *debug_desc (char *info) const;
273 const char *debug_desc () const; 288 const char *debug_desc () const;
274 289
… …
314 void unlink (); 329 void unlink ();
315 330
316 object (); 331 object ();
317 ~object (); 332 ~object ();
318}; 333};
319
320// compatibility functions/macros
321#define clear_owner(op) (op)->owner = 0
322#define copy_owner(op,other) (op)->owner = (other)->owner
323#define get_owner(op) (op)->owner
324#define clear_object(op) (op)->clear ()
325
326static inline void
327set_owner (object *op, object *owner)
328{
329 op->set_owner (owner);
330}
331
332#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
333 334
334typedef struct oblnk 335typedef struct oblnk
335{ /* Used to link together several objects */ 336{ /* Used to link together several objects */
336 object_ptr ob; 337 object_ptr ob;
337 struct oblnk *next; 338 struct oblnk *next;

Diff Legend

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