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.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.109 by root, Sun Jan 7 21:54:59 2007 UTC

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

Diff Legend

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