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.52 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.80 by root, Sat Dec 23 06:41:39 2006 UTC

… …
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <loader.h> 33#include <loader.h>
34
35#include <bitset>
34 36
35int nrofallocobjects = 0; 37int nrofallocobjects = 0;
36static UUID uuid; 38static UUID uuid;
37const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
38 40
… …
104 _exit (1); 106 _exit (1);
105 } 107 }
106 108
107 uuid.seq = uid; 109 uuid.seq = uid;
108 write_uuid (); 110 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 112 fclose (fp);
111} 113}
112 114
113UUID 115UUID
114gen_uuid () 116gen_uuid ()
… …
183 * 185 *
184 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
187 * 189 *
188 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
189 * 191 *
190 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
191 * check weight 193 * check weight
192 */ 194 */
193 195
194bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
195{ 197{
196 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
198 return 0; 204 return 0;
199 205
200 if (ob1->speed != ob2->speed) 206 //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 207 /* 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 208 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 209 * used to store nrof).
206 */ 210 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 222
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 225
222 226 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 227 || 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) || 228 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 247 || 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)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 251 return 0;
254 252
255 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 254 * check all objects in the inventory.
257 */ 255 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 260 return 0;
263 261
264 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 264 return 0;
267 265
268 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 267 * if it is valid.
270 */ 268 */
… …
354 op = op->env; 352 op = op->env;
355 return op; 353 return op;
356} 354}
357 355
358/* 356/*
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. 357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 358 * Some error messages.
376 * The result of the dump is stored in the static global errmsg array. 359 * The result of the dump is stored in the static global errmsg array.
377 */ 360 */
378 361
379void 362char *
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) 363dump_object (object *op)
435{ 364{
436 if (op == NULL) 365 if (!op)
437 { 366 return strdup ("[NULLOBJ]");
438 strcpy (errmsg, "[NULL pointer]");
439 return;
440 }
441 errmsg[0] = '\0';
442 dump_object2 (op);
443}
444 367
445void 368 object_freezer freezer;
446dump_all_objects (void) 369 save_object (freezer, op, 3);
447{ 370 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 %s\n", errmsg);
454 }
455} 371}
456 372
457/* 373/*
458 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
459 * multi-object 1 which is closest to the second object. 375 * multi-object 1 which is closest to the second object.
… …
479 */ 395 */
480 396
481object * 397object *
482find_object (tag_t i) 398find_object (tag_t i)
483{ 399{
484 object *op;
485
486 for (op = object::first; op != NULL; op = op->next) 400 for (object *op = object::first; op; op = op->next)
487 if (op->count == i) 401 if (op->count == i)
488 break; 402 return op;
489 403
490 return op; 404 return 0;
491} 405}
492 406
493/* 407/*
494 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
495 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
… …
553 } 467 }
554 468
555 op->key_values = 0; 469 op->key_values = 0;
556} 470}
557 471
558void object::clear ()
559{
560 attachable_base::clear ();
561
562 free_key_values (this);
563
564 owner = 0;
565 name = 0;
566 name_pl = 0;
567 title = 0;
568 race = 0;
569 slaying = 0;
570 skill = 0;
571 msg = 0;
572 lore = 0;
573 custom_name = 0;
574 materialname = 0;
575 contr = 0;
576 below = 0;
577 above = 0;
578 inv = 0;
579 container = 0;
580 env = 0;
581 more = 0;
582 head = 0;
583 map = 0;
584 active_next = 0;
585 active_prev = 0;
586
587 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
588
589 SET_FLAG (this, FLAG_REMOVED);
590
591 /* What is not cleared is next, prev, and count */
592
593 expmul = 1.0;
594 face = blank_face;
595
596 if (settings.casting_time)
597 casting_time = -1;
598}
599
600void object::clone (object *destination)
601{
602 *(object_copy *)destination = *this;
603 *(object_pod *)destination = *this;
604
605 if (self || cb)
606 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
607}
608
609/* 472/*
610 * copy object first frees everything allocated by the second object, 473 * copy_to first frees everything allocated by the dst object,
611 * and then copies the contends of the first object into the second 474 * and then copies the contents of itself into the second
612 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
613 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
614 * if the first object is freed, the pointers in the new object 477 * if the first object is freed, the pointers in the new object
615 * will point at garbage. 478 * will point at garbage.
616 */ 479 */
617void 480void
618copy_object (object *op2, object *op) 481object::copy_to (object *dst)
619{ 482{
620 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622 485
623 op2->clone (op); 486 *(object_copy *)dst = *this;
487
488 if (self || cb)
489 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
624 490
625 if (is_freed) 491 if (is_freed)
626 SET_FLAG (op, FLAG_FREED); 492 SET_FLAG (dst, FLAG_FREED);
493
627 if (is_removed) 494 if (is_removed)
628 SET_FLAG (op, FLAG_REMOVED); 495 SET_FLAG (dst, FLAG_REMOVED);
629 496
630 if (op2->speed < 0) 497 if (speed < 0)
631 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 498 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632 499
633 /* Copy over key_values, if any. */ 500 /* Copy over key_values, if any. */
634 if (op2->key_values) 501 if (key_values)
635 { 502 {
636 key_value *tail = 0; 503 key_value *tail = 0;
637 key_value *i; 504 key_value *i;
638 505
639 op->key_values = 0; 506 dst->key_values = 0;
640 507
641 for (i = op2->key_values; i; i = i->next) 508 for (i = key_values; i; i = i->next)
642 { 509 {
643 key_value *new_link = new key_value; 510 key_value *new_link = new key_value;
644 511
645 new_link->next = 0; 512 new_link->next = 0;
646 new_link->key = i->key; 513 new_link->key = i->key;
647 new_link->value = i->value; 514 new_link->value = i->value;
648 515
649 /* Try and be clever here, too. */ 516 /* Try and be clever here, too. */
650 if (!op->key_values) 517 if (!dst->key_values)
651 { 518 {
652 op->key_values = new_link; 519 dst->key_values = new_link;
653 tail = new_link; 520 tail = new_link;
654 } 521 }
655 else 522 else
656 { 523 {
657 tail->next = new_link; 524 tail->next = new_link;
658 tail = new_link; 525 tail = new_link;
659 } 526 }
660 } 527 }
661 } 528 }
662 529
663 update_ob_speed (op); 530 update_ob_speed (dst);
531}
532
533object *
534object::clone ()
535{
536 object *neu = create ();
537 copy_to (neu);
538 return neu;
664} 539}
665 540
666/* 541/*
667 * If an object with the IS_TURNABLE() flag needs to be turned due 542 * If an object with the IS_TURNABLE() flag needs to be turned due
668 * to the closest player being on the other side, this function can 543 * to the closest player being on the other side, this function can
… …
776 op->active_next = NULL; 651 op->active_next = NULL;
777 op->active_prev = NULL; 652 op->active_prev = NULL;
778} 653}
779 654
780/* 655/*
781 * update_object() updates the array which represents the map. 656 * update_object() updates the the map.
782 * It takes into account invisible objects (and represent squares covered 657 * It takes into account invisible objects (and represent squares covered
783 * by invisible objects by whatever is below them (unless it's another 658 * by invisible objects by whatever is below them (unless it's another
784 * invisible object, etc...) 659 * invisible object, etc...)
785 * If the object being updated is beneath a player, the look-window 660 * If the object being updated is beneath a player, the look-window
786 * of that player is updated (this might be a suboptimal way of 661 * of that player is updated (this might be a suboptimal way of
787 * updating that window, though, since update_object() is called _often_) 662 * updating that window, though, since update_object() is called _often_)
788 * 663 *
789 * action is a hint of what the caller believes need to be done. 664 * action is a hint of what the caller believes need to be done.
790 * For example, if the only thing that has changed is the face (due to
791 * an animation), we don't need to call update_position until that actually
792 * comes into view of a player. OTOH, many other things, like addition/removal
793 * of walls or living creatures may need us to update the flags now.
794 * current action are: 665 * current action are:
795 * UP_OBJ_INSERT: op was inserted 666 * UP_OBJ_INSERT: op was inserted
796 * UP_OBJ_REMOVE: op was removed 667 * UP_OBJ_REMOVE: op was removed
797 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 668 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
798 * as that is easier than trying to look at what may have changed. 669 * as that is easier than trying to look at what may have changed.
799 * UP_OBJ_FACE: only the objects face has changed. 670 * UP_OBJ_FACE: only the objects face has changed.
800 */ 671 */
801
802void 672void
803update_object (object *op, int action) 673update_object (object *op, int action)
804{ 674{
805 int update_now = 0, flags;
806 MoveType move_on, move_off, move_block, move_slow; 675 MoveType move_on, move_off, move_block, move_slow;
807 676
808 if (op == NULL) 677 if (op == NULL)
809 { 678 {
810 /* this should never happen */ 679 /* this should never happen */
811 LOG (llevDebug, "update_object() called for NULL object.\n"); 680 LOG (llevDebug, "update_object() called for NULL object.\n");
812 return; 681 return;
813 } 682 }
814 683
815 if (op->env != NULL) 684 if (op->env)
816 { 685 {
817 /* Animation is currently handled by client, so nothing 686 /* Animation is currently handled by client, so nothing
818 * to do in this case. 687 * to do in this case.
819 */ 688 */
820 return; 689 return;
… …
834 abort (); 703 abort ();
835#endif 704#endif
836 return; 705 return;
837 } 706 }
838 707
839 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 708 mapspace &m = op->ms ();
840 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
841 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
842 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
843 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
844 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
845 709
710 if (m.flags_ & P_NEED_UPDATE)
711 /* nop */;
846 if (action == UP_OBJ_INSERT) 712 else if (action == UP_OBJ_INSERT)
847 { 713 {
714 // this is likely overkill, TODO: revisit (schmorp)
848 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 715 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
849 update_now = 1;
850
851 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 716 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
852 update_now = 1; 717 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
853 718 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
719 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
854 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 720 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
855 update_now = 1;
856
857 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
858 update_now = 1;
859
860 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
861 update_now = 1;
862
863 if ((move_on | op->move_on) != move_on) 721 || (m.move_on | op->move_on ) != m.move_on
864 update_now = 1;
865
866 if ((move_off | op->move_off) != move_off) 722 || (m.move_off | op->move_off ) != m.move_off
867 update_now = 1; 723 || (m.move_slow | op->move_slow) != m.move_slow
868
869 /* This isn't perfect, but I don't expect a lot of objects to 724 /* This isn't perfect, but I don't expect a lot of objects to
870 * to have move_allow right now. 725 * to have move_allow right now.
871 */ 726 */
872 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 727 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
873 update_now = 1; 728 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
874 729 m.flags_ = P_NEED_UPDATE;
875 if ((move_slow | op->move_slow) != move_slow)
876 update_now = 1;
877 } 730 }
878 /* if the object is being removed, we can't make intelligent 731 /* if the object is being removed, we can't make intelligent
879 * decisions, because remove_ob can't really pass the object 732 * decisions, because remove_ob can't really pass the object
880 * that is being removed. 733 * that is being removed.
881 */ 734 */
882 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 735 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
883 update_now = 1; 736 m.flags_ = P_NEED_UPDATE;
884 else if (action == UP_OBJ_FACE) 737 else if (action == UP_OBJ_FACE)
885 /* Nothing to do for that case */ ; 738 /* Nothing to do for that case */ ;
886 else 739 else
887 LOG (llevError, "update_object called with invalid action: %d\n", action); 740 LOG (llevError, "update_object called with invalid action: %d\n", action);
888 741
889 if (update_now)
890 {
891 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
892 update_position (op->map, op->x, op->y);
893 }
894
895 if (op->more != NULL) 742 if (op->more)
896 update_object (op->more, action); 743 update_object (op->more, action);
897} 744}
898 745
899object::vector object::mortals; 746object::vector object::mortals;
900object::vector object::objects; // not yet used 747object::vector object::objects; // not yet used
… …
908 else 755 else
909 { 756 {
910 delete *i; 757 delete *i;
911 mortals.erase (i); 758 mortals.erase (i);
912 } 759 }
913
914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals && lastmortals > 100)//D
917 {
918 lastmortals = mortals.size ();//D
919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
921} 760}
922 761
923object::object () 762object::object ()
924{ 763{
925 SET_FLAG (this, FLAG_REMOVED); 764 SET_FLAG (this, FLAG_REMOVED);
… …
984 823
985 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 824 if (QUERY_FLAG (this, FLAG_FRIENDLY))
986 remove_friendly_object (this); 825 remove_friendly_object (this);
987 826
988 if (!QUERY_FLAG (this, FLAG_REMOVED)) 827 if (!QUERY_FLAG (this, FLAG_REMOVED))
989 remove_ob (this); 828 remove ();
990 829
991 SET_FLAG (this, FLAG_FREED); 830 SET_FLAG (this, FLAG_FREED);
992 831
993 if (more) 832 if (more)
994 { 833 {
… …
1019 858
1020 while (op) 859 while (op)
1021 { 860 {
1022 object *tmp = op->below; 861 object *tmp = op->below;
1023 862
1024 remove_ob (op); 863 op->remove ();
1025 864
1026 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 865 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1027 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 866 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1028 free_object (op); 867 op->destroy ();
1029 else 868 else
1030 { 869 {
1031 op->x = x; 870 op->x = x;
1032 op->y = y; 871 op->y = y;
1033 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 872 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1036 op = tmp; 875 op = tmp;
1037 } 876 }
1038 } 877 }
1039 } 878 }
1040 879
880 // hack to ensure that freed objects still have a valid map
881 {
882 static maptile *freed_map; // freed objects are moved here to avoid crashes
883
884 if (!freed_map)
885 {
886 freed_map = new maptile;
887
888 freed_map->name = "/internal/freed_objects_map";
889 freed_map->width = 3;
890 freed_map->height = 3;
891
892 freed_map->allocate ();
893 }
894
895 map = freed_map;
896 x = 1;
897 y = 1;
898 }
899
1041 // clear those pointers that likely might have circular references to us 900 // clear those pointers that likely might have circular references to us
1042 owner = 0; 901 owner = 0;
1043 enemy = 0; 902 enemy = 0;
1044 attacked_by = 0; 903 attacked_by = 0;
1045 904
… …
1057 916
1058/* 917/*
1059 * sub_weight() recursively (outwards) subtracts a number from the 918 * sub_weight() recursively (outwards) subtracts a number from the
1060 * weight of an object (and what is carried by it's environment(s)). 919 * weight of an object (and what is carried by it's environment(s)).
1061 */ 920 */
1062
1063void 921void
1064sub_weight (object *op, signed long weight) 922sub_weight (object *op, signed long weight)
1065{ 923{
1066 while (op != NULL) 924 while (op != NULL)
1067 { 925 {
… …
1071 op->carrying -= weight; 929 op->carrying -= weight;
1072 op = op->env; 930 op = op->env;
1073 } 931 }
1074} 932}
1075 933
1076/* remove_ob(op): 934/* op->remove ():
1077 * This function removes the object op from the linked list of objects 935 * This function removes the object op from the linked list of objects
1078 * which it is currently tied to. When this function is done, the 936 * which it is currently tied to. When this function is done, the
1079 * object will have no environment. If the object previously had an 937 * object will have no environment. If the object previously had an
1080 * environment, the x and y coordinates will be updated to 938 * environment, the x and y coordinates will be updated to
1081 * the previous environment. 939 * the previous environment.
1082 * Beware: This function is called from the editor as well! 940 * Beware: This function is called from the editor as well!
1083 */ 941 */
1084
1085void 942void
1086remove_ob (object *op) 943object::remove ()
1087{ 944{
1088 object *tmp, *last = 0; 945 object *tmp, *last = 0;
1089 object *otmp; 946 object *otmp;
1090 947
1091 int check_walk_off; 948 int check_walk_off;
1092 maptile *m;
1093 949
1094 sint16 x, y;
1095
1096 if (QUERY_FLAG (op, FLAG_REMOVED)) 950 if (QUERY_FLAG (this, FLAG_REMOVED))
1097 return; 951 return;
1098 952
1099 SET_FLAG (op, FLAG_REMOVED); 953 SET_FLAG (this, FLAG_REMOVED);
1100 954
1101 if (op->more != NULL) 955 if (more)
1102 remove_ob (op->more); 956 more->remove ();
1103 957
1104 /* 958 /*
1105 * In this case, the object to be removed is in someones 959 * In this case, the object to be removed is in someones
1106 * inventory. 960 * inventory.
1107 */ 961 */
1108 if (op->env != NULL) 962 if (env)
1109 { 963 {
1110 if (op->nrof) 964 if (nrof)
1111 sub_weight (op->env, op->weight * op->nrof); 965 sub_weight (env, weight * nrof);
1112 else 966 else
1113 sub_weight (op->env, op->weight + op->carrying); 967 sub_weight (env, weight + carrying);
1114 968
1115 /* NO_FIX_PLAYER is set when a great many changes are being 969 /* NO_FIX_PLAYER is set when a great many changes are being
1116 * made to players inventory. If set, avoiding the call 970 * made to players inventory. If set, avoiding the call
1117 * to save cpu time. 971 * to save cpu time.
1118 */ 972 */
1119 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 973 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1120 fix_player (otmp); 974 otmp->update_stats ();
1121 975
1122 if (op->above != NULL) 976 if (above != NULL)
1123 op->above->below = op->below; 977 above->below = below;
1124 else 978 else
1125 op->env->inv = op->below; 979 env->inv = below;
1126 980
1127 if (op->below != NULL) 981 if (below != NULL)
1128 op->below->above = op->above; 982 below->above = above;
1129 983
1130 /* we set up values so that it could be inserted into 984 /* we set up values so that it could be inserted into
1131 * the map, but we don't actually do that - it is up 985 * the map, but we don't actually do that - it is up
1132 * to the caller to decide what we want to do. 986 * to the caller to decide what we want to do.
1133 */ 987 */
1134 op->x = op->env->x, op->y = op->env->y; 988 x = env->x, y = env->y;
1135 op->map = op->env->map; 989 map = env->map;
1136 op->above = NULL, op->below = NULL; 990 above = 0, below = 0;
1137 op->env = NULL; 991 env = 0;
1138 } 992 }
1139 else if (op->map) 993 else if (map)
1140 { 994 {
1141 x = op->x;
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 }
1155
1156 if (op->map != m)
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 995 /* Re did the following section of code - it looks like it had
1161 * lots of logic for things we no longer care about 996 * lots of logic for things we no longer care about
1162 */ 997 */
1163 998
1164 /* link the object above us */ 999 /* link the object above us */
1165 if (op->above) 1000 if (above)
1166 op->above->below = op->below; 1001 above->below = below;
1167 else 1002 else
1168 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1003 map->at (x, y).top = below; /* we were top, set new top */
1169 1004
1170 /* Relink the object below us, if there is one */ 1005 /* Relink the object below us, if there is one */
1171 if (op->below) 1006 if (below)
1172 op->below->above = op->above; 1007 below->above = above;
1173 else 1008 else
1174 { 1009 {
1175 /* Nothing below, which means we need to relink map object for this space 1010 /* 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 1011 * use translated coordinates in case some oddness with map tiling is
1177 * evident 1012 * evident
1178 */ 1013 */
1179 if (GET_MAP_OB (m, x, y) != op) 1014 if (GET_MAP_OB (map, x, y) != this)
1180 { 1015 {
1181 dump_object (op); 1016 char *dump = dump_object (this);
1182 LOG (llevError, 1017 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); 1018 "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);
1019 free (dump);
1184 dump_object (GET_MAP_OB (m, x, y)); 1020 dump = dump_object (GET_MAP_OB (map, x, y));
1185 LOG (llevError, "%s\n", errmsg); 1021 LOG (llevError, "%s\n", dump);
1022 free (dump);
1186 } 1023 }
1187 1024
1188 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1025 map->at (x, y).bottom = above; /* goes on above it. */
1189 } 1026 }
1190 1027
1191 op->above = 0; 1028 above = 0;
1192 op->below = 0; 1029 below = 0;
1193 1030
1194 if (op->map->in_memory == MAP_SAVING) 1031 if (map->in_memory == MAP_SAVING)
1195 return; 1032 return;
1196 1033
1197 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1034 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1198 1035
1199 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1036 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1200 { 1037 {
1201 /* No point updating the players look faces if he is the object 1038 /* No point updating the players look faces if he is the object
1202 * being removed. 1039 * being removed.
1203 */ 1040 */
1204 1041
1205 if (tmp->type == PLAYER && tmp != op) 1042 if (tmp->type == PLAYER && tmp != this)
1206 { 1043 {
1207 /* If a container that the player is currently using somehow gets 1044 /* If a container that the player is currently using somehow gets
1208 * removed (most likely destroyed), update the player view 1045 * removed (most likely destroyed), update the player view
1209 * appropriately. 1046 * appropriately.
1210 */ 1047 */
1211 if (tmp->container == op) 1048 if (tmp->container == this)
1212 { 1049 {
1213 CLEAR_FLAG (op, FLAG_APPLIED); 1050 CLEAR_FLAG (this, FLAG_APPLIED);
1214 tmp->container = NULL; 1051 tmp->container = 0;
1215 } 1052 }
1216 1053
1217 tmp->contr->socket.update_look = 1; 1054 tmp->contr->ns->floorbox_update ();
1218 } 1055 }
1219 1056
1220 /* See if player moving off should effect something */ 1057 /* See if player moving off should effect something */
1221 if (check_walk_off 1058 if (check_walk_off
1222 && ((op->move_type & tmp->move_off) 1059 && ((move_type & tmp->move_off)
1223 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1060 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224 { 1061 {
1225 move_apply (tmp, op, NULL); 1062 move_apply (tmp, this, 0);
1226 1063
1227 if (op->destroyed ()) 1064 if (destroyed ())
1228 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1065 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1229 } 1066 }
1230 1067
1231 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1068 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1232 1069
1233 if (tmp->above == tmp) 1070 if (tmp->above == tmp)
1234 tmp->above = NULL; 1071 tmp->above = 0;
1235 1072
1236 last = tmp; 1073 last = tmp;
1237 } 1074 }
1238 1075
1239 /* last == NULL of there are no objects on this space */ 1076 /* last == NULL of there are no objects on this space */
1240 if (last == NULL) 1077 if (!last)
1241 { 1078 map->at (x, y).flags_ = P_NEED_UPDATE;
1242 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1243 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1244 * those out anyways, and if there are any flags set right now, they won't
1245 * be correct anyways.
1246 */
1247 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1248 update_position (op->map, op->x, op->y);
1249 }
1250 else 1079 else
1251 update_object (last, UP_OBJ_REMOVE); 1080 update_object (last, UP_OBJ_REMOVE);
1252 1081
1253 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1082 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1254 update_all_los (op->map, op->x, op->y); 1083 update_all_los (map, x, y);
1255 } 1084 }
1256} 1085}
1257 1086
1258/* 1087/*
1259 * merge_ob(op,top): 1088 * merge_ob(op,top):
… …
1274 1103
1275 for (; top != NULL; top = top->below) 1104 for (; top != NULL; top = top->below)
1276 { 1105 {
1277 if (top == op) 1106 if (top == op)
1278 continue; 1107 continue;
1279 if (CAN_MERGE (op, top)) 1108
1109 if (object::can_merge (op, top))
1280 { 1110 {
1281 top->nrof += op->nrof; 1111 top->nrof += op->nrof;
1282 1112
1283/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1113/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1284 op->weight = 0; /* Don't want any adjustements now */ 1114 op->weight = 0; /* Don't want any adjustements now */
1285 remove_ob (op); 1115 op->destroy ();
1286 free_object (op);
1287 return top; 1116 return top;
1288 } 1117 }
1289 } 1118 }
1290 1119
1291 return 0; 1120 return 0;
… …
1345 return NULL; 1174 return NULL;
1346 } 1175 }
1347 1176
1348 if (m == NULL) 1177 if (m == NULL)
1349 { 1178 {
1350 dump_object (op); 1179 char *dump = dump_object (op);
1351 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1180 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1181 free (dump);
1352 return op; 1182 return op;
1353 } 1183 }
1354 1184
1355 if (out_of_map (m, op->x, op->y)) 1185 if (out_of_map (m, op->x, op->y))
1356 { 1186 {
1357 dump_object (op); 1187 char *dump = dump_object (op);
1358 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1188 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1359#ifdef MANY_CORES 1189#ifdef MANY_CORES
1360 /* Better to catch this here, as otherwise the next use of this object 1190 /* Better to catch this here, as otherwise the next use of this object
1361 * is likely to cause a crash. Better to find out where it is getting 1191 * is likely to cause a crash. Better to find out where it is getting
1362 * improperly inserted. 1192 * improperly inserted.
1363 */ 1193 */
1364 abort (); 1194 abort ();
1365#endif 1195#endif
1196 free (dump);
1366 return op; 1197 return op;
1367 } 1198 }
1368 1199
1369 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1200 if (!QUERY_FLAG (op, FLAG_REMOVED))
1370 { 1201 {
1371 dump_object (op); 1202 char *dump = dump_object (op);
1372 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1203 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204 free (dump);
1373 return op; 1205 return op;
1374 } 1206 }
1375 1207
1376 if (op->more != NULL) 1208 if (op->more != NULL)
1377 { 1209 {
… …
1415 1247
1416 /* this has to be done after we translate the coordinates. 1248 /* this has to be done after we translate the coordinates.
1417 */ 1249 */
1418 if (op->nrof && !(flag & INS_NO_MERGE)) 1250 if (op->nrof && !(flag & INS_NO_MERGE))
1419 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1251 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1420 if (CAN_MERGE (op, tmp)) 1252 if (object::can_merge (op, tmp))
1421 { 1253 {
1422 op->nrof += tmp->nrof; 1254 op->nrof += tmp->nrof;
1423 remove_ob (tmp); 1255 tmp->destroy ();
1424 free_object (tmp);
1425 } 1256 }
1426 1257
1427 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1258 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1428 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1259 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1429 1260
… …
1442 op->below = originator->below; 1273 op->below = originator->below;
1443 1274
1444 if (op->below) 1275 if (op->below)
1445 op->below->above = op; 1276 op->below->above = op;
1446 else 1277 else
1447 SET_MAP_OB (op->map, op->x, op->y, op); 1278 op->ms ().bottom = op;
1448 1279
1449 /* since *below* originator, no need to update top */ 1280 /* since *below* originator, no need to update top */
1450 originator->below = op; 1281 originator->below = op;
1451 } 1282 }
1452 else 1283 else
… …
1498 * If INS_ON_TOP is used, don't do this processing 1329 * If INS_ON_TOP is used, don't do this processing
1499 * Need to find the object that in fact blocks view, otherwise 1330 * Need to find the object that in fact blocks view, otherwise
1500 * stacking is a bit odd. 1331 * stacking is a bit odd.
1501 */ 1332 */
1502 if (!(flag & INS_ON_TOP) && 1333 if (!(flag & INS_ON_TOP) &&
1503 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1334 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1504 { 1335 {
1505 for (last = top; last != floor; last = last->below) 1336 for (last = top; last != floor; last = last->below)
1506 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1337 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1507 break; 1338 break;
1508 /* Check to see if we found the object that blocks view, 1339 /* Check to see if we found the object that blocks view,
… …
1531 1362
1532 if (op->above) 1363 if (op->above)
1533 op->above->below = op; 1364 op->above->below = op;
1534 1365
1535 op->below = NULL; 1366 op->below = NULL;
1536 SET_MAP_OB (op->map, op->x, op->y, op); 1367 op->ms ().bottom = op;
1537 } 1368 }
1538 else 1369 else
1539 { /* get inserted into the stack above top */ 1370 { /* get inserted into the stack above top */
1540 op->above = top->above; 1371 op->above = top->above;
1541 1372
… …
1545 op->below = top; 1376 op->below = top;
1546 top->above = op; 1377 top->above = op;
1547 } 1378 }
1548 1379
1549 if (op->above == NULL) 1380 if (op->above == NULL)
1550 SET_MAP_TOP (op->map, op->x, op->y, op); 1381 op->ms ().top = op;
1551 } /* else not INS_BELOW_ORIGINATOR */ 1382 } /* else not INS_BELOW_ORIGINATOR */
1552 1383
1553 if (op->type == PLAYER) 1384 if (op->type == PLAYER)
1554 op->contr->do_los = 1; 1385 op->contr->do_los = 1;
1555 1386
1556 /* If we have a floor, we know the player, if any, will be above 1387 /* If we have a floor, we know the player, if any, will be above
1557 * it, so save a few ticks and start from there. 1388 * it, so save a few ticks and start from there.
1558 */ 1389 */
1559 if (!(flag & INS_MAP_LOAD)) 1390 if (!(flag & INS_MAP_LOAD))
1560 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1391 if (object *pl = op->ms ().player ())
1561 if (tmp->type == PLAYER) 1392 pl->contr->ns->floorbox_update ();
1562 tmp->contr->socket.update_look = 1;
1563 1393
1564 /* If this object glows, it may affect lighting conditions that are 1394 /* If this object glows, it may affect lighting conditions that are
1565 * visible to others on this map. But update_all_los is really 1395 * visible to others on this map. But update_all_los is really
1566 * an inefficient way to do this, as it means los for all players 1396 * an inefficient way to do this, as it means los for all players
1567 * on the map will get recalculated. The players could very well 1397 * on the map will get recalculated. The players could very well
… …
1575 1405
1576 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1406 /* updates flags (blocked, alive, no magic, etc) for this map space */
1577 update_object (op, UP_OBJ_INSERT); 1407 update_object (op, UP_OBJ_INSERT);
1578 1408
1579 /* Don't know if moving this to the end will break anything. However, 1409 /* Don't know if moving this to the end will break anything. However,
1580 * we want to have update_look set above before calling this. 1410 * we want to have floorbox_update called before calling this.
1581 * 1411 *
1582 * check_move_on() must be after this because code called from 1412 * check_move_on() must be after this because code called from
1583 * check_move_on() depends on correct map flags (so functions like 1413 * check_move_on() depends on correct map flags (so functions like
1584 * blocked() and wall() work properly), and these flags are updated by 1414 * blocked() and wall() work properly), and these flags are updated by
1585 * update_object(). 1415 * update_object().
… …
1601 1431
1602 return op; 1432 return op;
1603} 1433}
1604 1434
1605/* this function inserts an object in the map, but if it 1435/* this function inserts an object in the map, but if it
1606 * finds an object of its own type, it'll remove that one first. 1436 * finds an object of its own type, it'll remove that one first.
1607 * op is the object to insert it under: supplies x and the map. 1437 * op is the object to insert it under: supplies x and the map.
1608 */ 1438 */
1609void 1439void
1610replace_insert_ob_in_map (const char *arch_string, object *op) 1440replace_insert_ob_in_map (const char *arch_string, object *op)
1611{ 1441{
1612 object * 1442 object *tmp, *tmp1;
1613 tmp;
1614 object *
1615 tmp1;
1616 1443
1617 /* first search for itself and remove any old instances */ 1444 /* first search for itself and remove any old instances */
1618 1445
1619 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1446 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1620 {
1621 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1447 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1622 { 1448 tmp->destroy ();
1623 remove_ob (tmp);
1624 free_object (tmp);
1625 }
1626 }
1627 1449
1628 tmp1 = arch_to_object (archetype::find (arch_string)); 1450 tmp1 = arch_to_object (archetype::find (arch_string));
1629 1451
1630 tmp1->x = op->x; 1452 tmp1->x = op->x;
1631 tmp1->y = op->y; 1453 tmp1->y = op->y;
… …
1641 */ 1463 */
1642 1464
1643object * 1465object *
1644get_split_ob (object *orig_ob, uint32 nr) 1466get_split_ob (object *orig_ob, uint32 nr)
1645{ 1467{
1646 object * 1468 object *newob;
1647 newob;
1648 int
1649 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1469 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1650 1470
1651 if (orig_ob->nrof < nr) 1471 if (orig_ob->nrof < nr)
1652 { 1472 {
1653 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1473 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1654 return NULL; 1474 return NULL;
1655 } 1475 }
1656 1476
1657 newob = object_create_clone (orig_ob); 1477 newob = object_create_clone (orig_ob);
1658 1478
1659 if ((orig_ob->nrof -= nr) < 1) 1479 if ((orig_ob->nrof -= nr) < 1)
1660 { 1480 orig_ob->destroy (1);
1661 if (!is_removed)
1662 remove_ob (orig_ob);
1663 free_object2 (orig_ob, 1);
1664 }
1665 else if (!is_removed) 1481 else if (!is_removed)
1666 { 1482 {
1667 if (orig_ob->env != NULL) 1483 if (orig_ob->env != NULL)
1668 sub_weight (orig_ob->env, orig_ob->weight * nr); 1484 sub_weight (orig_ob->env, orig_ob->weight * nr);
1669 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1485 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1699 if (i > op->nrof) 1515 if (i > op->nrof)
1700 i = op->nrof; 1516 i = op->nrof;
1701 1517
1702 if (QUERY_FLAG (op, FLAG_REMOVED)) 1518 if (QUERY_FLAG (op, FLAG_REMOVED))
1703 op->nrof -= i; 1519 op->nrof -= i;
1704 else if (op->env != NULL) 1520 else if (op->env)
1705 { 1521 {
1706 /* is this object in the players inventory, or sub container 1522 /* is this object in the players inventory, or sub container
1707 * therein? 1523 * therein?
1708 */ 1524 */
1709 tmp = is_player_inv (op->env); 1525 tmp = op->in_player ();
1710 /* nope. Is this a container the player has opened? 1526 /* nope. Is this a container the player has opened?
1711 * If so, set tmp to that player. 1527 * If so, set tmp to that player.
1712 * IMO, searching through all the players will mostly 1528 * IMO, searching through all the players will mostly
1713 * likely be quicker than following op->env to the map, 1529 * likely be quicker than following op->env to the map,
1714 * and then searching the map for a player. 1530 * and then searching the map for a player.
1715 */ 1531 */
1716 if (!tmp) 1532 if (!tmp)
1717 { 1533 {
1718 for (pl = first_player; pl; pl = pl->next) 1534 for (pl = first_player; pl; pl = pl->next)
1719 if (pl->ob->container == op->env) 1535 if (pl->ob->container == op->env)
1536 {
1537 tmp = pl->ob;
1720 break; 1538 break;
1721 if (pl) 1539 }
1722 tmp = pl->ob;
1723 else
1724 tmp = NULL;
1725 } 1540 }
1726 1541
1727 if (i < op->nrof) 1542 if (i < op->nrof)
1728 { 1543 {
1729 sub_weight (op->env, op->weight * i); 1544 sub_weight (op->env, op->weight * i);
1730 op->nrof -= i; 1545 op->nrof -= i;
1731 if (tmp) 1546 if (tmp)
1732 {
1733 esrv_send_item (tmp, op); 1547 esrv_send_item (tmp, op);
1734 }
1735 } 1548 }
1736 else 1549 else
1737 { 1550 {
1738 remove_ob (op); 1551 op->remove ();
1739 op->nrof = 0; 1552 op->nrof = 0;
1740 if (tmp) 1553 if (tmp)
1741 {
1742 esrv_del_item (tmp->contr, op->count); 1554 esrv_del_item (tmp->contr, op->count);
1743 }
1744 } 1555 }
1745 } 1556 }
1746 else 1557 else
1747 { 1558 {
1748 object *above = op->above; 1559 object *above = op->above;
1749 1560
1750 if (i < op->nrof) 1561 if (i < op->nrof)
1751 op->nrof -= i; 1562 op->nrof -= i;
1752 else 1563 else
1753 { 1564 {
1754 remove_ob (op); 1565 op->remove ();
1755 op->nrof = 0; 1566 op->nrof = 0;
1756 } 1567 }
1757 1568
1758 /* Since we just removed op, op->above is null */ 1569 /* Since we just removed op, op->above is null */
1759 for (tmp = above; tmp != NULL; tmp = tmp->above) 1570 for (tmp = above; tmp; tmp = tmp->above)
1760 if (tmp->type == PLAYER) 1571 if (tmp->type == PLAYER)
1761 { 1572 {
1762 if (op->nrof) 1573 if (op->nrof)
1763 esrv_send_item (tmp, op); 1574 esrv_send_item (tmp, op);
1764 else 1575 else
… …
1768 1579
1769 if (op->nrof) 1580 if (op->nrof)
1770 return op; 1581 return op;
1771 else 1582 else
1772 { 1583 {
1773 free_object (op); 1584 op->destroy ();
1774 return NULL; 1585 return 0;
1775 } 1586 }
1776} 1587}
1777 1588
1778/* 1589/*
1779 * add_weight(object, weight) adds the specified weight to an object, 1590 * add_weight(object, weight) adds the specified weight to an object,
… …
1791 op->carrying += weight; 1602 op->carrying += weight;
1792 op = op->env; 1603 op = op->env;
1793 } 1604 }
1794} 1605}
1795 1606
1607object *
1608insert_ob_in_ob (object *op, object *where)
1609{
1610 if (!where)
1611 {
1612 char *dump = dump_object (op);
1613 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1614 free (dump);
1615 return op;
1616 }
1617
1618 if (where->head)
1619 {
1620 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1621 where = where->head;
1622 }
1623
1624 return where->insert (op);
1625}
1626
1796/* 1627/*
1797 * insert_ob_in_ob(op,environment): 1628 * env->insert (op)
1798 * This function inserts the object op in the linked list 1629 * This function inserts the object op in the linked list
1799 * inside the object environment. 1630 * inside the object environment.
1800 * 1631 *
1801 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1802 * the inventory at the last position or next to other objects of the same
1803 * type.
1804 * Frank: Now sorted by type, archetype and magic!
1805 *
1806 * The function returns now pointer to inserted item, and return value can 1632 * The function returns now pointer to inserted item, and return value can
1807 * be != op, if items are merged. -Tero 1633 * be != op, if items are merged. -Tero
1808 */ 1634 */
1809 1635
1810object * 1636object *
1811insert_ob_in_ob (object *op, object *where) 1637object::insert (object *op)
1812{ 1638{
1813 object * 1639 object *tmp, *otmp;
1814 tmp, *
1815 otmp;
1816 1640
1817 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1641 if (!QUERY_FLAG (op, FLAG_REMOVED))
1818 { 1642 op->remove ();
1819 dump_object (op);
1820 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1821 return op;
1822 }
1823
1824 if (where == NULL)
1825 {
1826 dump_object (op);
1827 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1828 return op;
1829 }
1830
1831 if (where->head)
1832 {
1833 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1834 where = where->head;
1835 }
1836 1643
1837 if (op->more) 1644 if (op->more)
1838 { 1645 {
1839 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1646 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1840 return op; 1647 return op;
… …
1842 1649
1843 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1650 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1844 CLEAR_FLAG (op, FLAG_REMOVED); 1651 CLEAR_FLAG (op, FLAG_REMOVED);
1845 if (op->nrof) 1652 if (op->nrof)
1846 { 1653 {
1847 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1654 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1848 if (CAN_MERGE (tmp, op)) 1655 if (object::can_merge (tmp, op))
1849 { 1656 {
1850 /* return the original object and remove inserted object 1657 /* return the original object and remove inserted object
1851 (client needs the original object) */ 1658 (client needs the original object) */
1852 tmp->nrof += op->nrof; 1659 tmp->nrof += op->nrof;
1853 /* Weight handling gets pretty funky. Since we are adding to 1660 /* Weight handling gets pretty funky. Since we are adding to
1854 * tmp->nrof, we need to increase the weight. 1661 * tmp->nrof, we need to increase the weight.
1855 */ 1662 */
1856 add_weight (where, op->weight * op->nrof); 1663 add_weight (this, op->weight * op->nrof);
1857 SET_FLAG (op, FLAG_REMOVED); 1664 SET_FLAG (op, FLAG_REMOVED);
1858 free_object (op); /* free the inserted object */ 1665 op->destroy (); /* free the inserted object */
1859 op = tmp; 1666 op = tmp;
1860 remove_ob (op); /* and fix old object's links */ 1667 op->remove (); /* and fix old object's links */
1861 CLEAR_FLAG (op, FLAG_REMOVED); 1668 CLEAR_FLAG (op, FLAG_REMOVED);
1862 break; 1669 break;
1863 } 1670 }
1864 1671
1865 /* I assume combined objects have no inventory 1672 /* I assume combined objects have no inventory
1866 * We add the weight - this object could have just been removed 1673 * We add the weight - this object could have just been removed
1867 * (if it was possible to merge). calling remove_ob will subtract 1674 * (if it was possible to merge). calling remove_ob will subtract
1868 * the weight, so we need to add it in again, since we actually do 1675 * the weight, so we need to add it in again, since we actually do
1869 * the linking below 1676 * the linking below
1870 */ 1677 */
1871 add_weight (where, op->weight * op->nrof); 1678 add_weight (this, op->weight * op->nrof);
1872 } 1679 }
1873 else 1680 else
1874 add_weight (where, (op->weight + op->carrying)); 1681 add_weight (this, (op->weight + op->carrying));
1875 1682
1876 otmp = is_player_inv (where); 1683 otmp = this->in_player ();
1877 if (otmp && otmp->contr != NULL) 1684 if (otmp && otmp->contr)
1878 {
1879 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1685 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1880 fix_player (otmp); 1686 otmp->update_stats ();
1881 }
1882 1687
1883 op->map = NULL; 1688 op->map = 0;
1884 op->env = where; 1689 op->env = this;
1885 op->above = NULL; 1690 op->above = 0;
1886 op->below = NULL; 1691 op->below = 0;
1887 op->x = 0, op->y = 0; 1692 op->x = 0, op->y = 0;
1888 1693
1889 /* reset the light list and los of the players on the map */ 1694 /* reset the light list and los of the players on the map */
1890 if ((op->glow_radius != 0) && where->map) 1695 if ((op->glow_radius != 0) && map)
1891 { 1696 {
1892#ifdef DEBUG_LIGHTS 1697#ifdef DEBUG_LIGHTS
1893 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1698 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1894#endif /* DEBUG_LIGHTS */ 1699#endif /* DEBUG_LIGHTS */
1895 if (MAP_DARKNESS (where->map)) 1700 if (MAP_DARKNESS (map))
1896 update_all_los (where->map, where->x, where->y); 1701 update_all_los (map, x, y);
1897 } 1702 }
1898 1703
1899 /* Client has no idea of ordering so lets not bother ordering it here. 1704 /* Client has no idea of ordering so lets not bother ordering it here.
1900 * It sure simplifies this function... 1705 * It sure simplifies this function...
1901 */ 1706 */
1902 if (where->inv == NULL) 1707 if (!inv)
1903 where->inv = op; 1708 inv = op;
1904 else 1709 else
1905 { 1710 {
1906 op->below = where->inv; 1711 op->below = inv;
1907 op->below->above = op; 1712 op->below->above = op;
1908 where->inv = op; 1713 inv = op;
1909 } 1714 }
1715
1910 return op; 1716 return op;
1911} 1717}
1912 1718
1913/* 1719/*
1914 * Checks if any objects has a move_type that matches objects 1720 * Checks if any objects has a move_type that matches objects
… …
2227 * if the space being examined only has a wall to the north and empty 2033 * if the space being examined only has a wall to the north and empty
2228 * spaces in all the other directions, this will reduce the search space 2034 * spaces in all the other directions, this will reduce the search space
2229 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
2230 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
2231 */ 2037 */
2232 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2038 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2233 stop = maxfree[i]; 2039 stop = maxfree[i];
2234 } 2040 }
2041
2235 if (!index) 2042 if (!index)
2236 return -1; 2043 return -1;
2044
2237 return altern[RANDOM () % index]; 2045 return altern[RANDOM () % index];
2238} 2046}
2239 2047
2240/* 2048/*
2241 * find_first_free_spot(archetype, maptile, x, y) works like 2049 * find_first_free_spot(archetype, maptile, x, y) works like
… …
2349 mp = m; 2157 mp = m;
2350 nx = x + freearr_x[i]; 2158 nx = x + freearr_x[i];
2351 ny = y + freearr_y[i]; 2159 ny = y + freearr_y[i];
2352 2160
2353 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2161 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2162
2354 if (mflags & P_OUT_OF_MAP) 2163 if (mflags & P_OUT_OF_MAP)
2355 {
2356 max = maxfree[i]; 2164 max = maxfree[i];
2357 }
2358 else 2165 else
2359 { 2166 {
2360 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2167 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2361 2168
2362 if ((move_type & blocked) == move_type) 2169 if ((move_type & blocked) == move_type)
2363 {
2364 max = maxfree[i]; 2170 max = maxfree[i];
2365 }
2366 else if (mflags & P_IS_ALIVE) 2171 else if (mflags & P_IS_ALIVE)
2367 { 2172 {
2368 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2173 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2369 {
2370 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2174 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2371 {
2372 break; 2175 break;
2373 } 2176
2374 }
2375 if (tmp) 2177 if (tmp)
2376 {
2377 return freedir[i]; 2178 return freedir[i];
2378 }
2379 } 2179 }
2380 } 2180 }
2381 } 2181 }
2182
2382 return 0; 2183 return 0;
2383} 2184}
2384 2185
2385/* 2186/*
2386 * distance(object 1, object 2) will return the square of the 2187 * distance(object 1, object 2) will return the square of the
… …
2388 */ 2189 */
2389 2190
2390int 2191int
2391distance (const object *ob1, const object *ob2) 2192distance (const object *ob1, const object *ob2)
2392{ 2193{
2393 int 2194 int i;
2394 i;
2395 2195
2396 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2196 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2397 return i; 2197 return i;
2398} 2198}
2399 2199
… …
2404 */ 2204 */
2405 2205
2406int 2206int
2407find_dir_2 (int x, int y) 2207find_dir_2 (int x, int y)
2408{ 2208{
2409 int 2209 int q;
2410 q;
2411 2210
2412 if (y) 2211 if (y)
2413 q = x * 100 / y; 2212 q = x * 100 / y;
2414 else if (x) 2213 else if (x)
2415 q = -300 * x; 2214 q = -300 * x;
… …
2541 * find a path to that monster that we found. If not, 2340 * find a path to that monster that we found. If not,
2542 * we don't bother going toward it. Returns 1 if we 2341 * we don't bother going toward it. Returns 1 if we
2543 * can see a direct way to get it 2342 * can see a direct way to get it
2544 * Modified to be map tile aware -.MSW 2343 * Modified to be map tile aware -.MSW
2545 */ 2344 */
2546
2547
2548int 2345int
2549can_see_monsterP (maptile *m, int x, int y, int dir) 2346can_see_monsterP (maptile *m, int x, int y, int dir)
2550{ 2347{
2551 sint16 dx, dy; 2348 sint16 dx, dy;
2552 int
2553 mflags; 2349 int mflags;
2554 2350
2555 if (dir < 0) 2351 if (dir < 0)
2556 return 0; /* exit condition: invalid direction */ 2352 return 0; /* exit condition: invalid direction */
2557 2353
2558 dx = x + freearr_x[dir]; 2354 dx = x + freearr_x[dir];
… …
2571 return 0; 2367 return 0;
2572 2368
2573 /* yes, can see. */ 2369 /* yes, can see. */
2574 if (dir < 9) 2370 if (dir < 9)
2575 return 1; 2371 return 1;
2372
2576 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2373 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2577 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2374 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2375 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2578} 2376}
2579
2580
2581 2377
2582/* 2378/*
2583 * can_pick(picker, item): finds out if an object is possible to be 2379 * can_pick(picker, item): finds out if an object is possible to be
2584 * picked up by the picker. Returnes 1 if it can be 2380 * picked up by the picker. Returnes 1 if it can be
2585 * picked up, otherwise 0. 2381 * picked up, otherwise 0.
… …
2596 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2392 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2597 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2393 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2598 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2394 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2599} 2395}
2600 2396
2601
2602/* 2397/*
2603 * create clone from object to another 2398 * create clone from object to another
2604 */ 2399 */
2605object * 2400object *
2606object_create_clone (object *asrc) 2401object_create_clone (object *asrc)
2607{ 2402{
2608 object *
2609 dst = NULL, *tmp, *src, *part, *prev, *item; 2403 object *dst = 0, *tmp, *src, *part, *prev, *item;
2610 2404
2611 if (!asrc) 2405 if (!asrc)
2612 return NULL; 2406 return 0;
2407
2613 src = asrc; 2408 src = asrc;
2614 if (src->head) 2409 if (src->head)
2615 src = src->head; 2410 src = src->head;
2616 2411
2617 prev = NULL; 2412 prev = 0;
2618 for (part = src; part; part = part->more) 2413 for (part = src; part; part = part->more)
2619 { 2414 {
2620 tmp = get_object (); 2415 tmp = part->clone ();
2621 copy_object (part, tmp);
2622 tmp->x -= src->x; 2416 tmp->x -= src->x;
2623 tmp->y -= src->y; 2417 tmp->y -= src->y;
2418
2624 if (!part->head) 2419 if (!part->head)
2625 { 2420 {
2626 dst = tmp; 2421 dst = tmp;
2627 tmp->head = NULL; 2422 tmp->head = 0;
2628 } 2423 }
2629 else 2424 else
2630 {
2631 tmp->head = dst; 2425 tmp->head = dst;
2632 } 2426
2633 tmp->more = NULL; 2427 tmp->more = 0;
2428
2634 if (prev) 2429 if (prev)
2635 prev->more = tmp; 2430 prev->more = tmp;
2431
2636 prev = tmp; 2432 prev = tmp;
2637 } 2433 }
2638 2434
2639 for (item = src->inv; item; item = item->below) 2435 for (item = src->inv; item; item = item->below)
2640 insert_ob_in_ob (object_create_clone (item), dst); 2436 insert_ob_in_ob (object_create_clone (item), dst);
… …
2666 } 2462 }
2667 2463
2668 fprintf (tempfile, obstr); 2464 fprintf (tempfile, obstr);
2669 fclose (tempfile); 2465 fclose (tempfile);
2670 2466
2671 op = get_object (); 2467 op = object::create ();
2672 2468
2673 object_thawer thawer (filename); 2469 object_thawer thawer (filename);
2674 2470
2675 if (thawer) 2471 if (thawer)
2676 load_object (thawer, op, 0); 2472 load_object (thawer, op, 0);

Diff Legend

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