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.123 by root, Thu May 17 20:27:01 2007 UTC vs.
Revision 1.126 by root, Sat May 26 15:44:04 2007 UTC

… …
106#define WILL_APPLY_HANDLE 0x01 106#define WILL_APPLY_HANDLE 0x01
107#define WILL_APPLY_TREASURE 0x02 107#define WILL_APPLY_TREASURE 0x02
108#define WILL_APPLY_EARTHWALL 0x04 108#define WILL_APPLY_EARTHWALL 0x04
109#define WILL_APPLY_DOOR 0x08 109#define WILL_APPLY_DOOR 0x08
110#define WILL_APPLY_FOOD 0x10 110#define WILL_APPLY_FOOD 0x10
111
112/* However, if you're keeping a pointer of some sort, you probably
113 * don't just want it copied, so you'll need to add to common/object.C,
114 * e.g. ->copy_to ()
115 */
116 111
117struct body_slot 112struct body_slot
118{ 113{
119 signed char info:4; /* body info as loaded from the file */ 114 signed char info:4; /* body info as loaded from the file */
120 signed char used:4; /* Calculated value based on items equipped */ 115 signed char used:4; /* Calculated value based on items equipped */
… …
297 { 292 {
298 if (!flag [FLAG_REMOVED]) 293 if (!flag [FLAG_REMOVED])
299 do_remove (); 294 do_remove ();
300 } 295 }
301 296
302 // move this object to the top of its env's inventory to speed up
303 // searches for it.
304 MTH object *inv_splay ()
305 {
306 if (env && env->inv != this)
307 {
308 if (above) above->below = below;
309 if (below) below->above = above;
310
311 above = 0;
312 below = env->inv;
313 below->above = this;
314 env->inv = this;
315 }
316
317 return this;
318 }
319
320 static bool can_merge_slow (object *op1, object *op2); 297 static bool can_merge_slow (object *op1, object *op2);
321 298
322 // this is often used in time-critical code, so optimise 299 // this is often used in time-critical code, so optimise
323 MTH static bool can_merge (object *op1, object *op2) 300 MTH static bool can_merge (object *op1, object *op2)
324 { 301 {
… …
334 311
335 MTH void open_container (object *new_container); 312 MTH void open_container (object *new_container);
336 MTH void close_container () 313 MTH void close_container ()
337 { 314 {
338 open_container (0); 315 open_container (0);
316 }
317
318 // overwrite the attachable should_invoke function with a version that also checks ev_want_type
319 bool should_invoke (event_type event)
320 {
321 return ev_want_event [event] || ev_want_type [type] || cb;
339 } 322 }
340 323
341 MTH void instantiate (); 324 MTH void instantiate ();
342 325
343 // recalculate all stats 326 // recalculate all stats
… …
507 void unlink (); 490 void unlink ();
508 491
509 object (); 492 object ();
510 ~object (); 493 ~object ();
511}; 494};
495
496// move this object to the top of its env's inventory to speed up
497// searches for it.
498static object *
499splay (object *ob)
500{
501 if (ob->env && ob->env->inv != ob)
502 {
503 if (ob->above) ob->above->below = ob->below;
504 if (ob->below) ob->below->above = ob->above;
505
506 ob->above = 0;
507 ob->below = ob->env->inv;
508 ob->below->above = ob;
509 ob->env->inv = ob;
510 }
511
512 return ob;
513}
512 514
513typedef object_vector<object, &object::index > objectvec; 515typedef object_vector<object, &object::index > objectvec;
514typedef object_vector<object, &object::active> activevec; 516typedef object_vector<object, &object::active> activevec;
515 517
516extern objectvec objects; 518extern objectvec objects;

Diff Legend

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