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.117 by root, Mon May 7 04:21:11 2007 UTC vs.
Revision 1.162 by root, Sun Apr 20 22:03:21 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer Online RPG 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at crossfire@schmorp.de 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#ifndef OBJECT_H 24#ifndef OBJECT_H
26#define OBJECT_H 25#define OBJECT_H
27 26
30#include "cfperl.h" 29#include "cfperl.h"
31#include "shstr.h" 30#include "shstr.h"
32 31
33typedef int tag_t; 32typedef int tag_t;
34 33
35#define NUM_BODY_LOCATIONS 14 34enum {
36#define BODY_ARMS 1 35 body_skill,
36 body_combat,
37 body_range,
38 body_shield,
39 body_arm,
40 body_torso,
41 body_head,
42 body_neck,
43 body_finger,
44 body_shoulder,
45 body_foot,
46 body_hand,
47 body_wrist,
48 body_waist,
49 NUM_BODY_LOCATIONS
50};
51
52enum slottype_t
53{
54 slot_none,
55 slot_combat,
56 slot_ranged,
57};
37 58
38/* See common/item.c */ 59/* See common/item.c */
39 60
40typedef struct Body_Locations 61typedef struct Body_Locations
41{ 62{
42 const char *save_name; /* Name used to load/save it to disk */ 63 keyword save_name; /* Name used to load/save it to disk */
43 const char *use_name; /* Name used when describing an item we can use */ 64 const char *use_name; /* Name used when describing an item we can use */
44 const char *nonuse_name; /* Name to describe objects we can't use */ 65 const char *nonuse_name; /* Name to describe objects we can't use */
45} Body_Locations; 66} Body_Locations;
46 67
47extern Body_Locations body_locations[NUM_BODY_LOCATIONS]; 68extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
69
70#define NUM_COINS 4 /* number of coin types */
71extern const char *const coins[NUM_COINS + 1];
48 72
49/* 73/*
50 * Each object (this also means archetypes!) could have a few of these 74 * Each object (this also means archetypes!) could have a few of these
51 * "dangling" from it; this could also end up containing 'parse errors'. 75 * "dangling" from it; this could also end up containing 'parse errors'.
52 * 76 *
64 88
65struct UUID 89struct UUID
66{ 90{
67 uint64 seq; 91 uint64 seq;
68 92
93 static UUID cur; // last uuid generated
94 static void init ();
95 static UUID gen ();
96
69 UUID () { } 97 UUID () { }
70 UUID (uint64 seq) : seq(seq) { } 98 UUID (uint64 seq) : seq(seq) { }
71 operator uint64() { return seq; } 99 operator uint64() { return seq; }
72 void operator =(uint64 seq) { this->seq = seq; } 100 void operator =(uint64 seq) { this->seq = seq; }
73};
74 101
75extern void init_uuid (); 102 typedef char BUF [32];
76extern UUID gen_uuid (); 103
77extern const uint64 UUID_SKIP; 104 bool parse (const char *s)
105 {
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
117 {
118 static BUF buf;
119
120 return c_str (buf, sizeof (buf));
121 }
122};
78 123
79/* Definition for WILL_APPLY values. Replaces having harcoded values 124/* Definition for WILL_APPLY values. Replaces having harcoded values
80 * sprinkled in the code. Note that some of these also replace fields 125 * sprinkled in the code. Note that some of these also replace fields
81 * that were in the can_apply area. What is the point of having both 126 * that were in the can_apply area. What is the point of having both
82 * can_apply and will_apply? 127 * can_apply and will_apply?
85#define WILL_APPLY_TREASURE 0x02 130#define WILL_APPLY_TREASURE 0x02
86#define WILL_APPLY_EARTHWALL 0x04 131#define WILL_APPLY_EARTHWALL 0x04
87#define WILL_APPLY_DOOR 0x08 132#define WILL_APPLY_DOOR 0x08
88#define WILL_APPLY_FOOD 0x10 133#define WILL_APPLY_FOOD 0x10
89 134
90/* However, if you're keeping a pointer of some sort, you probably
91 * don't just want it copied, so you'll need to add to common/object.C,
92 * e.g. ->copy_to ()
93 */
94
95struct body_slot 135struct body_slot
96{ 136{
97 signed char info:4; /* body info as loaded from the file */ 137 signed char info:4; /* body info as loaded from the file */
98 signed char used:4; /* Calculated value based on items equipped */ 138 signed char used:4; /* Calculated value based on items equipped */
99}; 139};
115 shstr ACC (RW, name_pl); /* The plural name of the object */ 155 shstr ACC (RW, name_pl); /* The plural name of the object */
116 shstr ACC (RW, title); /* Of foo, etc */ 156 shstr ACC (RW, title); /* Of foo, etc */
117 shstr ACC (RW, race); /* human, goblin, dragon, etc */ 157 shstr ACC (RW, race); /* human, goblin, dragon, etc */
118 shstr ACC (RW, slaying); /* Which race to do double damage to */ 158 shstr ACC (RW, slaying); /* Which race to do double damage to */
119 /* If this is an exit, this is the filename */ 159 /* If this is an exit, this is the filename */
160 shstr ACC (RW, tag); // a tag used to tracking this object
120 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ 161 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
121 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */ 162 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
122 shstr ACC (RW, lore); /* Obscure information about this object, */ 163 shstr ACC (RW, lore); /* Obscure information about this object, */
123 /* To get put into books and the like. */ 164 /* To get put into books and the like. */
124 shstr ACC (RW, materialname); /* specific material name */ 165 shstr ACC (RW, materialname); /* specific material name */
168 sint32 ACC (RW, carrying); /* How much weight this object contains */ 209 sint32 ACC (RW, carrying); /* How much weight this object contains */
169 sint64 ACC (RW, perm_exp); /* Permanent exp */ 210 sint64 ACC (RW, perm_exp); /* Permanent exp */
170 uint32 ACC (RW, weapontype); /* type of weapon */ 211 uint32 ACC (RW, weapontype); /* type of weapon */
171 uint32 ACC (RW, tooltype); /* type of tool or build facility */ 212 uint32 ACC (RW, tooltype); /* type of tool or build facility */
172 body_slot slot [NUM_BODY_LOCATIONS]; 213 body_slot slot [NUM_BODY_LOCATIONS];
173 faceidx ACC (RW, face); /* Face with colors */ 214 faceidx ACC (RW, face); /* the graphical face */
215 faceidx ACC (RW, sound); /* the sound face */
216 faceidx ACC (RW, sound_destroy); /* played on destroy */
174 living ACC (RO, stats); /* Str, Con, Dex, etc */ 217 living ACC (RO, stats); /* Str, Con, Dex, etc */
175 /* See the pod/objects.pod for more info about body locations */ 218 /* See the pod/objects.pod for more info about body locations */
176 219
177 /* Following mostly refers to fields only used for monsters */ 220 /* Following mostly refers to fields only used for monsters */
178 uint32 ACC (RW, hide); /* The object is hidden, not invisible */ 221 uint32 ACC (RW, hide); /* The object is hidden, not invisible */
229 // These variables are not changed by ->copy_to 272 // These variables are not changed by ->copy_to
230 maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */ 273 maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */
231 274
232 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. 275 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
233 int ACC (RO, count); 276 int ACC (RO, count);
234 int ACC (RO, index); // index into objects 277 object_vector_index ACC (RO, index); // index into objects
235 int ACC (RO, active); // index into actives 278 object_vector_index ACC (RO, active); // index into actives
236 279
237 player_ptr ACC (RW, contr); /* Pointer to the player which control this object */ 280 player_ptr ACC (RW, contr); /* Pointer to the player which control this object, ALWAYS set *iff* type == PLAYER */
238 281
239 object *ACC (RW, below); /* Pointer to the object stacked below this one */ 282 object *ACC (RW, below); /* Pointer to the object stacked below this one */
240 object *ACC (RW, above); /* Pointer to the object stacked above this one */ 283 object *ACC (RW, above); /* Pointer to the object stacked above this one */
241 /* Note: stacked in the *same* environment */ 284 /* Note: stacked in the *same* environment */
242 object *inv; /* Pointer to the first object in the inventory */ 285 object *inv; /* Pointer to the first object in the inventory */
252 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 295 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
253 client_container *seen_by; // seen by which player/container currently? 296 client_container *seen_by; // seen by which player/container currently?
254 key_value *key_values; /* Fields not explictly known by the loader. */ 297 key_value *key_values; /* Fields not explictly known by the loader. */
255 298
256 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all 299 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
300 MTH void post_load_check (); // do some adjustments after parsing
257 static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go. 301 static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
258 bool write (object_freezer &f); 302 bool write (object_freezer &f);
259 303
304 MTH int slottype () const;
260 MTH static object *create (); 305 MTH static object *create ();
306 const mapxy &operator =(const mapxy &pos);
261 object &operator =(const object &src); 307 object &operator =(const object &src);
262 MTH void copy_to (object *dst); 308 MTH void copy_to (object *dst);
263 MTH object *clone (); // create + copy_to 309 MTH object *clone (); // create + copy_to
264 void do_destroy (); 310 void do_destroy ();
265 void gather_callbacks (AV *&callbacks, event_type event) const; 311 void gather_callbacks (AV *&callbacks, event_type event) const;
266 MTH void destroy (bool destroy_inventory = false); 312 MTH void destroy (bool destroy_inventory = false);
267 313
268 // recursively destroy all objects in inventory, optionally dropping them to the ground instead 314 // recursively destroy all objects in inventory, optionally dropping them to the ground instead
269 MTH void destroy_inv (bool drop_to_ground = false); 315 MTH void destroy_inv (bool drop_to_ground = false);
270 MTH object *insert (object *item); // insert into inventory 316 MTH object *insert (object *item); // insert into inventory
317 MTH void play_sound (faceidx sound) const;
318
271 void do_remove (); 319 void do_remove ();
272 MTH void remove () 320 MTH void remove ()
273 { 321 {
274 if (!flag [FLAG_REMOVED]) 322 if (!flag [FLAG_REMOVED])
275 do_remove (); 323 do_remove ();
324 }
325
326 MTH bool blocked (maptile *m, int x, int y) const;
327
328 void move_to (const mapxy &pos)
329 {
330 remove ();
331 *this = pos;
332 insert_at (this, this);
276 } 333 }
277 334
278 static bool can_merge_slow (object *op1, object *op2); 335 static bool can_merge_slow (object *op1, object *op2);
279 336
280 // this is often used in time-critical code, so optimise 337 // this is often used in time-critical code, so optimise
285 && can_merge_slow (op1, op2); 342 && can_merge_slow (op1, op2);
286 } 343 }
287 344
288 MTH void set_owner (object *owner); 345 MTH void set_owner (object *owner);
289 MTH void set_speed (float speed); 346 MTH void set_speed (float speed);
290 MTH void set_weapon (object *ob); 347 MTH bool change_weapon (object *ob);
348 MTH bool change_skill (object *ob);
291 349
292 MTH void open_container (object *new_container); 350 MTH void open_container (object *new_container);
293 MTH void close_container () 351 MTH void close_container ()
294 { 352 {
295 open_container (0); 353 open_container (0);
354 }
355
356 MTH object *force_find (const shstr name);
357 MTH void force_add (const shstr name, int duration = 0);
358
359 // overwrite the attachable should_invoke function with a version that also checks ev_want_type
360 bool should_invoke (event_type event)
361 {
362 return ev_want_event [event] || ev_want_type [type] || cb;
296 } 363 }
297 364
298 MTH void instantiate (); 365 MTH void instantiate ();
299 366
300 // recalculate all stats 367 // recalculate all stats
317 return nrof ? nrof : 1; 384 return nrof ? nrof : 1;
318 } 385 }
319 386
320 uint64 total_weight () const 387 uint64 total_weight () const
321 { 388 {
322 return weight * number_of (); 389 return weight * number_of () + carrying;
323 } 390 }
324 391
325 // return the dominant material of this item, always return something 392 // return the dominant material of this item, always return something
326 const materialtype_t *dominant_material () const; 393 const materialtype_t *dominant_material () const;
327 394
351 418
352 // temporary: wether the object can be saved in a map file 419 // temporary: wether the object can be saved in a map file
353 // contr => is a player 420 // contr => is a player
354 // head => only save head of a multitile object 421 // head => only save head of a multitile object
355 // owner => can not reference owner yet 422 // owner => can not reference owner yet
356 MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; } 423 MTH bool can_map_save () const { return !head && (!owner || owner->contr) && !contr && !flag [FLAG_NO_MAP_SAVE]; }
357 424
358 /* This return true if object has still randomitems which 425 /* This return true if object has still randomitems which
359 * could be expanded. 426 * could be expanded.
360 */ 427 */
361 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } 428 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
372 439
373 // "temporary" helper function 440 // "temporary" helper function
374 MTH object *head_ () 441 MTH object *head_ ()
375 { 442 {
376 return head ? head : this; 443 return head ? head : this;
444 }
445
446 MTH bool is_head ()
447 {
448 return head_ () == this;
377 } 449 }
378 450
379 MTH std::string long_desc (object *who = 0); 451 MTH std::string long_desc (object *who = 0);
380 MTH std::string describe_monster (object *who = 0); 452 MTH std::string describe_monster (object *who = 0);
381 MTH std::string describe_item (object *who = 0); 453 MTH std::string describe_item (object *who = 0);
390 MTH void create_treasure (treasurelist *tl, int flags = 0); 462 MTH void create_treasure (treasurelist *tl, int flags = 0);
391 463
392 // insert object at same map position as 'where' 464 // insert object at same map position as 'where'
393 // handles both inventory and map "positions" 465 // handles both inventory and map "positions"
394 MTH object *insert_at (object *where, object *originator = 0, int flags = 0); 466 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
467 MTH void drop_unpaid_items ();
395 468
396 MTH void activate (); 469 MTH void activate ();
397 MTH void deactivate (); 470 MTH void deactivate ();
398 MTH void activate_recursive (); 471 MTH void activate_recursive ();
399 MTH void deactivate_recursive (); 472 MTH void deactivate_recursive ();
400 473
401 // set the givne flag on all objects in the inventory recursively 474 // set the given flag on all objects in the inventory recursively
402 MTH void set_flag_inv (int flag, int value = 1); 475 MTH void set_flag_inv (int flag, int value = 1);
403 476
404 void enter_exit (object *exit);//Perl 477 void enter_exit (object *exit);//Perl
405 MTH void enter_map (maptile *newmap, int x, int y); 478 MTH void enter_map (maptile *newmap, int x, int y);
406 479
455 return !invisible && type != PLAYER; 528 return !invisible && type != PLAYER;
456 } 529 }
457 530
458 MTH struct region *region () const; 531 MTH struct region *region () const;
459 532
533 void statusmsg (const char *msg, int color = NDI_BLACK);
534 void failmsg (const char *msg, int color = NDI_RED);
535
536 const char *query_inventory (object *who = 0, const char *indent = "");
537
538 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
539 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
540
460protected: 541protected:
461 friend struct archetype;
462
463 void link (); 542 void link ();
464 void unlink (); 543 void unlink ();
465 544
466 object (); 545 object ();
467 ~object (); 546 ~object ();
468}; 547};
469 548
470typedef object_vector<object, &object::index > objectvec; 549// move this object to the top of its env's inventory to speed up
471typedef object_vector<object, &object::active> activevec; 550// searches for it.
551static object *
552splay (object *ob)
553{
554 if (ob->env && ob->env->inv != ob)
555 {
556 if (ob->above) ob->above->below = ob->below;
557 if (ob->below) ob->below->above = ob->above;
472 558
473extern objectvec objects; 559 ob->above = 0;
474extern activevec actives; 560 ob->below = ob->env->inv;
561 ob->below->above = ob;
562 ob->env->inv = ob;
563 }
475 564
476#define for_all_objects(var) \ 565 return ob;
477 for (unsigned _i = 0; _i < objects.size (); ++_i) \ 566}
478 declvar (object *, var, objects [_i])
479
480#define for_all_actives(var) \
481 for (unsigned _i = 0; _i < actives.size (); ++_i) \
482 declvar (object *, var, actives [_i])
483 567
484typedef struct oblnk 568typedef struct oblnk
485{ /* Used to link together several objects */ 569{ /* Used to link together several objects */
486 object_ptr ob; 570 object_ptr ob;
487 struct oblnk *next; 571 struct oblnk *next;
488} objectlink; 572} objectlink;
489 573
490typedef struct oblinkpt 574typedef struct oblinkpt
491{ /* Used to link together several object links */ 575{ /* Used to link together several object links */
492 struct oblnk *link; 576 struct oblnk *link;
493 long value; /* Used as connected value in buttons/gates */ 577 sint32 value; /* Used as connected value in buttons/gates */
494 struct oblinkpt *next; 578 struct oblinkpt *next;
495} oblinkpt; 579} oblinkpt;
580
581object *find_skill_by_name (object *who, const char *name);
582object *find_skill_by_name (object *who, const shstr &sh);
583object *find_skill_by_number (object *who, int skillno);
496 584
497/* 585/*
498 * The archetype structure is a set of rules on how to generate and manipulate 586 * The archetype structure is a set of rules on how to generate and manipulate
499 * objects which point to archetypes. 587 * objects which point to archetypes.
500 * This probably belongs in arch.h, but there really doesn't appear to 588 * This probably belongs in arch.h, but there really doesn't appear to
502 * object and pointers. This structure should get removed, and just replaced 590 * object and pointers. This structure should get removed, and just replaced
503 * by the object structure 591 * by the object structure
504 */ 592 */
505 593
506INTERFACE_CLASS (archetype) 594INTERFACE_CLASS (archetype)
507struct archetype : zero_initialised, attachable 595struct archetype : object
508{ 596{
509 archetype (); 597 static arch_ptr empty; // the empty_archetype
598 MTH static void gc ();
599
600 archetype (const char *name);
510 ~archetype (); 601 ~archetype ();
511 void gather_callbacks (AV *&callbacks, event_type event) const; 602 void gather_callbacks (AV *&callbacks, event_type event) const;
512 603
604 MTH static archetype *find (const_utf8_string name);
605
606 MTH void link ();
607 MTH void unlink ();
608
609 MTH object *instance ();
610
611 object_vector_index ACC (RW, archid); // index in archvector
612 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
613
614 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
615 sint8 ACC (RW, max_x), ACC (RW, max_y);
616
617 // support for archetype loading
513 static archetype *read (object_thawer &f); 618 static archetype *read (object_thawer &f);
514 static archetype *get (const char *name); // find or create 619 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
515 static archetype *find (const char *name); 620 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
516
517 void hash_add (); // add to hashtable
518 void hash_del (); // remove from hashtable
519
520 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
521 struct archetype *ACC (RW, next); /* Next archetype in a linked list */
522 struct archetype *ACC (RW, head); /* The main part of a linked object */
523 struct archetype *ACC (RW, more); /* Next part of a linked object */
524 object ACC (RO, clone); /* An object from which to do ->copy_to () */
525 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
526 bool ACC (RW, linked); // linked into list of heads
527 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
528 * in comparison to the head.
529 */
530}; 621};
622
623inline void
624object_freezer::put (keyword k, archetype *v)
625{
626 put (k, v ? &v->archname : (const char *)0);
627}
628
629typedef object_vector<object, &object::index > objectvec;
630typedef object_vector<object, &object::active> activevec;
631typedef object_vector<archetype, &archetype::archid> archvec;
632
633extern objectvec objects;
634extern activevec actives;
635extern archvec archetypes;
636
637#define for_all_objects(var) \
638 for (unsigned _i = 0; _i < objects.size (); ++_i) \
639 statementvar (object *, var, objects [_i])
640
641#define for_all_actives(var) \
642 for (unsigned _i = 0; _i < actives.size (); ++_i) \
643 statementvar (object *, var, actives [_i])
644
645#define for_all_archetypes(var) \
646 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
647 statementvar (archetype *, var, archetypes [_i])
531 648
532/* Used by update_object to know if the object being passed is 649/* Used by update_object to know if the object being passed is
533 * being added or removed. 650 * being added or removed.
534 */ 651 */
535#define UP_OBJ_INSERT 1 652#define UP_OBJ_INSERT 1
552 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator - 669 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator -
553 * Use for treasure chests so the new object is the highest thing 670 * Use for treasure chests so the new object is the highest thing
554 * beneath the player, but not actually above it. Note - the 671 * beneath the player, but not actually above it. Note - the
555 * map and x,y coordinates for the object to be inserted must 672 * map and x,y coordinates for the object to be inserted must
556 * match the originator. 673 * match the originator.
557 * INS_MAP_LOAD: disable lots of checkings done at insertion to
558 * speed up map loading process, as we assume the ordering in
559 * loaded map is correct.
560 * 674 *
561 * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY 675 * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY
562 * are mutually exclusive. The behaviour for passing more than one 676 * are mutually exclusive. The behaviour for passing more than one
563 * should be considered undefined - while you may notice what happens 677 * should be considered undefined - while you may notice what happens
564 * right now if you pass more than one, that could very well change 678 * right now if you pass more than one, that could very well change
567#define INS_NO_MERGE 0x0001 681#define INS_NO_MERGE 0x0001
568#define INS_ABOVE_FLOOR_ONLY 0x0002 682#define INS_ABOVE_FLOOR_ONLY 0x0002
569#define INS_NO_WALK_ON 0x0004 683#define INS_NO_WALK_ON 0x0004
570#define INS_ON_TOP 0x0008 684#define INS_ON_TOP 0x0008
571#define INS_BELOW_ORIGINATOR 0x0010 685#define INS_BELOW_ORIGINATOR 0x0010
572#define INS_MAP_LOAD 0x0020
573 686
574#define ARCH_SINGULARITY "singularity"
575#define ARCH_DETECT_MAGIC "detect_magic"
576#define ARCH_DEPLETION "depletion" 687#define ARCH_DEPLETION "depletion"
577#define ARCH_SYMPTOM "symptom"
578 688
579#endif 689#endif
580 690

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines