… | |
… | |
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 | |
35 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
36 | static UUID uuid; |
38 | static UUID uuid; |
37 | const uint64 UUID_SKIP = 1<<19; |
39 | const 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 | |
113 | UUID |
115 | UUID |
114 | gen_uuid () |
116 | gen_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 | |
194 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool 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->flags ^ ob2->flags).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 | */ |
… | |
… | |
350 | object * |
348 | object * |
351 | object_get_env_recursive (object *op) |
349 | object_get_env_recursive (object *op) |
352 | { |
350 | { |
353 | while (op->env != NULL) |
351 | while (op->env != NULL) |
354 | op = op->env; |
352 | op = op->env; |
355 | return op; |
|
|
356 | } |
|
|
357 | |
|
|
358 | /* |
|
|
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 | |
|
|
364 | object * |
|
|
365 | is_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; |
353 | return op; |
371 | } |
354 | } |
372 | |
355 | |
373 | /* |
356 | /* |
374 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
… | |
… | |
484 | } |
467 | } |
485 | |
468 | |
486 | op->key_values = 0; |
469 | op->key_values = 0; |
487 | } |
470 | } |
488 | |
471 | |
489 | void object::clear () |
|
|
490 | { |
|
|
491 | attachable_base::clear (); |
|
|
492 | |
|
|
493 | free_key_values (this); |
|
|
494 | |
|
|
495 | owner = 0; |
|
|
496 | name = 0; |
|
|
497 | name_pl = 0; |
|
|
498 | title = 0; |
|
|
499 | race = 0; |
|
|
500 | slaying = 0; |
|
|
501 | skill = 0; |
|
|
502 | msg = 0; |
|
|
503 | lore = 0; |
|
|
504 | custom_name = 0; |
|
|
505 | materialname = 0; |
|
|
506 | contr = 0; |
|
|
507 | below = 0; |
|
|
508 | above = 0; |
|
|
509 | inv = 0; |
|
|
510 | container = 0; |
|
|
511 | env = 0; |
|
|
512 | more = 0; |
|
|
513 | head = 0; |
|
|
514 | map = 0; |
|
|
515 | active_next = 0; |
|
|
516 | active_prev = 0; |
|
|
517 | |
|
|
518 | memset (static_cast<object_pod *>(this), 0, sizeof (object_pod)); |
|
|
519 | |
|
|
520 | SET_FLAG (this, FLAG_REMOVED); |
|
|
521 | |
|
|
522 | /* What is not cleared is next, prev, and count */ |
|
|
523 | |
|
|
524 | expmul = 1.0; |
|
|
525 | face = blank_face; |
|
|
526 | |
|
|
527 | if (settings.casting_time) |
|
|
528 | casting_time = -1; |
|
|
529 | } |
|
|
530 | |
|
|
531 | void object::clone (object *destination) |
|
|
532 | { |
|
|
533 | *(object_copy *)destination = *this; |
|
|
534 | *(object_pod *)destination = *this; |
|
|
535 | |
|
|
536 | if (self || cb) |
|
|
537 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
538 | } |
|
|
539 | |
|
|
540 | /* |
472 | /* |
541 | * copy object first frees everything allocated by the second object, |
473 | * copy_to first frees everything allocated by the dst object, |
542 | * and then copies the contends of the first object into the second |
474 | * and then copies the contents of itself into the second |
543 | * object, allocating what needs to be allocated. Basically, any |
475 | * object, allocating what needs to be allocated. Basically, any |
544 | * 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, |
545 | * 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 |
546 | * will point at garbage. |
478 | * will point at garbage. |
547 | */ |
479 | */ |
548 | void |
480 | void |
549 | copy_object (object *op2, object *op) |
481 | object::copy_to (object *dst) |
550 | { |
482 | { |
551 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
483 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
552 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
484 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
553 | |
485 | |
554 | op2->clone (op); |
486 | *(object_copy *)dst = *this; |
|
|
487 | *(object_pod *)dst = *this; |
|
|
488 | |
|
|
489 | if (self || cb) |
|
|
490 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
555 | |
491 | |
556 | if (is_freed) |
492 | if (is_freed) |
557 | SET_FLAG (op, FLAG_FREED); |
493 | SET_FLAG (dst, FLAG_FREED); |
|
|
494 | |
558 | if (is_removed) |
495 | if (is_removed) |
559 | SET_FLAG (op, FLAG_REMOVED); |
496 | SET_FLAG (dst, FLAG_REMOVED); |
560 | |
497 | |
561 | if (op2->speed < 0) |
498 | if (speed < 0) |
562 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
499 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
563 | |
500 | |
564 | /* Copy over key_values, if any. */ |
501 | /* Copy over key_values, if any. */ |
565 | if (op2->key_values) |
502 | if (key_values) |
566 | { |
503 | { |
567 | key_value *tail = 0; |
504 | key_value *tail = 0; |
568 | key_value *i; |
505 | key_value *i; |
569 | |
506 | |
570 | op->key_values = 0; |
507 | dst->key_values = 0; |
571 | |
508 | |
572 | for (i = op2->key_values; i; i = i->next) |
509 | for (i = key_values; i; i = i->next) |
573 | { |
510 | { |
574 | key_value *new_link = new key_value; |
511 | key_value *new_link = new key_value; |
575 | |
512 | |
576 | new_link->next = 0; |
513 | new_link->next = 0; |
577 | new_link->key = i->key; |
514 | new_link->key = i->key; |
578 | new_link->value = i->value; |
515 | new_link->value = i->value; |
579 | |
516 | |
580 | /* Try and be clever here, too. */ |
517 | /* Try and be clever here, too. */ |
581 | if (!op->key_values) |
518 | if (!dst->key_values) |
582 | { |
519 | { |
583 | op->key_values = new_link; |
520 | dst->key_values = new_link; |
584 | tail = new_link; |
521 | tail = new_link; |
585 | } |
522 | } |
586 | else |
523 | else |
587 | { |
524 | { |
588 | tail->next = new_link; |
525 | tail->next = new_link; |
589 | tail = new_link; |
526 | tail = new_link; |
590 | } |
527 | } |
591 | } |
528 | } |
592 | } |
529 | } |
593 | |
530 | |
594 | update_ob_speed (op); |
531 | update_ob_speed (dst); |
|
|
532 | } |
|
|
533 | |
|
|
534 | object * |
|
|
535 | object::clone () |
|
|
536 | { |
|
|
537 | object *neu = create (); |
|
|
538 | copy_to (neu); |
|
|
539 | return neu; |
595 | } |
540 | } |
596 | |
541 | |
597 | /* |
542 | /* |
598 | * If an object with the IS_TURNABLE() flag needs to be turned due |
543 | * If an object with the IS_TURNABLE() flag needs to be turned due |
599 | * to the closest player being on the other side, this function can |
544 | * to the closest player being on the other side, this function can |
… | |
… | |
707 | op->active_next = NULL; |
652 | op->active_next = NULL; |
708 | op->active_prev = NULL; |
653 | op->active_prev = NULL; |
709 | } |
654 | } |
710 | |
655 | |
711 | /* |
656 | /* |
712 | * update_object() updates the array which represents the map. |
657 | * update_object() updates the the map. |
713 | * It takes into account invisible objects (and represent squares covered |
658 | * It takes into account invisible objects (and represent squares covered |
714 | * by invisible objects by whatever is below them (unless it's another |
659 | * by invisible objects by whatever is below them (unless it's another |
715 | * invisible object, etc...) |
660 | * invisible object, etc...) |
716 | * If the object being updated is beneath a player, the look-window |
661 | * If the object being updated is beneath a player, the look-window |
717 | * of that player is updated (this might be a suboptimal way of |
662 | * of that player is updated (this might be a suboptimal way of |
718 | * updating that window, though, since update_object() is called _often_) |
663 | * updating that window, though, since update_object() is called _often_) |
719 | * |
664 | * |
720 | * action is a hint of what the caller believes need to be done. |
665 | * action is a hint of what the caller believes need to be done. |
721 | * For example, if the only thing that has changed is the face (due to |
|
|
722 | * an animation), we don't need to call update_position until that actually |
|
|
723 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
724 | * of walls or living creatures may need us to update the flags now. |
|
|
725 | * current action are: |
666 | * current action are: |
726 | * UP_OBJ_INSERT: op was inserted |
667 | * UP_OBJ_INSERT: op was inserted |
727 | * UP_OBJ_REMOVE: op was removed |
668 | * UP_OBJ_REMOVE: op was removed |
728 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
669 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
729 | * as that is easier than trying to look at what may have changed. |
670 | * as that is easier than trying to look at what may have changed. |
730 | * UP_OBJ_FACE: only the objects face has changed. |
671 | * UP_OBJ_FACE: only the objects face has changed. |
731 | */ |
672 | */ |
732 | |
|
|
733 | void |
673 | void |
734 | update_object (object *op, int action) |
674 | update_object (object *op, int action) |
735 | { |
675 | { |
736 | int update_now = 0, flags; |
|
|
737 | MoveType move_on, move_off, move_block, move_slow; |
676 | MoveType move_on, move_off, move_block, move_slow; |
738 | |
677 | |
739 | if (op == NULL) |
678 | if (op == NULL) |
740 | { |
679 | { |
741 | /* this should never happen */ |
680 | /* this should never happen */ |
742 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
681 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
743 | return; |
682 | return; |
744 | } |
683 | } |
745 | |
684 | |
746 | if (op->env != NULL) |
685 | if (op->env) |
747 | { |
686 | { |
748 | /* Animation is currently handled by client, so nothing |
687 | /* Animation is currently handled by client, so nothing |
749 | * to do in this case. |
688 | * to do in this case. |
750 | */ |
689 | */ |
751 | return; |
690 | return; |
… | |
… | |
765 | abort (); |
704 | abort (); |
766 | #endif |
705 | #endif |
767 | return; |
706 | return; |
768 | } |
707 | } |
769 | |
708 | |
770 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
709 | mapspace &m = op->ms (); |
771 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
772 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
773 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
774 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
775 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
776 | |
710 | |
|
|
711 | if (m.flags_ & P_NEED_UPDATE) |
|
|
712 | /* nop */; |
777 | if (action == UP_OBJ_INSERT) |
713 | else if (action == UP_OBJ_INSERT) |
778 | { |
714 | { |
|
|
715 | // this is likely overkill, TODO: revisit (schmorp) |
779 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
716 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
780 | update_now = 1; |
|
|
781 | |
|
|
782 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
717 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
783 | update_now = 1; |
718 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
784 | |
719 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
720 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
785 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
721 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
786 | update_now = 1; |
|
|
787 | |
|
|
788 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
789 | update_now = 1; |
|
|
790 | |
|
|
791 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
792 | update_now = 1; |
|
|
793 | |
|
|
794 | if ((move_on | op->move_on) != move_on) |
722 | || (m.move_on | op->move_on ) != m.move_on |
795 | update_now = 1; |
|
|
796 | |
|
|
797 | if ((move_off | op->move_off) != move_off) |
723 | || (m.move_off | op->move_off ) != m.move_off |
798 | update_now = 1; |
724 | || (m.move_slow | op->move_slow) != m.move_slow |
799 | |
|
|
800 | /* This isn't perfect, but I don't expect a lot of objects to |
725 | /* This isn't perfect, but I don't expect a lot of objects to |
801 | * to have move_allow right now. |
726 | * to have move_allow right now. |
802 | */ |
727 | */ |
803 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
728 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
804 | update_now = 1; |
729 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
805 | |
730 | m.flags_ = P_NEED_UPDATE; |
806 | if ((move_slow | op->move_slow) != move_slow) |
|
|
807 | update_now = 1; |
|
|
808 | } |
731 | } |
809 | /* if the object is being removed, we can't make intelligent |
732 | /* if the object is being removed, we can't make intelligent |
810 | * decisions, because remove_ob can't really pass the object |
733 | * decisions, because remove_ob can't really pass the object |
811 | * that is being removed. |
734 | * that is being removed. |
812 | */ |
735 | */ |
813 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
736 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
814 | update_now = 1; |
737 | m.flags_ = P_NEED_UPDATE; |
815 | else if (action == UP_OBJ_FACE) |
738 | else if (action == UP_OBJ_FACE) |
816 | /* Nothing to do for that case */ ; |
739 | /* Nothing to do for that case */ ; |
817 | else |
740 | else |
818 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
741 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
819 | |
742 | |
820 | if (update_now) |
|
|
821 | { |
|
|
822 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
823 | update_position (op->map, op->x, op->y); |
|
|
824 | } |
|
|
825 | |
|
|
826 | if (op->more != NULL) |
743 | if (op->more) |
827 | update_object (op->more, action); |
744 | update_object (op->more, action); |
828 | } |
745 | } |
829 | |
746 | |
830 | object::vector object::mortals; |
747 | object::vector object::mortals; |
831 | object::vector object::objects; // not yet used |
748 | object::vector object::objects; // not yet used |
… | |
… | |
839 | else |
756 | else |
840 | { |
757 | { |
841 | delete *i; |
758 | delete *i; |
842 | mortals.erase (i); |
759 | mortals.erase (i); |
843 | } |
760 | } |
844 | |
|
|
845 | static int lastmortals = 0;//D |
|
|
846 | |
|
|
847 | if (mortals.size() != lastmortals && lastmortals > 100)//D |
|
|
848 | { |
|
|
849 | lastmortals = mortals.size ();//D |
|
|
850 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
851 | } |
|
|
852 | } |
761 | } |
853 | |
762 | |
854 | object::object () |
763 | object::object () |
855 | { |
764 | { |
856 | SET_FLAG (this, FLAG_REMOVED); |
765 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
915 | |
824 | |
916 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
825 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
917 | remove_friendly_object (this); |
826 | remove_friendly_object (this); |
918 | |
827 | |
919 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
828 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
920 | remove_ob (this); |
829 | remove (); |
921 | |
830 | |
922 | SET_FLAG (this, FLAG_FREED); |
831 | SET_FLAG (this, FLAG_FREED); |
923 | |
832 | |
924 | if (more) |
833 | if (more) |
925 | { |
834 | { |
… | |
… | |
950 | |
859 | |
951 | while (op) |
860 | while (op) |
952 | { |
861 | { |
953 | object *tmp = op->below; |
862 | object *tmp = op->below; |
954 | |
863 | |
955 | remove_ob (op); |
864 | op->remove (); |
956 | |
865 | |
957 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
866 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
958 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
867 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
959 | free_object (op); |
868 | op->destroy (); |
960 | else |
869 | else |
961 | { |
870 | { |
962 | op->x = x; |
871 | op->x = x; |
963 | op->y = y; |
872 | op->y = y; |
964 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
873 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
967 | op = tmp; |
876 | op = tmp; |
968 | } |
877 | } |
969 | } |
878 | } |
970 | } |
879 | } |
971 | |
880 | |
|
|
881 | // hack to ensure that freed objects still have a valid map |
|
|
882 | { |
|
|
883 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
884 | |
|
|
885 | if (!freed_map) |
|
|
886 | { |
|
|
887 | freed_map = new maptile; |
|
|
888 | |
|
|
889 | freed_map->name = "/internal/freed_objects_map"; |
|
|
890 | freed_map->width = 3; |
|
|
891 | freed_map->height = 3; |
|
|
892 | |
|
|
893 | freed_map->allocate (); |
|
|
894 | } |
|
|
895 | |
|
|
896 | map = freed_map; |
|
|
897 | x = 1; |
|
|
898 | y = 1; |
|
|
899 | } |
|
|
900 | |
972 | // clear those pointers that likely might have circular references to us |
901 | // clear those pointers that likely might have circular references to us |
973 | owner = 0; |
902 | owner = 0; |
974 | enemy = 0; |
903 | enemy = 0; |
975 | attacked_by = 0; |
904 | attacked_by = 0; |
976 | |
905 | |
… | |
… | |
988 | |
917 | |
989 | /* |
918 | /* |
990 | * sub_weight() recursively (outwards) subtracts a number from the |
919 | * sub_weight() recursively (outwards) subtracts a number from the |
991 | * weight of an object (and what is carried by it's environment(s)). |
920 | * weight of an object (and what is carried by it's environment(s)). |
992 | */ |
921 | */ |
993 | |
|
|
994 | void |
922 | void |
995 | sub_weight (object *op, signed long weight) |
923 | sub_weight (object *op, signed long weight) |
996 | { |
924 | { |
997 | while (op != NULL) |
925 | while (op != NULL) |
998 | { |
926 | { |
… | |
… | |
1002 | op->carrying -= weight; |
930 | op->carrying -= weight; |
1003 | op = op->env; |
931 | op = op->env; |
1004 | } |
932 | } |
1005 | } |
933 | } |
1006 | |
934 | |
1007 | /* remove_ob(op): |
935 | /* op->remove (): |
1008 | * This function removes the object op from the linked list of objects |
936 | * This function removes the object op from the linked list of objects |
1009 | * which it is currently tied to. When this function is done, the |
937 | * which it is currently tied to. When this function is done, the |
1010 | * object will have no environment. If the object previously had an |
938 | * object will have no environment. If the object previously had an |
1011 | * environment, the x and y coordinates will be updated to |
939 | * environment, the x and y coordinates will be updated to |
1012 | * the previous environment. |
940 | * the previous environment. |
1013 | * Beware: This function is called from the editor as well! |
941 | * Beware: This function is called from the editor as well! |
1014 | */ |
942 | */ |
1015 | |
|
|
1016 | void |
943 | void |
1017 | remove_ob (object *op) |
944 | object::remove () |
1018 | { |
945 | { |
1019 | object *tmp, *last = 0; |
946 | object *tmp, *last = 0; |
1020 | object *otmp; |
947 | object *otmp; |
1021 | |
948 | |
1022 | int check_walk_off; |
949 | int check_walk_off; |
1023 | maptile *m; |
|
|
1024 | |
950 | |
1025 | sint16 x, y; |
|
|
1026 | |
|
|
1027 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
951 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1028 | return; |
952 | return; |
1029 | |
953 | |
1030 | SET_FLAG (op, FLAG_REMOVED); |
954 | SET_FLAG (this, FLAG_REMOVED); |
1031 | |
955 | |
1032 | if (op->more != NULL) |
956 | if (more) |
1033 | remove_ob (op->more); |
957 | more->remove (); |
1034 | |
958 | |
1035 | /* |
959 | /* |
1036 | * In this case, the object to be removed is in someones |
960 | * In this case, the object to be removed is in someones |
1037 | * inventory. |
961 | * inventory. |
1038 | */ |
962 | */ |
1039 | if (op->env != NULL) |
963 | if (env) |
1040 | { |
964 | { |
1041 | if (op->nrof) |
965 | if (nrof) |
1042 | sub_weight (op->env, op->weight * op->nrof); |
966 | sub_weight (env, weight * nrof); |
1043 | else |
967 | else |
1044 | sub_weight (op->env, op->weight + op->carrying); |
968 | sub_weight (env, weight + carrying); |
1045 | |
969 | |
1046 | /* NO_FIX_PLAYER is set when a great many changes are being |
970 | /* NO_FIX_PLAYER is set when a great many changes are being |
1047 | * made to players inventory. If set, avoiding the call |
971 | * made to players inventory. If set, avoiding the call |
1048 | * to save cpu time. |
972 | * to save cpu time. |
1049 | */ |
973 | */ |
1050 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
974 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1051 | fix_player (otmp); |
975 | otmp->update_stats (); |
1052 | |
976 | |
1053 | if (op->above != NULL) |
977 | if (above != NULL) |
1054 | op->above->below = op->below; |
978 | above->below = below; |
1055 | else |
979 | else |
1056 | op->env->inv = op->below; |
980 | env->inv = below; |
1057 | |
981 | |
1058 | if (op->below != NULL) |
982 | if (below != NULL) |
1059 | op->below->above = op->above; |
983 | below->above = above; |
1060 | |
984 | |
1061 | /* we set up values so that it could be inserted into |
985 | /* we set up values so that it could be inserted into |
1062 | * the map, but we don't actually do that - it is up |
986 | * the map, but we don't actually do that - it is up |
1063 | * to the caller to decide what we want to do. |
987 | * to the caller to decide what we want to do. |
1064 | */ |
988 | */ |
1065 | op->x = op->env->x, op->y = op->env->y; |
989 | x = env->x, y = env->y; |
1066 | op->map = op->env->map; |
990 | map = env->map; |
1067 | op->above = NULL, op->below = NULL; |
991 | above = 0, below = 0; |
1068 | op->env = NULL; |
992 | env = 0; |
1069 | } |
993 | } |
1070 | else if (op->map) |
994 | else if (map) |
1071 | { |
995 | { |
1072 | x = op->x; |
|
|
1073 | y = op->y; |
|
|
1074 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1075 | |
|
|
1076 | if (!m) |
|
|
1077 | { |
|
|
1078 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1079 | op->map->path, op->x, op->y); |
|
|
1080 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1081 | * it seems if we get into this case, something is probablye |
|
|
1082 | * screwed up and should be fixed. |
|
|
1083 | */ |
|
|
1084 | abort (); |
|
|
1085 | } |
|
|
1086 | |
|
|
1087 | if (op->map != m) |
|
|
1088 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1089 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1090 | |
|
|
1091 | /* Re did the following section of code - it looks like it had |
996 | /* Re did the following section of code - it looks like it had |
1092 | * lots of logic for things we no longer care about |
997 | * lots of logic for things we no longer care about |
1093 | */ |
998 | */ |
1094 | |
999 | |
1095 | /* link the object above us */ |
1000 | /* link the object above us */ |
1096 | if (op->above) |
1001 | if (above) |
1097 | op->above->below = op->below; |
1002 | above->below = below; |
1098 | else |
1003 | else |
1099 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1004 | map->at (x, y).top = below; /* we were top, set new top */ |
1100 | |
1005 | |
1101 | /* Relink the object below us, if there is one */ |
1006 | /* Relink the object below us, if there is one */ |
1102 | if (op->below) |
1007 | if (below) |
1103 | op->below->above = op->above; |
1008 | below->above = above; |
1104 | else |
1009 | else |
1105 | { |
1010 | { |
1106 | /* Nothing below, which means we need to relink map object for this space |
1011 | /* Nothing below, which means we need to relink map object for this space |
1107 | * use translated coordinates in case some oddness with map tiling is |
1012 | * use translated coordinates in case some oddness with map tiling is |
1108 | * evident |
1013 | * evident |
1109 | */ |
1014 | */ |
1110 | if (GET_MAP_OB (m, x, y) != op) |
1015 | if (GET_MAP_OB (map, x, y) != this) |
1111 | { |
1016 | { |
1112 | char *dump = dump_object (op); |
1017 | char *dump = dump_object (this); |
1113 | LOG (llevError, |
1018 | LOG (llevError, |
1114 | "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 | "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); |
1115 | free (dump); |
1020 | free (dump); |
1116 | dump = dump_object (GET_MAP_OB (m, x, y)); |
1021 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1117 | LOG (llevError, "%s\n", dump); |
1022 | LOG (llevError, "%s\n", dump); |
1118 | free (dump); |
1023 | free (dump); |
1119 | } |
1024 | } |
1120 | |
1025 | |
1121 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1026 | map->at (x, y).bottom = above; /* goes on above it. */ |
1122 | } |
1027 | } |
1123 | |
1028 | |
1124 | op->above = 0; |
1029 | above = 0; |
1125 | op->below = 0; |
1030 | below = 0; |
1126 | |
1031 | |
1127 | if (op->map->in_memory == MAP_SAVING) |
1032 | if (map->in_memory == MAP_SAVING) |
1128 | return; |
1033 | return; |
1129 | |
1034 | |
1130 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1035 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1131 | |
1036 | |
1132 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1037 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1133 | { |
1038 | { |
1134 | /* No point updating the players look faces if he is the object |
1039 | /* No point updating the players look faces if he is the object |
1135 | * being removed. |
1040 | * being removed. |
1136 | */ |
1041 | */ |
1137 | |
1042 | |
1138 | if (tmp->type == PLAYER && tmp != op) |
1043 | if (tmp->type == PLAYER && tmp != this) |
1139 | { |
1044 | { |
1140 | /* If a container that the player is currently using somehow gets |
1045 | /* If a container that the player is currently using somehow gets |
1141 | * removed (most likely destroyed), update the player view |
1046 | * removed (most likely destroyed), update the player view |
1142 | * appropriately. |
1047 | * appropriately. |
1143 | */ |
1048 | */ |
1144 | if (tmp->container == op) |
1049 | if (tmp->container == this) |
1145 | { |
1050 | { |
1146 | CLEAR_FLAG (op, FLAG_APPLIED); |
1051 | CLEAR_FLAG (this, FLAG_APPLIED); |
1147 | tmp->container = NULL; |
1052 | tmp->container = 0; |
1148 | } |
1053 | } |
1149 | |
1054 | |
1150 | tmp->contr->socket.update_look = 1; |
1055 | tmp->contr->ns->floorbox_update (); |
1151 | } |
1056 | } |
1152 | |
1057 | |
1153 | /* See if player moving off should effect something */ |
1058 | /* See if player moving off should effect something */ |
1154 | if (check_walk_off |
1059 | if (check_walk_off |
1155 | && ((op->move_type & tmp->move_off) |
1060 | && ((move_type & tmp->move_off) |
1156 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1061 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1157 | { |
1062 | { |
1158 | move_apply (tmp, op, NULL); |
1063 | move_apply (tmp, this, 0); |
1159 | |
1064 | |
1160 | if (op->destroyed ()) |
1065 | if (destroyed ()) |
1161 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1066 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1162 | } |
1067 | } |
1163 | |
1068 | |
1164 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1069 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1165 | |
1070 | |
1166 | if (tmp->above == tmp) |
1071 | if (tmp->above == tmp) |
1167 | tmp->above = NULL; |
1072 | tmp->above = 0; |
1168 | |
1073 | |
1169 | last = tmp; |
1074 | last = tmp; |
1170 | } |
1075 | } |
1171 | |
1076 | |
1172 | /* last == NULL of there are no objects on this space */ |
1077 | /* last == NULL of there are no objects on this space */ |
1173 | if (last == NULL) |
1078 | if (!last) |
1174 | { |
1079 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1175 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1176 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1177 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1178 | * be correct anyways. |
|
|
1179 | */ |
|
|
1180 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
|
|
1181 | update_position (op->map, op->x, op->y); |
|
|
1182 | } |
|
|
1183 | else |
1080 | else |
1184 | update_object (last, UP_OBJ_REMOVE); |
1081 | update_object (last, UP_OBJ_REMOVE); |
1185 | |
1082 | |
1186 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1083 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1187 | update_all_los (op->map, op->x, op->y); |
1084 | update_all_los (map, x, y); |
1188 | } |
1085 | } |
1189 | } |
1086 | } |
1190 | |
1087 | |
1191 | /* |
1088 | /* |
1192 | * merge_ob(op,top): |
1089 | * merge_ob(op,top): |
… | |
… | |
1207 | |
1104 | |
1208 | for (; top != NULL; top = top->below) |
1105 | for (; top != NULL; top = top->below) |
1209 | { |
1106 | { |
1210 | if (top == op) |
1107 | if (top == op) |
1211 | continue; |
1108 | continue; |
1212 | if (CAN_MERGE (op, top)) |
1109 | |
|
|
1110 | if (object::can_merge (op, top)) |
1213 | { |
1111 | { |
1214 | top->nrof += op->nrof; |
1112 | top->nrof += op->nrof; |
1215 | |
1113 | |
1216 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1114 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1217 | op->weight = 0; /* Don't want any adjustements now */ |
1115 | op->weight = 0; /* Don't want any adjustements now */ |
1218 | remove_ob (op); |
1116 | op->destroy (); |
1219 | free_object (op); |
|
|
1220 | return top; |
1117 | return top; |
1221 | } |
1118 | } |
1222 | } |
1119 | } |
1223 | |
1120 | |
1224 | return 0; |
1121 | return 0; |
… | |
… | |
1351 | |
1248 | |
1352 | /* this has to be done after we translate the coordinates. |
1249 | /* this has to be done after we translate the coordinates. |
1353 | */ |
1250 | */ |
1354 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1251 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1355 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1252 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1356 | if (CAN_MERGE (op, tmp)) |
1253 | if (object::can_merge (op, tmp)) |
1357 | { |
1254 | { |
1358 | op->nrof += tmp->nrof; |
1255 | op->nrof += tmp->nrof; |
1359 | remove_ob (tmp); |
1256 | tmp->destroy (); |
1360 | free_object (tmp); |
|
|
1361 | } |
1257 | } |
1362 | |
1258 | |
1363 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1259 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1364 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1260 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1365 | |
1261 | |
… | |
… | |
1378 | op->below = originator->below; |
1274 | op->below = originator->below; |
1379 | |
1275 | |
1380 | if (op->below) |
1276 | if (op->below) |
1381 | op->below->above = op; |
1277 | op->below->above = op; |
1382 | else |
1278 | else |
1383 | SET_MAP_OB (op->map, op->x, op->y, op); |
1279 | op->ms ().bottom = op; |
1384 | |
1280 | |
1385 | /* since *below* originator, no need to update top */ |
1281 | /* since *below* originator, no need to update top */ |
1386 | originator->below = op; |
1282 | originator->below = op; |
1387 | } |
1283 | } |
1388 | else |
1284 | else |
… | |
… | |
1434 | * If INS_ON_TOP is used, don't do this processing |
1330 | * If INS_ON_TOP is used, don't do this processing |
1435 | * Need to find the object that in fact blocks view, otherwise |
1331 | * Need to find the object that in fact blocks view, otherwise |
1436 | * stacking is a bit odd. |
1332 | * stacking is a bit odd. |
1437 | */ |
1333 | */ |
1438 | if (!(flag & INS_ON_TOP) && |
1334 | if (!(flag & INS_ON_TOP) && |
1439 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1335 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1440 | { |
1336 | { |
1441 | for (last = top; last != floor; last = last->below) |
1337 | for (last = top; last != floor; last = last->below) |
1442 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1338 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1443 | break; |
1339 | break; |
1444 | /* Check to see if we found the object that blocks view, |
1340 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1467 | |
1363 | |
1468 | if (op->above) |
1364 | if (op->above) |
1469 | op->above->below = op; |
1365 | op->above->below = op; |
1470 | |
1366 | |
1471 | op->below = NULL; |
1367 | op->below = NULL; |
1472 | SET_MAP_OB (op->map, op->x, op->y, op); |
1368 | op->ms ().bottom = op; |
1473 | } |
1369 | } |
1474 | else |
1370 | else |
1475 | { /* get inserted into the stack above top */ |
1371 | { /* get inserted into the stack above top */ |
1476 | op->above = top->above; |
1372 | op->above = top->above; |
1477 | |
1373 | |
… | |
… | |
1481 | op->below = top; |
1377 | op->below = top; |
1482 | top->above = op; |
1378 | top->above = op; |
1483 | } |
1379 | } |
1484 | |
1380 | |
1485 | if (op->above == NULL) |
1381 | if (op->above == NULL) |
1486 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1382 | op->ms ().top = op; |
1487 | } /* else not INS_BELOW_ORIGINATOR */ |
1383 | } /* else not INS_BELOW_ORIGINATOR */ |
1488 | |
1384 | |
1489 | if (op->type == PLAYER) |
1385 | if (op->type == PLAYER) |
1490 | op->contr->do_los = 1; |
1386 | op->contr->do_los = 1; |
1491 | |
1387 | |
1492 | /* If we have a floor, we know the player, if any, will be above |
1388 | /* If we have a floor, we know the player, if any, will be above |
1493 | * it, so save a few ticks and start from there. |
1389 | * it, so save a few ticks and start from there. |
1494 | */ |
1390 | */ |
1495 | if (!(flag & INS_MAP_LOAD)) |
1391 | if (!(flag & INS_MAP_LOAD)) |
1496 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1392 | if (object *pl = op->ms ().player ()) |
1497 | if (tmp->type == PLAYER) |
1393 | pl->contr->ns->floorbox_update (); |
1498 | tmp->contr->socket.update_look = 1; |
|
|
1499 | |
1394 | |
1500 | /* If this object glows, it may affect lighting conditions that are |
1395 | /* If this object glows, it may affect lighting conditions that are |
1501 | * visible to others on this map. But update_all_los is really |
1396 | * visible to others on this map. But update_all_los is really |
1502 | * an inefficient way to do this, as it means los for all players |
1397 | * an inefficient way to do this, as it means los for all players |
1503 | * on the map will get recalculated. The players could very well |
1398 | * on the map will get recalculated. The players could very well |
… | |
… | |
1511 | |
1406 | |
1512 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1407 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1513 | update_object (op, UP_OBJ_INSERT); |
1408 | update_object (op, UP_OBJ_INSERT); |
1514 | |
1409 | |
1515 | /* Don't know if moving this to the end will break anything. However, |
1410 | /* Don't know if moving this to the end will break anything. However, |
1516 | * we want to have update_look set above before calling this. |
1411 | * we want to have floorbox_update called before calling this. |
1517 | * |
1412 | * |
1518 | * check_move_on() must be after this because code called from |
1413 | * check_move_on() must be after this because code called from |
1519 | * check_move_on() depends on correct map flags (so functions like |
1414 | * check_move_on() depends on correct map flags (so functions like |
1520 | * blocked() and wall() work properly), and these flags are updated by |
1415 | * blocked() and wall() work properly), and these flags are updated by |
1521 | * update_object(). |
1416 | * update_object(). |
… | |
… | |
1537 | |
1432 | |
1538 | return op; |
1433 | return op; |
1539 | } |
1434 | } |
1540 | |
1435 | |
1541 | /* this function inserts an object in the map, but if it |
1436 | /* this function inserts an object in the map, but if it |
1542 | * finds an object of its own type, it'll remove that one first. |
1437 | * finds an object of its own type, it'll remove that one first. |
1543 | * op is the object to insert it under: supplies x and the map. |
1438 | * op is the object to insert it under: supplies x and the map. |
1544 | */ |
1439 | */ |
1545 | void |
1440 | void |
1546 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1441 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1547 | { |
1442 | { |
1548 | object * |
1443 | object *tmp, *tmp1; |
1549 | tmp; |
|
|
1550 | object * |
|
|
1551 | tmp1; |
|
|
1552 | |
1444 | |
1553 | /* first search for itself and remove any old instances */ |
1445 | /* first search for itself and remove any old instances */ |
1554 | |
1446 | |
1555 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1447 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1556 | { |
|
|
1557 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1448 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1558 | { |
1449 | tmp->destroy (); |
1559 | remove_ob (tmp); |
|
|
1560 | free_object (tmp); |
|
|
1561 | } |
|
|
1562 | } |
|
|
1563 | |
1450 | |
1564 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1451 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1565 | |
1452 | |
1566 | tmp1->x = op->x; |
1453 | tmp1->x = op->x; |
1567 | tmp1->y = op->y; |
1454 | tmp1->y = op->y; |
… | |
… | |
1577 | */ |
1464 | */ |
1578 | |
1465 | |
1579 | object * |
1466 | object * |
1580 | get_split_ob (object *orig_ob, uint32 nr) |
1467 | get_split_ob (object *orig_ob, uint32 nr) |
1581 | { |
1468 | { |
1582 | object * |
1469 | object *newob; |
1583 | newob; |
|
|
1584 | int |
|
|
1585 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1470 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1586 | |
1471 | |
1587 | if (orig_ob->nrof < nr) |
1472 | if (orig_ob->nrof < nr) |
1588 | { |
1473 | { |
1589 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1474 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1590 | return NULL; |
1475 | return NULL; |
1591 | } |
1476 | } |
1592 | |
1477 | |
1593 | newob = object_create_clone (orig_ob); |
1478 | newob = object_create_clone (orig_ob); |
1594 | |
1479 | |
1595 | if ((orig_ob->nrof -= nr) < 1) |
1480 | if ((orig_ob->nrof -= nr) < 1) |
1596 | { |
1481 | orig_ob->destroy (1); |
1597 | if (!is_removed) |
|
|
1598 | remove_ob (orig_ob); |
|
|
1599 | free_object2 (orig_ob, 1); |
|
|
1600 | } |
|
|
1601 | else if (!is_removed) |
1482 | else if (!is_removed) |
1602 | { |
1483 | { |
1603 | if (orig_ob->env != NULL) |
1484 | if (orig_ob->env != NULL) |
1604 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1485 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1605 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1486 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1635 | if (i > op->nrof) |
1516 | if (i > op->nrof) |
1636 | i = op->nrof; |
1517 | i = op->nrof; |
1637 | |
1518 | |
1638 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1519 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1639 | op->nrof -= i; |
1520 | op->nrof -= i; |
1640 | else if (op->env != NULL) |
1521 | else if (op->env) |
1641 | { |
1522 | { |
1642 | /* is this object in the players inventory, or sub container |
1523 | /* is this object in the players inventory, or sub container |
1643 | * therein? |
1524 | * therein? |
1644 | */ |
1525 | */ |
1645 | tmp = is_player_inv (op->env); |
1526 | tmp = op->in_player (); |
1646 | /* nope. Is this a container the player has opened? |
1527 | /* nope. Is this a container the player has opened? |
1647 | * If so, set tmp to that player. |
1528 | * If so, set tmp to that player. |
1648 | * IMO, searching through all the players will mostly |
1529 | * IMO, searching through all the players will mostly |
1649 | * likely be quicker than following op->env to the map, |
1530 | * likely be quicker than following op->env to the map, |
1650 | * and then searching the map for a player. |
1531 | * and then searching the map for a player. |
1651 | */ |
1532 | */ |
1652 | if (!tmp) |
1533 | if (!tmp) |
1653 | { |
1534 | { |
1654 | for (pl = first_player; pl; pl = pl->next) |
1535 | for (pl = first_player; pl; pl = pl->next) |
1655 | if (pl->ob->container == op->env) |
1536 | if (pl->ob->container == op->env) |
|
|
1537 | { |
|
|
1538 | tmp = pl->ob; |
1656 | break; |
1539 | break; |
1657 | if (pl) |
1540 | } |
1658 | tmp = pl->ob; |
|
|
1659 | else |
|
|
1660 | tmp = NULL; |
|
|
1661 | } |
1541 | } |
1662 | |
1542 | |
1663 | if (i < op->nrof) |
1543 | if (i < op->nrof) |
1664 | { |
1544 | { |
1665 | sub_weight (op->env, op->weight * i); |
1545 | sub_weight (op->env, op->weight * i); |
1666 | op->nrof -= i; |
1546 | op->nrof -= i; |
1667 | if (tmp) |
1547 | if (tmp) |
1668 | { |
|
|
1669 | esrv_send_item (tmp, op); |
1548 | esrv_send_item (tmp, op); |
1670 | } |
|
|
1671 | } |
1549 | } |
1672 | else |
1550 | else |
1673 | { |
1551 | { |
1674 | remove_ob (op); |
1552 | op->remove (); |
1675 | op->nrof = 0; |
1553 | op->nrof = 0; |
1676 | if (tmp) |
1554 | if (tmp) |
1677 | { |
|
|
1678 | esrv_del_item (tmp->contr, op->count); |
1555 | esrv_del_item (tmp->contr, op->count); |
1679 | } |
|
|
1680 | } |
1556 | } |
1681 | } |
1557 | } |
1682 | else |
1558 | else |
1683 | { |
1559 | { |
1684 | object *above = op->above; |
1560 | object *above = op->above; |
1685 | |
1561 | |
1686 | if (i < op->nrof) |
1562 | if (i < op->nrof) |
1687 | op->nrof -= i; |
1563 | op->nrof -= i; |
1688 | else |
1564 | else |
1689 | { |
1565 | { |
1690 | remove_ob (op); |
1566 | op->remove (); |
1691 | op->nrof = 0; |
1567 | op->nrof = 0; |
1692 | } |
1568 | } |
1693 | |
1569 | |
1694 | /* Since we just removed op, op->above is null */ |
1570 | /* Since we just removed op, op->above is null */ |
1695 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1571 | for (tmp = above; tmp; tmp = tmp->above) |
1696 | if (tmp->type == PLAYER) |
1572 | if (tmp->type == PLAYER) |
1697 | { |
1573 | { |
1698 | if (op->nrof) |
1574 | if (op->nrof) |
1699 | esrv_send_item (tmp, op); |
1575 | esrv_send_item (tmp, op); |
1700 | else |
1576 | else |
… | |
… | |
1704 | |
1580 | |
1705 | if (op->nrof) |
1581 | if (op->nrof) |
1706 | return op; |
1582 | return op; |
1707 | else |
1583 | else |
1708 | { |
1584 | { |
1709 | free_object (op); |
1585 | op->destroy (); |
1710 | return NULL; |
1586 | return 0; |
1711 | } |
1587 | } |
1712 | } |
1588 | } |
1713 | |
1589 | |
1714 | /* |
1590 | /* |
1715 | * add_weight(object, weight) adds the specified weight to an object, |
1591 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1727 | op->carrying += weight; |
1603 | op->carrying += weight; |
1728 | op = op->env; |
1604 | op = op->env; |
1729 | } |
1605 | } |
1730 | } |
1606 | } |
1731 | |
1607 | |
1732 | /* |
|
|
1733 | * insert_ob_in_ob(op,environment): |
|
|
1734 | * This function inserts the object op in the linked list |
|
|
1735 | * inside the object environment. |
|
|
1736 | * |
|
|
1737 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1738 | * the inventory at the last position or next to other objects of the same |
|
|
1739 | * type. |
|
|
1740 | * Frank: Now sorted by type, archetype and magic! |
|
|
1741 | * |
|
|
1742 | * The function returns now pointer to inserted item, and return value can |
|
|
1743 | * be != op, if items are merged. -Tero |
|
|
1744 | */ |
|
|
1745 | |
|
|
1746 | object * |
1608 | object * |
1747 | insert_ob_in_ob (object *op, object *where) |
1609 | insert_ob_in_ob (object *op, object *where) |
1748 | { |
1610 | { |
1749 | object * |
1611 | if (!where) |
1750 | tmp, * |
|
|
1751 | otmp; |
|
|
1752 | |
|
|
1753 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1754 | { |
|
|
1755 | char *dump = dump_object (op); |
|
|
1756 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump); |
|
|
1757 | free (dump); |
|
|
1758 | return op; |
|
|
1759 | } |
|
|
1760 | |
|
|
1761 | if (where == NULL) |
|
|
1762 | { |
1612 | { |
1763 | char *dump = dump_object (op); |
1613 | char *dump = dump_object (op); |
1764 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1614 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1765 | free (dump); |
1615 | free (dump); |
1766 | return op; |
1616 | return op; |
1767 | } |
1617 | } |
1768 | |
1618 | |
1769 | if (where->head) |
1619 | if (where->head) |
1770 | { |
1620 | { |
1771 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
1621 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1772 | where = where->head; |
1622 | where = where->head; |
1773 | } |
1623 | } |
|
|
1624 | |
|
|
1625 | return where->insert (op); |
|
|
1626 | } |
|
|
1627 | |
|
|
1628 | /* |
|
|
1629 | * env->insert (op) |
|
|
1630 | * This function inserts the object op in the linked list |
|
|
1631 | * inside the object environment. |
|
|
1632 | * |
|
|
1633 | * The function returns now pointer to inserted item, and return value can |
|
|
1634 | * be != op, if items are merged. -Tero |
|
|
1635 | */ |
|
|
1636 | |
|
|
1637 | object * |
|
|
1638 | object::insert (object *op) |
|
|
1639 | { |
|
|
1640 | object *tmp, *otmp; |
|
|
1641 | |
|
|
1642 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1643 | op->remove (); |
1774 | |
1644 | |
1775 | if (op->more) |
1645 | if (op->more) |
1776 | { |
1646 | { |
1777 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1647 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1778 | return op; |
1648 | return op; |
… | |
… | |
1780 | |
1650 | |
1781 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1651 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1782 | CLEAR_FLAG (op, FLAG_REMOVED); |
1652 | CLEAR_FLAG (op, FLAG_REMOVED); |
1783 | if (op->nrof) |
1653 | if (op->nrof) |
1784 | { |
1654 | { |
1785 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1655 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1786 | if (CAN_MERGE (tmp, op)) |
1656 | if (object::can_merge (tmp, op)) |
1787 | { |
1657 | { |
1788 | /* return the original object and remove inserted object |
1658 | /* return the original object and remove inserted object |
1789 | (client needs the original object) */ |
1659 | (client needs the original object) */ |
1790 | tmp->nrof += op->nrof; |
1660 | tmp->nrof += op->nrof; |
1791 | /* Weight handling gets pretty funky. Since we are adding to |
1661 | /* Weight handling gets pretty funky. Since we are adding to |
1792 | * tmp->nrof, we need to increase the weight. |
1662 | * tmp->nrof, we need to increase the weight. |
1793 | */ |
1663 | */ |
1794 | add_weight (where, op->weight * op->nrof); |
1664 | add_weight (this, op->weight * op->nrof); |
1795 | SET_FLAG (op, FLAG_REMOVED); |
1665 | SET_FLAG (op, FLAG_REMOVED); |
1796 | free_object (op); /* free the inserted object */ |
1666 | op->destroy (); /* free the inserted object */ |
1797 | op = tmp; |
1667 | op = tmp; |
1798 | remove_ob (op); /* and fix old object's links */ |
1668 | op->remove (); /* and fix old object's links */ |
1799 | CLEAR_FLAG (op, FLAG_REMOVED); |
1669 | CLEAR_FLAG (op, FLAG_REMOVED); |
1800 | break; |
1670 | break; |
1801 | } |
1671 | } |
1802 | |
1672 | |
1803 | /* I assume combined objects have no inventory |
1673 | /* I assume combined objects have no inventory |
1804 | * We add the weight - this object could have just been removed |
1674 | * We add the weight - this object could have just been removed |
1805 | * (if it was possible to merge). calling remove_ob will subtract |
1675 | * (if it was possible to merge). calling remove_ob will subtract |
1806 | * the weight, so we need to add it in again, since we actually do |
1676 | * the weight, so we need to add it in again, since we actually do |
1807 | * the linking below |
1677 | * the linking below |
1808 | */ |
1678 | */ |
1809 | add_weight (where, op->weight * op->nrof); |
1679 | add_weight (this, op->weight * op->nrof); |
1810 | } |
1680 | } |
1811 | else |
1681 | else |
1812 | add_weight (where, (op->weight + op->carrying)); |
1682 | add_weight (this, (op->weight + op->carrying)); |
1813 | |
1683 | |
1814 | otmp = is_player_inv (where); |
1684 | otmp = this->in_player (); |
1815 | if (otmp && otmp->contr != NULL) |
1685 | if (otmp && otmp->contr) |
1816 | { |
|
|
1817 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1686 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1818 | fix_player (otmp); |
1687 | otmp->update_stats (); |
1819 | } |
|
|
1820 | |
1688 | |
1821 | op->map = NULL; |
1689 | op->map = 0; |
1822 | op->env = where; |
1690 | op->env = this; |
1823 | op->above = NULL; |
1691 | op->above = 0; |
1824 | op->below = NULL; |
1692 | op->below = 0; |
1825 | op->x = 0, op->y = 0; |
1693 | op->x = 0, op->y = 0; |
1826 | |
1694 | |
1827 | /* reset the light list and los of the players on the map */ |
1695 | /* reset the light list and los of the players on the map */ |
1828 | if ((op->glow_radius != 0) && where->map) |
1696 | if ((op->glow_radius != 0) && map) |
1829 | { |
1697 | { |
1830 | #ifdef DEBUG_LIGHTS |
1698 | #ifdef DEBUG_LIGHTS |
1831 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1699 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1832 | #endif /* DEBUG_LIGHTS */ |
1700 | #endif /* DEBUG_LIGHTS */ |
1833 | if (MAP_DARKNESS (where->map)) |
1701 | if (MAP_DARKNESS (map)) |
1834 | update_all_los (where->map, where->x, where->y); |
1702 | update_all_los (map, x, y); |
1835 | } |
1703 | } |
1836 | |
1704 | |
1837 | /* Client has no idea of ordering so lets not bother ordering it here. |
1705 | /* Client has no idea of ordering so lets not bother ordering it here. |
1838 | * It sure simplifies this function... |
1706 | * It sure simplifies this function... |
1839 | */ |
1707 | */ |
1840 | if (where->inv == NULL) |
1708 | if (!inv) |
1841 | where->inv = op; |
1709 | inv = op; |
1842 | else |
1710 | else |
1843 | { |
1711 | { |
1844 | op->below = where->inv; |
1712 | op->below = inv; |
1845 | op->below->above = op; |
1713 | op->below->above = op; |
1846 | where->inv = op; |
1714 | inv = op; |
1847 | } |
1715 | } |
|
|
1716 | |
1848 | return op; |
1717 | return op; |
1849 | } |
1718 | } |
1850 | |
1719 | |
1851 | /* |
1720 | /* |
1852 | * Checks if any objects has a move_type that matches objects |
1721 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
2165 | * if the space being examined only has a wall to the north and empty |
2034 | * if the space being examined only has a wall to the north and empty |
2166 | * spaces in all the other directions, this will reduce the search space |
2035 | * spaces in all the other directions, this will reduce the search space |
2167 | * to only the spaces immediately surrounding the target area, and |
2036 | * to only the spaces immediately surrounding the target area, and |
2168 | * won't look 2 spaces south of the target space. |
2037 | * won't look 2 spaces south of the target space. |
2169 | */ |
2038 | */ |
2170 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2039 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2171 | stop = maxfree[i]; |
2040 | stop = maxfree[i]; |
2172 | } |
2041 | } |
|
|
2042 | |
2173 | if (!index) |
2043 | if (!index) |
2174 | return -1; |
2044 | return -1; |
|
|
2045 | |
2175 | return altern[RANDOM () % index]; |
2046 | return altern[RANDOM () % index]; |
2176 | } |
2047 | } |
2177 | |
2048 | |
2178 | /* |
2049 | /* |
2179 | * find_first_free_spot(archetype, maptile, x, y) works like |
2050 | * find_first_free_spot(archetype, maptile, x, y) works like |
… | |
… | |
2287 | mp = m; |
2158 | mp = m; |
2288 | nx = x + freearr_x[i]; |
2159 | nx = x + freearr_x[i]; |
2289 | ny = y + freearr_y[i]; |
2160 | ny = y + freearr_y[i]; |
2290 | |
2161 | |
2291 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2162 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2163 | |
2292 | if (mflags & P_OUT_OF_MAP) |
2164 | if (mflags & P_OUT_OF_MAP) |
2293 | { |
|
|
2294 | max = maxfree[i]; |
2165 | max = maxfree[i]; |
2295 | } |
|
|
2296 | else |
2166 | else |
2297 | { |
2167 | { |
2298 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2168 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2299 | |
2169 | |
2300 | if ((move_type & blocked) == move_type) |
2170 | if ((move_type & blocked) == move_type) |
2301 | { |
|
|
2302 | max = maxfree[i]; |
2171 | max = maxfree[i]; |
2303 | } |
|
|
2304 | else if (mflags & P_IS_ALIVE) |
2172 | else if (mflags & P_IS_ALIVE) |
2305 | { |
2173 | { |
2306 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2174 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) |
2307 | { |
|
|
2308 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2175 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2309 | { |
|
|
2310 | break; |
2176 | break; |
2311 | } |
2177 | |
2312 | } |
|
|
2313 | if (tmp) |
2178 | if (tmp) |
2314 | { |
|
|
2315 | return freedir[i]; |
2179 | return freedir[i]; |
2316 | } |
|
|
2317 | } |
2180 | } |
2318 | } |
2181 | } |
2319 | } |
2182 | } |
|
|
2183 | |
2320 | return 0; |
2184 | return 0; |
2321 | } |
2185 | } |
2322 | |
2186 | |
2323 | /* |
2187 | /* |
2324 | * distance(object 1, object 2) will return the square of the |
2188 | * distance(object 1, object 2) will return the square of the |
… | |
… | |
2326 | */ |
2190 | */ |
2327 | |
2191 | |
2328 | int |
2192 | int |
2329 | distance (const object *ob1, const object *ob2) |
2193 | distance (const object *ob1, const object *ob2) |
2330 | { |
2194 | { |
2331 | int |
2195 | int i; |
2332 | i; |
|
|
2333 | |
2196 | |
2334 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2197 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2335 | return i; |
2198 | return i; |
2336 | } |
2199 | } |
2337 | |
2200 | |
… | |
… | |
2342 | */ |
2205 | */ |
2343 | |
2206 | |
2344 | int |
2207 | int |
2345 | find_dir_2 (int x, int y) |
2208 | find_dir_2 (int x, int y) |
2346 | { |
2209 | { |
2347 | int |
2210 | int q; |
2348 | q; |
|
|
2349 | |
2211 | |
2350 | if (y) |
2212 | if (y) |
2351 | q = x * 100 / y; |
2213 | q = x * 100 / y; |
2352 | else if (x) |
2214 | else if (x) |
2353 | q = -300 * x; |
2215 | q = -300 * x; |
… | |
… | |
2479 | * find a path to that monster that we found. If not, |
2341 | * find a path to that monster that we found. If not, |
2480 | * we don't bother going toward it. Returns 1 if we |
2342 | * we don't bother going toward it. Returns 1 if we |
2481 | * can see a direct way to get it |
2343 | * can see a direct way to get it |
2482 | * Modified to be map tile aware -.MSW |
2344 | * Modified to be map tile aware -.MSW |
2483 | */ |
2345 | */ |
2484 | |
|
|
2485 | |
|
|
2486 | int |
2346 | int |
2487 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2347 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2488 | { |
2348 | { |
2489 | sint16 dx, dy; |
2349 | sint16 dx, dy; |
2490 | int |
|
|
2491 | mflags; |
2350 | int mflags; |
2492 | |
2351 | |
2493 | if (dir < 0) |
2352 | if (dir < 0) |
2494 | return 0; /* exit condition: invalid direction */ |
2353 | return 0; /* exit condition: invalid direction */ |
2495 | |
2354 | |
2496 | dx = x + freearr_x[dir]; |
2355 | dx = x + freearr_x[dir]; |
… | |
… | |
2509 | return 0; |
2368 | return 0; |
2510 | |
2369 | |
2511 | /* yes, can see. */ |
2370 | /* yes, can see. */ |
2512 | if (dir < 9) |
2371 | if (dir < 9) |
2513 | return 1; |
2372 | return 1; |
|
|
2373 | |
2514 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2374 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2515 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2375 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2376 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2516 | } |
2377 | } |
2517 | |
|
|
2518 | |
|
|
2519 | |
2378 | |
2520 | /* |
2379 | /* |
2521 | * can_pick(picker, item): finds out if an object is possible to be |
2380 | * can_pick(picker, item): finds out if an object is possible to be |
2522 | * picked up by the picker. Returnes 1 if it can be |
2381 | * picked up by the picker. Returnes 1 if it can be |
2523 | * picked up, otherwise 0. |
2382 | * picked up, otherwise 0. |
… | |
… | |
2534 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2393 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2535 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2394 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2536 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2395 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2537 | } |
2396 | } |
2538 | |
2397 | |
2539 | |
|
|
2540 | /* |
2398 | /* |
2541 | * create clone from object to another |
2399 | * create clone from object to another |
2542 | */ |
2400 | */ |
2543 | object * |
2401 | object * |
2544 | object_create_clone (object *asrc) |
2402 | object_create_clone (object *asrc) |
2545 | { |
2403 | { |
2546 | object * |
|
|
2547 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2404 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2548 | |
2405 | |
2549 | if (!asrc) |
2406 | if (!asrc) |
2550 | return NULL; |
2407 | return 0; |
|
|
2408 | |
2551 | src = asrc; |
2409 | src = asrc; |
2552 | if (src->head) |
2410 | if (src->head) |
2553 | src = src->head; |
2411 | src = src->head; |
2554 | |
2412 | |
2555 | prev = NULL; |
2413 | prev = 0; |
2556 | for (part = src; part; part = part->more) |
2414 | for (part = src; part; part = part->more) |
2557 | { |
2415 | { |
2558 | tmp = get_object (); |
2416 | tmp = part->clone (); |
2559 | copy_object (part, tmp); |
|
|
2560 | tmp->x -= src->x; |
2417 | tmp->x -= src->x; |
2561 | tmp->y -= src->y; |
2418 | tmp->y -= src->y; |
|
|
2419 | |
2562 | if (!part->head) |
2420 | if (!part->head) |
2563 | { |
2421 | { |
2564 | dst = tmp; |
2422 | dst = tmp; |
2565 | tmp->head = NULL; |
2423 | tmp->head = 0; |
2566 | } |
2424 | } |
2567 | else |
2425 | else |
2568 | { |
|
|
2569 | tmp->head = dst; |
2426 | tmp->head = dst; |
2570 | } |
2427 | |
2571 | tmp->more = NULL; |
2428 | tmp->more = 0; |
|
|
2429 | |
2572 | if (prev) |
2430 | if (prev) |
2573 | prev->more = tmp; |
2431 | prev->more = tmp; |
|
|
2432 | |
2574 | prev = tmp; |
2433 | prev = tmp; |
2575 | } |
2434 | } |
2576 | |
2435 | |
2577 | for (item = src->inv; item; item = item->below) |
2436 | for (item = src->inv; item; item = item->below) |
2578 | insert_ob_in_ob (object_create_clone (item), dst); |
2437 | insert_ob_in_ob (object_create_clone (item), dst); |
… | |
… | |
2604 | } |
2463 | } |
2605 | |
2464 | |
2606 | fprintf (tempfile, obstr); |
2465 | fprintf (tempfile, obstr); |
2607 | fclose (tempfile); |
2466 | fclose (tempfile); |
2608 | |
2467 | |
2609 | op = get_object (); |
2468 | op = object::create (); |
2610 | |
2469 | |
2611 | object_thawer thawer (filename); |
2470 | object_thawer thawer (filename); |
2612 | |
2471 | |
2613 | if (thawer) |
2472 | if (thawer) |
2614 | load_object (thawer, op, 0); |
2473 | load_object (thawer, op, 0); |