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.121 by root, Mon May 14 19:08:26 2007 UTC vs.
Revision 1.125 by root, Sat May 19 00:08:11 2007 UTC

… …
31#include "shstr.h" 31#include "shstr.h"
32 32
33typedef int tag_t; 33typedef int tag_t;
34 34
35enum { 35enum {
36 body_skill,
37 body_combat,
36 body_range, 38 body_range,
37 body_shield, 39 body_shield,
38 body_combat,
39 body_arm, 40 body_arm,
40 body_torso, 41 body_torso,
41 body_head, 42 body_head,
42 body_neck, 43 body_neck,
43 body_skill,
44 body_finger, 44 body_finger,
45 body_shoulder, 45 body_shoulder,
46 body_foot, 46 body_foot,
47 body_hand, 47 body_hand,
48 body_wrist, 48 body_wrist,
… …
297 { 297 {
298 if (!flag [FLAG_REMOVED]) 298 if (!flag [FLAG_REMOVED])
299 do_remove (); 299 do_remove ();
300 } 300 }
301 301
302 // move this object to the top of its env's inventory to speed up
303 // searches for it.
304 MTH void 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
318 static bool can_merge_slow (object *op1, object *op2); 302 static bool can_merge_slow (object *op1, object *op2);
319 303
320 // this is often used in time-critical code, so optimise 304 // this is often used in time-critical code, so optimise
321 MTH static bool can_merge (object *op1, object *op2) 305 MTH static bool can_merge (object *op1, object *op2)
322 { 306 {
… …
326 } 310 }
327 311
328 MTH void set_owner (object *owner); 312 MTH void set_owner (object *owner);
329 MTH void set_speed (float speed); 313 MTH void set_speed (float speed);
330 MTH bool change_weapon (object *ob); 314 MTH bool change_weapon (object *ob);
315 MTH bool change_skill (object *ob);
331 316
332 MTH void open_container (object *new_container); 317 MTH void open_container (object *new_container);
333 MTH void close_container () 318 MTH void close_container ()
334 { 319 {
335 open_container (0); 320 open_container (0);
321 }
322
323 // overwrite the attachable invoke function with a version that also checks ev_want_type
324 bool invoke (event_type event, ...)
325 {
326 if (ev_want_event [event] || ev_want_type [type] || cb)
327 {
328 va_list ap;
329 va_start (ap, event);
330 vinvoke (event, ap);
331 va_end (ap);
332 }
336 } 333 }
337 334
338 MTH void instantiate (); 335 MTH void instantiate ();
339 336
340 // recalculate all stats 337 // recalculate all stats
… …
505 502
506 object (); 503 object ();
507 ~object (); 504 ~object ();
508}; 505};
509 506
507// move this object to the top of its env's inventory to speed up
508// searches for it.
509static object *
510splay (object *ob)
511{
512 if (ob->env && ob->env->inv != ob)
513 {
514 if (ob->above) ob->above->below = ob->below;
515 if (ob->below) ob->below->above = ob->above;
516
517 ob->above = 0;
518 ob->below = ob->env->inv;
519 ob->below->above = ob;
520 ob->env->inv = ob;
521 }
522
523 return ob;
524}
525
510typedef object_vector<object, &object::index > objectvec; 526typedef object_vector<object, &object::index > objectvec;
511typedef object_vector<object, &object::active> activevec; 527typedef object_vector<object, &object::active> activevec;
512 528
513extern objectvec objects; 529extern objectvec objects;
514extern activevec actives; 530extern activevec actives;
… …
531{ /* Used to link together several object links */ 547{ /* Used to link together several object links */
532 struct oblnk *link; 548 struct oblnk *link;
533 long value; /* Used as connected value in buttons/gates */ 549 long value; /* Used as connected value in buttons/gates */
534 struct oblinkpt *next; 550 struct oblinkpt *next;
535} oblinkpt; 551} oblinkpt;
552
553object *find_skill_by_name (object *who, const char *name);
554object *find_skill_by_name (object *who, const shstr &sh);
555object *find_skill_by_number (object *who, int skillno);
536 556
537/* 557/*
538 * The archetype structure is a set of rules on how to generate and manipulate 558 * The archetype structure is a set of rules on how to generate and manipulate
539 * objects which point to archetypes. 559 * objects which point to archetypes.
540 * This probably belongs in arch.h, but there really doesn't appear to 560 * This probably belongs in arch.h, but there really doesn't appear to

Diff Legend

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