ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.39 by root, Wed Sep 13 02:05:19 2006 UTC vs.
Revision 1.102 by root, Mon Jan 1 17:34:11 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <loader.h> 33#include <loader.h>
35 34
35#include <bitset>
36
36int nrofallocobjects = 0; 37int nrofallocobjects = 0;
37static UUID uuid; 38static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
39 40
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 41object *active_objects; /* List of active objects that need to be processed */
42 42
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 45};
… …
106 _exit (1); 106 _exit (1);
107 } 107 }
108 108
109 uuid.seq = uid; 109 uuid.seq = uid;
110 write_uuid (); 110 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112 fclose (fp); 112 fclose (fp);
113} 113}
114 114
115UUID 115UUID
116gen_uuid () 116gen_uuid ()
… …
141 * objects with lists are rare, and lists stay short. If not, use a 141 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 142 * different structure or at least keep the lists sorted...
143 */ 143 */
144 144
145 /* For each field in wants, */ 145 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 146 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 147 {
148 key_value *has_field; 148 key_value *has_field;
149 149
150 /* Look for a field in has with the same key. */ 150 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 151 has_field = get_ob_key_link (has, wants_field->key);
… …
185 * 185 *
186 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
187 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
188 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
189 * 189 *
190 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
191 * 191 *
192 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
193 * check weight 193 * check weight
194 */ 194 */
195
196bool object::can_merge (object *ob1, object *ob2) 195bool object::can_merge_slow (object *ob1, object *ob2)
197{ 196{
198 /* A couple quicksanity checks */ 197 /* A couple quicksanity checks */
199 if ((ob1 == ob2) || (ob1->type != ob2->type)) 198 if (ob1 == ob2
199 || ob1->type != ob2->type
200 || ob1->speed != ob2->speed
201 || ob1->value != ob2->value
202 || ob1->name != ob2->name)
200 return 0; 203 return 0;
201 204
202 if (ob1->speed != ob2->speed) 205 //TODO: this ain't working well, use nicer and correct overflow check
203 return 0;
204
205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 206 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
206 * value could not be stored in a sint32 (which unfortunately sometimes is 207 * value could not be stored in a sint32 (which unfortunately sometimes is
207 * used to store nrof). 208 * used to store nrof).
208 */ 209 */
209 if (ob1->nrof + ob2->nrof >= 1UL << 31) 210 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
219 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 220 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
220 221
221 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
222 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 223 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
223 224
224 225 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 226 || ob1->arch != ob2->arch
226 * being locked in inventory should prevent merging.
227 * 0x4 in flags3 is CLIENT_SENT
228 */
229 if ((ob1->arch != ob2->arch) ||
230 (ob1->flags[0] != ob2->flags[0]) ||
231 (ob1->flags[1] != ob2->flags[1]) ||
232 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234 (ob1->name != ob2->name) || 227 || ob1->name != ob2->name
235 (ob1->title != ob2->title) || 228 || ob1->title != ob2->title
236 (ob1->msg != ob2->msg) || 229 || ob1->msg != ob2->msg
237 (ob1->weight != ob2->weight) || 230 || ob1->weight != ob2->weight
238 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 231 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240 (ob1->attacktype != ob2->attacktype) || 233 || ob1->attacktype != ob2->attacktype
241 (ob1->magic != ob2->magic) || 234 || ob1->magic != ob2->magic
242 (ob1->slaying != ob2->slaying) || 235 || ob1->slaying != ob2->slaying
243 (ob1->skill != ob2->skill) || 236 || ob1->skill != ob2->skill
244 (ob1->value != ob2->value) || 237 || ob1->value != ob2->value
245 (ob1->animation_id != ob2->animation_id) || 238 || ob1->animation_id != ob2->animation_id
246 (ob1->client_type != ob2->client_type) || 239 || ob1->client_type != ob2->client_type
247 (ob1->materialname != ob2->materialname) || 240 || ob1->materialname != ob2->materialname
248 (ob1->lore != ob2->lore) || 241 || ob1->lore != ob2->lore
249 (ob1->subtype != ob2->subtype) || 242 || ob1->subtype != ob2->subtype
250 (ob1->move_type != ob2->move_type) || 243 || ob1->move_type != ob2->move_type
251 (ob1->move_block != ob2->move_block) || 244 || ob1->move_block != ob2->move_block
252 (ob1->move_allow != ob2->move_allow) || 245 || ob1->move_allow != ob2->move_allow
253 (ob1->move_on != ob2->move_on) || 246 || ob1->move_on != ob2->move_on
254 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 247 || ob1->move_off != ob2->move_off
248 || ob1->move_slow != ob2->move_slow
249 || ob1->move_slow_penalty != ob2->move_slow_penalty)
255 return 0; 250 return 0;
256 251
257 /* This is really a spellbook check - really, we should 252 /* This is really a spellbook check - really, we should
258 * check all objects in the inventory. 253 * check all objects in the inventory.
259 */ 254 */
… …
262 /* if one object has inventory but the other doesn't, not equiv */ 257 /* if one object has inventory but the other doesn't, not equiv */
263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 258 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264 return 0; 259 return 0;
265 260
266 /* Now check to see if the two inventory objects could merge */ 261 /* Now check to see if the two inventory objects could merge */
267 if (!CAN_MERGE (ob1->inv, ob2->inv)) 262 if (!object::can_merge (ob1->inv, ob2->inv))
268 return 0; 263 return 0;
269 264
270 /* inventory ok - still need to check rest of this object to see 265 /* inventory ok - still need to check rest of this object to see
271 * if it is valid. 266 * if it is valid.
272 */ 267 */
… …
281 276
282 /* Note sure why the following is the case - either the object has to 277 /* Note sure why the following is the case - either the object has to
283 * be animated or have a very low speed. Is this an attempted monster 278 * be animated or have a very low speed. Is this an attempted monster
284 * check? 279 * check?
285 */ 280 */
286 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 281 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
287 return 0; 282 return 0;
288 283
289 switch (ob1->type) 284 switch (ob1->type)
290 { 285 {
291 case SCROLL: 286 case SCROLL:
… …
356 op = op->env; 351 op = op->env;
357 return op; 352 return op;
358} 353}
359 354
360/* 355/*
361 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
362 * a better check. We basically keeping traversing up until we can't
363 * or find a player.
364 */
365
366object *
367is_player_inv (object *op)
368{
369 for (; op != NULL && op->type != PLAYER; op = op->env)
370 if (op->env == op)
371 op->env = NULL;
372 return op;
373}
374
375/*
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 356 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 357 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 358 * The result of the dump is stored in the static global errmsg array.
379 */ 359 */
380 360
381void 361char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 362dump_object (object *op)
437{ 363{
438 if (op == NULL) 364 if (!op)
439 { 365 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 366
447void 367 object_freezer freezer;
448dump_all_objects (void) 368 save_object (freezer, op, 1);
449{ 369 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 370}
458 371
459/* 372/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 373 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 374 * multi-object 1 which is closest to the second object.
… …
481 */ 394 */
482 395
483object * 396object *
484find_object (tag_t i) 397find_object (tag_t i)
485{ 398{
486 object *op; 399 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 400 if (op->count == i)
490 break; 401 return op;
402
491 return op; 403 return 0;
492} 404}
493 405
494/* 406/*
495 * Returns the first object which has a name equal to the argument. 407 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 408 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 413find_object_name (const char *str)
502{ 414{
503 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
504 object *op; 416 object *op;
505 417
506 for (op = objects; op != NULL; op = op->next) 418 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 419 if (op->name == str_)
508 break; 420 break;
509 421
510 return op; 422 return op;
511} 423}
512 424
513void 425void
514free_all_object_data () 426free_all_object_data ()
515{ 427{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 429}
539 430
540/* 431/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 432 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 433 * skill and experience objects.
… …
575 } 466 }
576 467
577 op->key_values = 0; 468 op->key_values = 0;
578} 469}
579 470
580void object::clear ()
581{
582 attachable_base::clear ();
583
584 free_key_values (this);
585
586 owner = 0;
587 name = 0;
588 name_pl = 0;
589 title = 0;
590 race = 0;
591 slaying = 0;
592 skill = 0;
593 msg = 0;
594 lore = 0;
595 custom_name = 0;
596 materialname = 0;
597 contr = 0;
598 below = 0;
599 above = 0;
600 inv = 0;
601 container = 0;
602 env = 0;
603 more = 0;
604 head = 0;
605 map = 0;
606 active_next = 0;
607 active_prev = 0;
608
609 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
610
611 SET_FLAG (this, FLAG_REMOVED);
612
613 /* What is not cleared is next, prev, and count */
614
615 expmul = 1.0;
616 face = blank_face;
617 attacked_by_count = -1;
618
619 if (settings.casting_time)
620 casting_time = -1;
621}
622
623void object::clone (object *destination)
624{
625 *(object_copy *)destination = *this;
626 *(object_pod *)destination = *this;
627
628 if (self || cb)
629 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
630}
631
632/* 471/*
633 * copy object first frees everything allocated by the second object, 472 * copy_to first frees everything allocated by the dst object,
634 * and then copies the contends of the first object into the second 473 * and then copies the contents of itself into the second
635 * object, allocating what needs to be allocated. Basically, any 474 * object, allocating what needs to be allocated. Basically, any
636 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
637 * if the first object is freed, the pointers in the new object 476 * if the first object is freed, the pointers in the new object
638 * will point at garbage. 477 * will point at garbage.
639 */ 478 */
640void 479void
641copy_object (object *op2, object *op) 480object::copy_to (object *dst)
642{ 481{
643 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645 484
646 op2->clone (op); 485 *(object_copy *)dst = *this;
647 486
648 if (is_freed) 487 if (is_freed)
649 SET_FLAG (op, FLAG_FREED); 488 SET_FLAG (dst, FLAG_FREED);
489
650 if (is_removed) 490 if (is_removed)
651 SET_FLAG (op, FLAG_REMOVED); 491 SET_FLAG (dst, FLAG_REMOVED);
652 492
653 if (op2->speed < 0) 493 if (speed < 0)
654 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655 495
656 /* Copy over key_values, if any. */ 496 /* Copy over key_values, if any. */
657 if (op2->key_values) 497 if (key_values)
658 { 498 {
659 key_value *tail = 0; 499 key_value *tail = 0;
660 key_value *i; 500 key_value *i;
661 501
662 op->key_values = 0; 502 dst->key_values = 0;
663 503
664 for (i = op2->key_values; i; i = i->next) 504 for (i = key_values; i; i = i->next)
665 { 505 {
666 key_value *new_link = new key_value; 506 key_value *new_link = new key_value;
667 507
668 new_link->next = 0; 508 new_link->next = 0;
669 new_link->key = i->key; 509 new_link->key = i->key;
670 new_link->value = i->value; 510 new_link->value = i->value;
671 511
672 /* Try and be clever here, too. */ 512 /* Try and be clever here, too. */
673 if (!op->key_values) 513 if (!dst->key_values)
674 { 514 {
675 op->key_values = new_link; 515 dst->key_values = new_link;
676 tail = new_link; 516 tail = new_link;
677 } 517 }
678 else 518 else
679 { 519 {
680 tail->next = new_link; 520 tail->next = new_link;
681 tail = new_link; 521 tail = new_link;
682 } 522 }
683 } 523 }
684 } 524 }
685 525
686 update_ob_speed (op); 526 dst->set_speed (dst->speed);
527}
528
529object *
530object::clone ()
531{
532 object *neu = create ();
533 copy_to (neu);
534 return neu;
687} 535}
688 536
689/* 537/*
690 * If an object with the IS_TURNABLE() flag needs to be turned due 538 * If an object with the IS_TURNABLE() flag needs to be turned due
691 * to the closest player being on the other side, this function can 539 * to the closest player being on the other side, this function can
692 * be called to update the face variable, _and_ how it looks on the map. 540 * be called to update the face variable, _and_ how it looks on the map.
693 */ 541 */
694
695void 542void
696update_turn_face (object *op) 543update_turn_face (object *op)
697{ 544{
698 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 545 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
699 return; 546 return;
547
700 SET_ANIMATION (op, op->direction); 548 SET_ANIMATION (op, op->direction);
701 update_object (op, UP_OBJ_FACE); 549 update_object (op, UP_OBJ_FACE);
702} 550}
703 551
704/* 552/*
705 * Updates the speed of an object. If the speed changes from 0 to another 553 * Updates the speed of an object. If the speed changes from 0 to another
706 * value, or vice versa, then add/remove the object from the active list. 554 * value, or vice versa, then add/remove the object from the active list.
707 * This function needs to be called whenever the speed of an object changes. 555 * This function needs to be called whenever the speed of an object changes.
708 */ 556 */
709void 557void
710update_ob_speed (object *op) 558object::set_speed (float speed)
711{ 559{
712 extern int arch_init; 560 if (flag [FLAG_FREED] && speed)
713
714 /* No reason putting the archetypes objects on the speed list,
715 * since they never really need to be updated.
716 */
717
718 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
719 { 561 {
720 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 562 LOG (llevError, "Object %s is freed but has speed.\n", &name);
721#ifdef MANY_CORES
722 abort ();
723#else
724 op->speed = 0; 563 speed = 0;
725#endif
726 }
727
728 if (arch_init)
729 return;
730
731 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
732 { 564 }
733 /* If already on active list, don't do anything */
734 if (op->active_next || op->active_prev || op == active_objects)
735 return;
736 565
737 /* process_events() expects us to insert the object at the beginning 566 this->speed = speed;
738 * of the list. */
739 op->active_next = active_objects;
740 567
741 if (op->active_next != NULL) 568 if (has_active_speed ())
742 op->active_next->active_prev = op; 569 activate ();
743
744 active_objects = op;
745 }
746 else 570 else
747 { 571 deactivate ();
748 /* If not on the active list, nothing needs to be done */
749 if (!op->active_next && !op->active_prev && op != active_objects)
750 return;
751
752 if (op->active_prev == NULL)
753 {
754 active_objects = op->active_next;
755
756 if (op->active_next != NULL)
757 op->active_next->active_prev = NULL;
758 }
759 else
760 {
761 op->active_prev->active_next = op->active_next;
762
763 if (op->active_next)
764 op->active_next->active_prev = op->active_prev;
765 }
766
767 op->active_next = NULL;
768 op->active_prev = NULL;
769 }
770} 572}
771 573
772/* This function removes object 'op' from the list of active
773 * objects.
774 * This should only be used for style maps or other such
775 * reference maps where you don't want an object that isn't
776 * in play chewing up cpu time getting processed.
777 * The reverse of this is to call update_ob_speed, which
778 * will do the right thing based on the speed of the object.
779 */
780void
781remove_from_active_list (object *op)
782{
783 /* If not on the active list, nothing needs to be done */
784 if (!op->active_next && !op->active_prev && op != active_objects)
785 return;
786
787 if (op->active_prev == NULL)
788 {
789 active_objects = op->active_next;
790 if (op->active_next != NULL)
791 op->active_next->active_prev = NULL;
792 }
793 else
794 {
795 op->active_prev->active_next = op->active_next;
796 if (op->active_next)
797 op->active_next->active_prev = op->active_prev;
798 }
799 op->active_next = NULL;
800 op->active_prev = NULL;
801}
802
803/* 574/*
804 * update_object() updates the array which represents the map. 575 * update_object() updates the the map.
805 * It takes into account invisible objects (and represent squares covered 576 * It takes into account invisible objects (and represent squares covered
806 * by invisible objects by whatever is below them (unless it's another 577 * by invisible objects by whatever is below them (unless it's another
807 * invisible object, etc...) 578 * invisible object, etc...)
808 * If the object being updated is beneath a player, the look-window 579 * If the object being updated is beneath a player, the look-window
809 * of that player is updated (this might be a suboptimal way of 580 * of that player is updated (this might be a suboptimal way of
810 * updating that window, though, since update_object() is called _often_) 581 * updating that window, though, since update_object() is called _often_)
811 * 582 *
812 * action is a hint of what the caller believes need to be done. 583 * action is a hint of what the caller believes need to be done.
813 * For example, if the only thing that has changed is the face (due to
814 * an animation), we don't need to call update_position until that actually
815 * comes into view of a player. OTOH, many other things, like addition/removal
816 * of walls or living creatures may need us to update the flags now.
817 * current action are: 584 * current action are:
818 * UP_OBJ_INSERT: op was inserted 585 * UP_OBJ_INSERT: op was inserted
819 * UP_OBJ_REMOVE: op was removed 586 * UP_OBJ_REMOVE: op was removed
820 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 587 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
821 * as that is easier than trying to look at what may have changed. 588 * as that is easier than trying to look at what may have changed.
822 * UP_OBJ_FACE: only the objects face has changed. 589 * UP_OBJ_FACE: only the objects face has changed.
823 */ 590 */
824
825void 591void
826update_object (object *op, int action) 592update_object (object *op, int action)
827{ 593{
828 int update_now = 0, flags;
829 MoveType move_on, move_off, move_block, move_slow; 594 MoveType move_on, move_off, move_block, move_slow;
830 595
831 if (op == NULL) 596 if (op == NULL)
832 { 597 {
833 /* this should never happen */ 598 /* this should never happen */
834 LOG (llevDebug, "update_object() called for NULL object.\n"); 599 LOG (llevDebug, "update_object() called for NULL object.\n");
835 return; 600 return;
836 } 601 }
837 602
838 if (op->env != NULL) 603 if (op->env)
839 { 604 {
840 /* Animation is currently handled by client, so nothing 605 /* Animation is currently handled by client, so nothing
841 * to do in this case. 606 * to do in this case.
842 */ 607 */
843 return; 608 return;
… …
848 */ 613 */
849 if (!op->map || op->map->in_memory == MAP_SAVING) 614 if (!op->map || op->map->in_memory == MAP_SAVING)
850 return; 615 return;
851 616
852 /* make sure the object is within map boundaries */ 617 /* make sure the object is within map boundaries */
853 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 618 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
854 { 619 {
855 LOG (llevError, "update_object() called for object out of map!\n"); 620 LOG (llevError, "update_object() called for object out of map!\n");
856#ifdef MANY_CORES 621#ifdef MANY_CORES
857 abort (); 622 abort ();
858#endif 623#endif
859 return; 624 return;
860 } 625 }
861 626
862 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 627 mapspace &m = op->ms ();
863 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
864 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
865 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
866 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
867 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
868 628
629 if (!(m.flags_ & P_UPTODATE))
630 /* nop */;
869 if (action == UP_OBJ_INSERT) 631 else if (action == UP_OBJ_INSERT)
870 { 632 {
633 // this is likely overkill, TODO: revisit (schmorp)
871 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
872 update_now = 1;
873
874 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 635 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
875 update_now = 1; 636 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
876 637 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
638 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
877 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 639 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
878 update_now = 1;
879
880 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
881 update_now = 1;
882
883 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
884 update_now = 1;
885
886 if ((move_on | op->move_on) != move_on) 640 || (m.move_on | op->move_on ) != m.move_on
887 update_now = 1;
888
889 if ((move_off | op->move_off) != move_off) 641 || (m.move_off | op->move_off ) != m.move_off
890 update_now = 1; 642 || (m.move_slow | op->move_slow) != m.move_slow
891
892 /* This isn't perfect, but I don't expect a lot of objects to 643 /* This isn't perfect, but I don't expect a lot of objects to
893 * to have move_allow right now. 644 * to have move_allow right now.
894 */ 645 */
895 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
896 update_now = 1; 647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
897 648 m.flags_ = 0;
898 if ((move_slow | op->move_slow) != move_slow)
899 update_now = 1;
900 } 649 }
901 /* if the object is being removed, we can't make intelligent 650 /* if the object is being removed, we can't make intelligent
902 * decisions, because remove_ob can't really pass the object 651 * decisions, because remove_ob can't really pass the object
903 * that is being removed. 652 * that is being removed.
904 */ 653 */
905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
906 update_now = 1; 655 m.flags_ = 0;
907 else if (action == UP_OBJ_FACE) 656 else if (action == UP_OBJ_FACE)
908 /* Nothing to do for that case */ ; 657 /* Nothing to do for that case */ ;
909 else 658 else
910 LOG (llevError, "update_object called with invalid action: %d\n", action); 659 LOG (llevError, "update_object called with invalid action: %d\n", action);
911 660
912 if (update_now)
913 {
914 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
915 update_position (op->map, op->x, op->y);
916 }
917
918 if (op->more != NULL) 661 if (op->more)
919 update_object (op->more, action); 662 update_object (op->more, action);
920} 663}
921 664
922static unordered_vector<object *> mortals; 665object *object::first;
923static std::vector<object *, slice_allocator <object *> > freed;
924
925void object::free_mortals ()
926{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
928 if ((*i)->refcnt)
929 ++i; // further delay freeing
930 else
931 {
932 freed.push_back (*i);//D
933 //delete *i;
934 mortals.erase (i);
935 }
936
937 if (mortals.size() && 0)//D
938 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
939}
940 666
941object::object () 667object::object ()
942{ 668{
943 SET_FLAG (this, FLAG_REMOVED); 669 SET_FLAG (this, FLAG_REMOVED);
944 670
945 expmul = 1.0; 671 expmul = 1.0;
946 face = blank_face; 672 face = blank_face;
947 attacked_by_count = -1;
948} 673}
949 674
950object::~object () 675object::~object ()
951{ 676{
952 free_key_values (this); 677 free_key_values (this);
953} 678}
954 679
955void object::link () 680void object::link ()
956{ 681{
957 count = ++ob_count; 682 count = ++ob_count;
683 uuid = gen_uuid ();
958 684
959 prev = 0; 685 prev = 0;
960 next = objects; 686 next = object::first;
961 687
962 if (objects) 688 if (object::first)
963 objects->prev = this; 689 object::first->prev = this;
964 690
965 objects = this; 691 object::first = this;
966} 692}
967 693
968void object::unlink () 694void object::unlink ()
969{ 695{
970 count = 0;
971 uuid = gen_uuid ();
972
973 if (this == objects) 696 if (this == object::first)
974 objects = next; 697 object::first = next;
975 698
976 /* Remove this object from the list of used objects */ 699 /* Remove this object from the list of used objects */
977 if (prev)
978 {
979 prev->next = next; 700 if (prev) prev->next = next;
701 if (next) next->prev = prev;
702
980 prev = 0; 703 prev = 0;
981 }
982
983 if (next)
984 {
985 next->prev = prev;
986 next = 0; 704 next = 0;
705}
706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711}
712
713void
714object::activate ()
715{
716 /* If already on active list, don't do anything */
717 if (active ())
718 return;
719
720 if (has_active_speed ())
721 {
722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
725
726 if (active_next)
727 active_next->active_prev = this;
728
729 active_objects = this;
730 }
731}
732
733void
734object::activate_recursive ()
735{
736 activate ();
737
738 for (object *op = inv; op; op = op->above)
739 op->activate_recursive ();
740}
741
742/* This function removes object 'op' from the list of active
743 * objects.
744 * This should only be used for style maps or other such
745 * reference maps where you don't want an object that isn't
746 * in play chewing up cpu time getting processed.
747 * The reverse of this is to call update_ob_speed, which
748 * will do the right thing based on the speed of the object.
749 */
750void
751object::deactivate ()
752{
753 /* If not on the active list, nothing needs to be done */
754 if (!active ())
755 return;
756
757 if (active_prev == 0)
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772}
773
774void
775object::deactivate_recursive ()
776{
777 for (object *op = inv; op; op = op->above)
778 op->deactivate_recursive ();
779
780 deactivate ();
781}
782
783/*
784 * Remove and free all objects in the inventory of the given object.
785 * object.c ?
786 */
787void
788object::destroy_inv (bool drop_to_ground)
789{
790 // need to check first, because the checks below might segfault
791 // as we might be on an invalid mapspace and crossfire code
792 // is too buggy to ensure that the inventory is empty.
793 // corollary: if you create arrows etc. with stuff in tis inventory,
794 // cf will crash below with off-map x and y
795 if (!inv)
796 return;
797
798 /* Only if the space blocks everything do we not process -
799 * if some form of movement is allowed, let objects
800 * drop on that space.
801 */
802 if (!drop_to_ground
803 || !map
804 || map->in_memory != MAP_IN_MEMORY
805 || ms ().move_block == MOVE_ALL)
806 {
807 while (inv)
808 {
809 inv->destroy_inv (drop_to_ground);
810 inv->destroy ();
811 }
812 }
813 else
814 { /* Put objects in inventory onto this space */
815 while (inv)
816 {
817 object *op = inv;
818
819 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE
822 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE])
824 op->destroy ();
825 else
826 map->insert (op, x, y);
827 }
987 } 828 }
988} 829}
989 830
990object *object::create () 831object *object::create ()
991{ 832{
992 object *op;
993
994 if (freed.empty ())
995 op = new object; 833 object *op = new object;
996 else
997 {
998 // highly annoying, but the only way to get it stable right now
999 op = freed.back ();
1000 freed.pop_back ();
1001 op->~object ();
1002 new ((void *) op) object;
1003 }
1004
1005 op->link (); 834 op->link ();
1006 return op; 835 return op;
1007} 836}
1008 837
1009/* 838void
1010 * free_object() frees everything allocated by an object, removes 839object::do_destroy ()
1011 * it from the list of used objects, and puts it on the list of
1012 * free objects. The IS_FREED() flag is set in the object.
1013 * The object must have been removed by remove_ob() first for
1014 * this function to succeed.
1015 *
1016 * If free_inventory is set, free inventory as well. Else drop items in
1017 * inventory to the ground.
1018 */
1019void object::free (bool free_inventory)
1020{ 840{
1021 if (QUERY_FLAG (this, FLAG_FREED)) 841 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this);
843
844 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this);
846
847 if (!flag [FLAG_REMOVED])
848 remove ();
849
850 if (flag [FLAG_FREED])
1022 return; 851 return;
1023 852
1024 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 853 set_speed (0);
1025 remove_friendly_object (this);
1026 854
1027 if (!QUERY_FLAG (this, FLAG_REMOVED)) 855 flag [FLAG_FREED] = 1;
1028 remove_ob (this);
1029 856
1030 SET_FLAG (this, FLAG_FREED); 857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861
862 // hack to ensure that freed objects still have a valid map
863 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes
865
866 if (!freed_map)
867 {
868 freed_map = new maptile;
869
870 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3;
872 freed_map->height = 3;
873
874 freed_map->alloc ();
875 }
876
877 map = freed_map;
878 x = 1;
879 y = 1;
880 }
881
882 head = 0;
1031 883
1032 if (more) 884 if (more)
1033 { 885 {
1034 more->free (free_inventory); 886 more->destroy ();
1035 more = 0; 887 more = 0;
1036 } 888 }
1037 889
1038 if (inv) 890 // clear those pointers that likely might have circular references to us
1039 {
1040 /* Only if the space blocks everything do we not process -
1041 * if some form of movement is allowed, let objects
1042 * drop on that space.
1043 */
1044 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1045 {
1046 object *op = inv;
1047
1048 while (op)
1049 {
1050 object *tmp = op->below;
1051 op->free (free_inventory);
1052 op = tmp;
1053 }
1054 }
1055 else
1056 { /* Put objects in inventory onto this space */
1057 object *op = inv;
1058
1059 while (op)
1060 {
1061 object *tmp = op->below;
1062
1063 remove_ob (op);
1064
1065 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1066 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1067 free_object (op);
1068 else
1069 {
1070 op->x = x;
1071 op->y = y;
1072 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1073 }
1074
1075 op = tmp;
1076 }
1077 }
1078 }
1079
1080 owner = 0; 891 owner = 0;
892 enemy = 0;
893 attacked_by = 0;
1081 894
1082 /* Remove object from the active list */ 895 // only relevant for players(?), but make sure of it anyways
1083 speed = 0; 896 contr = 0;
1084 update_ob_speed (this); 897}
1085 898
1086 unlink (); 899void
900object::destroy (bool destroy_inventory)
901{
902 if (destroyed ())
903 return;
1087 904
1088 mortals.push_back (this); 905 if (destroy_inventory)
906 destroy_inv (false);
907
908 attachable::destroy ();
1089} 909}
1090 910
1091/* 911/*
1092 * sub_weight() recursively (outwards) subtracts a number from the 912 * sub_weight() recursively (outwards) subtracts a number from the
1093 * weight of an object (and what is carried by it's environment(s)). 913 * weight of an object (and what is carried by it's environment(s)).
1094 */ 914 */
1095
1096void 915void
1097sub_weight (object *op, signed long weight) 916sub_weight (object *op, signed long weight)
1098{ 917{
1099 while (op != NULL) 918 while (op != NULL)
1100 { 919 {
1101 if (op->type == CONTAINER) 920 if (op->type == CONTAINER)
1102 {
1103 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 921 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104 } 922
1105 op->carrying -= weight; 923 op->carrying -= weight;
1106 op = op->env; 924 op = op->env;
1107 } 925 }
1108} 926}
1109 927
1110/* remove_ob(op): 928/* op->remove ():
1111 * This function removes the object op from the linked list of objects 929 * This function removes the object op from the linked list of objects
1112 * which it is currently tied to. When this function is done, the 930 * which it is currently tied to. When this function is done, the
1113 * object will have no environment. If the object previously had an 931 * object will have no environment. If the object previously had an
1114 * environment, the x and y coordinates will be updated to 932 * environment, the x and y coordinates will be updated to
1115 * the previous environment. 933 * the previous environment.
1116 * Beware: This function is called from the editor as well! 934 * Beware: This function is called from the editor as well!
1117 */ 935 */
1118
1119void 936void
1120remove_ob (object *op) 937object::remove ()
1121{ 938{
939 object *tmp, *last = 0;
1122 object * 940 object *otmp;
1123 tmp, *
1124 last = NULL;
1125 object *
1126 otmp;
1127 941
1128 tag_t
1129 tag;
1130 int
1131 check_walk_off;
1132 mapstruct *
1133 m;
1134
1135 sint16
1136 x,
1137 y;
1138
1139 if (QUERY_FLAG (op, FLAG_REMOVED)) 942 if (QUERY_FLAG (this, FLAG_REMOVED))
1140 return; 943 return;
1141 944
1142 SET_FLAG (op, FLAG_REMOVED); 945 SET_FLAG (this, FLAG_REMOVED);
946 INVOKE_OBJECT (REMOVE, this);
1143 947
1144 if (op->more != NULL) 948 if (more)
1145 remove_ob (op->more); 949 more->remove ();
1146 950
1147 /* 951 /*
1148 * In this case, the object to be removed is in someones 952 * In this case, the object to be removed is in someones
1149 * inventory. 953 * inventory.
1150 */ 954 */
1151 if (op->env != NULL) 955 if (env)
1152 { 956 {
1153 if (op->nrof) 957 if (nrof)
1154 sub_weight (op->env, op->weight * op->nrof); 958 sub_weight (env, weight * nrof);
1155 else 959 else
1156 sub_weight (op->env, op->weight + op->carrying); 960 sub_weight (env, weight + carrying);
1157 961
1158 /* NO_FIX_PLAYER is set when a great many changes are being 962 /* NO_FIX_PLAYER is set when a great many changes are being
1159 * made to players inventory. If set, avoiding the call 963 * made to players inventory. If set, avoiding the call
1160 * to save cpu time. 964 * to save cpu time.
1161 */ 965 */
1162 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163 fix_player (otmp); 967 otmp->update_stats ();
1164 968
1165 if (op->above != NULL) 969 if (above)
1166 op->above->below = op->below; 970 above->below = below;
1167 else 971 else
1168 op->env->inv = op->below; 972 env->inv = below;
1169 973
1170 if (op->below != NULL) 974 if (below)
1171 op->below->above = op->above; 975 below->above = above;
1172 976
1173 /* we set up values so that it could be inserted into 977 /* we set up values so that it could be inserted into
1174 * the map, but we don't actually do that - it is up 978 * the map, but we don't actually do that - it is up
1175 * to the caller to decide what we want to do. 979 * to the caller to decide what we want to do.
1176 */ 980 */
1177 op->x = op->env->x, op->y = op->env->y; 981 x = env->x, y = env->y;
1178 op->map = op->env->map; 982 map = env->map;
1179 op->above = NULL, op->below = NULL; 983 above = 0, below = 0;
1180 op->env = NULL; 984 env = 0;
1181 } 985 }
1182 else if (op->map) 986 else if (map)
1183 { 987 {
1184 x = op->x; 988 if (type == PLAYER)
1185 y = op->y;
1186 m = get_map_from_coord (op->map, &x, &y);
1187
1188 if (!m)
1189 {
1190 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1191 op->map->path, op->x, op->y);
1192 /* in old days, we used to set x and y to 0 and continue.
1193 * it seems if we get into this case, something is probablye
1194 * screwed up and should be fixed.
1195 */
1196 abort ();
1197 } 989 {
1198 990 --map->players;
1199 if (op->map != m) 991 map->touch ();
1200 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1201 op->map->path, m->path, op->x, op->y, x, y);
1202
1203 /* Re did the following section of code - it looks like it had
1204 * lots of logic for things we no longer care about
1205 */ 992 }
993
994 map->dirty = true;
1206 995
1207 /* link the object above us */ 996 /* link the object above us */
1208 if (op->above) 997 if (above)
1209 op->above->below = op->below; 998 above->below = below;
1210 else 999 else
1211 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1000 map->at (x, y).top = below; /* we were top, set new top */
1212 1001
1213 /* Relink the object below us, if there is one */ 1002 /* Relink the object below us, if there is one */
1214 if (op->below) 1003 if (below)
1215 op->below->above = op->above; 1004 below->above = above;
1216 else 1005 else
1217 { 1006 {
1218 /* Nothing below, which means we need to relink map object for this space 1007 /* Nothing below, which means we need to relink map object for this space
1219 * use translated coordinates in case some oddness with map tiling is 1008 * use translated coordinates in case some oddness with map tiling is
1220 * evident 1009 * evident
1221 */ 1010 */
1222 if (GET_MAP_OB (m, x, y) != op) 1011 if (GET_MAP_OB (map, x, y) != this)
1223 { 1012 {
1224 dump_object (op); 1013 char *dump = dump_object (this);
1225 LOG (llevError, 1014 LOG (llevError,
1226 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1015 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1016 free (dump);
1227 dump_object (GET_MAP_OB (m, x, y)); 1017 dump = dump_object (GET_MAP_OB (map, x, y));
1228 LOG (llevError, "%s\n", errmsg); 1018 LOG (llevError, "%s\n", dump);
1019 free (dump);
1229 } 1020 }
1230 1021
1231 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1022 map->at (x, y).bot = above; /* goes on above it. */
1232 } 1023 }
1233 1024
1234 op->above = 0; 1025 above = 0;
1235 op->below = 0; 1026 below = 0;
1236 1027
1237 if (op->map->in_memory == MAP_SAVING) 1028 if (map->in_memory == MAP_SAVING)
1238 return; 1029 return;
1239 1030
1240 tag = op->count; 1031 int check_walk_off = !flag [FLAG_NO_APPLY];
1241 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1242 1032
1243 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1033 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1244 { 1034 {
1245 /* No point updating the players look faces if he is the object 1035 /* No point updating the players look faces if he is the object
1246 * being removed. 1036 * being removed.
1247 */ 1037 */
1248 1038
1249 if (tmp->type == PLAYER && tmp != op) 1039 if (tmp->type == PLAYER && tmp != this)
1250 { 1040 {
1251 /* If a container that the player is currently using somehow gets 1041 /* If a container that the player is currently using somehow gets
1252 * removed (most likely destroyed), update the player view 1042 * removed (most likely destroyed), update the player view
1253 * appropriately. 1043 * appropriately.
1254 */ 1044 */
1255 if (tmp->container == op) 1045 if (tmp->container == this)
1256 { 1046 {
1257 CLEAR_FLAG (op, FLAG_APPLIED); 1047 flag [FLAG_APPLIED] = 0;
1258 tmp->container = NULL; 1048 tmp->container = 0;
1259 } 1049 }
1260 1050
1261 tmp->contr->socket.update_look = 1; 1051 if (tmp->contr->ns)
1052 tmp->contr->ns->floorbox_update ();
1262 } 1053 }
1263 1054
1264 /* See if player moving off should effect something */ 1055 /* See if object moving off should effect something */
1265 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1056 if (check_walk_off
1057 && ((move_type & tmp->move_off)
1058 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1266 { 1059 {
1267 move_apply (tmp, op, NULL); 1060 move_apply (tmp, this, 0);
1268 1061
1269 if (was_destroyed (op, tag)) 1062 if (destroyed ())
1270 {
1271 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1063 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1272 }
1273 } 1064 }
1274 1065
1275 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1066 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276 1067 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1277 if (tmp->above == tmp) 1068 if (tmp->above == tmp)
1278 tmp->above = NULL; 1069 tmp->above = 0;
1279 1070
1280 last = tmp; 1071 last = tmp;
1281 } 1072 }
1282 1073
1283 /* last == NULL of there are no objects on this space */ 1074 /* last == NULL if there are no objects on this space */
1075 //TODO: this makes little sense, why only update the topmost object?
1284 if (last == NULL) 1076 if (!last)
1285 { 1077 map->at (x, y).flags_ = 0;
1286 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288 * those out anyways, and if there are any flags set right now, they won't
1289 * be correct anyways.
1290 */
1291 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292 update_position (op->map, op->x, op->y);
1293 }
1294 else 1078 else
1295 update_object (last, UP_OBJ_REMOVE); 1079 update_object (last, UP_OBJ_REMOVE);
1296 1080
1297 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1081 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1298 update_all_los (op->map, op->x, op->y); 1082 update_all_los (map, x, y);
1299 } 1083 }
1300} 1084}
1301 1085
1302/* 1086/*
1303 * merge_ob(op,top): 1087 * merge_ob(op,top):
… …
1311merge_ob (object *op, object *top) 1095merge_ob (object *op, object *top)
1312{ 1096{
1313 if (!op->nrof) 1097 if (!op->nrof)
1314 return 0; 1098 return 0;
1315 1099
1316 if (top == NULL) 1100 if (top)
1317 for (top = op; top != NULL && top->above != NULL; top = top->above); 1101 for (top = op; top && top->above; top = top->above)
1102 ;
1318 1103
1319 for (; top != NULL; top = top->below) 1104 for (; top; top = top->below)
1320 { 1105 {
1321 if (top == op) 1106 if (top == op)
1322 continue; 1107 continue;
1323 if (CAN_MERGE (op, top)) 1108
1109 if (object::can_merge (op, top))
1324 { 1110 {
1325 top->nrof += op->nrof; 1111 top->nrof += op->nrof;
1326 1112
1327/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1113/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1328 op->weight = 0; /* Don't want any adjustements now */ 1114 op->weight = 0; /* Don't want any adjustements now */
1329 remove_ob (op); 1115 op->destroy ();
1330 free_object (op);
1331 return top; 1116 return top;
1332 } 1117 }
1333 } 1118 }
1334 1119
1335 return NULL; 1120 return 0;
1336} 1121}
1337 1122
1338/* 1123/*
1339 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1124 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1340 * job preparing multi-part monsters 1125 * job preparing multi-part monsters
1341 */ 1126 */
1342object * 1127object *
1343insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1128insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1344{ 1129{
1345 object *tmp;
1346
1347 if (op->head)
1348 op = op->head;
1349
1350 for (tmp = op; tmp; tmp = tmp->more) 1130 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1351 { 1131 {
1352 tmp->x = x + tmp->arch->clone.x; 1132 tmp->x = x + tmp->arch->clone.x;
1353 tmp->y = y + tmp->arch->clone.y; 1133 tmp->y = y + tmp->arch->clone.y;
1354 } 1134 }
1355 1135
… …
1374 * Return value: 1154 * Return value:
1375 * new object if 'op' was merged with other object 1155 * new object if 'op' was merged with other object
1376 * NULL if 'op' was destroyed 1156 * NULL if 'op' was destroyed
1377 * just 'op' otherwise 1157 * just 'op' otherwise
1378 */ 1158 */
1379
1380object * 1159object *
1381insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382{ 1161{
1383 object *tmp, *top, *floor = NULL; 1162 object *tmp, *top, *floor = NULL;
1384 sint16 x, y; 1163 sint16 x, y;
1385 1164
1386 if (QUERY_FLAG (op, FLAG_FREED)) 1165 if (QUERY_FLAG (op, FLAG_FREED))
1387 { 1166 {
1388 LOG (llevError, "Trying to insert freed object!\n"); 1167 LOG (llevError, "Trying to insert freed object!\n");
1389 return NULL; 1168 return NULL;
1390 } 1169 }
1391 1170
1392 if (m == NULL) 1171 if (!m)
1393 { 1172 {
1394 dump_object (op); 1173 char *dump = dump_object (op);
1395 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1175 free (dump);
1396 return op; 1176 return op;
1397 } 1177 }
1398 1178
1399 if (out_of_map (m, op->x, op->y)) 1179 if (out_of_map (m, op->x, op->y))
1400 { 1180 {
1401 dump_object (op); 1181 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1182 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403#ifdef MANY_CORES 1183#ifdef MANY_CORES
1404 /* Better to catch this here, as otherwise the next use of this object 1184 /* Better to catch this here, as otherwise the next use of this object
1405 * is likely to cause a crash. Better to find out where it is getting 1185 * is likely to cause a crash. Better to find out where it is getting
1406 * improperly inserted. 1186 * improperly inserted.
1407 */ 1187 */
1408 abort (); 1188 abort ();
1409#endif 1189#endif
1190 free (dump);
1410 return op; 1191 return op;
1411 } 1192 }
1412 1193
1413 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1194 if (!QUERY_FLAG (op, FLAG_REMOVED))
1414 { 1195 {
1415 dump_object (op); 1196 char *dump = dump_object (op);
1416 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1197 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198 free (dump);
1417 return op; 1199 return op;
1418 } 1200 }
1419 1201
1420 if (op->more != NULL) 1202 if (op->more)
1421 { 1203 {
1422 /* The part may be on a different map. */ 1204 /* The part may be on a different map. */
1423 1205
1424 object *more = op->more; 1206 object *more = op->more;
1425 1207
… …
1441 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1223 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1442 { 1224 {
1443 if (!op->head) 1225 if (!op->head)
1444 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1445 1227
1446 return NULL; 1228 return 0;
1447 } 1229 }
1448 } 1230 }
1449 1231
1450 CLEAR_FLAG (op, FLAG_REMOVED); 1232 CLEAR_FLAG (op, FLAG_REMOVED);
1451 1233
… …
1458 y = op->y; 1240 y = op->y;
1459 1241
1460 /* this has to be done after we translate the coordinates. 1242 /* this has to be done after we translate the coordinates.
1461 */ 1243 */
1462 if (op->nrof && !(flag & INS_NO_MERGE)) 1244 if (op->nrof && !(flag & INS_NO_MERGE))
1463 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1464 if (CAN_MERGE (op, tmp)) 1246 if (object::can_merge (op, tmp))
1465 { 1247 {
1466 op->nrof += tmp->nrof; 1248 op->nrof += tmp->nrof;
1467 remove_ob (tmp); 1249 tmp->destroy ();
1468 free_object (tmp);
1469 } 1250 }
1470 1251
1471 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1252 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1472 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1253 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1473 1254
… …
1486 op->below = originator->below; 1267 op->below = originator->below;
1487 1268
1488 if (op->below) 1269 if (op->below)
1489 op->below->above = op; 1270 op->below->above = op;
1490 else 1271 else
1491 SET_MAP_OB (op->map, op->x, op->y, op); 1272 op->ms ().bot = op;
1492 1273
1493 /* since *below* originator, no need to update top */ 1274 /* since *below* originator, no need to update top */
1494 originator->below = op; 1275 originator->below = op;
1495 } 1276 }
1496 else 1277 else
1497 { 1278 {
1498 /* If there are other objects, then */ 1279 /* If there are other objects, then */
1499 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1280 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1500 { 1281 {
1501 object *last = NULL; 1282 object *last = 0;
1502 1283
1503 /* 1284 /*
1504 * If there are multiple objects on this space, we do some trickier handling. 1285 * If there are multiple objects on this space, we do some trickier handling.
1505 * We've already dealt with merging if appropriate. 1286 * We've already dealt with merging if appropriate.
1506 * Generally, we want to put the new object on top. But if 1287 * Generally, we want to put the new object on top. But if
… …
1510 * once we get to them. This reduces the need to traverse over all of 1291 * once we get to them. This reduces the need to traverse over all of
1511 * them when adding another one - this saves quite a bit of cpu time 1292 * them when adding another one - this saves quite a bit of cpu time
1512 * when lots of spells are cast in one area. Currently, it is presumed 1293 * when lots of spells are cast in one area. Currently, it is presumed
1513 * that flying non pickable objects are spell objects. 1294 * that flying non pickable objects are spell objects.
1514 */ 1295 */
1515
1516 while (top != NULL) 1296 while (top)
1517 { 1297 {
1518 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1298 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1519 floor = top; 1299 floor = top;
1520 1300
1521 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1301 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1542 * If INS_ON_TOP is used, don't do this processing 1322 * If INS_ON_TOP is used, don't do this processing
1543 * Need to find the object that in fact blocks view, otherwise 1323 * Need to find the object that in fact blocks view, otherwise
1544 * stacking is a bit odd. 1324 * stacking is a bit odd.
1545 */ 1325 */
1546 if (!(flag & INS_ON_TOP) && 1326 if (!(flag & INS_ON_TOP) &&
1547 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1327 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1548 { 1328 {
1549 for (last = top; last != floor; last = last->below) 1329 for (last = top; last != floor; last = last->below)
1550 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1330 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1551 break; 1331 break;
1552 /* Check to see if we found the object that blocks view, 1332 /* Check to see if we found the object that blocks view,
… …
1574 op->above = GET_MAP_OB (op->map, op->x, op->y); 1354 op->above = GET_MAP_OB (op->map, op->x, op->y);
1575 1355
1576 if (op->above) 1356 if (op->above)
1577 op->above->below = op; 1357 op->above->below = op;
1578 1358
1579 op->below = NULL; 1359 op->below = 0;
1580 SET_MAP_OB (op->map, op->x, op->y, op); 1360 op->ms ().bot = op;
1581 } 1361 }
1582 else 1362 else
1583 { /* get inserted into the stack above top */ 1363 { /* get inserted into the stack above top */
1584 op->above = top->above; 1364 op->above = top->above;
1585 1365
… …
1588 1368
1589 op->below = top; 1369 op->below = top;
1590 top->above = op; 1370 top->above = op;
1591 } 1371 }
1592 1372
1593 if (op->above == NULL) 1373 if (!op->above)
1594 SET_MAP_TOP (op->map, op->x, op->y, op); 1374 op->ms ().top = op;
1595 } /* else not INS_BELOW_ORIGINATOR */ 1375 } /* else not INS_BELOW_ORIGINATOR */
1596 1376
1597 if (op->type == PLAYER) 1377 if (op->type == PLAYER)
1378 {
1598 op->contr->do_los = 1; 1379 op->contr->do_los = 1;
1380 ++op->map->players;
1381 op->map->touch ();
1382 }
1383
1384 op->map->dirty = true;
1599 1385
1600 /* If we have a floor, we know the player, if any, will be above 1386 /* If we have a floor, we know the player, if any, will be above
1601 * it, so save a few ticks and start from there. 1387 * it, so save a few ticks and start from there.
1602 */ 1388 */
1603 if (!(flag & INS_MAP_LOAD)) 1389 if (!(flag & INS_MAP_LOAD))
1604 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1390 if (object *pl = op->ms ().player ())
1605 if (tmp->type == PLAYER) 1391 if (pl->contr->ns)
1606 tmp->contr->socket.update_look = 1; 1392 pl->contr->ns->floorbox_update ();
1607 1393
1608 /* If this object glows, it may affect lighting conditions that are 1394 /* If this object glows, it may affect lighting conditions that are
1609 * visible to others on this map. But update_all_los is really 1395 * visible to others on this map. But update_all_los is really
1610 * an inefficient way to do this, as it means los for all players 1396 * an inefficient way to do this, as it means los for all players
1611 * on the map will get recalculated. The players could very well 1397 * on the map will get recalculated. The players could very well
1612 * be far away from this change and not affected in any way - 1398 * be far away from this change and not affected in any way -
1613 * this should get redone to only look for players within range, 1399 * this should get redone to only look for players within range,
1614 * or just updating the P_NEED_UPDATE for spaces within this area 1400 * or just updating the P_UPTODATE for spaces within this area
1615 * of effect may be sufficient. 1401 * of effect may be sufficient.
1616 */ 1402 */
1617 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1403 if (op->map->darkness && (op->glow_radius != 0))
1618 update_all_los (op->map, op->x, op->y); 1404 update_all_los (op->map, op->x, op->y);
1619 1405
1620 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1406 /* updates flags (blocked, alive, no magic, etc) for this map space */
1621 update_object (op, UP_OBJ_INSERT); 1407 update_object (op, UP_OBJ_INSERT);
1622 1408
1409 INVOKE_OBJECT (INSERT, op);
1410
1623 /* Don't know if moving this to the end will break anything. However, 1411 /* Don't know if moving this to the end will break anything. However,
1624 * we want to have update_look set above before calling this. 1412 * we want to have floorbox_update called before calling this.
1625 * 1413 *
1626 * check_move_on() must be after this because code called from 1414 * check_move_on() must be after this because code called from
1627 * check_move_on() depends on correct map flags (so functions like 1415 * check_move_on() depends on correct map flags (so functions like
1628 * blocked() and wall() work properly), and these flags are updated by 1416 * blocked() and wall() work properly), and these flags are updated by
1629 * update_object(). 1417 * update_object().
… …
1631 1419
1632 /* if this is not the head or flag has been passed, don't check walk on status */ 1420 /* if this is not the head or flag has been passed, don't check walk on status */
1633 if (!(flag & INS_NO_WALK_ON) && !op->head) 1421 if (!(flag & INS_NO_WALK_ON) && !op->head)
1634 { 1422 {
1635 if (check_move_on (op, originator)) 1423 if (check_move_on (op, originator))
1636 return NULL; 1424 return 0;
1637 1425
1638 /* If we are a multi part object, lets work our way through the check 1426 /* If we are a multi part object, lets work our way through the check
1639 * walk on's. 1427 * walk on's.
1640 */ 1428 */
1641 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1429 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1642 if (check_move_on (tmp, originator)) 1430 if (check_move_on (tmp, originator))
1643 return NULL; 1431 return 0;
1644 } 1432 }
1645 1433
1646 return op; 1434 return op;
1647} 1435}
1648 1436
1649/* this function inserts an object in the map, but if it 1437/* this function inserts an object in the map, but if it
1650 * finds an object of its own type, it'll remove that one first. 1438 * finds an object of its own type, it'll remove that one first.
1651 * op is the object to insert it under: supplies x and the map. 1439 * op is the object to insert it under: supplies x and the map.
1652 */ 1440 */
1653void 1441void
1654replace_insert_ob_in_map (const char *arch_string, object *op) 1442replace_insert_ob_in_map (const char *arch_string, object *op)
1655{ 1443{
1656 object * 1444 object *tmp, *tmp1;
1657 tmp;
1658 object *
1659 tmp1;
1660 1445
1661 /* first search for itself and remove any old instances */ 1446 /* first search for itself and remove any old instances */
1662 1447
1663 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1448 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1664 {
1665 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1449 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1666 { 1450 tmp->destroy ();
1667 remove_ob (tmp);
1668 free_object (tmp);
1669 }
1670 }
1671 1451
1672 tmp1 = arch_to_object (find_archetype (arch_string)); 1452 tmp1 = arch_to_object (archetype::find (arch_string));
1673 1453
1674 tmp1->x = op->x; 1454 tmp1->x = op->x;
1675 tmp1->y = op->y; 1455 tmp1->y = op->y;
1676 insert_ob_in_map (tmp1, op->map, op, 0); 1456 insert_ob_in_map (tmp1, op->map, op, 0);
1457}
1458
1459object *
1460object::insert_at (object *where, object *originator, int flags)
1461{
1462 where->map->insert (this, where->x, where->y, originator, flags);
1677} 1463}
1678 1464
1679/* 1465/*
1680 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1466 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1681 * is returned contains nr objects, and the remaining parts contains 1467 * is returned contains nr objects, and the remaining parts contains
1682 * the rest (or is removed and freed if that number is 0). 1468 * the rest (or is removed and freed if that number is 0).
1683 * On failure, NULL is returned, and the reason put into the 1469 * On failure, NULL is returned, and the reason put into the
1684 * global static errmsg array. 1470 * global static errmsg array.
1685 */ 1471 */
1686
1687object * 1472object *
1688get_split_ob (object *orig_ob, uint32 nr) 1473get_split_ob (object *orig_ob, uint32 nr)
1689{ 1474{
1690 object * 1475 object *newob;
1691 newob;
1692 int
1693 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1476 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1694 1477
1695 if (orig_ob->nrof < nr) 1478 if (orig_ob->nrof < nr)
1696 { 1479 {
1697 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1480 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1698 return NULL; 1481 return NULL;
1699 } 1482 }
1700 1483
1701 newob = object_create_clone (orig_ob); 1484 newob = object_create_clone (orig_ob);
1702 1485
1703 if ((orig_ob->nrof -= nr) < 1) 1486 if ((orig_ob->nrof -= nr) < 1)
1704 { 1487 orig_ob->destroy (1);
1705 if (!is_removed)
1706 remove_ob (orig_ob);
1707 free_object2 (orig_ob, 1);
1708 }
1709 else if (!is_removed) 1488 else if (!is_removed)
1710 { 1489 {
1711 if (orig_ob->env != NULL) 1490 if (orig_ob->env != NULL)
1712 sub_weight (orig_ob->env, orig_ob->weight * nr); 1491 sub_weight (orig_ob->env, orig_ob->weight * nr);
1713 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1492 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1733 1512
1734object * 1513object *
1735decrease_ob_nr (object *op, uint32 i) 1514decrease_ob_nr (object *op, uint32 i)
1736{ 1515{
1737 object *tmp; 1516 object *tmp;
1738 player *pl;
1739 1517
1740 if (i == 0) /* objects with op->nrof require this check */ 1518 if (i == 0) /* objects with op->nrof require this check */
1741 return op; 1519 return op;
1742 1520
1743 if (i > op->nrof) 1521 if (i > op->nrof)
1744 i = op->nrof; 1522 i = op->nrof;
1745 1523
1746 if (QUERY_FLAG (op, FLAG_REMOVED)) 1524 if (QUERY_FLAG (op, FLAG_REMOVED))
1747 op->nrof -= i; 1525 op->nrof -= i;
1748 else if (op->env != NULL) 1526 else if (op->env)
1749 { 1527 {
1750 /* is this object in the players inventory, or sub container 1528 /* is this object in the players inventory, or sub container
1751 * therein? 1529 * therein?
1752 */ 1530 */
1753 tmp = is_player_inv (op->env); 1531 tmp = op->in_player ();
1754 /* nope. Is this a container the player has opened? 1532 /* nope. Is this a container the player has opened?
1755 * If so, set tmp to that player. 1533 * If so, set tmp to that player.
1756 * IMO, searching through all the players will mostly 1534 * IMO, searching through all the players will mostly
1757 * likely be quicker than following op->env to the map, 1535 * likely be quicker than following op->env to the map,
1758 * and then searching the map for a player. 1536 * and then searching the map for a player.
1759 */ 1537 */
1760 if (!tmp) 1538 if (!tmp)
1761 { 1539 for_all_players (pl)
1762 for (pl = first_player; pl; pl = pl->next)
1763 if (pl->ob->container == op->env) 1540 if (pl->ob->container == op->env)
1541 {
1542 tmp = pl->ob;
1764 break; 1543 break;
1765 if (pl)
1766 tmp = pl->ob;
1767 else
1768 tmp = NULL;
1769 } 1544 }
1770 1545
1771 if (i < op->nrof) 1546 if (i < op->nrof)
1772 { 1547 {
1773 sub_weight (op->env, op->weight * i); 1548 sub_weight (op->env, op->weight * i);
1774 op->nrof -= i; 1549 op->nrof -= i;
1775 if (tmp) 1550 if (tmp)
1776 {
1777 esrv_send_item (tmp, op); 1551 esrv_send_item (tmp, op);
1778 }
1779 } 1552 }
1780 else 1553 else
1781 { 1554 {
1782 remove_ob (op); 1555 op->remove ();
1783 op->nrof = 0; 1556 op->nrof = 0;
1784 if (tmp) 1557 if (tmp)
1785 {
1786 esrv_del_item (tmp->contr, op->count); 1558 esrv_del_item (tmp->contr, op->count);
1787 }
1788 } 1559 }
1789 } 1560 }
1790 else 1561 else
1791 { 1562 {
1792 object *above = op->above; 1563 object *above = op->above;
1793 1564
1794 if (i < op->nrof) 1565 if (i < op->nrof)
1795 op->nrof -= i; 1566 op->nrof -= i;
1796 else 1567 else
1797 { 1568 {
1798 remove_ob (op); 1569 op->remove ();
1799 op->nrof = 0; 1570 op->nrof = 0;
1800 } 1571 }
1801 1572
1802 /* Since we just removed op, op->above is null */ 1573 /* Since we just removed op, op->above is null */
1803 for (tmp = above; tmp != NULL; tmp = tmp->above) 1574 for (tmp = above; tmp; tmp = tmp->above)
1804 if (tmp->type == PLAYER) 1575 if (tmp->type == PLAYER)
1805 { 1576 {
1806 if (op->nrof) 1577 if (op->nrof)
1807 esrv_send_item (tmp, op); 1578 esrv_send_item (tmp, op);
1808 else 1579 else
… …
1812 1583
1813 if (op->nrof) 1584 if (op->nrof)
1814 return op; 1585 return op;
1815 else 1586 else
1816 { 1587 {
1817 free_object (op); 1588 op->destroy ();
1818 return NULL; 1589 return 0;
1819 } 1590 }
1820} 1591}
1821 1592
1822/* 1593/*
1823 * add_weight(object, weight) adds the specified weight to an object, 1594 * add_weight(object, weight) adds the specified weight to an object,
… …
1835 op->carrying += weight; 1606 op->carrying += weight;
1836 op = op->env; 1607 op = op->env;
1837 } 1608 }
1838} 1609}
1839 1610
1611object *
1612insert_ob_in_ob (object *op, object *where)
1613{
1614 if (!where)
1615 {
1616 char *dump = dump_object (op);
1617 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1618 free (dump);
1619 return op;
1620 }
1621
1622 if (where->head)
1623 {
1624 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1625 where = where->head;
1626 }
1627
1628 return where->insert (op);
1629}
1630
1840/* 1631/*
1841 * insert_ob_in_ob(op,environment): 1632 * env->insert (op)
1842 * This function inserts the object op in the linked list 1633 * This function inserts the object op in the linked list
1843 * inside the object environment. 1634 * inside the object environment.
1844 * 1635 *
1845 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1846 * the inventory at the last position or next to other objects of the same
1847 * type.
1848 * Frank: Now sorted by type, archetype and magic!
1849 *
1850 * The function returns now pointer to inserted item, and return value can 1636 * The function returns now pointer to inserted item, and return value can
1851 * be != op, if items are merged. -Tero 1637 * be != op, if items are merged. -Tero
1852 */ 1638 */
1853 1639
1854object * 1640object *
1855insert_ob_in_ob (object *op, object *where) 1641object::insert (object *op)
1856{ 1642{
1857 object * 1643 object *tmp, *otmp;
1858 tmp, *
1859 otmp;
1860 1644
1861 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1645 if (!QUERY_FLAG (op, FLAG_REMOVED))
1862 { 1646 op->remove ();
1863 dump_object (op);
1864 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1865 return op;
1866 }
1867
1868 if (where == NULL)
1869 {
1870 dump_object (op);
1871 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1872 return op;
1873 }
1874
1875 if (where->head)
1876 {
1877 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1878 where = where->head;
1879 }
1880 1647
1881 if (op->more) 1648 if (op->more)
1882 { 1649 {
1883 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1650 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1884 return op; 1651 return op;
… …
1886 1653
1887 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1654 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1888 CLEAR_FLAG (op, FLAG_REMOVED); 1655 CLEAR_FLAG (op, FLAG_REMOVED);
1889 if (op->nrof) 1656 if (op->nrof)
1890 { 1657 {
1891 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1658 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1892 if (CAN_MERGE (tmp, op)) 1659 if (object::can_merge (tmp, op))
1893 { 1660 {
1894 /* return the original object and remove inserted object 1661 /* return the original object and remove inserted object
1895 (client needs the original object) */ 1662 (client needs the original object) */
1896 tmp->nrof += op->nrof; 1663 tmp->nrof += op->nrof;
1897 /* Weight handling gets pretty funky. Since we are adding to 1664 /* Weight handling gets pretty funky. Since we are adding to
1898 * tmp->nrof, we need to increase the weight. 1665 * tmp->nrof, we need to increase the weight.
1899 */ 1666 */
1900 add_weight (where, op->weight * op->nrof); 1667 add_weight (this, op->weight * op->nrof);
1901 SET_FLAG (op, FLAG_REMOVED); 1668 SET_FLAG (op, FLAG_REMOVED);
1902 free_object (op); /* free the inserted object */ 1669 op->destroy (); /* free the inserted object */
1903 op = tmp; 1670 op = tmp;
1904 remove_ob (op); /* and fix old object's links */ 1671 op->remove (); /* and fix old object's links */
1905 CLEAR_FLAG (op, FLAG_REMOVED); 1672 CLEAR_FLAG (op, FLAG_REMOVED);
1906 break; 1673 break;
1907 } 1674 }
1908 1675
1909 /* I assume combined objects have no inventory 1676 /* I assume combined objects have no inventory
1910 * We add the weight - this object could have just been removed 1677 * We add the weight - this object could have just been removed
1911 * (if it was possible to merge). calling remove_ob will subtract 1678 * (if it was possible to merge). calling remove_ob will subtract
1912 * the weight, so we need to add it in again, since we actually do 1679 * the weight, so we need to add it in again, since we actually do
1913 * the linking below 1680 * the linking below
1914 */ 1681 */
1915 add_weight (where, op->weight * op->nrof); 1682 add_weight (this, op->weight * op->nrof);
1916 } 1683 }
1917 else 1684 else
1918 add_weight (where, (op->weight + op->carrying)); 1685 add_weight (this, (op->weight + op->carrying));
1919 1686
1920 otmp = is_player_inv (where); 1687 otmp = this->in_player ();
1921 if (otmp && otmp->contr != NULL) 1688 if (otmp && otmp->contr)
1922 {
1923 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1689 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1924 fix_player (otmp); 1690 otmp->update_stats ();
1925 }
1926 1691
1927 op->map = NULL; 1692 op->map = 0;
1928 op->env = where; 1693 op->env = this;
1929 op->above = NULL; 1694 op->above = 0;
1930 op->below = NULL; 1695 op->below = 0;
1931 op->x = 0, op->y = 0; 1696 op->x = 0, op->y = 0;
1932 1697
1933 /* reset the light list and los of the players on the map */ 1698 /* reset the light list and los of the players on the map */
1934 if ((op->glow_radius != 0) && where->map) 1699 if ((op->glow_radius != 0) && map)
1935 { 1700 {
1936#ifdef DEBUG_LIGHTS 1701#ifdef DEBUG_LIGHTS
1937 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1702 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1938#endif /* DEBUG_LIGHTS */ 1703#endif /* DEBUG_LIGHTS */
1939 if (MAP_DARKNESS (where->map)) 1704 if (map->darkness)
1940 update_all_los (where->map, where->x, where->y); 1705 update_all_los (map, x, y);
1941 } 1706 }
1942 1707
1943 /* Client has no idea of ordering so lets not bother ordering it here. 1708 /* Client has no idea of ordering so lets not bother ordering it here.
1944 * It sure simplifies this function... 1709 * It sure simplifies this function...
1945 */ 1710 */
1946 if (where->inv == NULL) 1711 if (!inv)
1947 where->inv = op; 1712 inv = op;
1948 else 1713 else
1949 { 1714 {
1950 op->below = where->inv; 1715 op->below = inv;
1951 op->below->above = op; 1716 op->below->above = op;
1952 where->inv = op; 1717 inv = op;
1953 } 1718 }
1719
1720 INVOKE_OBJECT (INSERT, this);
1721
1954 return op; 1722 return op;
1955} 1723}
1956 1724
1957/* 1725/*
1958 * Checks if any objects has a move_type that matches objects 1726 * Checks if any objects has a move_type that matches objects
… …
1972 * 1740 *
1973 * MSW 2001-07-08: Check all objects on space, not just those below 1741 * MSW 2001-07-08: Check all objects on space, not just those below
1974 * object being inserted. insert_ob_in_map may not put new objects 1742 * object being inserted. insert_ob_in_map may not put new objects
1975 * on top. 1743 * on top.
1976 */ 1744 */
1977
1978int 1745int
1979check_move_on (object *op, object *originator) 1746check_move_on (object *op, object *originator)
1980{ 1747{
1981 object * 1748 object *tmp;
1982 tmp; 1749 maptile *m = op->map;
1983 tag_t
1984 tag;
1985 mapstruct *
1986 m = op->map;
1987 int
1988 x = op->x, y = op->y; 1750 int x = op->x, y = op->y;
1989 1751
1990 MoveType 1752 MoveType move_on, move_slow, move_block;
1991 move_on,
1992 move_slow,
1993 move_block;
1994 1753
1995 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1754 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996 return 0; 1755 return 0;
1997
1998 tag = op->count;
1999 1756
2000 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1757 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2001 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1758 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2002 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1759 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2003 1760
… …
2019 1776
2020 /* The objects have to be checked from top to bottom. 1777 /* The objects have to be checked from top to bottom.
2021 * Hence, we first go to the top: 1778 * Hence, we first go to the top:
2022 */ 1779 */
2023 1780
2024 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
2025 { 1782 {
2026 /* Trim the search when we find the first other spell effect 1783 /* Trim the search when we find the first other spell effect
2027 * this helps performance so that if a space has 50 spell objects, 1784 * this helps performance so that if a space has 50 spell objects,
2028 * we don't need to check all of them. 1785 * we don't need to check all of them.
2029 */ 1786 */
… …
2064 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1821 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2065 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1822 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2066 { 1823 {
2067 move_apply (tmp, op, originator); 1824 move_apply (tmp, op, originator);
2068 1825
2069 if (was_destroyed (op, tag)) 1826 if (op->destroyed ())
2070 return 1; 1827 return 1;
2071 1828
2072 /* what the person/creature stepped onto has moved the object 1829 /* what the person/creature stepped onto has moved the object
2073 * someplace new. Don't process any further - if we did, 1830 * someplace new. Don't process any further - if we did,
2074 * have a feeling strange problems would result. 1831 * have a feeling strange problems would result.
… …
2084/* 1841/*
2085 * present_arch(arch, map, x, y) searches for any objects with 1842 * present_arch(arch, map, x, y) searches for any objects with
2086 * a matching archetype at the given map and coordinates. 1843 * a matching archetype at the given map and coordinates.
2087 * The first matching object is returned, or NULL if none. 1844 * The first matching object is returned, or NULL if none.
2088 */ 1845 */
2089
2090object * 1846object *
2091present_arch (const archetype *at, mapstruct *m, int x, int y) 1847present_arch (const archetype *at, maptile *m, int x, int y)
2092{ 1848{
2093 object *
2094 tmp;
2095
2096 if (m == NULL || out_of_map (m, x, y)) 1849 if (m == NULL || out_of_map (m, x, y))
2097 { 1850 {
2098 LOG (llevError, "Present_arch called outside map.\n"); 1851 LOG (llevError, "Present_arch called outside map.\n");
2099 return NULL; 1852 return NULL;
2100 } 1853 }
1854
2101 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2102 if (tmp->arch == at) 1856 if (tmp->arch == at)
2103 return tmp; 1857 return tmp;
1858
2104 return NULL; 1859 return NULL;
2105} 1860}
2106 1861
2107/* 1862/*
2108 * present(type, map, x, y) searches for any objects with 1863 * present(type, map, x, y) searches for any objects with
2109 * a matching type variable at the given map and coordinates. 1864 * a matching type variable at the given map and coordinates.
2110 * The first matching object is returned, or NULL if none. 1865 * The first matching object is returned, or NULL if none.
2111 */ 1866 */
2112
2113object * 1867object *
2114present (unsigned char type, mapstruct *m, int x, int y) 1868present (unsigned char type, maptile *m, int x, int y)
2115{ 1869{
2116 object *
2117 tmp;
2118
2119 if (out_of_map (m, x, y)) 1870 if (out_of_map (m, x, y))
2120 { 1871 {
2121 LOG (llevError, "Present called outside map.\n"); 1872 LOG (llevError, "Present called outside map.\n");
2122 return NULL; 1873 return NULL;
2123 } 1874 }
1875
2124 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2125 if (tmp->type == type) 1877 if (tmp->type == type)
2126 return tmp; 1878 return tmp;
1879
2127 return NULL; 1880 return NULL;
2128} 1881}
2129 1882
2130/* 1883/*
2131 * present_in_ob(type, object) searches for any objects with 1884 * present_in_ob(type, object) searches for any objects with
2132 * a matching type variable in the inventory of the given object. 1885 * a matching type variable in the inventory of the given object.
2133 * The first matching object is returned, or NULL if none. 1886 * The first matching object is returned, or NULL if none.
2134 */ 1887 */
2135
2136object * 1888object *
2137present_in_ob (unsigned char type, const object *op) 1889present_in_ob (unsigned char type, const object *op)
2138{ 1890{
2139 object *
2140 tmp;
2141
2142 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1891 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2143 if (tmp->type == type) 1892 if (tmp->type == type)
2144 return tmp; 1893 return tmp;
1894
2145 return NULL; 1895 return NULL;
2146} 1896}
2147 1897
2148/* 1898/*
2149 * present_in_ob (type, str, object) searches for any objects with 1899 * present_in_ob (type, str, object) searches for any objects with
… …
2157 * str is the string to match against. Note that we match against 1907 * str is the string to match against. Note that we match against
2158 * the object name, not the archetype name. this is so that the 1908 * the object name, not the archetype name. this is so that the
2159 * spell code can use one object type (force), but change it's name 1909 * spell code can use one object type (force), but change it's name
2160 * to be unique. 1910 * to be unique.
2161 */ 1911 */
2162
2163object * 1912object *
2164present_in_ob_by_name (int type, const char *str, const object *op) 1913present_in_ob_by_name (int type, const char *str, const object *op)
2165{ 1914{
2166 object *
2167 tmp;
2168
2169 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1915 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2170 {
2171 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1916 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2172 return tmp; 1917 return tmp;
2173 } 1918
2174 return NULL; 1919 return 0;
2175} 1920}
2176 1921
2177/* 1922/*
2178 * present_arch_in_ob(archetype, object) searches for any objects with 1923 * present_arch_in_ob(archetype, object) searches for any objects with
2179 * a matching archetype in the inventory of the given object. 1924 * a matching archetype in the inventory of the given object.
2180 * The first matching object is returned, or NULL if none. 1925 * The first matching object is returned, or NULL if none.
2181 */ 1926 */
2182
2183object * 1927object *
2184present_arch_in_ob (const archetype *at, const object *op) 1928present_arch_in_ob (const archetype *at, const object *op)
2185{ 1929{
2186 object *
2187 tmp;
2188
2189 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1930 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2190 if (tmp->arch == at) 1931 if (tmp->arch == at)
2191 return tmp; 1932 return tmp;
1933
2192 return NULL; 1934 return NULL;
2193} 1935}
2194 1936
2195/* 1937/*
2196 * activate recursively a flag on an object inventory 1938 * activate recursively a flag on an object inventory
2197 */ 1939 */
2198void 1940void
2199flag_inv (object *op, int flag) 1941flag_inv (object *op, int flag)
2200{ 1942{
2201 object *
2202 tmp;
2203
2204 if (op->inv) 1943 if (op->inv)
2205 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1944 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2206 { 1945 {
2207 SET_FLAG (tmp, flag); 1946 SET_FLAG (tmp, flag);
2208 flag_inv (tmp, flag); 1947 flag_inv (tmp, flag);
2209 } 1948 }
2210} /* 1949}
1950
1951/*
2211 * desactivate recursively a flag on an object inventory 1952 * deactivate recursively a flag on an object inventory
2212 */ 1953 */
2213void 1954void
2214unflag_inv (object *op, int flag) 1955unflag_inv (object *op, int flag)
2215{ 1956{
2216 object *
2217 tmp;
2218
2219 if (op->inv) 1957 if (op->inv)
2220 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2221 { 1959 {
2222 CLEAR_FLAG (tmp, flag); 1960 CLEAR_FLAG (tmp, flag);
2223 unflag_inv (tmp, flag); 1961 unflag_inv (tmp, flag);
2224 } 1962 }
2225} 1963}
… …
2228 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1966 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2229 * all it's inventory (recursively). 1967 * all it's inventory (recursively).
2230 * If checksums are used, a player will get set_cheat called for 1968 * If checksums are used, a player will get set_cheat called for
2231 * him/her-self and all object carried by a call to this function. 1969 * him/her-self and all object carried by a call to this function.
2232 */ 1970 */
2233
2234void 1971void
2235set_cheat (object *op) 1972set_cheat (object *op)
2236{ 1973{
2237 SET_FLAG (op, FLAG_WAS_WIZ); 1974 SET_FLAG (op, FLAG_WAS_WIZ);
2238 flag_inv (op, FLAG_WAS_WIZ); 1975 flag_inv (op, FLAG_WAS_WIZ);
… …
2257 * because arch_blocked (now ob_blocked) needs to know the movement type 1994 * because arch_blocked (now ob_blocked) needs to know the movement type
2258 * to know if the space in question will block the object. We can't use 1995 * to know if the space in question will block the object. We can't use
2259 * the archetype because that isn't correct if the monster has been 1996 * the archetype because that isn't correct if the monster has been
2260 * customized, changed states, etc. 1997 * customized, changed states, etc.
2261 */ 1998 */
2262
2263int 1999int
2264find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2265{ 2001{
2266 int
2267 i,
2268 index = 0, flag; 2002 int index = 0, flag;
2269 static int
2270 altern[SIZEOFFREE]; 2003 int altern[SIZEOFFREE];
2271 2004
2272 for (i = start; i < stop; i++) 2005 for (int i = start; i < stop; i++)
2273 { 2006 {
2274 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2007 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2275 if (!flag) 2008 if (!flag)
2276 altern[index++] = i; 2009 altern [index++] = i;
2277 2010
2278 /* Basically, if we find a wall on a space, we cut down the search size. 2011 /* Basically, if we find a wall on a space, we cut down the search size.
2279 * In this way, we won't return spaces that are on another side of a wall. 2012 * In this way, we won't return spaces that are on another side of a wall.
2280 * This mostly work, but it cuts down the search size in all directions - 2013 * This mostly work, but it cuts down the search size in all directions -
2281 * if the space being examined only has a wall to the north and empty 2014 * if the space being examined only has a wall to the north and empty
2282 * spaces in all the other directions, this will reduce the search space 2015 * spaces in all the other directions, this will reduce the search space
2283 * to only the spaces immediately surrounding the target area, and 2016 * to only the spaces immediately surrounding the target area, and
2284 * won't look 2 spaces south of the target space. 2017 * won't look 2 spaces south of the target space.
2285 */ 2018 */
2286 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2019 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2287 stop = maxfree[i]; 2020 stop = maxfree[i];
2288 } 2021 }
2022
2289 if (!index) 2023 if (!index)
2290 return -1; 2024 return -1;
2025
2291 return altern[RANDOM () % index]; 2026 return altern[RANDOM () % index];
2292} 2027}
2293 2028
2294/* 2029/*
2295 * find_first_free_spot(archetype, mapstruct, x, y) works like 2030 * find_first_free_spot(archetype, maptile, x, y) works like
2296 * find_free_spot(), but it will search max number of squares. 2031 * find_free_spot(), but it will search max number of squares.
2297 * But it will return the first available spot, not a random choice. 2032 * But it will return the first available spot, not a random choice.
2298 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2033 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2299 */ 2034 */
2300
2301int 2035int
2302find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2036find_first_free_spot (const object *ob, maptile *m, int x, int y)
2303{ 2037{
2304 int
2305 i;
2306
2307 for (i = 0; i < SIZEOFFREE; i++) 2038 for (int i = 0; i < SIZEOFFREE; i++)
2308 {
2309 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2039 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2310 return i; 2040 return i;
2311 } 2041
2312 return -1; 2042 return -1;
2313} 2043}
2314 2044
2315/* 2045/*
2316 * The function permute(arr, begin, end) randomly reorders the array 2046 * The function permute(arr, begin, end) randomly reorders the array
2317 * arr[begin..end-1]. 2047 * arr[begin..end-1].
2048 * now uses a fisher-yates shuffle, old permute was broken
2318 */ 2049 */
2319static void 2050static void
2320permute (int *arr, int begin, int end) 2051permute (int *arr, int begin, int end)
2321{ 2052{
2322 int 2053 arr += begin;
2323 i,
2324 j,
2325 tmp,
2326 len;
2327
2328 len = end - begin; 2054 end -= begin;
2329 for (i = begin; i < end; i++)
2330 {
2331 j = begin + RANDOM () % len;
2332 2055
2333 tmp = arr[i]; 2056 while (--end)
2334 arr[i] = arr[j]; 2057 swap (arr [end], arr [RANDOM () % (end + 1)]);
2335 arr[j] = tmp;
2336 }
2337} 2058}
2338 2059
2339/* new function to make monster searching more efficient, and effective! 2060/* new function to make monster searching more efficient, and effective!
2340 * This basically returns a randomized array (in the passed pointer) of 2061 * This basically returns a randomized array (in the passed pointer) of
2341 * the spaces to find monsters. In this way, it won't always look for 2062 * the spaces to find monsters. In this way, it won't always look for
… …
2344 * the 3x3 area will be searched, just not in a predictable order. 2065 * the 3x3 area will be searched, just not in a predictable order.
2345 */ 2066 */
2346void 2067void
2347get_search_arr (int *search_arr) 2068get_search_arr (int *search_arr)
2348{ 2069{
2349 int 2070 int i;
2350 i;
2351 2071
2352 for (i = 0; i < SIZEOFFREE; i++) 2072 for (i = 0; i < SIZEOFFREE; i++)
2353 {
2354 search_arr[i] = i; 2073 search_arr[i] = i;
2355 }
2356 2074
2357 permute (search_arr, 1, SIZEOFFREE1 + 1); 2075 permute (search_arr, 1, SIZEOFFREE1 + 1);
2358 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2076 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2359 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2077 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2360} 2078}
… …
2369 * Perhaps incorrectly, but I'm making the assumption that exclude 2087 * Perhaps incorrectly, but I'm making the assumption that exclude
2370 * is actually want is going to try and move there. We need this info 2088 * is actually want is going to try and move there. We need this info
2371 * because we have to know what movement the thing looking to move 2089 * because we have to know what movement the thing looking to move
2372 * there is capable of. 2090 * there is capable of.
2373 */ 2091 */
2374
2375int 2092int
2376find_dir (mapstruct *m, int x, int y, object *exclude) 2093find_dir (maptile *m, int x, int y, object *exclude)
2377{ 2094{
2378 int
2379 i,
2380 max = SIZEOFFREE, mflags; 2095 int i, max = SIZEOFFREE, mflags;
2381 2096
2382 sint16 nx, ny; 2097 sint16 nx, ny;
2383 object * 2098 object *tmp;
2384 tmp; 2099 maptile *mp;
2385 mapstruct *
2386 mp;
2387 2100
2388 MoveType blocked, move_type; 2101 MoveType blocked, move_type;
2389 2102
2390 if (exclude && exclude->head) 2103 if (exclude && exclude->head)
2391 { 2104 {
… …
2403 mp = m; 2116 mp = m;
2404 nx = x + freearr_x[i]; 2117 nx = x + freearr_x[i];
2405 ny = y + freearr_y[i]; 2118 ny = y + freearr_y[i];
2406 2119
2407 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2120 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2121
2408 if (mflags & P_OUT_OF_MAP) 2122 if (mflags & P_OUT_OF_MAP)
2409 {
2410 max = maxfree[i]; 2123 max = maxfree[i];
2411 }
2412 else 2124 else
2413 { 2125 {
2414 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2126 mapspace &ms = mp->at (nx, ny);
2127
2128 blocked = ms.move_block;
2415 2129
2416 if ((move_type & blocked) == move_type) 2130 if ((move_type & blocked) == move_type)
2417 {
2418 max = maxfree[i]; 2131 max = maxfree[i];
2419 }
2420 else if (mflags & P_IS_ALIVE) 2132 else if (mflags & P_IS_ALIVE)
2421 { 2133 {
2422 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2134 for (tmp = ms.bot; tmp; tmp = tmp->above)
2423 { 2135 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2424 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2136 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2425 {
2426 break; 2137 break;
2427 } 2138
2428 }
2429 if (tmp) 2139 if (tmp)
2430 {
2431 return freedir[i]; 2140 return freedir[i];
2432 }
2433 } 2141 }
2434 } 2142 }
2435 } 2143 }
2144
2436 return 0; 2145 return 0;
2437} 2146}
2438 2147
2439/* 2148/*
2440 * distance(object 1, object 2) will return the square of the 2149 * distance(object 1, object 2) will return the square of the
2441 * distance between the two given objects. 2150 * distance between the two given objects.
2442 */ 2151 */
2443
2444int 2152int
2445distance (const object *ob1, const object *ob2) 2153distance (const object *ob1, const object *ob2)
2446{ 2154{
2447 int
2448 i;
2449
2450 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2155 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2451 return i;
2452} 2156}
2453 2157
2454/* 2158/*
2455 * find_dir_2(delta-x,delta-y) will return a direction in which 2159 * find_dir_2(delta-x,delta-y) will return a direction in which
2456 * an object which has subtracted the x and y coordinates of another 2160 * an object which has subtracted the x and y coordinates of another
2457 * object, needs to travel toward it. 2161 * object, needs to travel toward it.
2458 */ 2162 */
2459
2460int 2163int
2461find_dir_2 (int x, int y) 2164find_dir_2 (int x, int y)
2462{ 2165{
2463 int 2166 int q;
2464 q;
2465 2167
2466 if (y) 2168 if (y)
2467 q = x * 100 / y; 2169 q = x * 100 / y;
2468 else if (x) 2170 else if (x)
2469 q = -300 * x; 2171 q = -300 * x;
… …
2504int 2206int
2505absdir (int d) 2207absdir (int d)
2506{ 2208{
2507 while (d < 1) 2209 while (d < 1)
2508 d += 8; 2210 d += 8;
2211
2509 while (d > 8) 2212 while (d > 8)
2510 d -= 8; 2213 d -= 8;
2214
2511 return d; 2215 return d;
2512} 2216}
2513 2217
2514/* 2218/*
2515 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2517 */ 2221 */
2518 2222
2519int 2223int
2520dirdiff (int dir1, int dir2) 2224dirdiff (int dir1, int dir2)
2521{ 2225{
2522 int 2226 int d;
2523 d;
2524 2227
2525 d = abs (dir1 - dir2); 2228 d = abs (dir1 - dir2);
2526 if (d > 4) 2229 if (d > 4)
2527 d = 8 - d; 2230 d = 8 - d;
2231
2528 return d; 2232 return d;
2529} 2233}
2530 2234
2531/* peterm: 2235/* peterm:
2532 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2236 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2535 * This basically means that if direction is 15, then it could either go 2239 * This basically means that if direction is 15, then it could either go
2536 * direction 4, 14, or 16 to get back to where we are. 2240 * direction 4, 14, or 16 to get back to where we are.
2537 * Moved from spell_util.c to object.c with the other related direction 2241 * Moved from spell_util.c to object.c with the other related direction
2538 * functions. 2242 * functions.
2539 */ 2243 */
2540
2541int
2542 reduction_dir[SIZEOFFREE][3] = { 2244int reduction_dir[SIZEOFFREE][3] = {
2543 {0, 0, 0}, /* 0 */ 2245 {0, 0, 0}, /* 0 */
2544 {0, 0, 0}, /* 1 */ 2246 {0, 0, 0}, /* 1 */
2545 {0, 0, 0}, /* 2 */ 2247 {0, 0, 0}, /* 2 */
2546 {0, 0, 0}, /* 3 */ 2248 {0, 0, 0}, /* 3 */
2547 {0, 0, 0}, /* 4 */ 2249 {0, 0, 0}, /* 4 */
… …
2595 * find a path to that monster that we found. If not, 2297 * find a path to that monster that we found. If not,
2596 * we don't bother going toward it. Returns 1 if we 2298 * we don't bother going toward it. Returns 1 if we
2597 * can see a direct way to get it 2299 * can see a direct way to get it
2598 * Modified to be map tile aware -.MSW 2300 * Modified to be map tile aware -.MSW
2599 */ 2301 */
2600
2601
2602int 2302int
2603can_see_monsterP (mapstruct *m, int x, int y, int dir) 2303can_see_monsterP (maptile *m, int x, int y, int dir)
2604{ 2304{
2605 sint16 dx, dy; 2305 sint16 dx, dy;
2606 int
2607 mflags; 2306 int mflags;
2608 2307
2609 if (dir < 0) 2308 if (dir < 0)
2610 return 0; /* exit condition: invalid direction */ 2309 return 0; /* exit condition: invalid direction */
2611 2310
2612 dx = x + freearr_x[dir]; 2311 dx = x + freearr_x[dir];
… …
2625 return 0; 2324 return 0;
2626 2325
2627 /* yes, can see. */ 2326 /* yes, can see. */
2628 if (dir < 9) 2327 if (dir < 9)
2629 return 1; 2328 return 1;
2329
2630 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2330 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2631 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2331 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2332 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2632} 2333}
2633
2634
2635 2334
2636/* 2335/*
2637 * can_pick(picker, item): finds out if an object is possible to be 2336 * can_pick(picker, item): finds out if an object is possible to be
2638 * picked up by the picker. Returnes 1 if it can be 2337 * picked up by the picker. Returnes 1 if it can be
2639 * picked up, otherwise 0. 2338 * picked up, otherwise 0.
… …
2650 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2349 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2651 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2350 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2652 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2351 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2653} 2352}
2654 2353
2655
2656/* 2354/*
2657 * create clone from object to another 2355 * create clone from object to another
2658 */ 2356 */
2659object * 2357object *
2660object_create_clone (object *asrc) 2358object_create_clone (object *asrc)
2661{ 2359{
2662 object *
2663 dst = NULL, *tmp, *src, *part, *prev, *item; 2360 object *dst = 0, *tmp, *src, *part, *prev, *item;
2664 2361
2665 if (!asrc) 2362 if (!asrc)
2666 return NULL; 2363 return 0;
2364
2667 src = asrc; 2365 src = asrc;
2668 if (src->head) 2366 if (src->head)
2669 src = src->head; 2367 src = src->head;
2670 2368
2671 prev = NULL; 2369 prev = 0;
2672 for (part = src; part; part = part->more) 2370 for (part = src; part; part = part->more)
2673 { 2371 {
2674 tmp = get_object (); 2372 tmp = part->clone ();
2675 copy_object (part, tmp);
2676 tmp->x -= src->x; 2373 tmp->x -= src->x;
2677 tmp->y -= src->y; 2374 tmp->y -= src->y;
2375
2678 if (!part->head) 2376 if (!part->head)
2679 { 2377 {
2680 dst = tmp; 2378 dst = tmp;
2681 tmp->head = NULL; 2379 tmp->head = 0;
2682 } 2380 }
2683 else 2381 else
2684 {
2685 tmp->head = dst; 2382 tmp->head = dst;
2686 } 2383
2687 tmp->more = NULL; 2384 tmp->more = 0;
2385
2688 if (prev) 2386 if (prev)
2689 prev->more = tmp; 2387 prev->more = tmp;
2388
2690 prev = tmp; 2389 prev = tmp;
2691 } 2390 }
2692 2391
2693 /*** copy inventory ***/
2694 for (item = src->inv; item; item = item->below) 2392 for (item = src->inv; item; item = item->below)
2695 {
2696 (void) insert_ob_in_ob (object_create_clone (item), dst); 2393 insert_ob_in_ob (object_create_clone (item), dst);
2697 }
2698 2394
2699 return dst; 2395 return dst;
2700} 2396}
2701 2397
2702/* return true if the object was destroyed, 0 otherwise */
2703int
2704was_destroyed (const object *op, tag_t old_tag)
2705{
2706 /* checking for FLAG_FREED isn't necessary, but makes this function more
2707 * robust */
2708 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709}
2710
2711/* GROS - Creates an object using a string representing its content. */ 2398/* GROS - Creates an object using a string representing its content. */
2712
2713/* Basically, we save the content of the string to a temp file, then call */ 2399/* Basically, we save the content of the string to a temp file, then call */
2714
2715/* load_object on it. I admit it is a highly inefficient way to make things, */ 2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717/* but it was simple to make and allows reusing the load_object function. */ 2401/* but it was simple to make and allows reusing the load_object function. */
2718
2719/* Remember not to use load_object_str in a time-critical situation. */ 2402/* Remember not to use load_object_str in a time-critical situation. */
2720
2721/* Also remember that multiparts objects are not supported for now. */ 2403/* Also remember that multiparts objects are not supported for now. */
2722
2723object * 2404object *
2724load_object_str (const char *obstr) 2405load_object_str (const char *obstr)
2725{ 2406{
2726 object * 2407 object *op;
2727 op;
2728 char
2729 filename[MAX_BUF]; 2408 char filename[MAX_BUF];
2730 2409
2731 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2410 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732 2411
2733 FILE *
2734 tempfile = fopen (filename, "w"); 2412 FILE *tempfile = fopen (filename, "w");
2735 2413
2736 if (tempfile == NULL) 2414 if (tempfile == NULL)
2737 { 2415 {
2738 LOG (llevError, "Error - Unable to access load object temp file\n"); 2416 LOG (llevError, "Error - Unable to access load object temp file\n");
2739 return NULL; 2417 return NULL;
2740 }; 2418 }
2419
2741 fprintf (tempfile, obstr); 2420 fprintf (tempfile, obstr);
2742 fclose (tempfile); 2421 fclose (tempfile);
2743 2422
2744 op = get_object (); 2423 op = object::create ();
2745 2424
2746 object_thawer thawer (filename); 2425 object_thawer thawer (filename);
2747 2426
2748 if (thawer) 2427 if (thawer)
2749 load_object (thawer, op, 0); 2428 load_object (thawer, op, 0);
… …
2759 * returns NULL if no match. 2438 * returns NULL if no match.
2760 */ 2439 */
2761object * 2440object *
2762find_obj_by_type_subtype (const object *who, int type, int subtype) 2441find_obj_by_type_subtype (const object *who, int type, int subtype)
2763{ 2442{
2764 object *
2765 tmp;
2766
2767 for (tmp = who->inv; tmp; tmp = tmp->below) 2443 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2768 if (tmp->type == type && tmp->subtype == subtype) 2444 if (tmp->type == type && tmp->subtype == subtype)
2769 return tmp; 2445 return tmp;
2770 2446
2771 return NULL; 2447 return 0;
2772} 2448}
2773 2449
2774/* If ob has a field named key, return the link from the list, 2450/* If ob has a field named key, return the link from the list,
2775 * otherwise return NULL. 2451 * otherwise return NULL.
2776 * 2452 *
… …
2778 * do the desired thing. 2454 * do the desired thing.
2779 */ 2455 */
2780key_value * 2456key_value *
2781get_ob_key_link (const object *ob, const char *key) 2457get_ob_key_link (const object *ob, const char *key)
2782{ 2458{
2783 key_value *
2784 link;
2785
2786 for (link = ob->key_values; link != NULL; link = link->next) 2459 for (key_value *link = ob->key_values; link; link = link->next)
2787 {
2788 if (link->key == key) 2460 if (link->key == key)
2789 {
2790 return link; 2461 return link;
2791 }
2792 }
2793 2462
2794 return NULL; 2463 return 0;
2795} 2464}
2796 2465
2797/* 2466/*
2798 * Returns the value of op has an extra_field for key, or NULL. 2467 * Returns the value of op has an extra_field for key, or NULL.
2799 * 2468 *
… …
2839 * Returns TRUE on success. 2508 * Returns TRUE on success.
2840 */ 2509 */
2841int 2510int
2842set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2511set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2843{ 2512{
2844 key_value *
2845 field = NULL, *last = NULL; 2513 key_value *field = NULL, *last = NULL;
2846 2514
2847 for (field = op->key_values; field != NULL; field = field->next) 2515 for (field = op->key_values; field != NULL; field = field->next)
2848 { 2516 {
2849 if (field->key != canonical_key) 2517 if (field->key != canonical_key)
2850 { 2518 {
… …
2878 /* IF we get here, key doesn't exist */ 2546 /* IF we get here, key doesn't exist */
2879 2547
2880 /* No field, we'll have to add it. */ 2548 /* No field, we'll have to add it. */
2881 2549
2882 if (!add_key) 2550 if (!add_key)
2883 {
2884 return FALSE; 2551 return FALSE;
2885 } 2552
2886 /* There isn't any good reason to store a null 2553 /* There isn't any good reason to store a null
2887 * value in the key/value list. If the archetype has 2554 * value in the key/value list. If the archetype has
2888 * this key, then we should also have it, so shouldn't 2555 * this key, then we should also have it, so shouldn't
2889 * be here. If user wants to store empty strings, 2556 * be here. If user wants to store empty strings,
2890 * should pass in "" 2557 * should pass in ""
… …
2939 } 2606 }
2940 else 2607 else
2941 item = item->env; 2608 item = item->env;
2942} 2609}
2943 2610
2611
2612const char *
2613object::flag_desc (char *desc, int len) const
2614{
2615 char *p = desc;
2616 bool first = true;
2617
2618 *p = 0;
2619
2620 for (int i = 0; i < NUM_FLAGS; i++)
2621 {
2622 if (len <= 10) // magic constant!
2623 {
2624 snprintf (p, len, ",...");
2625 break;
2626 }
2627
2628 if (flag [i])
2629 {
2630 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2631 len -= cnt;
2632 p += cnt;
2633 first = false;
2634 }
2635 }
2636
2637 return desc;
2638}
2639
2944// return a suitable string describing an objetc in enough detail to find it 2640// return a suitable string describing an object in enough detail to find it
2945const char * 2641const char *
2946object::debug_desc (char *info) const 2642object::debug_desc (char *info) const
2947{ 2643{
2644 char flagdesc[512];
2948 char info2[256 * 3]; 2645 char info2[256 * 4];
2949 char *p = info; 2646 char *p = info;
2950 2647
2951 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2648 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2952 count, 2649 count, uuid.seq,
2953 &name, 2650 &name,
2954 title ? " " : "", 2651 title ? "\",title:" : "",
2955 title ? (const char *)title : ""); 2652 title ? (const char *)title : "",
2653 flag_desc (flagdesc, 512), type);
2956 2654
2957 if (env) 2655 if (env)
2958 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2656 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2959 2657
2960 if (map) 2658 if (map)
2961 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2659 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2962 2660
2963 return info; 2661 return info;
2964} 2662}
2965 2663
2966const char * 2664const char *
2967object::debug_desc () const 2665object::debug_desc () const
2968{ 2666{
2969 static char info[256 * 3]; 2667 static char info[256 * 4];
2970 return debug_desc (info); 2668 return debug_desc (info);
2971} 2669}
2972 2670

Diff Legend

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