… | |
… | |
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 | |
… | |
… | |
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. |
… | |
… | |
526 | |
509 | |
527 | if (settings.casting_time) |
510 | if (settings.casting_time) |
528 | casting_time = -1; |
511 | casting_time = -1; |
529 | } |
512 | } |
530 | |
513 | |
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 | /* |
514 | /* |
541 | * copy object first frees everything allocated by the second object, |
515 | * copy_to first frees everything allocated by the dst object, |
542 | * and then copies the contends of the first object into the second |
516 | * and then copies the contents of itself into the second |
543 | * object, allocating what needs to be allocated. Basically, any |
517 | * object, allocating what needs to be allocated. Basically, any |
544 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
518 | * 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 |
519 | * if the first object is freed, the pointers in the new object |
546 | * will point at garbage. |
520 | * will point at garbage. |
547 | */ |
521 | */ |
548 | void |
522 | void |
549 | copy_object (object *op2, object *op) |
523 | object::copy_to (object *dst) |
550 | { |
524 | { |
551 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
525 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
552 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
526 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
553 | |
527 | |
554 | op2->clone (op); |
528 | *(object_copy *)dst = *this; |
|
|
529 | *(object_pod *)dst = *this; |
|
|
530 | |
|
|
531 | if (self || cb) |
|
|
532 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
555 | |
533 | |
556 | if (is_freed) |
534 | if (is_freed) |
557 | SET_FLAG (op, FLAG_FREED); |
535 | SET_FLAG (dst, FLAG_FREED); |
558 | |
536 | |
559 | if (is_removed) |
537 | if (is_removed) |
560 | SET_FLAG (op, FLAG_REMOVED); |
538 | SET_FLAG (dst, FLAG_REMOVED); |
561 | |
539 | |
562 | if (op2->speed < 0) |
540 | if (speed < 0) |
563 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
541 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
564 | |
542 | |
565 | /* Copy over key_values, if any. */ |
543 | /* Copy over key_values, if any. */ |
566 | if (op2->key_values) |
544 | if (key_values) |
567 | { |
545 | { |
568 | key_value *tail = 0; |
546 | key_value *tail = 0; |
569 | key_value *i; |
547 | key_value *i; |
570 | |
548 | |
571 | op->key_values = 0; |
549 | dst->key_values = 0; |
572 | |
550 | |
573 | for (i = op2->key_values; i; i = i->next) |
551 | for (i = key_values; i; i = i->next) |
574 | { |
552 | { |
575 | key_value *new_link = new key_value; |
553 | key_value *new_link = new key_value; |
576 | |
554 | |
577 | new_link->next = 0; |
555 | new_link->next = 0; |
578 | new_link->key = i->key; |
556 | new_link->key = i->key; |
579 | new_link->value = i->value; |
557 | new_link->value = i->value; |
580 | |
558 | |
581 | /* Try and be clever here, too. */ |
559 | /* Try and be clever here, too. */ |
582 | if (!op->key_values) |
560 | if (!dst->key_values) |
583 | { |
561 | { |
584 | op->key_values = new_link; |
562 | dst->key_values = new_link; |
585 | tail = new_link; |
563 | tail = new_link; |
586 | } |
564 | } |
587 | else |
565 | else |
588 | { |
566 | { |
589 | tail->next = new_link; |
567 | tail->next = new_link; |
590 | tail = new_link; |
568 | tail = new_link; |
591 | } |
569 | } |
592 | } |
570 | } |
593 | } |
571 | } |
594 | |
572 | |
595 | update_ob_speed (op); |
573 | update_ob_speed (dst); |
|
|
574 | } |
|
|
575 | |
|
|
576 | object * |
|
|
577 | object::clone () |
|
|
578 | { |
|
|
579 | object *neu = create (); |
|
|
580 | copy_to (neu); |
|
|
581 | return neu; |
596 | } |
582 | } |
597 | |
583 | |
598 | /* |
584 | /* |
599 | * If an object with the IS_TURNABLE() flag needs to be turned due |
585 | * If an object with the IS_TURNABLE() flag needs to be turned due |
600 | * to the closest player being on the other side, this function can |
586 | * to the closest player being on the other side, this function can |
… | |
… | |
708 | op->active_next = NULL; |
694 | op->active_next = NULL; |
709 | op->active_prev = NULL; |
695 | op->active_prev = NULL; |
710 | } |
696 | } |
711 | |
697 | |
712 | /* |
698 | /* |
713 | * update_object() updates the array which represents the map. |
699 | * update_object() updates the the map. |
714 | * It takes into account invisible objects (and represent squares covered |
700 | * It takes into account invisible objects (and represent squares covered |
715 | * by invisible objects by whatever is below them (unless it's another |
701 | * by invisible objects by whatever is below them (unless it's another |
716 | * invisible object, etc...) |
702 | * invisible object, etc...) |
717 | * If the object being updated is beneath a player, the look-window |
703 | * If the object being updated is beneath a player, the look-window |
718 | * of that player is updated (this might be a suboptimal way of |
704 | * of that player is updated (this might be a suboptimal way of |
719 | * updating that window, though, since update_object() is called _often_) |
705 | * updating that window, though, since update_object() is called _often_) |
720 | * |
706 | * |
721 | * action is a hint of what the caller believes need to be done. |
707 | * action is a hint of what the caller believes need to be done. |
722 | * For example, if the only thing that has changed is the face (due to |
|
|
723 | * an animation), we don't need to call update_position until that actually |
|
|
724 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
725 | * of walls or living creatures may need us to update the flags now. |
|
|
726 | * current action are: |
708 | * current action are: |
727 | * UP_OBJ_INSERT: op was inserted |
709 | * UP_OBJ_INSERT: op was inserted |
728 | * UP_OBJ_REMOVE: op was removed |
710 | * UP_OBJ_REMOVE: op was removed |
729 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
711 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
730 | * as that is easier than trying to look at what may have changed. |
712 | * as that is easier than trying to look at what may have changed. |
731 | * UP_OBJ_FACE: only the objects face has changed. |
713 | * UP_OBJ_FACE: only the objects face has changed. |
732 | */ |
714 | */ |
733 | |
|
|
734 | void |
715 | void |
735 | update_object (object *op, int action) |
716 | update_object (object *op, int action) |
736 | { |
717 | { |
737 | int update_now = 0, flags; |
|
|
738 | MoveType move_on, move_off, move_block, move_slow; |
718 | MoveType move_on, move_off, move_block, move_slow; |
739 | |
719 | |
740 | if (op == NULL) |
720 | if (op == NULL) |
741 | { |
721 | { |
742 | /* this should never happen */ |
722 | /* this should never happen */ |
743 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
723 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
744 | return; |
724 | return; |
745 | } |
725 | } |
746 | |
726 | |
747 | if (op->env != NULL) |
727 | if (op->env) |
748 | { |
728 | { |
749 | /* Animation is currently handled by client, so nothing |
729 | /* Animation is currently handled by client, so nothing |
750 | * to do in this case. |
730 | * to do in this case. |
751 | */ |
731 | */ |
752 | return; |
732 | return; |
… | |
… | |
766 | abort (); |
746 | abort (); |
767 | #endif |
747 | #endif |
768 | return; |
748 | return; |
769 | } |
749 | } |
770 | |
750 | |
771 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
751 | mapspace &m = op->ms (); |
772 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
773 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
774 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
775 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
776 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
777 | |
752 | |
|
|
753 | if (m.flags_ & P_NEED_UPDATE) |
|
|
754 | /* nop */; |
778 | if (action == UP_OBJ_INSERT) |
755 | else if (action == UP_OBJ_INSERT) |
779 | { |
756 | { |
|
|
757 | // this is likely overkill, TODO: revisit (schmorp) |
780 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
758 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
781 | update_now = 1; |
|
|
782 | |
|
|
783 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
759 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
784 | update_now = 1; |
760 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
785 | |
761 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
762 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
786 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
763 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
787 | update_now = 1; |
|
|
788 | |
|
|
789 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
790 | update_now = 1; |
|
|
791 | |
|
|
792 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
793 | update_now = 1; |
|
|
794 | |
|
|
795 | if ((move_on | op->move_on) != move_on) |
764 | || (m.move_on | op->move_on ) != m.move_on |
796 | update_now = 1; |
|
|
797 | |
|
|
798 | if ((move_off | op->move_off) != move_off) |
765 | || (m.move_off | op->move_off ) != m.move_off |
799 | update_now = 1; |
766 | || (m.move_slow | op->move_slow) != m.move_slow |
800 | |
|
|
801 | /* This isn't perfect, but I don't expect a lot of objects to |
767 | /* This isn't perfect, but I don't expect a lot of objects to |
802 | * to have move_allow right now. |
768 | * to have move_allow right now. |
803 | */ |
769 | */ |
804 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
770 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
805 | update_now = 1; |
771 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
806 | |
772 | m.flags_ = P_NEED_UPDATE; |
807 | if ((move_slow | op->move_slow) != move_slow) |
|
|
808 | update_now = 1; |
|
|
809 | } |
773 | } |
810 | |
|
|
811 | /* if the object is being removed, we can't make intelligent |
774 | /* if the object is being removed, we can't make intelligent |
812 | * decisions, because remove_ob can't really pass the object |
775 | * decisions, because remove_ob can't really pass the object |
813 | * that is being removed. |
776 | * that is being removed. |
814 | */ |
777 | */ |
815 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
778 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
816 | update_now = 1; |
779 | m.flags_ = P_NEED_UPDATE; |
817 | else if (action == UP_OBJ_FACE) |
780 | else if (action == UP_OBJ_FACE) |
818 | /* Nothing to do for that case */ ; |
781 | /* Nothing to do for that case */ ; |
819 | else |
782 | else |
820 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
783 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
821 | |
784 | |
822 | if (update_now) |
|
|
823 | { |
|
|
824 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
825 | update_position (op->map, op->x, op->y); |
|
|
826 | } |
|
|
827 | |
|
|
828 | if (op->more != NULL) |
785 | if (op->more) |
829 | update_object (op->more, action); |
786 | update_object (op->more, action); |
830 | } |
787 | } |
831 | |
788 | |
832 | object::vector object::mortals; |
789 | object::vector object::mortals; |
833 | object::vector object::objects; // not yet used |
790 | object::vector object::objects; // not yet used |
… | |
… | |
948 | |
905 | |
949 | op->remove (); |
906 | op->remove (); |
950 | |
907 | |
951 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
908 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
952 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
909 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
953 | op->destroy (0); |
910 | op->destroy (); |
954 | else |
911 | else |
955 | { |
912 | { |
956 | op->x = x; |
913 | op->x = x; |
957 | op->y = y; |
914 | op->y = y; |
958 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
915 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
1054 | |
1011 | |
1055 | /* NO_FIX_PLAYER is set when a great many changes are being |
1012 | /* NO_FIX_PLAYER is set when a great many changes are being |
1056 | * made to players inventory. If set, avoiding the call |
1013 | * made to players inventory. If set, avoiding the call |
1057 | * to save cpu time. |
1014 | * to save cpu time. |
1058 | */ |
1015 | */ |
1059 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1016 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1060 | fix_player (otmp); |
1017 | fix_player (otmp); |
1061 | |
1018 | |
1062 | if (above != NULL) |
1019 | if (above != NULL) |
1063 | above->below = below; |
1020 | above->below = below; |
1064 | else |
1021 | else |
… | |
… | |
1084 | |
1041 | |
1085 | /* link the object above us */ |
1042 | /* link the object above us */ |
1086 | if (above) |
1043 | if (above) |
1087 | above->below = below; |
1044 | above->below = below; |
1088 | else |
1045 | else |
1089 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1046 | map->at (x, y).top = below; /* we were top, set new top */ |
1090 | |
1047 | |
1091 | /* Relink the object below us, if there is one */ |
1048 | /* Relink the object below us, if there is one */ |
1092 | if (below) |
1049 | if (below) |
1093 | below->above = above; |
1050 | below->above = above; |
1094 | else |
1051 | else |
… | |
… | |
1106 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1063 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1107 | LOG (llevError, "%s\n", dump); |
1064 | LOG (llevError, "%s\n", dump); |
1108 | free (dump); |
1065 | free (dump); |
1109 | } |
1066 | } |
1110 | |
1067 | |
1111 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1068 | map->at (x, y).bottom = above; /* goes on above it. */ |
1112 | } |
1069 | } |
1113 | |
1070 | |
1114 | above = 0; |
1071 | above = 0; |
1115 | below = 0; |
1072 | below = 0; |
1116 | |
1073 | |
… | |
… | |
1135 | { |
1092 | { |
1136 | CLEAR_FLAG (this, FLAG_APPLIED); |
1093 | CLEAR_FLAG (this, FLAG_APPLIED); |
1137 | tmp->container = 0; |
1094 | tmp->container = 0; |
1138 | } |
1095 | } |
1139 | |
1096 | |
1140 | tmp->contr->socket.update_look = 1; |
1097 | tmp->contr->socket->floorbox_update (); |
1141 | } |
1098 | } |
1142 | |
1099 | |
1143 | /* See if player moving off should effect something */ |
1100 | /* See if player moving off should effect something */ |
1144 | if (check_walk_off |
1101 | if (check_walk_off |
1145 | && ((move_type & tmp->move_off) |
1102 | && ((move_type & tmp->move_off) |
… | |
… | |
1159 | last = tmp; |
1116 | last = tmp; |
1160 | } |
1117 | } |
1161 | |
1118 | |
1162 | /* last == NULL of there are no objects on this space */ |
1119 | /* last == NULL of there are no objects on this space */ |
1163 | if (!last) |
1120 | if (!last) |
1164 | { |
1121 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1165 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1166 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1167 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1168 | * be correct anyways. |
|
|
1169 | */ |
|
|
1170 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
|
|
1171 | update_position (map, x, y); |
|
|
1172 | } |
|
|
1173 | else |
1122 | else |
1174 | update_object (last, UP_OBJ_REMOVE); |
1123 | update_object (last, UP_OBJ_REMOVE); |
1175 | |
1124 | |
1176 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1125 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1177 | update_all_los (map, x, y); |
1126 | update_all_los (map, x, y); |
… | |
… | |
1197 | |
1146 | |
1198 | for (; top != NULL; top = top->below) |
1147 | for (; top != NULL; top = top->below) |
1199 | { |
1148 | { |
1200 | if (top == op) |
1149 | if (top == op) |
1201 | continue; |
1150 | continue; |
1202 | if (CAN_MERGE (op, top)) |
1151 | |
|
|
1152 | if (object::can_merge (op, top)) |
1203 | { |
1153 | { |
1204 | top->nrof += op->nrof; |
1154 | top->nrof += op->nrof; |
1205 | |
1155 | |
1206 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1156 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1207 | op->weight = 0; /* Don't want any adjustements now */ |
1157 | op->weight = 0; /* Don't want any adjustements now */ |
1208 | op->remove (); |
|
|
1209 | op->destroy (0); |
1158 | op->destroy (); |
1210 | return top; |
1159 | return top; |
1211 | } |
1160 | } |
1212 | } |
1161 | } |
1213 | |
1162 | |
1214 | return 0; |
1163 | return 0; |
… | |
… | |
1341 | |
1290 | |
1342 | /* this has to be done after we translate the coordinates. |
1291 | /* this has to be done after we translate the coordinates. |
1343 | */ |
1292 | */ |
1344 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1293 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1345 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1294 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1346 | if (CAN_MERGE (op, tmp)) |
1295 | if (object::can_merge (op, tmp)) |
1347 | { |
1296 | { |
1348 | op->nrof += tmp->nrof; |
1297 | op->nrof += tmp->nrof; |
1349 | tmp->remove (); |
|
|
1350 | tmp->destroy (0); |
1298 | tmp->destroy (); |
1351 | } |
1299 | } |
1352 | |
1300 | |
1353 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1301 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1354 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1302 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1355 | |
1303 | |
… | |
… | |
1368 | op->below = originator->below; |
1316 | op->below = originator->below; |
1369 | |
1317 | |
1370 | if (op->below) |
1318 | if (op->below) |
1371 | op->below->above = op; |
1319 | op->below->above = op; |
1372 | else |
1320 | else |
1373 | SET_MAP_OB (op->map, op->x, op->y, op); |
1321 | op->ms ().bottom = op; |
1374 | |
1322 | |
1375 | /* since *below* originator, no need to update top */ |
1323 | /* since *below* originator, no need to update top */ |
1376 | originator->below = op; |
1324 | originator->below = op; |
1377 | } |
1325 | } |
1378 | else |
1326 | else |
… | |
… | |
1424 | * If INS_ON_TOP is used, don't do this processing |
1372 | * If INS_ON_TOP is used, don't do this processing |
1425 | * Need to find the object that in fact blocks view, otherwise |
1373 | * Need to find the object that in fact blocks view, otherwise |
1426 | * stacking is a bit odd. |
1374 | * stacking is a bit odd. |
1427 | */ |
1375 | */ |
1428 | if (!(flag & INS_ON_TOP) && |
1376 | if (!(flag & INS_ON_TOP) && |
1429 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1377 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1430 | { |
1378 | { |
1431 | for (last = top; last != floor; last = last->below) |
1379 | for (last = top; last != floor; last = last->below) |
1432 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1380 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1433 | break; |
1381 | break; |
1434 | /* Check to see if we found the object that blocks view, |
1382 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1457 | |
1405 | |
1458 | if (op->above) |
1406 | if (op->above) |
1459 | op->above->below = op; |
1407 | op->above->below = op; |
1460 | |
1408 | |
1461 | op->below = NULL; |
1409 | op->below = NULL; |
1462 | SET_MAP_OB (op->map, op->x, op->y, op); |
1410 | op->ms ().bottom = op; |
1463 | } |
1411 | } |
1464 | else |
1412 | else |
1465 | { /* get inserted into the stack above top */ |
1413 | { /* get inserted into the stack above top */ |
1466 | op->above = top->above; |
1414 | op->above = top->above; |
1467 | |
1415 | |
… | |
… | |
1471 | op->below = top; |
1419 | op->below = top; |
1472 | top->above = op; |
1420 | top->above = op; |
1473 | } |
1421 | } |
1474 | |
1422 | |
1475 | if (op->above == NULL) |
1423 | if (op->above == NULL) |
1476 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1424 | op->ms ().top = op; |
1477 | } /* else not INS_BELOW_ORIGINATOR */ |
1425 | } /* else not INS_BELOW_ORIGINATOR */ |
1478 | |
1426 | |
1479 | if (op->type == PLAYER) |
1427 | if (op->type == PLAYER) |
1480 | op->contr->do_los = 1; |
1428 | op->contr->do_los = 1; |
1481 | |
1429 | |
1482 | /* If we have a floor, we know the player, if any, will be above |
1430 | /* If we have a floor, we know the player, if any, will be above |
1483 | * it, so save a few ticks and start from there. |
1431 | * it, so save a few ticks and start from there. |
1484 | */ |
1432 | */ |
1485 | if (!(flag & INS_MAP_LOAD)) |
1433 | if (!(flag & INS_MAP_LOAD)) |
1486 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1434 | if (object *pl = op->ms ().player ()) |
1487 | if (tmp->type == PLAYER) |
1435 | pl->contr->socket->floorbox_update (); |
1488 | tmp->contr->socket.update_look = 1; |
|
|
1489 | |
1436 | |
1490 | /* If this object glows, it may affect lighting conditions that are |
1437 | /* If this object glows, it may affect lighting conditions that are |
1491 | * visible to others on this map. But update_all_los is really |
1438 | * visible to others on this map. But update_all_los is really |
1492 | * an inefficient way to do this, as it means los for all players |
1439 | * an inefficient way to do this, as it means los for all players |
1493 | * on the map will get recalculated. The players could very well |
1440 | * on the map will get recalculated. The players could very well |
… | |
… | |
1501 | |
1448 | |
1502 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1449 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1503 | update_object (op, UP_OBJ_INSERT); |
1450 | update_object (op, UP_OBJ_INSERT); |
1504 | |
1451 | |
1505 | /* Don't know if moving this to the end will break anything. However, |
1452 | /* Don't know if moving this to the end will break anything. However, |
1506 | * we want to have update_look set above before calling this. |
1453 | * we want to have floorbox_update called before calling this. |
1507 | * |
1454 | * |
1508 | * check_move_on() must be after this because code called from |
1455 | * check_move_on() must be after this because code called from |
1509 | * check_move_on() depends on correct map flags (so functions like |
1456 | * check_move_on() depends on correct map flags (so functions like |
1510 | * blocked() and wall() work properly), and these flags are updated by |
1457 | * blocked() and wall() work properly), and these flags are updated by |
1511 | * update_object(). |
1458 | * update_object(). |
… | |
… | |
1527 | |
1474 | |
1528 | return op; |
1475 | return op; |
1529 | } |
1476 | } |
1530 | |
1477 | |
1531 | /* this function inserts an object in the map, but if it |
1478 | /* this function inserts an object in the map, but if it |
1532 | * finds an object of its own type, it'll remove that one first. |
1479 | * finds an object of its own type, it'll remove that one first. |
1533 | * op is the object to insert it under: supplies x and the map. |
1480 | * op is the object to insert it under: supplies x and the map. |
1534 | */ |
1481 | */ |
1535 | void |
1482 | void |
1536 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1483 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1537 | { |
1484 | { |
1538 | object * |
1485 | object *tmp, *tmp1; |
1539 | tmp; |
|
|
1540 | object * |
|
|
1541 | tmp1; |
|
|
1542 | |
1486 | |
1543 | /* first search for itself and remove any old instances */ |
1487 | /* first search for itself and remove any old instances */ |
1544 | |
1488 | |
1545 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1489 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1546 | { |
|
|
1547 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1490 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1548 | { |
|
|
1549 | tmp->remove (); |
|
|
1550 | tmp->destroy (0); |
1491 | tmp->destroy (); |
1551 | } |
|
|
1552 | } |
|
|
1553 | |
1492 | |
1554 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1493 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1555 | |
1494 | |
1556 | tmp1->x = op->x; |
1495 | tmp1->x = op->x; |
1557 | tmp1->y = op->y; |
1496 | tmp1->y = op->y; |
… | |
… | |
1567 | */ |
1506 | */ |
1568 | |
1507 | |
1569 | object * |
1508 | object * |
1570 | get_split_ob (object *orig_ob, uint32 nr) |
1509 | get_split_ob (object *orig_ob, uint32 nr) |
1571 | { |
1510 | { |
1572 | object * |
1511 | object *newob; |
1573 | newob; |
|
|
1574 | int |
|
|
1575 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1512 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1576 | |
1513 | |
1577 | if (orig_ob->nrof < nr) |
1514 | if (orig_ob->nrof < nr) |
1578 | { |
1515 | { |
1579 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1516 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1580 | return NULL; |
1517 | return NULL; |
… | |
… | |
1621 | if (i > op->nrof) |
1558 | if (i > op->nrof) |
1622 | i = op->nrof; |
1559 | i = op->nrof; |
1623 | |
1560 | |
1624 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1561 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1625 | op->nrof -= i; |
1562 | op->nrof -= i; |
1626 | else if (op->env != NULL) |
1563 | else if (op->env) |
1627 | { |
1564 | { |
1628 | /* is this object in the players inventory, or sub container |
1565 | /* is this object in the players inventory, or sub container |
1629 | * therein? |
1566 | * therein? |
1630 | */ |
1567 | */ |
1631 | tmp = is_player_inv (op->env); |
1568 | tmp = op->in_player (); |
1632 | /* nope. Is this a container the player has opened? |
1569 | /* nope. Is this a container the player has opened? |
1633 | * If so, set tmp to that player. |
1570 | * If so, set tmp to that player. |
1634 | * IMO, searching through all the players will mostly |
1571 | * IMO, searching through all the players will mostly |
1635 | * likely be quicker than following op->env to the map, |
1572 | * likely be quicker than following op->env to the map, |
1636 | * and then searching the map for a player. |
1573 | * and then searching the map for a player. |
1637 | */ |
1574 | */ |
1638 | if (!tmp) |
1575 | if (!tmp) |
1639 | { |
1576 | { |
1640 | for (pl = first_player; pl; pl = pl->next) |
1577 | for (pl = first_player; pl; pl = pl->next) |
1641 | if (pl->ob->container == op->env) |
1578 | if (pl->ob->container == op->env) |
|
|
1579 | { |
|
|
1580 | tmp = pl->ob; |
1642 | break; |
1581 | break; |
1643 | if (pl) |
1582 | } |
1644 | tmp = pl->ob; |
|
|
1645 | else |
|
|
1646 | tmp = NULL; |
|
|
1647 | } |
1583 | } |
1648 | |
1584 | |
1649 | if (i < op->nrof) |
1585 | if (i < op->nrof) |
1650 | { |
1586 | { |
1651 | sub_weight (op->env, op->weight * i); |
1587 | sub_weight (op->env, op->weight * i); |
1652 | op->nrof -= i; |
1588 | op->nrof -= i; |
1653 | if (tmp) |
1589 | if (tmp) |
1654 | { |
|
|
1655 | esrv_send_item (tmp, op); |
1590 | esrv_send_item (tmp, op); |
1656 | } |
|
|
1657 | } |
1591 | } |
1658 | else |
1592 | else |
1659 | { |
1593 | { |
1660 | op->remove (); |
1594 | op->remove (); |
1661 | op->nrof = 0; |
1595 | op->nrof = 0; |
1662 | if (tmp) |
1596 | if (tmp) |
1663 | { |
|
|
1664 | esrv_del_item (tmp->contr, op->count); |
1597 | esrv_del_item (tmp->contr, op->count); |
1665 | } |
|
|
1666 | } |
1598 | } |
1667 | } |
1599 | } |
1668 | else |
1600 | else |
1669 | { |
1601 | { |
1670 | object *above = op->above; |
1602 | object *above = op->above; |
… | |
… | |
1676 | op->remove (); |
1608 | op->remove (); |
1677 | op->nrof = 0; |
1609 | op->nrof = 0; |
1678 | } |
1610 | } |
1679 | |
1611 | |
1680 | /* Since we just removed op, op->above is null */ |
1612 | /* Since we just removed op, op->above is null */ |
1681 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1613 | for (tmp = above; tmp; tmp = tmp->above) |
1682 | if (tmp->type == PLAYER) |
1614 | if (tmp->type == PLAYER) |
1683 | { |
1615 | { |
1684 | if (op->nrof) |
1616 | if (op->nrof) |
1685 | esrv_send_item (tmp, op); |
1617 | esrv_send_item (tmp, op); |
1686 | else |
1618 | else |
… | |
… | |
1690 | |
1622 | |
1691 | if (op->nrof) |
1623 | if (op->nrof) |
1692 | return op; |
1624 | return op; |
1693 | else |
1625 | else |
1694 | { |
1626 | { |
1695 | op->destroy (0); |
1627 | op->destroy (); |
1696 | return NULL; |
1628 | return 0; |
1697 | } |
1629 | } |
1698 | } |
1630 | } |
1699 | |
1631 | |
1700 | /* |
1632 | /* |
1701 | * add_weight(object, weight) adds the specified weight to an object, |
1633 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1761 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1693 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1762 | CLEAR_FLAG (op, FLAG_REMOVED); |
1694 | CLEAR_FLAG (op, FLAG_REMOVED); |
1763 | if (op->nrof) |
1695 | if (op->nrof) |
1764 | { |
1696 | { |
1765 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1697 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1766 | if (CAN_MERGE (tmp, op)) |
1698 | if (object::can_merge (tmp, op)) |
1767 | { |
1699 | { |
1768 | /* return the original object and remove inserted object |
1700 | /* return the original object and remove inserted object |
1769 | (client needs the original object) */ |
1701 | (client needs the original object) */ |
1770 | tmp->nrof += op->nrof; |
1702 | tmp->nrof += op->nrof; |
1771 | /* Weight handling gets pretty funky. Since we are adding to |
1703 | /* Weight handling gets pretty funky. Since we are adding to |
… | |
… | |
1789 | add_weight (this, op->weight * op->nrof); |
1721 | add_weight (this, op->weight * op->nrof); |
1790 | } |
1722 | } |
1791 | else |
1723 | else |
1792 | add_weight (this, (op->weight + op->carrying)); |
1724 | add_weight (this, (op->weight + op->carrying)); |
1793 | |
1725 | |
1794 | otmp = is_player_inv (this); |
1726 | otmp = this->in_player (); |
1795 | if (otmp && otmp->contr) |
1727 | if (otmp && otmp->contr) |
1796 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1728 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1797 | fix_player (otmp); |
1729 | fix_player (otmp); |
1798 | |
1730 | |
1799 | op->map = NULL; |
1731 | op->map = 0; |
1800 | op->env = this; |
1732 | op->env = this; |
1801 | op->above = NULL; |
1733 | op->above = 0; |
1802 | op->below = NULL; |
1734 | op->below = 0; |
1803 | op->x = 0, op->y = 0; |
1735 | op->x = 0, op->y = 0; |
1804 | |
1736 | |
1805 | /* reset the light list and los of the players on the map */ |
1737 | /* reset the light list and los of the players on the map */ |
1806 | if ((op->glow_radius != 0) && map) |
1738 | if ((op->glow_radius != 0) && map) |
1807 | { |
1739 | { |
… | |
… | |
2144 | * if the space being examined only has a wall to the north and empty |
2076 | * if the space being examined only has a wall to the north and empty |
2145 | * spaces in all the other directions, this will reduce the search space |
2077 | * spaces in all the other directions, this will reduce the search space |
2146 | * to only the spaces immediately surrounding the target area, and |
2078 | * to only the spaces immediately surrounding the target area, and |
2147 | * won't look 2 spaces south of the target space. |
2079 | * won't look 2 spaces south of the target space. |
2148 | */ |
2080 | */ |
2149 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2081 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2150 | stop = maxfree[i]; |
2082 | stop = maxfree[i]; |
2151 | } |
2083 | } |
|
|
2084 | |
2152 | if (!index) |
2085 | if (!index) |
2153 | return -1; |
2086 | return -1; |
|
|
2087 | |
2154 | return altern[RANDOM () % index]; |
2088 | return altern[RANDOM () % index]; |
2155 | } |
2089 | } |
2156 | |
2090 | |
2157 | /* |
2091 | /* |
2158 | * find_first_free_spot(archetype, maptile, x, y) works like |
2092 | * find_first_free_spot(archetype, maptile, x, y) works like |
… | |
… | |
2266 | mp = m; |
2200 | mp = m; |
2267 | nx = x + freearr_x[i]; |
2201 | nx = x + freearr_x[i]; |
2268 | ny = y + freearr_y[i]; |
2202 | ny = y + freearr_y[i]; |
2269 | |
2203 | |
2270 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2204 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2205 | |
2271 | if (mflags & P_OUT_OF_MAP) |
2206 | if (mflags & P_OUT_OF_MAP) |
2272 | { |
|
|
2273 | max = maxfree[i]; |
2207 | max = maxfree[i]; |
2274 | } |
|
|
2275 | else |
2208 | else |
2276 | { |
2209 | { |
2277 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2210 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2278 | |
2211 | |
2279 | if ((move_type & blocked) == move_type) |
2212 | if ((move_type & blocked) == move_type) |
2280 | { |
|
|
2281 | max = maxfree[i]; |
2213 | max = maxfree[i]; |
2282 | } |
|
|
2283 | else if (mflags & P_IS_ALIVE) |
2214 | else if (mflags & P_IS_ALIVE) |
2284 | { |
2215 | { |
2285 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2216 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) |
2286 | { |
|
|
2287 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2217 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2288 | { |
|
|
2289 | break; |
2218 | break; |
2290 | } |
2219 | |
2291 | } |
|
|
2292 | if (tmp) |
2220 | if (tmp) |
2293 | { |
|
|
2294 | return freedir[i]; |
2221 | return freedir[i]; |
2295 | } |
|
|
2296 | } |
2222 | } |
2297 | } |
2223 | } |
2298 | } |
2224 | } |
|
|
2225 | |
2299 | return 0; |
2226 | return 0; |
2300 | } |
2227 | } |
2301 | |
2228 | |
2302 | /* |
2229 | /* |
2303 | * distance(object 1, object 2) will return the square of the |
2230 | * distance(object 1, object 2) will return the square of the |
… | |
… | |
2305 | */ |
2232 | */ |
2306 | |
2233 | |
2307 | int |
2234 | int |
2308 | distance (const object *ob1, const object *ob2) |
2235 | distance (const object *ob1, const object *ob2) |
2309 | { |
2236 | { |
2310 | int |
2237 | int i; |
2311 | i; |
|
|
2312 | |
2238 | |
2313 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2239 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2314 | return i; |
2240 | return i; |
2315 | } |
2241 | } |
2316 | |
2242 | |
… | |
… | |
2321 | */ |
2247 | */ |
2322 | |
2248 | |
2323 | int |
2249 | int |
2324 | find_dir_2 (int x, int y) |
2250 | find_dir_2 (int x, int y) |
2325 | { |
2251 | { |
2326 | int |
2252 | int q; |
2327 | q; |
|
|
2328 | |
2253 | |
2329 | if (y) |
2254 | if (y) |
2330 | q = x * 100 / y; |
2255 | q = x * 100 / y; |
2331 | else if (x) |
2256 | else if (x) |
2332 | q = -300 * x; |
2257 | q = -300 * x; |
… | |
… | |
2458 | * find a path to that monster that we found. If not, |
2383 | * find a path to that monster that we found. If not, |
2459 | * we don't bother going toward it. Returns 1 if we |
2384 | * we don't bother going toward it. Returns 1 if we |
2460 | * can see a direct way to get it |
2385 | * can see a direct way to get it |
2461 | * Modified to be map tile aware -.MSW |
2386 | * Modified to be map tile aware -.MSW |
2462 | */ |
2387 | */ |
2463 | |
|
|
2464 | |
|
|
2465 | int |
2388 | int |
2466 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2389 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2467 | { |
2390 | { |
2468 | sint16 dx, dy; |
2391 | sint16 dx, dy; |
2469 | int |
|
|
2470 | mflags; |
2392 | int mflags; |
2471 | |
2393 | |
2472 | if (dir < 0) |
2394 | if (dir < 0) |
2473 | return 0; /* exit condition: invalid direction */ |
2395 | return 0; /* exit condition: invalid direction */ |
2474 | |
2396 | |
2475 | dx = x + freearr_x[dir]; |
2397 | dx = x + freearr_x[dir]; |
… | |
… | |
2488 | return 0; |
2410 | return 0; |
2489 | |
2411 | |
2490 | /* yes, can see. */ |
2412 | /* yes, can see. */ |
2491 | if (dir < 9) |
2413 | if (dir < 9) |
2492 | return 1; |
2414 | return 1; |
|
|
2415 | |
2493 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2416 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2494 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2417 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2418 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2495 | } |
2419 | } |
2496 | |
|
|
2497 | |
|
|
2498 | |
2420 | |
2499 | /* |
2421 | /* |
2500 | * can_pick(picker, item): finds out if an object is possible to be |
2422 | * can_pick(picker, item): finds out if an object is possible to be |
2501 | * picked up by the picker. Returnes 1 if it can be |
2423 | * picked up by the picker. Returnes 1 if it can be |
2502 | * picked up, otherwise 0. |
2424 | * picked up, otherwise 0. |
… | |
… | |
2513 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2435 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2514 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2436 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2515 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2437 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2516 | } |
2438 | } |
2517 | |
2439 | |
2518 | |
|
|
2519 | /* |
2440 | /* |
2520 | * create clone from object to another |
2441 | * create clone from object to another |
2521 | */ |
2442 | */ |
2522 | object * |
2443 | object * |
2523 | object_create_clone (object *asrc) |
2444 | object_create_clone (object *asrc) |
… | |
… | |
2532 | src = src->head; |
2453 | src = src->head; |
2533 | |
2454 | |
2534 | prev = 0; |
2455 | prev = 0; |
2535 | for (part = src; part; part = part->more) |
2456 | for (part = src; part; part = part->more) |
2536 | { |
2457 | { |
2537 | tmp = get_object (); |
2458 | tmp = part->clone (); |
2538 | copy_object (part, tmp); |
|
|
2539 | tmp->x -= src->x; |
2459 | tmp->x -= src->x; |
2540 | tmp->y -= src->y; |
2460 | tmp->y -= src->y; |
2541 | |
2461 | |
2542 | if (!part->head) |
2462 | if (!part->head) |
2543 | { |
2463 | { |
2544 | dst = tmp; |
2464 | dst = tmp; |
2545 | tmp->head = 0; |
2465 | tmp->head = 0; |
2546 | } |
2466 | } |
2547 | else |
2467 | else |
2548 | { |
|
|
2549 | tmp->head = dst; |
2468 | tmp->head = dst; |
2550 | } |
|
|
2551 | |
2469 | |
2552 | tmp->more = 0; |
2470 | tmp->more = 0; |
2553 | |
2471 | |
2554 | if (prev) |
2472 | if (prev) |
2555 | prev->more = tmp; |
2473 | prev->more = tmp; |
… | |
… | |
2587 | } |
2505 | } |
2588 | |
2506 | |
2589 | fprintf (tempfile, obstr); |
2507 | fprintf (tempfile, obstr); |
2590 | fclose (tempfile); |
2508 | fclose (tempfile); |
2591 | |
2509 | |
2592 | op = get_object (); |
2510 | op = object::create (); |
2593 | |
2511 | |
2594 | object_thawer thawer (filename); |
2512 | object_thawer thawer (filename); |
2595 | |
2513 | |
2596 | if (thawer) |
2514 | if (thawer) |
2597 | load_object (thawer, op, 0); |
2515 | load_object (thawer, op, 0); |