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.212 by root, Mon Oct 12 14:00:58 2009 UTC vs.
Revision 1.228 by root, Fri Mar 26 00:53:26 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
28#include <bitset> 28#include <bitset>
29 29
30#include "cfperl.h" 30#include "cfperl.h"
31#include "shstr.h" 31#include "shstr.h"
32 32
33//+GPL
34
33typedef int tag_t; 35typedef int tag_t;
34 36
35enum { 37enum {
36 body_skill, 38 body_skill,
37 body_combat, 39 body_combat,
… …
85{ 87{
86 key_value *next; 88 key_value *next;
87 shstr key, value; 89 shstr key, value;
88}; 90};
89 91
92//-GPL
93
90struct UUID 94struct UUID
91{ 95{
92 uint64 seq; 96 uint64 seq;
97
98 enum { MAX_LEN = 3 + 16 + 1 + 1 }; // <1. + hex + > + \0
93 99
94 static UUID cur; // last uuid generated 100 static UUID cur; // last uuid generated
95 static void init (); 101 static void init ();
96 static UUID gen (); 102 static UUID gen ();
97 103
98 UUID () { } 104 UUID () { }
99 UUID (uint64 seq) : seq(seq) { } 105 UUID (uint64 seq) : seq(seq) { }
100 operator uint64() { return seq; } 106 operator uint64() { return seq; }
101 void operator =(uint64 seq) { this->seq = seq; } 107 void operator =(uint64 seq) { this->seq = seq; }
102 108
103 typedef char BUF [32];
104
105 bool parse (const char *s) 109 bool parse (const char *s);
106 { 110 char *append (char *buf) const;
107 return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
108 }
109
110 const char *c_str (char *buf, int len) const
111 {
112 snprintf (buf, len, "<1.%" PRIx64 ">", seq);
113
114 return buf;
115 }
116
117 const char *c_str () const 111 char *c_str () const;
118 {
119 static BUF buf;
120
121 return c_str (buf, sizeof (buf));
122 }
123}; 112};
113
114//+GPL
124 115
125/* Definition for WILL_APPLY values. Replaces having harcoded values 116/* Definition for WILL_APPLY values. Replaces having harcoded values
126 * sprinkled in the code. Note that some of these also replace fields 117 * sprinkled in the code. Note that some of these also replace fields
127 * that were in the can_apply area. What is the point of having both 118 * that were in the can_apply area. What is the point of having both
128 * can_apply and will_apply? 119 * can_apply and will_apply?
… …
133#define WILL_APPLY_DOOR 0x08 124#define WILL_APPLY_DOOR 0x08
134#define WILL_APPLY_FOOD 0x10 125#define WILL_APPLY_FOOD 0x10
135 126
136struct body_slot 127struct body_slot
137{ 128{
129 signed char used:4; /* Calculated value based on items equipped */
138 signed char info:4; /* body info as loaded from the file */ 130 signed char info:4; /* body info as loaded from the file */
139 signed char used:4; /* Calculated value based on items equipped */
140}; 131};
141 132
142typedef struct oblnk 133typedef struct oblnk
143{ /* Used to link together several objects */ 134{ /* Used to link together several objects */
144 object_ptr ob; 135 object_ptr ob;
… …
174 flags_t flag; /* various flags */ 165 flags_t flag; /* various flags */
175#if FOR_PERL 166#if FOR_PERL
176 bool ACC (RW, flag[NUM_FLAGS]); 167 bool ACC (RW, flag[NUM_FLAGS]);
177#endif 168#endif
178 169
179 shstr ACC (RW, materialname); /* specific material name */ 170 materialtype_t *material; // What material this object consists of //TODO, make perl-accessible
180 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ 171 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
181// materialtype_t *ACC (RW, material); /* What material this object consists of */
182 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */ 172 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
183 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */ 173 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
184 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */ 174 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
185 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */ 175 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
186 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */ 176 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
… …
221 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 211 uint8 ACC (RW, pick_up); /* See crossfire.doc */
222 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */ 212 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
223 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ 213 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
224 uint8 ACC (RW, weapontype); /* type of weapon */ 214 uint8 ACC (RW, weapontype); /* type of weapon */
225 215
216 body_slot slot [NUM_BODY_LOCATIONS];
217
226 faceidx ACC (RW, face); /* the graphical face */ 218 faceidx ACC (RW, face); /* the graphical face */
227 219
228 faceidx ACC (RW, sound); /* the sound face */ 220 faceidx ACC (RW, sound); /* the sound face */
229 faceidx ACC (RW, sound_destroy); /* played on destroy */ 221 faceidx ACC (RW, sound_destroy); /* played on destroy */
230
231 body_slot slot [NUM_BODY_LOCATIONS];
232 222
233 sint32 ACC (RW, weight); /* Attributes of the object */ 223 sint32 ACC (RW, weight); /* Attributes of the object */
234 sint32 ACC (RW, weight_limit);/* Weight-limit of object */ 224 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
235 225
236 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */ 226 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */
… …
295 shstr ACC (RW, lore); /* Obscure information about this object, */ 285 shstr ACC (RW, lore); /* Obscure information about this object, */
296 /* To get put into books and the like. */ 286 /* To get put into books and the like. */
297 shstr ACC (RW, custom_name); /* Custom name assigned by player */ 287 shstr ACC (RW, custom_name); /* Custom name assigned by player */
298}; 288};
299 289
300const char *query_weight (const object *op); 290const_utf8_string query_weight (const object *op);
301const char *query_short_name (const object *op); 291const_utf8_string query_short_name (const object *op);
302const char *query_name (const object *op); 292const_utf8_string query_name (const object *op);
303const char *query_base_name (const object *op, int plural); 293const_utf8_string query_base_name (const object *op, int plural);
304 294
305struct object : zero_initialised, object_copy 295struct object : zero_initialised, object_copy
306{ 296{
307 // These variables are not changed by ->copy_to 297 // These variables are not changed by ->copy_to
308 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */ 298 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
… …
318 object *ACC (RW, above); /* Pointer to the object stacked above this one */ 308 object *ACC (RW, above); /* Pointer to the object stacked above this one */
319 /* Note: stacked in the *same* environment */ 309 /* Note: stacked in the *same* environment */
320 object *inv; /* Pointer to the first object in the inventory */ 310 object *inv; /* Pointer to the first object in the inventory */
321 311
322 //TODO: container must move into client 312 //TODO: container must move into client
323 object_ptr ACC (RW, container); /* Current container being used. I think this 313 object_ptr ACC (RW, container);/* Currently opened container. I think this
324 * is only used by the player right now. 314 * is only used by the player right now.
325 */ 315 */
326 object *ACC (RW, env); /* Pointer to the object which is the environment. 316 object *ACC (RW, env); /* Pointer to the object which is the environment.
327 * This is typically the container that the object is in. 317 * This is typically the container that the object is in.
328 */ 318 */
329 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 319 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
330 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 320 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
331 client_container *seen_by; // seen by which player/container currently?
332 key_value *key_values; /* Fields not explictly known by the loader. */ 321 key_value *key_values; /* Fields not explictly known by the loader. */
333 322
334 // privates / perl 323 // privates / perl
335 shstr_tmp kv_get (shstr_tmp key) const; 324 shstr_tmp kv_get (shstr_tmp key) const;
336 void kv_del (shstr_tmp key); 325 void kv_del (shstr_tmp key);
337 void kv_set (shstr_tmp key, shstr_tmp value); 326 void kv_set (shstr_tmp key, shstr_tmp value);
327
328//-GPL
338 329
339 // custom extra fields management 330 // custom extra fields management
340 struct key_value_access_proxy 331 struct key_value_access_proxy
341 { 332 {
342 object &ob; 333 object &ob;
… …
388 379
389 // recursively destroy all objects in inventory, optionally dropping them to the ground instead 380 // recursively destroy all objects in inventory, optionally dropping them to the ground instead
390 MTH void destroy_inv (bool drop_to_ground = false); 381 MTH void destroy_inv (bool drop_to_ground = false);
391 MTH object *insert (object *item); // insert into inventory 382 MTH object *insert (object *item); // insert into inventory
392 MTH void play_sound (faceidx sound) const; 383 MTH void play_sound (faceidx sound) const;
393 MTH void say_msg (const char *msg) const; 384 MTH void say_msg (const_utf8_string msg) const;
394 385
395 void do_remove (); 386 void do_remove ();
396 MTH void remove () 387 MTH void remove ()
397 { 388 {
398 if (!flag [FLAG_REMOVED]) 389 if (!flag [FLAG_REMOVED])
… …
406 remove (); 397 remove ();
407 *this = pos; 398 *this = pos;
408 insert_at (this, this); 399 insert_at (this, this);
409 } 400 }
410 401
411 // high-level move functions, return true if successful 402 // high-level move method.
403 // object op is trying to move in direction dir.
404 // originator is typically the same as op, but
405 // can be different if originator is causing op to
406 // move (originator is pushing op)
407 // returns 0 if the object is not able to move to the
408 // desired space, 1 otherwise (in which case we also
409 // move the object accordingly. This function is
410 // very similiar to move_object.
412 int move (int dir, object *originator); 411 int move (int dir, object *originator);
413 412
414 int move (int dir) 413 int move (int dir)
415 { 414 {
416 return move (dir, this); 415 return move (dir, this);
417 } 416 }
417
418 // changes move_type to a new value - handles move_on/move_off effects
419 MTH void change_move_type (MoveType mt);
418 420
419 static bool can_merge_slow (object *op1, object *op2); 421 static bool can_merge_slow (object *op1, object *op2);
420 422
421 // this is often used in time-critical code, so optimise 423 // this is often used in time-critical code, so optimise
422 MTH static bool can_merge (object *op1, object *op2) 424 MTH static bool can_merge (object *op1, object *op2)
… …
434 436
435 MTH void open_container (object *new_container); 437 MTH void open_container (object *new_container);
436 MTH void close_container () 438 MTH void close_container ()
437 { 439 {
438 open_container (0); 440 open_container (0);
441 }
442
443 // potential future accessor for "container"
444 MTH object *container_ () const
445 {
446 return container;
447 }
448
449 MTH bool is_open_container () const
450 {
451 // strangely enough, using ?: here causes code to inflate
452 return type == CONTAINER
453 && ((env && env->container_ () == this)
454 || (!env && flag [FLAG_APPLIED]));
439 } 455 }
440 456
441 MTH object *force_find (shstr_tmp name); 457 MTH object *force_find (shstr_tmp name);
442 MTH void force_set_timer (int duration); 458 MTH void force_set_timer (int duration);
443 MTH object *force_add (shstr_tmp name, int duration = 0); 459 MTH object *force_add (shstr_tmp name, int duration = 0);
… …
463 MTH void drain_stat (); 479 MTH void drain_stat ();
464 MTH void drain_specific_stat (int deplete_stats); 480 MTH void drain_specific_stat (int deplete_stats);
465 MTH void change_luck (int value); 481 MTH void change_luck (int value);
466 482
467 // info must hold 256 * 3 bytes currently 483 // info must hold 256 * 3 bytes currently
468 const char *debug_desc (char *info) const; 484 const_utf8_string debug_desc (char *info) const;
469 MTH const char *debug_desc () const; // uses at least 3 round-robin buffers 485 MTH const_utf8_string debug_desc () const; // uses at least 3 round-robin buffers
470 const char *flag_desc (char *desc, int len) const; 486 const_utf8_string flag_desc (char *desc, int len) const;
471 487
472 MTH bool decrease (sint32 nr = 1); // returns true if anything is left 488 MTH bool decrease (sint32 nr = 1); // returns true if anything is left
473 MTH object *split (sint32 nr = 1); // return 0 on failure 489 MTH object *split (sint32 nr = 1); // return 0 on failure
474 490
475 MTH int number_of () const 491 MTH int number_of () const
… …
483 } 499 }
484 500
485 MTH void update_weight (); 501 MTH void update_weight ();
486 502
487 // return the dominant material of this item, always return something 503 // return the dominant material of this item, always return something
488 const materialtype_t *dominant_material () const; 504 const materialtype_t *dominant_material () const
505 {
506 return material;
507 }
489 508
490 // return the volume of this object in cm³ 509 // return the volume of this object in cm³
491 MTH uint64 volume () const 510 MTH uint64 volume () const
492 { 511 {
493 return (uint64)total_weight () 512 return (uint64)total_weight ()
494 * 1000 513 * 1024 // 1000 actually
495 * (type == CONTAINER ? 1000 : 1) 514 * (type == CONTAINER ? 128 : 1)
496 / dominant_material ()->density; 515 / dominant_material ()->density; // ugh, division
497 } 516 }
498 517
499 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; } 518 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
500 519
501 MTH bool is_wiz () const { return flag [FLAG_WIZ]; } 520 MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
… …
510 MTH bool is_arrow () const { return type == ARROW 529 MTH bool is_arrow () const { return type == ARROW
511 || (type == SPELL_EFFECT 530 || (type == SPELL_EFFECT
512 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } 531 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
513 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; } 532 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
514 533
534 MTH bool is_dragon () const;
535
515 MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; } 536 MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
516 537
517 // temporary: wether the object can be saved in a map file 538 // temporary: wether the object can be saved in a map file
518 // contr => is a player 539 // contr => is a player
519 // head => only save head of a multitile object 540 // head => only save head of a multitile object
520 // owner => can not reference owner yet 541 // owner => can not reference owner yet
… …
608 MTH std::string long_desc (object *who = 0); // query_name . " " . describe 629 MTH std::string long_desc (object *who = 0); // query_name . " " . describe
609 MTH std::string describe_monster (object *who = 0); 630 MTH std::string describe_monster (object *who = 0);
610 MTH std::string describe_item (object *who = 0); 631 MTH std::string describe_item (object *who = 0);
611 MTH std::string describe (object *who = 0); // long description, without name 632 MTH std::string describe (object *who = 0); // long description, without name
612 633
613 MTH const char *query_weight () { return ::query_weight (this); } 634 MTH const_utf8_string query_weight () { return ::query_weight (this); }
614 MTH const char *query_name () { return ::query_name (this); } 635 MTH const_utf8_string query_name () { return ::query_name (this); }
615 MTH const char *query_short_name () { return ::query_short_name (this); } 636 MTH const_utf8_string query_short_name () { return ::query_short_name (this); }
616 MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); } 637 MTH const_utf8_string query_base_name (bool plural) { return ::query_base_name (this, plural); }
617 638
618 // If this object has no extra parts but should have them, 639 // If this object has no extra parts but should have them,
619 // add them, effectively expanding heads into multipart 640 // add them, effectively expanding heads into multipart
620 // objects. This method only works on objects not inserted 641 // objects. This method only works on objects not inserted
621 // anywhere. 642 // anywhere.
… …
624 MTH void create_treasure (treasurelist *tl, int flags = 0); 645 MTH void create_treasure (treasurelist *tl, int flags = 0);
625 646
626 // insert object at same map position as 'where' 647 // insert object at same map position as 'where'
627 // handles both inventory and map "positions" 648 // handles both inventory and map "positions"
628 MTH object *insert_at (object *where, object *originator = 0, int flags = 0); 649 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
650 // check whether we can put this into the map, respect max_nrof, max_volume, max_items
651 MTH bool can_drop_at (maptile *m, int x, int y, object *originator = 0);
629 MTH void drop_unpaid_items (); 652 MTH void drop_unpaid_items ();
630 653
631 MTH void activate (); 654 MTH void activate ();
632 MTH void deactivate (); 655 MTH void deactivate ();
633 MTH void activate_recursive (); 656 MTH void activate_recursive ();
… …
636 // set the given flag on all objects in the inventory recursively 659 // set the given flag on all objects in the inventory recursively
637 MTH void set_flag_inv (int flag, int value = 1); 660 MTH void set_flag_inv (int flag, int value = 1);
638 661
639 void enter_exit (object *exit);//Perl 662 void enter_exit (object *exit);//Perl
640 MTH void enter_map (maptile *newmap, int x, int y); 663 MTH void enter_map (maptile *newmap, int x, int y);
641 void player_goto (const char *path, int x, int y); // only for players 664 void player_goto (const_utf8_string path, int x, int y); // only for players
642 665
643 // returns the mapspace this object is in 666 // returns the mapspace this object is in
644 mapspace &ms () const; 667 mapspace &ms () const;
645 668
646 // fully recursive iterator 669 // fully recursive iterator
… …
697 return weight + carrying; 720 return weight + carrying;
698 } 721 }
699 722
700 MTH struct region *region () const; 723 MTH struct region *region () const;
701 724
702 void statusmsg (const char *msg, int color = NDI_BLACK); 725 void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
703 void failmsg (const char *msg, int color = NDI_RED); 726 void failmsg (const_utf8_string msg, int color = NDI_RED);
704 727
705 const char *query_inventory (object *who = 0, const char *indent = ""); 728 const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
706 729
707 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference 730 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
708 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible 731 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
709 732
710 // make some noise with given item into direction dir, 733 // make some noise with given item into direction dir,
… …
723 * range from 0 through 7. 746 * range from 0 through 7.
724 */ 747 */
725 MTH int anim_frames () const { return anim ().num_animations; } 748 MTH int anim_frames () const { return anim ().num_animations; }
726 MTH int anim_facings () const { return anim ().facings; } 749 MTH int anim_facings () const { return anim ().facings; }
727 750
728 MTH char *as_string (); 751 MTH utf8_string as_string ();
729 752
730protected: 753protected:
731 void link (); 754 void link ();
732 void unlink (); 755 void unlink ();
733 756
… …
739 object (const object &); 762 object (const object &);
740}; 763};
741 764
742// move this object to the top of its env's inventory to speed up 765// move this object to the top of its env's inventory to speed up
743// searches for it. 766// searches for it.
744static object * 767static inline object *
745splay (object *ob) 768splay (object *ob)
746{ 769{
747 if (ob->above && ob->env) 770 if (ob->above && ob->env)
748 { 771 {
749 if (ob->above) ob->above->below = ob->below; 772 if (ob->above) ob->above->below = ob->below;
… …
756 } 779 }
757 780
758 return ob; 781 return ob;
759} 782}
760 783
784//+GPL
785
761object *find_skill_by_name_fuzzy (object *who, const char *name); 786object *find_skill_by_name_fuzzy (object *who, const_utf8_string name);
762object *find_skill_by_name (object *who, shstr_cmp sh); 787object *find_skill_by_name (object *who, shstr_cmp sh);
763object *find_skill_by_number (object *who, int skillno); 788object *find_skill_by_number (object *who, int skillno);
764 789
765/* 790/*
766 * The archetype structure is a set of rules on how to generate and manipulate 791 * The archetype structure is a set of rules on how to generate and manipulate
… …
769 * be much left in the archetype - all it really is is a holder for the 794 * be much left in the archetype - all it really is is a holder for the
770 * object and pointers. This structure should get removed, and just replaced 795 * object and pointers. This structure should get removed, and just replaced
771 * by the object structure 796 * by the object structure
772 */ 797 */
773 798
799//-GPL
800
774INTERFACE_CLASS (archetype) 801INTERFACE_CLASS (archetype)
775struct archetype : object 802struct archetype : object
776{ 803{
777 static arch_ptr empty; // the empty_archetype 804 static arch_ptr empty; // the empty_archetype
778 MTH static void gc (); 805 MTH static void gc ();
779 806
780 archetype (const char *name); 807 archetype (const_utf8_string name);
781 ~archetype (); 808 ~archetype ();
782 void gather_callbacks (AV *&callbacks, event_type event) const; 809 void gather_callbacks (AV *&callbacks, event_type event) const;
783 810
784 MTH static archetype *find (const_utf8_string name); 811 MTH static archetype *find (const_utf8_string name);
785 812
786 MTH void link (); 813 MTH void link ();
787 MTH void unlink (); 814 MTH void unlink ();
788 815
789 MTH static object *get (const char *name); // (find() || singularity)->instance() 816 MTH static object *get (const_utf8_string name); // (find() || singularity)->instance()
790 MTH object *instance (); 817 MTH object *instance ();
818
819 MTH void post_load_check (); // do some adjustments after parsing
791 820
792 object_vector_index ACC (RW, archid); // index in archvector 821 object_vector_index ACC (RW, archid); // index in archvector
793 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 822 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
794 823
795 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ 824 sint8 ACC (RW, max_x); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
796 sint8 ACC (RW, max_x), ACC (RW, max_y);
797 825
798 // support for archetype loading 826 // support for archetype loading
799 static archetype *read (object_thawer &f); 827 static archetype *read (object_thawer &f);
800 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more 828 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
801 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */ 829 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
802}; 830};
803 831
804// compatbiility, remove once replaced by ->instance 832// returns whether the object is a dragon player, which are often specialcased
805inline object * 833inline bool
806arch_to_object (archetype *at) 834object::is_dragon () const
807{ 835{
808 return at->instance (); 836 return arch->race == shstr_dragon && is_player ();
809} 837}
810 838
811inline void 839inline void
812object_freezer::put (keyword k, archetype *v) 840object_freezer::put (const keyword_string k, archetype *v)
813{ 841{
814 put (k, v ? &v->archname : (const char *)0); 842 if (expect_true (v))
843 put (k, v->archname);
844 else
845 put (k);
815} 846}
816 847
817typedef object_vector<object, &object::index > objectvec; 848typedef object_vector<object, &object::index > objectvec;
818typedef object_vector<object, &object::active> activevec; 849typedef object_vector<object, &object::active> activevec;
819typedef object_vector<archetype, &archetype::archid> archvec; 850typedef object_vector<archetype, &archetype::archid> archvec;
… …
836 statementvar (object *, var, actives [_i]) 867 statementvar (object *, var, actives [_i])
837 868
838#define for_all_archetypes(var) \ 869#define for_all_archetypes(var) \
839 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \ 870 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
840 statementvar (archetype *, var, archetypes [_i]) 871 statementvar (archetype *, var, archetypes [_i])
872
873//+GPL
841 874
842/* Used by update_object to know if the object being passed is 875/* Used by update_object to know if the object being passed is
843 * being added or removed. 876 * being added or removed.
844 */ 877 */
845#define UP_OBJ_INSERT 1 878#define UP_OBJ_INSERT 1
… …
875#define INS_ABOVE_FLOOR_ONLY 0x0002 908#define INS_ABOVE_FLOOR_ONLY 0x0002
876#define INS_NO_WALK_ON 0x0004 909#define INS_NO_WALK_ON 0x0004
877#define INS_ON_TOP 0x0008 910#define INS_ON_TOP 0x0008
878#define INS_BELOW_ORIGINATOR 0x0010 911#define INS_BELOW_ORIGINATOR 0x0010
879 912
880#define ARCH_DEPLETION "depletion" 913//-GPL
881 914
882#endif 915#endif
883 916

Diff Legend

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