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.210 by root, Sun Oct 11 05:31:54 2009 UTC vs.
Revision 1.227 by root, Fri Mar 26 00:05:45 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#ifndef OBJECT_H 25#ifndef OBJECT_H
… …
26 27
27#include <bitset> 28#include <bitset>
28 29
29#include "cfperl.h" 30#include "cfperl.h"
30#include "shstr.h" 31#include "shstr.h"
32
33//+GPL
31 34
32typedef int tag_t; 35typedef int tag_t;
33 36
34enum { 37enum {
35 body_skill, 38 body_skill,
… …
84{ 87{
85 key_value *next; 88 key_value *next;
86 shstr key, value; 89 shstr key, value;
87}; 90};
88 91
92//-GPL
93
89struct UUID 94struct UUID
90{ 95{
91 uint64 seq; 96 uint64 seq;
97
98 enum { MAX_LEN = 3 + 16 + 1 + 1 }; // <1. + hex + > + \0
92 99
93 static UUID cur; // last uuid generated 100 static UUID cur; // last uuid generated
94 static void init (); 101 static void init ();
95 static UUID gen (); 102 static UUID gen ();
96 103
97 UUID () { } 104 UUID () { }
98 UUID (uint64 seq) : seq(seq) { } 105 UUID (uint64 seq) : seq(seq) { }
99 operator uint64() { return seq; } 106 operator uint64() { return seq; }
100 void operator =(uint64 seq) { this->seq = seq; } 107 void operator =(uint64 seq) { this->seq = seq; }
101 108
102 typedef char BUF [32];
103
104 bool parse (const char *s) 109 bool parse (const char *s);
105 { 110 char *append (char *buf) const;
106 return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
107 }
108
109 const char *c_str (char *buf, int len) const
110 {
111 snprintf (buf, len, "<1.%" PRIx64 ">", seq);
112
113 return buf;
114 }
115
116 const char *c_str () const 111 char *c_str () const;
117 {
118 static BUF buf;
119
120 return c_str (buf, sizeof (buf));
121 }
122}; 112};
113
114//+GPL
123 115
124/* Definition for WILL_APPLY values. Replaces having harcoded values 116/* Definition for WILL_APPLY values. Replaces having harcoded values
125 * 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
126 * 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
127 * can_apply and will_apply? 119 * can_apply and will_apply?
… …
132#define WILL_APPLY_DOOR 0x08 124#define WILL_APPLY_DOOR 0x08
133#define WILL_APPLY_FOOD 0x10 125#define WILL_APPLY_FOOD 0x10
134 126
135struct body_slot 127struct body_slot
136{ 128{
129 signed char used:4; /* Calculated value based on items equipped */
137 signed char info:4; /* body info as loaded from the file */ 130 signed char info:4; /* body info as loaded from the file */
138 signed char used:4; /* Calculated value based on items equipped */
139}; 131};
140 132
141typedef struct oblnk 133typedef struct oblnk
142{ /* Used to link together several objects */ 134{ /* Used to link together several objects */
143 object_ptr ob; 135 object_ptr ob;
… …
173 flags_t flag; /* various flags */ 165 flags_t flag; /* various flags */
174#if FOR_PERL 166#if FOR_PERL
175 bool ACC (RW, flag[NUM_FLAGS]); 167 bool ACC (RW, flag[NUM_FLAGS]);
176#endif 168#endif
177 169
178 shstr ACC (RW, materialname); /* specific material name */ 170 materialtype_t *material; // What material this object consists of //TODO, make perl-accessible
179 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 */
180// materialtype_t *ACC (RW, material); /* What material this object consists of */
181 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 */
182 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 */
183 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 */
184 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */ 175 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
185 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 */
… …
220 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 211 uint8 ACC (RW, pick_up); /* See crossfire.doc */
221 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) */
222 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 */
223 uint8 ACC (RW, weapontype); /* type of weapon */ 214 uint8 ACC (RW, weapontype); /* type of weapon */
224 215
216 body_slot slot [NUM_BODY_LOCATIONS];
217
225 faceidx ACC (RW, face); /* the graphical face */ 218 faceidx ACC (RW, face); /* the graphical face */
226 219
227 faceidx ACC (RW, sound); /* the sound face */ 220 faceidx ACC (RW, sound); /* the sound face */
228 faceidx ACC (RW, sound_destroy); /* played on destroy */ 221 faceidx ACC (RW, sound_destroy); /* played on destroy */
229
230 body_slot slot [NUM_BODY_LOCATIONS];
231 222
232 sint32 ACC (RW, weight); /* Attributes of the object */ 223 sint32 ACC (RW, weight); /* Attributes of the object */
233 sint32 ACC (RW, weight_limit);/* Weight-limit of object */ 224 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
234 225
235 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 */
… …
294 shstr ACC (RW, lore); /* Obscure information about this object, */ 285 shstr ACC (RW, lore); /* Obscure information about this object, */
295 /* To get put into books and the like. */ 286 /* To get put into books and the like. */
296 shstr ACC (RW, custom_name); /* Custom name assigned by player */ 287 shstr ACC (RW, custom_name); /* Custom name assigned by player */
297}; 288};
298 289
299const char *query_weight (const object *op); 290const_utf8_string query_weight (const object *op);
300const char *query_short_name (const object *op); 291const_utf8_string query_short_name (const object *op);
301const char *query_name (const object *op); 292const_utf8_string query_name (const object *op);
302const char *query_base_name (const object *op, int plural); 293const_utf8_string query_base_name (const object *op, int plural);
303 294
304struct object : zero_initialised, object_copy 295struct object : zero_initialised, object_copy
305{ 296{
306 // These variables are not changed by ->copy_to 297 // These variables are not changed by ->copy_to
307 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 */
… …
317 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 */
318 /* Note: stacked in the *same* environment */ 309 /* Note: stacked in the *same* environment */
319 object *inv; /* Pointer to the first object in the inventory */ 310 object *inv; /* Pointer to the first object in the inventory */
320 311
321 //TODO: container must move into client 312 //TODO: container must move into client
322 object_ptr ACC (RW, container); /* Current container being used. I think this 313 object_ptr ACC (RW, container);/* Currently opened container. I think this
323 * is only used by the player right now. 314 * is only used by the player right now.
324 */ 315 */
325 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.
326 * This is typically the container that the object is in. 317 * This is typically the container that the object is in.
327 */ 318 */
328 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 */
329 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
330 client_container *seen_by; // seen by which player/container currently?
331 key_value *key_values; /* Fields not explictly known by the loader. */ 321 key_value *key_values; /* Fields not explictly known by the loader. */
332 322
333 // privates / perl 323 // privates / perl
334 shstr_tmp kv_get (shstr_tmp key) const; 324 shstr_tmp kv_get (shstr_tmp key) const;
335 void kv_del (shstr_tmp key); 325 void kv_del (shstr_tmp key);
336 void kv_set (shstr_tmp key, shstr_tmp value); 326 void kv_set (shstr_tmp key, shstr_tmp value);
327
328//-GPL
337 329
338 // custom extra fields management 330 // custom extra fields management
339 struct key_value_access_proxy 331 struct key_value_access_proxy
340 { 332 {
341 object &ob; 333 object &ob;
… …
387 379
388 // 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
389 MTH void destroy_inv (bool drop_to_ground = false); 381 MTH void destroy_inv (bool drop_to_ground = false);
390 MTH object *insert (object *item); // insert into inventory 382 MTH object *insert (object *item); // insert into inventory
391 MTH void play_sound (faceidx sound) const; 383 MTH void play_sound (faceidx sound) const;
392 MTH void say_msg (const char *msg) const; 384 MTH void say_msg (const_utf8_string msg) const;
393 385
394 void do_remove (); 386 void do_remove ();
395 MTH void remove () 387 MTH void remove ()
396 { 388 {
397 if (!flag [FLAG_REMOVED]) 389 if (!flag [FLAG_REMOVED])
… …
412 404
413 int move (int dir) 405 int move (int dir)
414 { 406 {
415 return move (dir, this); 407 return move (dir, this);
416 } 408 }
409
410 // changes move_type to a new value - handles move_on/move_off effects
411 void change_move_type (MoveType mt);
417 412
418 static bool can_merge_slow (object *op1, object *op2); 413 static bool can_merge_slow (object *op1, object *op2);
419 414
420 // this is often used in time-critical code, so optimise 415 // this is often used in time-critical code, so optimise
421 MTH static bool can_merge (object *op1, object *op2) 416 MTH static bool can_merge (object *op1, object *op2)
… …
435 MTH void close_container () 430 MTH void close_container ()
436 { 431 {
437 open_container (0); 432 open_container (0);
438 } 433 }
439 434
435 // potential future accessor for "container"
436 MTH object *container_ () const
437 {
438 return container;
439 }
440
441 MTH bool is_open_container () const
442 {
443 // strangely enough, using ?: here causes code to inflate
444 return type == CONTAINER
445 && ((env && env->container_ () == this)
446 || (!env && flag [FLAG_APPLIED]));
447 }
448
440 MTH object *force_find (shstr_tmp name); 449 MTH object *force_find (shstr_tmp name);
450 MTH void force_set_timer (int duration);
441 MTH object *force_add (shstr_tmp name, int duration = 0); 451 MTH object *force_add (shstr_tmp name, int duration = 0);
442 452
443 oblinkpt *find_link () const; 453 oblinkpt *find_link () const;
444 MTH void add_link (maptile *map, shstr_tmp id); 454 MTH void add_link (maptile *map, shstr_tmp id);
445 MTH void remove_link (); 455 MTH void remove_link ();
… …
461 MTH void drain_stat (); 471 MTH void drain_stat ();
462 MTH void drain_specific_stat (int deplete_stats); 472 MTH void drain_specific_stat (int deplete_stats);
463 MTH void change_luck (int value); 473 MTH void change_luck (int value);
464 474
465 // info must hold 256 * 3 bytes currently 475 // info must hold 256 * 3 bytes currently
466 const char *debug_desc (char *info) const; 476 const_utf8_string debug_desc (char *info) const;
467 MTH const char *debug_desc () const; // uses at least 3 round-robin buffers 477 MTH const_utf8_string debug_desc () const; // uses at least 3 round-robin buffers
468 const char *flag_desc (char *desc, int len) const; 478 const_utf8_string flag_desc (char *desc, int len) const;
469 479
470 MTH bool decrease (sint32 nr = 1); // returns true if anything is left 480 MTH bool decrease (sint32 nr = 1); // returns true if anything is left
471 MTH object *split (sint32 nr = 1); // return 0 on failure 481 MTH object *split (sint32 nr = 1); // return 0 on failure
472 482
473 MTH int number_of () const 483 MTH int number_of () const
… …
481 } 491 }
482 492
483 MTH void update_weight (); 493 MTH void update_weight ();
484 494
485 // return the dominant material of this item, always return something 495 // return the dominant material of this item, always return something
486 const materialtype_t *dominant_material () const; 496 const materialtype_t *dominant_material () const
497 {
498 return material;
499 }
487 500
488 // return the volume of this object in cm³ 501 // return the volume of this object in cm³
489 MTH uint64 volume () const 502 MTH uint64 volume () const
490 { 503 {
491 return (uint64)total_weight () 504 return (uint64)total_weight ()
492 * 1000 505 * 1024 // 1000 actually
493 * (type == CONTAINER ? 1000 : 1) 506 * (type == CONTAINER ? 128 : 1)
494 / dominant_material ()->density; 507 / dominant_material ()->density; // ugh, division
495 } 508 }
496 509
497 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; } 510 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
498 511
499 MTH bool is_wiz () const { return flag [FLAG_WIZ]; } 512 MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
… …
508 MTH bool is_arrow () const { return type == ARROW 521 MTH bool is_arrow () const { return type == ARROW
509 || (type == SPELL_EFFECT 522 || (type == SPELL_EFFECT
510 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } 523 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
511 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; } 524 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
512 525
526 MTH bool is_dragon () const;
527
513 MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; } 528 MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
514 529
515 // temporary: wether the object can be saved in a map file 530 // temporary: wether the object can be saved in a map file
516 // contr => is a player 531 // contr => is a player
517 // head => only save head of a multitile object 532 // head => only save head of a multitile object
518 // owner => can not reference owner yet 533 // owner => can not reference owner yet
… …
606 MTH std::string long_desc (object *who = 0); // query_name . " " . describe 621 MTH std::string long_desc (object *who = 0); // query_name . " " . describe
607 MTH std::string describe_monster (object *who = 0); 622 MTH std::string describe_monster (object *who = 0);
608 MTH std::string describe_item (object *who = 0); 623 MTH std::string describe_item (object *who = 0);
609 MTH std::string describe (object *who = 0); // long description, without name 624 MTH std::string describe (object *who = 0); // long description, without name
610 625
611 MTH const char *query_weight () { return ::query_weight (this); } 626 MTH const_utf8_string query_weight () { return ::query_weight (this); }
612 MTH const char *query_name () { return ::query_name (this); } 627 MTH const_utf8_string query_name () { return ::query_name (this); }
613 MTH const char *query_short_name () { return ::query_short_name (this); } 628 MTH const_utf8_string query_short_name () { return ::query_short_name (this); }
614 MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); } 629 MTH const_utf8_string query_base_name (bool plural) { return ::query_base_name (this, plural); }
615 630
616 // If this object has no extra parts but should have them, 631 // If this object has no extra parts but should have them,
617 // add them, effectively expanding heads into multipart 632 // add them, effectively expanding heads into multipart
618 // objects. This method only works on objects not inserted 633 // objects. This method only works on objects not inserted
619 // anywhere. 634 // anywhere.
… …
622 MTH void create_treasure (treasurelist *tl, int flags = 0); 637 MTH void create_treasure (treasurelist *tl, int flags = 0);
623 638
624 // insert object at same map position as 'where' 639 // insert object at same map position as 'where'
625 // handles both inventory and map "positions" 640 // handles both inventory and map "positions"
626 MTH object *insert_at (object *where, object *originator = 0, int flags = 0); 641 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
642 // check whether we can put this into the map, respect max_nrof, max_volume, max_items
643 MTH bool can_drop_at (maptile *m, int x, int y, object *originator = 0);
627 MTH void drop_unpaid_items (); 644 MTH void drop_unpaid_items ();
628 645
629 MTH void activate (); 646 MTH void activate ();
630 MTH void deactivate (); 647 MTH void deactivate ();
631 MTH void activate_recursive (); 648 MTH void activate_recursive ();
… …
634 // set the given flag on all objects in the inventory recursively 651 // set the given flag on all objects in the inventory recursively
635 MTH void set_flag_inv (int flag, int value = 1); 652 MTH void set_flag_inv (int flag, int value = 1);
636 653
637 void enter_exit (object *exit);//Perl 654 void enter_exit (object *exit);//Perl
638 MTH void enter_map (maptile *newmap, int x, int y); 655 MTH void enter_map (maptile *newmap, int x, int y);
639 void player_goto (const char *path, int x, int y); // only for players 656 void player_goto (const_utf8_string path, int x, int y); // only for players
640 657
641 // returns the mapspace this object is in 658 // returns the mapspace this object is in
642 mapspace &ms () const; 659 mapspace &ms () const;
643 660
644 // fully recursive iterator 661 // fully recursive iterator
… …
695 return weight + carrying; 712 return weight + carrying;
696 } 713 }
697 714
698 MTH struct region *region () const; 715 MTH struct region *region () const;
699 716
700 void statusmsg (const char *msg, int color = NDI_BLACK); 717 void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
701 void failmsg (const char *msg, int color = NDI_RED); 718 void failmsg (const_utf8_string msg, int color = NDI_RED);
702 719
703 const char *query_inventory (object *who = 0, const char *indent = ""); 720 const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
704 721
705 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference 722 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
706 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible 723 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
707 724
708 // make some noise with given item into direction dir, 725 // make some noise with given item into direction dir,
… …
721 * range from 0 through 7. 738 * range from 0 through 7.
722 */ 739 */
723 MTH int anim_frames () const { return anim ().num_animations; } 740 MTH int anim_frames () const { return anim ().num_animations; }
724 MTH int anim_facings () const { return anim ().facings; } 741 MTH int anim_facings () const { return anim ().facings; }
725 742
726 MTH char *as_string (); 743 MTH utf8_string as_string ();
727 744
728protected: 745protected:
729 void link (); 746 void link ();
730 void unlink (); 747 void unlink ();
731 748
… …
737 object (const object &); 754 object (const object &);
738}; 755};
739 756
740// move this object to the top of its env's inventory to speed up 757// move this object to the top of its env's inventory to speed up
741// searches for it. 758// searches for it.
742static object * 759static inline object *
743splay (object *ob) 760splay (object *ob)
744{ 761{
745 if (ob->above && ob->env) 762 if (ob->above && ob->env)
746 { 763 {
747 if (ob->above) ob->above->below = ob->below; 764 if (ob->above) ob->above->below = ob->below;
… …
754 } 771 }
755 772
756 return ob; 773 return ob;
757} 774}
758 775
776//+GPL
777
759object *find_skill_by_name_fuzzy (object *who, const char *name); 778object *find_skill_by_name_fuzzy (object *who, const_utf8_string name);
760object *find_skill_by_name (object *who, shstr_cmp sh); 779object *find_skill_by_name (object *who, shstr_cmp sh);
761object *find_skill_by_number (object *who, int skillno); 780object *find_skill_by_number (object *who, int skillno);
762 781
763/* 782/*
764 * The archetype structure is a set of rules on how to generate and manipulate 783 * The archetype structure is a set of rules on how to generate and manipulate
… …
767 * be much left in the archetype - all it really is is a holder for the 786 * be much left in the archetype - all it really is is a holder for the
768 * object and pointers. This structure should get removed, and just replaced 787 * object and pointers. This structure should get removed, and just replaced
769 * by the object structure 788 * by the object structure
770 */ 789 */
771 790
791//-GPL
792
772INTERFACE_CLASS (archetype) 793INTERFACE_CLASS (archetype)
773struct archetype : object 794struct archetype : object
774{ 795{
775 static arch_ptr empty; // the empty_archetype 796 static arch_ptr empty; // the empty_archetype
776 MTH static void gc (); 797 MTH static void gc ();
777 798
778 archetype (const char *name); 799 archetype (const_utf8_string name);
779 ~archetype (); 800 ~archetype ();
780 void gather_callbacks (AV *&callbacks, event_type event) const; 801 void gather_callbacks (AV *&callbacks, event_type event) const;
781 802
782 MTH static archetype *find (const_utf8_string name); 803 MTH static archetype *find (const_utf8_string name);
783 804
784 MTH void link (); 805 MTH void link ();
785 MTH void unlink (); 806 MTH void unlink ();
786 807
787 MTH static object *get (const char *name); // (find() || singularity)->instance() 808 MTH static object *get (const_utf8_string name); // (find() || singularity)->instance()
788 MTH object *instance (); 809 MTH object *instance ();
810
811 MTH void post_load_check (); // do some adjustments after parsing
789 812
790 object_vector_index ACC (RW, archid); // index in archvector 813 object_vector_index ACC (RW, archid); // index in archvector
791 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 814 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
792 815
793 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ 816 sint8 ACC (RW, max_x); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
794 sint8 ACC (RW, max_x), ACC (RW, max_y);
795 817
796 // support for archetype loading 818 // support for archetype loading
797 static archetype *read (object_thawer &f); 819 static archetype *read (object_thawer &f);
798 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more 820 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
799 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */ 821 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
800}; 822};
801 823
802// compatbiility, remove once replaced by ->instance 824// returns whether the object is a dragon player, which are often specialcased
803inline object * 825inline bool
804arch_to_object (archetype *at) 826object::is_dragon () const
805{ 827{
806 return at->instance (); 828 return arch->race == shstr_dragon && is_player ();
807} 829}
808 830
809inline void 831inline void
810object_freezer::put (keyword k, archetype *v) 832object_freezer::put (const keyword_string k, archetype *v)
811{ 833{
812 put (k, v ? &v->archname : (const char *)0); 834 if (expect_true (v))
835 put (k, v->archname);
836 else
837 put (k);
813} 838}
814 839
815typedef object_vector<object, &object::index > objectvec; 840typedef object_vector<object, &object::index > objectvec;
816typedef object_vector<object, &object::active> activevec; 841typedef object_vector<object, &object::active> activevec;
817typedef object_vector<archetype, &archetype::archid> archvec; 842typedef object_vector<archetype, &archetype::archid> archvec;
… …
834 statementvar (object *, var, actives [_i]) 859 statementvar (object *, var, actives [_i])
835 860
836#define for_all_archetypes(var) \ 861#define for_all_archetypes(var) \
837 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \ 862 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
838 statementvar (archetype *, var, archetypes [_i]) 863 statementvar (archetype *, var, archetypes [_i])
864
865//+GPL
839 866
840/* Used by update_object to know if the object being passed is 867/* Used by update_object to know if the object being passed is
841 * being added or removed. 868 * being added or removed.
842 */ 869 */
843#define UP_OBJ_INSERT 1 870#define UP_OBJ_INSERT 1
… …
873#define INS_ABOVE_FLOOR_ONLY 0x0002 900#define INS_ABOVE_FLOOR_ONLY 0x0002
874#define INS_NO_WALK_ON 0x0004 901#define INS_NO_WALK_ON 0x0004
875#define INS_ON_TOP 0x0008 902#define INS_ON_TOP 0x0008
876#define INS_BELOW_ORIGINATOR 0x0010 903#define INS_BELOW_ORIGINATOR 0x0010
877 904
878#define ARCH_DEPLETION "depletion" 905//-GPL
879 906
880#endif 907#endif
881 908

Diff Legend

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