… | |
… | |
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 | |
… | |
… | |
139 | * objects with lists are rare, and lists stay short. If not, use a |
141 | * objects with lists are rare, and lists stay short. If not, use a |
140 | * different structure or at least keep the lists sorted... |
142 | * different structure or at least keep the lists sorted... |
141 | */ |
143 | */ |
142 | |
144 | |
143 | /* For each field in wants, */ |
145 | /* For each field in wants, */ |
144 | for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) |
146 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
145 | { |
147 | { |
146 | key_value *has_field; |
148 | key_value *has_field; |
147 | |
149 | |
148 | /* Look for a field in has with the same key. */ |
150 | /* Look for a field in has with the same key. */ |
149 | has_field = get_ob_key_link (has, wants_field->key); |
151 | has_field = get_ob_key_link (has, wants_field->key); |
… | |
… | |
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->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
223 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
224 | * being locked in inventory should prevent merging. |
|
|
225 | * 0x4 in flags3 is CLIENT_SENT |
|
|
226 | */ |
|
|
227 | if ((ob1->arch != ob2->arch) || |
|
|
228 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
229 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
230 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
231 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
232 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
233 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
234 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
235 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
236 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
237 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
238 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
239 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
240 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
241 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
242 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
243 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
244 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
245 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
246 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
247 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
248 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
249 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
250 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
251 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
252 | (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) |
248 | || ob1->move_off != ob2->move_off |
|
|
249 | || ob1->move_slow != ob2->move_slow |
|
|
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
253 | return 0; |
251 | return 0; |
254 | |
252 | |
255 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
256 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
257 | */ |
255 | */ |
… | |
… | |
260 | /* if one object has inventory but the other doesn't, not equiv */ |
258 | /* if one object has inventory but the other doesn't, not equiv */ |
261 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
262 | return 0; |
260 | return 0; |
263 | |
261 | |
264 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
265 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
266 | return 0; |
264 | return 0; |
267 | |
265 | |
268 | /* inventory ok - still need to check rest of this object to see |
266 | /* inventory ok - still need to check rest of this object to see |
269 | * if it is valid. |
267 | * if it is valid. |
270 | */ |
268 | */ |
… | |
… | |
354 | op = op->env; |
352 | op = op->env; |
355 | return op; |
353 | return op; |
356 | } |
354 | } |
357 | |
355 | |
358 | /* |
356 | /* |
359 | * Eneq(@csd.uu.se): Since we can have items buried in a character we need |
|
|
360 | * a better check. We basically keeping traversing up until we can't |
|
|
361 | * or find a player. |
|
|
362 | */ |
|
|
363 | |
|
|
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; |
|
|
371 | } |
|
|
372 | |
|
|
373 | /* |
|
|
374 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
375 | * Some error messages. |
358 | * Some error messages. |
376 | * The result of the dump is stored in the static global errmsg array. |
359 | * The result of the dump is stored in the static global errmsg array. |
377 | */ |
360 | */ |
378 | |
361 | |
… | |
… | |
381 | { |
364 | { |
382 | if (!op) |
365 | if (!op) |
383 | return strdup ("[NULLOBJ]"); |
366 | return strdup ("[NULLOBJ]"); |
384 | |
367 | |
385 | object_freezer freezer; |
368 | object_freezer freezer; |
386 | save_object (freezer, op, 3); |
369 | save_object (freezer, op, 1); |
387 | return freezer.as_string (); |
370 | return freezer.as_string (); |
388 | } |
371 | } |
389 | |
372 | |
390 | /* |
373 | /* |
391 | * get_nearest_part(multi-object, object 2) returns the part of the |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
… | |
… | |
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 | /* |
472 | /* |
532 | * copy_to first frees everything allocated by the dst object, |
473 | * copy_to first frees everything allocated by the dst object, |
533 | * and then copies the contents of itself into the second |
474 | * and then copies the contents of itself into the second |
534 | * object, allocating what needs to be allocated. Basically, any |
475 | * object, allocating what needs to be allocated. Basically, any |
535 | * 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, |
… | |
… | |
541 | { |
482 | { |
542 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
483 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
543 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
484 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
544 | |
485 | |
545 | *(object_copy *)dst = *this; |
486 | *(object_copy *)dst = *this; |
546 | *(object_pod *)dst = *this; |
|
|
547 | |
|
|
548 | if (self || cb) |
|
|
549 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
|
|
550 | |
487 | |
551 | if (is_freed) |
488 | if (is_freed) |
552 | SET_FLAG (dst, FLAG_FREED); |
489 | SET_FLAG (dst, FLAG_FREED); |
553 | |
490 | |
554 | if (is_removed) |
491 | if (is_removed) |
… | |
… | |
585 | tail = new_link; |
522 | tail = new_link; |
586 | } |
523 | } |
587 | } |
524 | } |
588 | } |
525 | } |
589 | |
526 | |
590 | update_ob_speed (dst); |
527 | dst->set_speed (dst->speed); |
|
|
528 | } |
|
|
529 | |
|
|
530 | object * |
|
|
531 | object::clone () |
|
|
532 | { |
|
|
533 | object *neu = create (); |
|
|
534 | copy_to (neu); |
|
|
535 | return neu; |
591 | } |
536 | } |
592 | |
537 | |
593 | /* |
538 | /* |
594 | * If an object with the IS_TURNABLE() flag needs to be turned due |
539 | * If an object with the IS_TURNABLE() flag needs to be turned due |
595 | * to the closest player being on the other side, this function can |
540 | * to the closest player being on the other side, this function can |
… | |
… | |
609 | * Updates the speed of an object. If the speed changes from 0 to another |
554 | * Updates the speed of an object. If the speed changes from 0 to another |
610 | * value, or vice versa, then add/remove the object from the active list. |
555 | * value, or vice versa, then add/remove the object from the active list. |
611 | * This function needs to be called whenever the speed of an object changes. |
556 | * This function needs to be called whenever the speed of an object changes. |
612 | */ |
557 | */ |
613 | void |
558 | void |
614 | update_ob_speed (object *op) |
559 | object::set_speed (float speed) |
615 | { |
560 | { |
616 | extern int arch_init; |
561 | extern int arch_init; |
617 | |
562 | |
618 | /* No reason putting the archetypes objects on the speed list, |
563 | /* No reason putting the archetypes objects on the speed list, |
619 | * since they never really need to be updated. |
564 | * since they never really need to be updated. |
620 | */ |
565 | */ |
621 | |
566 | if (flag [FLAG_FREED] && speed) |
622 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
|
|
623 | { |
567 | { |
624 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
568 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
625 | #ifdef MANY_CORES |
|
|
626 | abort (); |
|
|
627 | #else |
|
|
628 | op->speed = 0; |
569 | speed = 0; |
629 | #endif |
|
|
630 | } |
570 | } |
|
|
571 | |
|
|
572 | this->speed = speed; |
631 | |
573 | |
632 | if (arch_init) |
574 | if (arch_init) |
633 | return; |
575 | return; |
634 | |
576 | |
635 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
577 | if (FABS (speed) > MIN_ACTIVE_SPEED) |
636 | { |
578 | { |
637 | /* If already on active list, don't do anything */ |
579 | /* If already on active list, don't do anything */ |
638 | if (op->active_next || op->active_prev || op == active_objects) |
580 | if (active_next || active_prev || this == active_objects) |
639 | return; |
581 | return; |
640 | |
582 | |
641 | /* process_events() expects us to insert the object at the beginning |
583 | /* process_events() expects us to insert the object at the beginning |
642 | * of the list. */ |
584 | * of the list. */ |
643 | op->active_next = active_objects; |
585 | active_next = active_objects; |
644 | |
586 | |
645 | if (op->active_next != NULL) |
587 | if (active_next) |
646 | op->active_next->active_prev = op; |
588 | active_next->active_prev = this; |
647 | |
589 | |
648 | active_objects = op; |
590 | active_objects = this; |
649 | } |
591 | } |
650 | else |
592 | else |
651 | { |
593 | { |
652 | /* If not on the active list, nothing needs to be done */ |
594 | /* If not on the active list, nothing needs to be done */ |
653 | if (!op->active_next && !op->active_prev && op != active_objects) |
595 | if (!active_next && !active_prev && this != active_objects) |
654 | return; |
596 | return; |
655 | |
597 | |
656 | if (op->active_prev == NULL) |
598 | if (!active_prev) |
657 | { |
599 | { |
658 | active_objects = op->active_next; |
600 | active_objects = active_next; |
659 | |
601 | |
660 | if (op->active_next != NULL) |
602 | if (active_next) |
661 | op->active_next->active_prev = NULL; |
603 | active_next->active_prev = 0; |
662 | } |
604 | } |
663 | else |
605 | else |
664 | { |
606 | { |
665 | op->active_prev->active_next = op->active_next; |
607 | active_prev->active_next = active_next; |
666 | |
608 | |
667 | if (op->active_next) |
609 | if (active_next) |
668 | op->active_next->active_prev = op->active_prev; |
610 | active_next->active_prev = active_prev; |
669 | } |
611 | } |
670 | |
612 | |
671 | op->active_next = NULL; |
613 | active_next = 0; |
672 | op->active_prev = NULL; |
614 | active_prev = 0; |
673 | } |
615 | } |
674 | } |
616 | } |
675 | |
617 | |
676 | /* This function removes object 'op' from the list of active |
618 | /* This function removes object 'op' from the list of active |
677 | * objects. |
619 | * objects. |
… | |
… | |
703 | op->active_next = NULL; |
645 | op->active_next = NULL; |
704 | op->active_prev = NULL; |
646 | op->active_prev = NULL; |
705 | } |
647 | } |
706 | |
648 | |
707 | /* |
649 | /* |
708 | * update_object() updates the array which represents the map. |
650 | * update_object() updates the the map. |
709 | * It takes into account invisible objects (and represent squares covered |
651 | * It takes into account invisible objects (and represent squares covered |
710 | * by invisible objects by whatever is below them (unless it's another |
652 | * by invisible objects by whatever is below them (unless it's another |
711 | * invisible object, etc...) |
653 | * invisible object, etc...) |
712 | * If the object being updated is beneath a player, the look-window |
654 | * If the object being updated is beneath a player, the look-window |
713 | * of that player is updated (this might be a suboptimal way of |
655 | * of that player is updated (this might be a suboptimal way of |
714 | * updating that window, though, since update_object() is called _often_) |
656 | * updating that window, though, since update_object() is called _often_) |
715 | * |
657 | * |
716 | * action is a hint of what the caller believes need to be done. |
658 | * action is a hint of what the caller believes need to be done. |
717 | * For example, if the only thing that has changed is the face (due to |
|
|
718 | * an animation), we don't need to call update_position until that actually |
|
|
719 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
720 | * of walls or living creatures may need us to update the flags now. |
|
|
721 | * current action are: |
659 | * current action are: |
722 | * UP_OBJ_INSERT: op was inserted |
660 | * UP_OBJ_INSERT: op was inserted |
723 | * UP_OBJ_REMOVE: op was removed |
661 | * UP_OBJ_REMOVE: op was removed |
724 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
662 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
725 | * as that is easier than trying to look at what may have changed. |
663 | * as that is easier than trying to look at what may have changed. |
726 | * UP_OBJ_FACE: only the objects face has changed. |
664 | * UP_OBJ_FACE: only the objects face has changed. |
727 | */ |
665 | */ |
728 | |
|
|
729 | void |
666 | void |
730 | update_object (object *op, int action) |
667 | update_object (object *op, int action) |
731 | { |
668 | { |
732 | int update_now = 0, flags; |
|
|
733 | MoveType move_on, move_off, move_block, move_slow; |
669 | MoveType move_on, move_off, move_block, move_slow; |
734 | |
670 | |
735 | if (op == NULL) |
671 | if (op == NULL) |
736 | { |
672 | { |
737 | /* this should never happen */ |
673 | /* this should never happen */ |
738 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
674 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
739 | return; |
675 | return; |
740 | } |
676 | } |
741 | |
677 | |
742 | if (op->env != NULL) |
678 | if (op->env) |
743 | { |
679 | { |
744 | /* Animation is currently handled by client, so nothing |
680 | /* Animation is currently handled by client, so nothing |
745 | * to do in this case. |
681 | * to do in this case. |
746 | */ |
682 | */ |
747 | return; |
683 | return; |
… | |
… | |
752 | */ |
688 | */ |
753 | if (!op->map || op->map->in_memory == MAP_SAVING) |
689 | if (!op->map || op->map->in_memory == MAP_SAVING) |
754 | return; |
690 | return; |
755 | |
691 | |
756 | /* make sure the object is within map boundaries */ |
692 | /* make sure the object is within map boundaries */ |
757 | if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) |
693 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
758 | { |
694 | { |
759 | LOG (llevError, "update_object() called for object out of map!\n"); |
695 | LOG (llevError, "update_object() called for object out of map!\n"); |
760 | #ifdef MANY_CORES |
696 | #ifdef MANY_CORES |
761 | abort (); |
697 | abort (); |
762 | #endif |
698 | #endif |
763 | return; |
699 | return; |
764 | } |
700 | } |
765 | |
701 | |
766 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
702 | mapspace &m = op->ms (); |
767 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
768 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
769 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
770 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
771 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
772 | |
703 | |
|
|
704 | if (m.flags_ & P_NEED_UPDATE) |
|
|
705 | /* nop */; |
773 | if (action == UP_OBJ_INSERT) |
706 | else if (action == UP_OBJ_INSERT) |
774 | { |
707 | { |
|
|
708 | // this is likely overkill, TODO: revisit (schmorp) |
775 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
709 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
776 | update_now = 1; |
|
|
777 | |
|
|
778 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
710 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
779 | update_now = 1; |
711 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
780 | |
712 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
713 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
781 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
714 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
782 | update_now = 1; |
|
|
783 | |
|
|
784 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
785 | update_now = 1; |
|
|
786 | |
|
|
787 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
788 | update_now = 1; |
|
|
789 | |
|
|
790 | if ((move_on | op->move_on) != move_on) |
715 | || (m.move_on | op->move_on ) != m.move_on |
791 | update_now = 1; |
|
|
792 | |
|
|
793 | if ((move_off | op->move_off) != move_off) |
716 | || (m.move_off | op->move_off ) != m.move_off |
794 | update_now = 1; |
717 | || (m.move_slow | op->move_slow) != m.move_slow |
795 | |
|
|
796 | /* This isn't perfect, but I don't expect a lot of objects to |
718 | /* This isn't perfect, but I don't expect a lot of objects to |
797 | * to have move_allow right now. |
719 | * to have move_allow right now. |
798 | */ |
720 | */ |
799 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
721 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
800 | update_now = 1; |
722 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
801 | |
723 | m.flags_ = P_NEED_UPDATE; |
802 | if ((move_slow | op->move_slow) != move_slow) |
|
|
803 | update_now = 1; |
|
|
804 | } |
724 | } |
805 | |
|
|
806 | /* if the object is being removed, we can't make intelligent |
725 | /* if the object is being removed, we can't make intelligent |
807 | * decisions, because remove_ob can't really pass the object |
726 | * decisions, because remove_ob can't really pass the object |
808 | * that is being removed. |
727 | * that is being removed. |
809 | */ |
728 | */ |
810 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
729 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
811 | update_now = 1; |
730 | m.flags_ = P_NEED_UPDATE; |
812 | else if (action == UP_OBJ_FACE) |
731 | else if (action == UP_OBJ_FACE) |
813 | /* Nothing to do for that case */ ; |
732 | /* Nothing to do for that case */ ; |
814 | else |
733 | else |
815 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
734 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
816 | |
735 | |
817 | if (update_now) |
|
|
818 | { |
|
|
819 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
820 | update_position (op->map, op->x, op->y); |
|
|
821 | } |
|
|
822 | |
|
|
823 | if (op->more != NULL) |
736 | if (op->more) |
824 | update_object (op->more, action); |
737 | update_object (op->more, action); |
825 | } |
738 | } |
826 | |
739 | |
827 | object::vector object::mortals; |
|
|
828 | object::vector object::objects; // not yet used |
740 | object::vector object::objects; // not yet used |
829 | object *object::first; |
741 | object *object::first; |
830 | |
|
|
831 | void object::free_mortals () |
|
|
832 | { |
|
|
833 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
|
|
834 | if ((*i)->refcnt) |
|
|
835 | ++i; // further delay freeing |
|
|
836 | else |
|
|
837 | { |
|
|
838 | delete *i; |
|
|
839 | mortals.erase (i); |
|
|
840 | } |
|
|
841 | } |
|
|
842 | |
742 | |
843 | object::object () |
743 | object::object () |
844 | { |
744 | { |
845 | SET_FLAG (this, FLAG_REMOVED); |
745 | SET_FLAG (this, FLAG_REMOVED); |
846 | |
746 | |
… | |
… | |
878 | |
778 | |
879 | prev = 0; |
779 | prev = 0; |
880 | next = 0; |
780 | next = 0; |
881 | } |
781 | } |
882 | |
782 | |
|
|
783 | /* |
|
|
784 | * Remove and free all objects in the inventory of the given object. |
|
|
785 | * object.c ? |
|
|
786 | */ |
|
|
787 | void |
|
|
788 | object::destroy_inv (bool drop_to_ground) |
|
|
789 | { |
|
|
790 | /* Only if the space blocks everything do we not process - |
|
|
791 | * if some form of movement is allowed, let objects |
|
|
792 | * drop on that space. |
|
|
793 | */ |
|
|
794 | if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
795 | { |
|
|
796 | while (inv) |
|
|
797 | inv->destroy (); |
|
|
798 | } |
|
|
799 | else |
|
|
800 | { /* Put objects in inventory onto this space */ |
|
|
801 | while (inv) |
|
|
802 | { |
|
|
803 | object *op = inv; |
|
|
804 | |
|
|
805 | if (op->flag [FLAG_STARTEQUIP] |
|
|
806 | || op->flag [FLAG_NO_DROP] |
|
|
807 | || op->type == RUNE |
|
|
808 | || op->type == TRAP |
|
|
809 | || op->flag [FLAG_IS_A_TEMPLATE]) |
|
|
810 | op->destroy (); |
|
|
811 | else |
|
|
812 | { |
|
|
813 | op->remove (); |
|
|
814 | op->x = x; |
|
|
815 | op->y = y; |
|
|
816 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
817 | } |
|
|
818 | } |
|
|
819 | } |
|
|
820 | } |
|
|
821 | |
883 | object *object::create () |
822 | object *object::create () |
884 | { |
823 | { |
885 | object *op = new object; |
824 | object *op = new object; |
886 | op->link (); |
825 | op->link (); |
887 | return op; |
826 | return op; |
888 | } |
827 | } |
889 | |
828 | |
890 | /* |
829 | void |
891 | * free_object() frees everything allocated by an object, removes |
830 | object::do_destroy () |
892 | * it from the list of used objects, and puts it on the list of |
|
|
893 | * free objects. The IS_FREED() flag is set in the object. |
|
|
894 | * The object must have been removed by remove_ob() first for |
|
|
895 | * this function to succeed. |
|
|
896 | * |
|
|
897 | * If destroy_inventory is set, free inventory as well. Else drop items in |
|
|
898 | * inventory to the ground. |
|
|
899 | */ |
|
|
900 | void object::destroy (bool destroy_inventory) |
|
|
901 | { |
831 | { |
902 | if (QUERY_FLAG (this, FLAG_FREED)) |
832 | if (flag [FLAG_IS_LINKED]) |
|
|
833 | remove_button_link (this); |
|
|
834 | |
|
|
835 | if (flag [FLAG_FRIENDLY]) |
|
|
836 | remove_friendly_object (this); |
|
|
837 | |
|
|
838 | if (!flag [FLAG_REMOVED]) |
|
|
839 | remove (); |
|
|
840 | |
|
|
841 | if (flag [FLAG_FREED]) |
903 | return; |
842 | return; |
904 | |
843 | |
905 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
844 | flag [FLAG_FREED] = 1; |
906 | remove_friendly_object (this); |
|
|
907 | |
845 | |
908 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
846 | attachable::do_destroy (); |
909 | remove (); |
|
|
910 | |
847 | |
911 | SET_FLAG (this, FLAG_FREED); |
848 | destroy_inv (true); |
912 | |
849 | set_speed (0); |
913 | if (more) |
850 | unlink (); |
914 | { |
|
|
915 | more->destroy (destroy_inventory); |
|
|
916 | more = 0; |
|
|
917 | } |
|
|
918 | |
|
|
919 | if (inv) |
|
|
920 | { |
|
|
921 | /* Only if the space blocks everything do we not process - |
|
|
922 | * if some form of movement is allowed, let objects |
|
|
923 | * drop on that space. |
|
|
924 | */ |
|
|
925 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
926 | { |
|
|
927 | object *op = inv; |
|
|
928 | |
|
|
929 | while (op) |
|
|
930 | { |
|
|
931 | object *tmp = op->below; |
|
|
932 | op->destroy (destroy_inventory); |
|
|
933 | op = tmp; |
|
|
934 | } |
|
|
935 | } |
|
|
936 | else |
|
|
937 | { /* Put objects in inventory onto this space */ |
|
|
938 | object *op = inv; |
|
|
939 | |
|
|
940 | while (op) |
|
|
941 | { |
|
|
942 | object *tmp = op->below; |
|
|
943 | |
|
|
944 | op->remove (); |
|
|
945 | |
|
|
946 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
|
|
947 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
|
|
948 | op->destroy (); |
|
|
949 | else |
|
|
950 | { |
|
|
951 | op->x = x; |
|
|
952 | op->y = y; |
|
|
953 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
954 | } |
|
|
955 | |
|
|
956 | op = tmp; |
|
|
957 | } |
|
|
958 | } |
|
|
959 | } |
|
|
960 | |
851 | |
961 | // hack to ensure that freed objects still have a valid map |
852 | // hack to ensure that freed objects still have a valid map |
962 | { |
853 | { |
963 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
854 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
964 | |
855 | |
… | |
… | |
976 | map = freed_map; |
867 | map = freed_map; |
977 | x = 1; |
868 | x = 1; |
978 | y = 1; |
869 | y = 1; |
979 | } |
870 | } |
980 | |
871 | |
|
|
872 | head = 0; |
|
|
873 | |
|
|
874 | if (more) |
|
|
875 | { |
|
|
876 | more->destroy (); |
|
|
877 | more = 0; |
|
|
878 | } |
|
|
879 | |
981 | // clear those pointers that likely might have circular references to us |
880 | // clear those pointers that likely might have circular references to us |
982 | owner = 0; |
881 | owner = 0; |
983 | enemy = 0; |
882 | enemy = 0; |
984 | attacked_by = 0; |
883 | attacked_by = 0; |
985 | |
884 | |
986 | // only relevant for players(?), but make sure of it anyways |
885 | // only relevant for players(?), but make sure of it anyways |
987 | contr = 0; |
886 | contr = 0; |
|
|
887 | } |
988 | |
888 | |
989 | /* Remove object from the active list */ |
889 | void |
990 | speed = 0; |
890 | object::destroy (bool destroy_inventory) |
991 | update_ob_speed (this); |
891 | { |
|
|
892 | if (destroyed ()) |
|
|
893 | return; |
992 | |
894 | |
993 | unlink (); |
895 | if (destroy_inventory) |
|
|
896 | destroy_inv (false); |
994 | |
897 | |
995 | mortals.push_back (this); |
898 | attachable::destroy (); |
996 | } |
899 | } |
997 | |
900 | |
998 | /* |
901 | /* |
999 | * sub_weight() recursively (outwards) subtracts a number from the |
902 | * sub_weight() recursively (outwards) subtracts a number from the |
1000 | * weight of an object (and what is carried by it's environment(s)). |
903 | * weight of an object (and what is carried by it's environment(s)). |
… | |
… | |
1024 | object::remove () |
927 | object::remove () |
1025 | { |
928 | { |
1026 | object *tmp, *last = 0; |
929 | object *tmp, *last = 0; |
1027 | object *otmp; |
930 | object *otmp; |
1028 | |
931 | |
1029 | int check_walk_off; |
|
|
1030 | |
|
|
1031 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
932 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1032 | return; |
933 | return; |
1033 | |
934 | |
1034 | SET_FLAG (this, FLAG_REMOVED); |
935 | SET_FLAG (this, FLAG_REMOVED); |
|
|
936 | INVOKE_OBJECT (REMOVE, this); |
1035 | |
937 | |
1036 | if (more) |
938 | if (more) |
1037 | more->remove (); |
939 | more->remove (); |
1038 | |
940 | |
1039 | /* |
941 | /* |
… | |
… | |
1049 | |
951 | |
1050 | /* NO_FIX_PLAYER is set when a great many changes are being |
952 | /* NO_FIX_PLAYER is set when a great many changes are being |
1051 | * made to players inventory. If set, avoiding the call |
953 | * made to players inventory. If set, avoiding the call |
1052 | * to save cpu time. |
954 | * to save cpu time. |
1053 | */ |
955 | */ |
1054 | if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
956 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1055 | fix_player (otmp); |
957 | otmp->update_stats (); |
1056 | |
958 | |
1057 | if (above != NULL) |
959 | if (above != NULL) |
1058 | above->below = below; |
960 | above->below = below; |
1059 | else |
961 | else |
1060 | env->inv = below; |
962 | env->inv = below; |
… | |
… | |
1079 | |
981 | |
1080 | /* link the object above us */ |
982 | /* link the object above us */ |
1081 | if (above) |
983 | if (above) |
1082 | above->below = below; |
984 | above->below = below; |
1083 | else |
985 | else |
1084 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
986 | map->at (x, y).top = below; /* we were top, set new top */ |
1085 | |
987 | |
1086 | /* Relink the object below us, if there is one */ |
988 | /* Relink the object below us, if there is one */ |
1087 | if (below) |
989 | if (below) |
1088 | below->above = above; |
990 | below->above = above; |
1089 | else |
991 | else |
… | |
… | |
1101 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1003 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1102 | LOG (llevError, "%s\n", dump); |
1004 | LOG (llevError, "%s\n", dump); |
1103 | free (dump); |
1005 | free (dump); |
1104 | } |
1006 | } |
1105 | |
1007 | |
1106 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1008 | map->at (x, y).bot = above; /* goes on above it. */ |
1107 | } |
1009 | } |
1108 | |
1010 | |
1109 | above = 0; |
1011 | above = 0; |
1110 | below = 0; |
1012 | below = 0; |
1111 | |
1013 | |
1112 | if (map->in_memory == MAP_SAVING) |
1014 | if (map->in_memory == MAP_SAVING) |
1113 | return; |
1015 | return; |
1114 | |
1016 | |
1115 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1017 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1116 | |
1018 | |
1117 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1019 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1118 | { |
1020 | { |
1119 | /* No point updating the players look faces if he is the object |
1021 | /* No point updating the players look faces if he is the object |
1120 | * being removed. |
1022 | * being removed. |
1121 | */ |
1023 | */ |
1122 | |
1024 | |
… | |
… | |
1126 | * removed (most likely destroyed), update the player view |
1028 | * removed (most likely destroyed), update the player view |
1127 | * appropriately. |
1029 | * appropriately. |
1128 | */ |
1030 | */ |
1129 | if (tmp->container == this) |
1031 | if (tmp->container == this) |
1130 | { |
1032 | { |
1131 | CLEAR_FLAG (this, FLAG_APPLIED); |
1033 | flag [FLAG_APPLIED] = 0; |
1132 | tmp->container = 0; |
1034 | tmp->container = 0; |
1133 | } |
1035 | } |
1134 | |
1036 | |
1135 | tmp->contr->socket.update_look = 1; |
1037 | if (tmp->contr->ns) |
|
|
1038 | tmp->contr->ns->floorbox_update (); |
1136 | } |
1039 | } |
1137 | |
1040 | |
1138 | /* See if player moving off should effect something */ |
1041 | /* See if player moving off should effect something */ |
1139 | if (check_walk_off |
1042 | if (check_walk_off |
1140 | && ((move_type & tmp->move_off) |
1043 | && ((move_type & tmp->move_off) |
… | |
… | |
1154 | last = tmp; |
1057 | last = tmp; |
1155 | } |
1058 | } |
1156 | |
1059 | |
1157 | /* last == NULL of there are no objects on this space */ |
1060 | /* last == NULL of there are no objects on this space */ |
1158 | if (!last) |
1061 | if (!last) |
1159 | { |
1062 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1160 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1161 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1162 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1163 | * be correct anyways. |
|
|
1164 | */ |
|
|
1165 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
|
|
1166 | update_position (map, x, y); |
|
|
1167 | } |
|
|
1168 | else |
1063 | else |
1169 | update_object (last, UP_OBJ_REMOVE); |
1064 | update_object (last, UP_OBJ_REMOVE); |
1170 | |
1065 | |
1171 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1066 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1172 | update_all_los (map, x, y); |
1067 | update_all_los (map, x, y); |
1173 | } |
1068 | } |
1174 | } |
1069 | } |
1175 | |
1070 | |
1176 | /* |
1071 | /* |
… | |
… | |
1185 | merge_ob (object *op, object *top) |
1080 | merge_ob (object *op, object *top) |
1186 | { |
1081 | { |
1187 | if (!op->nrof) |
1082 | if (!op->nrof) |
1188 | return 0; |
1083 | return 0; |
1189 | |
1084 | |
1190 | if (top == NULL) |
1085 | if (top) |
1191 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1086 | for (top = op; top && top->above; top = top->above) |
|
|
1087 | ; |
1192 | |
1088 | |
1193 | for (; top != NULL; top = top->below) |
1089 | for (; top; top = top->below) |
1194 | { |
1090 | { |
1195 | if (top == op) |
1091 | if (top == op) |
1196 | continue; |
1092 | continue; |
1197 | if (CAN_MERGE (op, top)) |
1093 | |
|
|
1094 | if (object::can_merge (op, top)) |
1198 | { |
1095 | { |
1199 | top->nrof += op->nrof; |
1096 | top->nrof += op->nrof; |
1200 | |
1097 | |
1201 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1098 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1202 | op->weight = 0; /* Don't want any adjustements now */ |
1099 | op->weight = 0; /* Don't want any adjustements now */ |
… | |
… | |
1247 | * Return value: |
1144 | * Return value: |
1248 | * new object if 'op' was merged with other object |
1145 | * new object if 'op' was merged with other object |
1249 | * NULL if 'op' was destroyed |
1146 | * NULL if 'op' was destroyed |
1250 | * just 'op' otherwise |
1147 | * just 'op' otherwise |
1251 | */ |
1148 | */ |
1252 | |
|
|
1253 | object * |
1149 | object * |
1254 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1150 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1255 | { |
1151 | { |
1256 | object *tmp, *top, *floor = NULL; |
1152 | object *tmp, *top, *floor = NULL; |
1257 | sint16 x, y; |
1153 | sint16 x, y; |
… | |
… | |
1291 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1187 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1292 | free (dump); |
1188 | free (dump); |
1293 | return op; |
1189 | return op; |
1294 | } |
1190 | } |
1295 | |
1191 | |
1296 | if (op->more != NULL) |
1192 | if (op->more) |
1297 | { |
1193 | { |
1298 | /* The part may be on a different map. */ |
1194 | /* The part may be on a different map. */ |
1299 | |
1195 | |
1300 | object *more = op->more; |
1196 | object *more = op->more; |
1301 | |
1197 | |
… | |
… | |
1317 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1213 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1318 | { |
1214 | { |
1319 | if (!op->head) |
1215 | if (!op->head) |
1320 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1216 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1321 | |
1217 | |
1322 | return NULL; |
1218 | return 0; |
1323 | } |
1219 | } |
1324 | } |
1220 | } |
1325 | |
1221 | |
1326 | CLEAR_FLAG (op, FLAG_REMOVED); |
1222 | CLEAR_FLAG (op, FLAG_REMOVED); |
1327 | |
1223 | |
… | |
… | |
1335 | |
1231 | |
1336 | /* this has to be done after we translate the coordinates. |
1232 | /* this has to be done after we translate the coordinates. |
1337 | */ |
1233 | */ |
1338 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1234 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1339 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1235 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1340 | if (CAN_MERGE (op, tmp)) |
1236 | if (object::can_merge (op, tmp)) |
1341 | { |
1237 | { |
1342 | op->nrof += tmp->nrof; |
1238 | op->nrof += tmp->nrof; |
1343 | tmp->destroy (); |
1239 | tmp->destroy (); |
1344 | } |
1240 | } |
1345 | |
1241 | |
… | |
… | |
1361 | op->below = originator->below; |
1257 | op->below = originator->below; |
1362 | |
1258 | |
1363 | if (op->below) |
1259 | if (op->below) |
1364 | op->below->above = op; |
1260 | op->below->above = op; |
1365 | else |
1261 | else |
1366 | SET_MAP_OB (op->map, op->x, op->y, op); |
1262 | op->ms ().bot = op; |
1367 | |
1263 | |
1368 | /* since *below* originator, no need to update top */ |
1264 | /* since *below* originator, no need to update top */ |
1369 | originator->below = op; |
1265 | originator->below = op; |
1370 | } |
1266 | } |
1371 | else |
1267 | else |
… | |
… | |
1417 | * If INS_ON_TOP is used, don't do this processing |
1313 | * If INS_ON_TOP is used, don't do this processing |
1418 | * Need to find the object that in fact blocks view, otherwise |
1314 | * Need to find the object that in fact blocks view, otherwise |
1419 | * stacking is a bit odd. |
1315 | * stacking is a bit odd. |
1420 | */ |
1316 | */ |
1421 | if (!(flag & INS_ON_TOP) && |
1317 | if (!(flag & INS_ON_TOP) && |
1422 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1318 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1423 | { |
1319 | { |
1424 | for (last = top; last != floor; last = last->below) |
1320 | for (last = top; last != floor; last = last->below) |
1425 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1321 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1426 | break; |
1322 | break; |
1427 | /* Check to see if we found the object that blocks view, |
1323 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1450 | |
1346 | |
1451 | if (op->above) |
1347 | if (op->above) |
1452 | op->above->below = op; |
1348 | op->above->below = op; |
1453 | |
1349 | |
1454 | op->below = NULL; |
1350 | op->below = NULL; |
1455 | SET_MAP_OB (op->map, op->x, op->y, op); |
1351 | op->ms ().bot = op; |
1456 | } |
1352 | } |
1457 | else |
1353 | else |
1458 | { /* get inserted into the stack above top */ |
1354 | { /* get inserted into the stack above top */ |
1459 | op->above = top->above; |
1355 | op->above = top->above; |
1460 | |
1356 | |
… | |
… | |
1464 | op->below = top; |
1360 | op->below = top; |
1465 | top->above = op; |
1361 | top->above = op; |
1466 | } |
1362 | } |
1467 | |
1363 | |
1468 | if (op->above == NULL) |
1364 | if (op->above == NULL) |
1469 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1365 | op->ms ().top = op; |
1470 | } /* else not INS_BELOW_ORIGINATOR */ |
1366 | } /* else not INS_BELOW_ORIGINATOR */ |
1471 | |
1367 | |
1472 | if (op->type == PLAYER) |
1368 | if (op->type == PLAYER) |
1473 | op->contr->do_los = 1; |
1369 | op->contr->do_los = 1; |
1474 | |
1370 | |
1475 | /* If we have a floor, we know the player, if any, will be above |
1371 | /* If we have a floor, we know the player, if any, will be above |
1476 | * it, so save a few ticks and start from there. |
1372 | * it, so save a few ticks and start from there. |
1477 | */ |
1373 | */ |
1478 | if (!(flag & INS_MAP_LOAD)) |
1374 | if (!(flag & INS_MAP_LOAD)) |
1479 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1375 | if (object *pl = op->ms ().player ()) |
1480 | if (tmp->type == PLAYER) |
1376 | if (pl->contr->ns) |
1481 | tmp->contr->socket.update_look = 1; |
1377 | pl->contr->ns->floorbox_update (); |
1482 | |
1378 | |
1483 | /* If this object glows, it may affect lighting conditions that are |
1379 | /* If this object glows, it may affect lighting conditions that are |
1484 | * visible to others on this map. But update_all_los is really |
1380 | * visible to others on this map. But update_all_los is really |
1485 | * an inefficient way to do this, as it means los for all players |
1381 | * an inefficient way to do this, as it means los for all players |
1486 | * on the map will get recalculated. The players could very well |
1382 | * on the map will get recalculated. The players could very well |
1487 | * be far away from this change and not affected in any way - |
1383 | * be far away from this change and not affected in any way - |
1488 | * this should get redone to only look for players within range, |
1384 | * this should get redone to only look for players within range, |
1489 | * or just updating the P_NEED_UPDATE for spaces within this area |
1385 | * or just updating the P_NEED_UPDATE for spaces within this area |
1490 | * of effect may be sufficient. |
1386 | * of effect may be sufficient. |
1491 | */ |
1387 | */ |
1492 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1388 | if (op->map->darkness && (op->glow_radius != 0)) |
1493 | update_all_los (op->map, op->x, op->y); |
1389 | update_all_los (op->map, op->x, op->y); |
1494 | |
1390 | |
1495 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1391 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1496 | update_object (op, UP_OBJ_INSERT); |
1392 | update_object (op, UP_OBJ_INSERT); |
1497 | |
1393 | |
|
|
1394 | INVOKE_OBJECT (INSERT, op); |
|
|
1395 | |
1498 | /* Don't know if moving this to the end will break anything. However, |
1396 | /* Don't know if moving this to the end will break anything. However, |
1499 | * we want to have update_look set above before calling this. |
1397 | * we want to have floorbox_update called before calling this. |
1500 | * |
1398 | * |
1501 | * check_move_on() must be after this because code called from |
1399 | * check_move_on() must be after this because code called from |
1502 | * check_move_on() depends on correct map flags (so functions like |
1400 | * check_move_on() depends on correct map flags (so functions like |
1503 | * blocked() and wall() work properly), and these flags are updated by |
1401 | * blocked() and wall() work properly), and these flags are updated by |
1504 | * update_object(). |
1402 | * update_object(). |
… | |
… | |
1506 | |
1404 | |
1507 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1405 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1508 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1406 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1509 | { |
1407 | { |
1510 | if (check_move_on (op, originator)) |
1408 | if (check_move_on (op, originator)) |
1511 | return NULL; |
1409 | return 0; |
1512 | |
1410 | |
1513 | /* If we are a multi part object, lets work our way through the check |
1411 | /* If we are a multi part object, lets work our way through the check |
1514 | * walk on's. |
1412 | * walk on's. |
1515 | */ |
1413 | */ |
1516 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1414 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1517 | if (check_move_on (tmp, originator)) |
1415 | if (check_move_on (tmp, originator)) |
1518 | return NULL; |
1416 | return 0; |
1519 | } |
1417 | } |
1520 | |
1418 | |
1521 | return op; |
1419 | return op; |
1522 | } |
1420 | } |
1523 | |
1421 | |
1524 | /* this function inserts an object in the map, but if it |
1422 | /* this function inserts an object in the map, but if it |
1525 | * finds an object of its own type, it'll remove that one first. |
1423 | * finds an object of its own type, it'll remove that one first. |
1526 | * op is the object to insert it under: supplies x and the map. |
1424 | * op is the object to insert it under: supplies x and the map. |
1527 | */ |
1425 | */ |
1528 | void |
1426 | void |
1529 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1427 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1530 | { |
1428 | { |
1531 | object * |
1429 | object *tmp, *tmp1; |
1532 | tmp; |
|
|
1533 | object * |
|
|
1534 | tmp1; |
|
|
1535 | |
1430 | |
1536 | /* first search for itself and remove any old instances */ |
1431 | /* first search for itself and remove any old instances */ |
1537 | |
1432 | |
1538 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1433 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1539 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1434 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
… | |
… | |
1597 | |
1492 | |
1598 | object * |
1493 | object * |
1599 | decrease_ob_nr (object *op, uint32 i) |
1494 | decrease_ob_nr (object *op, uint32 i) |
1600 | { |
1495 | { |
1601 | object *tmp; |
1496 | object *tmp; |
1602 | player *pl; |
|
|
1603 | |
1497 | |
1604 | if (i == 0) /* objects with op->nrof require this check */ |
1498 | if (i == 0) /* objects with op->nrof require this check */ |
1605 | return op; |
1499 | return op; |
1606 | |
1500 | |
1607 | if (i > op->nrof) |
1501 | if (i > op->nrof) |
1608 | i = op->nrof; |
1502 | i = op->nrof; |
1609 | |
1503 | |
1610 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1504 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1611 | op->nrof -= i; |
1505 | op->nrof -= i; |
1612 | else if (op->env != NULL) |
1506 | else if (op->env) |
1613 | { |
1507 | { |
1614 | /* is this object in the players inventory, or sub container |
1508 | /* is this object in the players inventory, or sub container |
1615 | * therein? |
1509 | * therein? |
1616 | */ |
1510 | */ |
1617 | tmp = is_player_inv (op->env); |
1511 | tmp = op->in_player (); |
1618 | /* nope. Is this a container the player has opened? |
1512 | /* nope. Is this a container the player has opened? |
1619 | * If so, set tmp to that player. |
1513 | * If so, set tmp to that player. |
1620 | * IMO, searching through all the players will mostly |
1514 | * IMO, searching through all the players will mostly |
1621 | * likely be quicker than following op->env to the map, |
1515 | * likely be quicker than following op->env to the map, |
1622 | * and then searching the map for a player. |
1516 | * and then searching the map for a player. |
1623 | */ |
1517 | */ |
1624 | if (!tmp) |
1518 | if (!tmp) |
1625 | { |
1519 | for_all_players (pl) |
1626 | for (pl = first_player; pl; pl = pl->next) |
|
|
1627 | if (pl->ob->container == op->env) |
1520 | if (pl->ob->container == op->env) |
|
|
1521 | { |
|
|
1522 | tmp = pl->ob; |
1628 | break; |
1523 | break; |
1629 | if (pl) |
|
|
1630 | tmp = pl->ob; |
|
|
1631 | else |
|
|
1632 | tmp = NULL; |
|
|
1633 | } |
1524 | } |
1634 | |
1525 | |
1635 | if (i < op->nrof) |
1526 | if (i < op->nrof) |
1636 | { |
1527 | { |
1637 | sub_weight (op->env, op->weight * i); |
1528 | sub_weight (op->env, op->weight * i); |
1638 | op->nrof -= i; |
1529 | op->nrof -= i; |
1639 | if (tmp) |
1530 | if (tmp) |
1640 | { |
|
|
1641 | esrv_send_item (tmp, op); |
1531 | esrv_send_item (tmp, op); |
1642 | } |
|
|
1643 | } |
1532 | } |
1644 | else |
1533 | else |
1645 | { |
1534 | { |
1646 | op->remove (); |
1535 | op->remove (); |
1647 | op->nrof = 0; |
1536 | op->nrof = 0; |
1648 | if (tmp) |
1537 | if (tmp) |
1649 | { |
|
|
1650 | esrv_del_item (tmp->contr, op->count); |
1538 | esrv_del_item (tmp->contr, op->count); |
1651 | } |
|
|
1652 | } |
1539 | } |
1653 | } |
1540 | } |
1654 | else |
1541 | else |
1655 | { |
1542 | { |
1656 | object *above = op->above; |
1543 | object *above = op->above; |
… | |
… | |
1662 | op->remove (); |
1549 | op->remove (); |
1663 | op->nrof = 0; |
1550 | op->nrof = 0; |
1664 | } |
1551 | } |
1665 | |
1552 | |
1666 | /* Since we just removed op, op->above is null */ |
1553 | /* Since we just removed op, op->above is null */ |
1667 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1554 | for (tmp = above; tmp; tmp = tmp->above) |
1668 | if (tmp->type == PLAYER) |
1555 | if (tmp->type == PLAYER) |
1669 | { |
1556 | { |
1670 | if (op->nrof) |
1557 | if (op->nrof) |
1671 | esrv_send_item (tmp, op); |
1558 | esrv_send_item (tmp, op); |
1672 | else |
1559 | else |
… | |
… | |
1677 | if (op->nrof) |
1564 | if (op->nrof) |
1678 | return op; |
1565 | return op; |
1679 | else |
1566 | else |
1680 | { |
1567 | { |
1681 | op->destroy (); |
1568 | op->destroy (); |
1682 | return NULL; |
1569 | return 0; |
1683 | } |
1570 | } |
1684 | } |
1571 | } |
1685 | |
1572 | |
1686 | /* |
1573 | /* |
1687 | * add_weight(object, weight) adds the specified weight to an object, |
1574 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1747 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1634 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1748 | CLEAR_FLAG (op, FLAG_REMOVED); |
1635 | CLEAR_FLAG (op, FLAG_REMOVED); |
1749 | if (op->nrof) |
1636 | if (op->nrof) |
1750 | { |
1637 | { |
1751 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1638 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1752 | if (CAN_MERGE (tmp, op)) |
1639 | if (object::can_merge (tmp, op)) |
1753 | { |
1640 | { |
1754 | /* return the original object and remove inserted object |
1641 | /* return the original object and remove inserted object |
1755 | (client needs the original object) */ |
1642 | (client needs the original object) */ |
1756 | tmp->nrof += op->nrof; |
1643 | tmp->nrof += op->nrof; |
1757 | /* Weight handling gets pretty funky. Since we are adding to |
1644 | /* Weight handling gets pretty funky. Since we are adding to |
… | |
… | |
1775 | add_weight (this, op->weight * op->nrof); |
1662 | add_weight (this, op->weight * op->nrof); |
1776 | } |
1663 | } |
1777 | else |
1664 | else |
1778 | add_weight (this, (op->weight + op->carrying)); |
1665 | add_weight (this, (op->weight + op->carrying)); |
1779 | |
1666 | |
1780 | otmp = is_player_inv (this); |
1667 | otmp = this->in_player (); |
1781 | if (otmp && otmp->contr) |
1668 | if (otmp && otmp->contr) |
1782 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1669 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1783 | fix_player (otmp); |
1670 | otmp->update_stats (); |
1784 | |
1671 | |
1785 | op->map = NULL; |
1672 | op->map = 0; |
1786 | op->env = this; |
1673 | op->env = this; |
1787 | op->above = NULL; |
1674 | op->above = 0; |
1788 | op->below = NULL; |
1675 | op->below = 0; |
1789 | op->x = 0, op->y = 0; |
1676 | op->x = 0, op->y = 0; |
1790 | |
1677 | |
1791 | /* reset the light list and los of the players on the map */ |
1678 | /* reset the light list and los of the players on the map */ |
1792 | if ((op->glow_radius != 0) && map) |
1679 | if ((op->glow_radius != 0) && map) |
1793 | { |
1680 | { |
1794 | #ifdef DEBUG_LIGHTS |
1681 | #ifdef DEBUG_LIGHTS |
1795 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1682 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1796 | #endif /* DEBUG_LIGHTS */ |
1683 | #endif /* DEBUG_LIGHTS */ |
1797 | if (MAP_DARKNESS (map)) |
1684 | if (map->darkness) |
1798 | update_all_los (map, x, y); |
1685 | update_all_los (map, x, y); |
1799 | } |
1686 | } |
1800 | |
1687 | |
1801 | /* Client has no idea of ordering so lets not bother ordering it here. |
1688 | /* Client has no idea of ordering so lets not bother ordering it here. |
1802 | * It sure simplifies this function... |
1689 | * It sure simplifies this function... |
… | |
… | |
1807 | { |
1694 | { |
1808 | op->below = inv; |
1695 | op->below = inv; |
1809 | op->below->above = op; |
1696 | op->below->above = op; |
1810 | inv = op; |
1697 | inv = op; |
1811 | } |
1698 | } |
|
|
1699 | |
|
|
1700 | INVOKE_OBJECT (INSERT, this); |
1812 | |
1701 | |
1813 | return op; |
1702 | return op; |
1814 | } |
1703 | } |
1815 | |
1704 | |
1816 | /* |
1705 | /* |
… | |
… | |
1868 | |
1757 | |
1869 | /* The objects have to be checked from top to bottom. |
1758 | /* The objects have to be checked from top to bottom. |
1870 | * Hence, we first go to the top: |
1759 | * Hence, we first go to the top: |
1871 | */ |
1760 | */ |
1872 | |
1761 | |
1873 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
1762 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1874 | { |
1763 | { |
1875 | /* Trim the search when we find the first other spell effect |
1764 | /* Trim the search when we find the first other spell effect |
1876 | * this helps performance so that if a space has 50 spell objects, |
1765 | * this helps performance so that if a space has 50 spell objects, |
1877 | * we don't need to check all of them. |
1766 | * we don't need to check all of them. |
1878 | */ |
1767 | */ |
… | |
… | |
1933 | /* |
1822 | /* |
1934 | * present_arch(arch, map, x, y) searches for any objects with |
1823 | * present_arch(arch, map, x, y) searches for any objects with |
1935 | * a matching archetype at the given map and coordinates. |
1824 | * a matching archetype at the given map and coordinates. |
1936 | * The first matching object is returned, or NULL if none. |
1825 | * The first matching object is returned, or NULL if none. |
1937 | */ |
1826 | */ |
1938 | |
|
|
1939 | object * |
1827 | object * |
1940 | present_arch (const archetype *at, maptile *m, int x, int y) |
1828 | present_arch (const archetype *at, maptile *m, int x, int y) |
1941 | { |
1829 | { |
1942 | object * |
|
|
1943 | tmp; |
|
|
1944 | |
|
|
1945 | if (m == NULL || out_of_map (m, x, y)) |
1830 | if (m == NULL || out_of_map (m, x, y)) |
1946 | { |
1831 | { |
1947 | LOG (llevError, "Present_arch called outside map.\n"); |
1832 | LOG (llevError, "Present_arch called outside map.\n"); |
1948 | return NULL; |
1833 | return NULL; |
1949 | } |
1834 | } |
|
|
1835 | |
1950 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1836 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1951 | if (tmp->arch == at) |
1837 | if (tmp->arch == at) |
1952 | return tmp; |
1838 | return tmp; |
|
|
1839 | |
1953 | return NULL; |
1840 | return NULL; |
1954 | } |
1841 | } |
1955 | |
1842 | |
1956 | /* |
1843 | /* |
1957 | * present(type, map, x, y) searches for any objects with |
1844 | * present(type, map, x, y) searches for any objects with |
1958 | * a matching type variable at the given map and coordinates. |
1845 | * a matching type variable at the given map and coordinates. |
1959 | * The first matching object is returned, or NULL if none. |
1846 | * The first matching object is returned, or NULL if none. |
1960 | */ |
1847 | */ |
1961 | |
|
|
1962 | object * |
1848 | object * |
1963 | present (unsigned char type, maptile *m, int x, int y) |
1849 | present (unsigned char type, maptile *m, int x, int y) |
1964 | { |
1850 | { |
1965 | object * |
|
|
1966 | tmp; |
|
|
1967 | |
|
|
1968 | if (out_of_map (m, x, y)) |
1851 | if (out_of_map (m, x, y)) |
1969 | { |
1852 | { |
1970 | LOG (llevError, "Present called outside map.\n"); |
1853 | LOG (llevError, "Present called outside map.\n"); |
1971 | return NULL; |
1854 | return NULL; |
1972 | } |
1855 | } |
|
|
1856 | |
1973 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1857 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1974 | if (tmp->type == type) |
1858 | if (tmp->type == type) |
1975 | return tmp; |
1859 | return tmp; |
|
|
1860 | |
1976 | return NULL; |
1861 | return NULL; |
1977 | } |
1862 | } |
1978 | |
1863 | |
1979 | /* |
1864 | /* |
1980 | * present_in_ob(type, object) searches for any objects with |
1865 | * present_in_ob(type, object) searches for any objects with |
1981 | * a matching type variable in the inventory of the given object. |
1866 | * a matching type variable in the inventory of the given object. |
1982 | * The first matching object is returned, or NULL if none. |
1867 | * The first matching object is returned, or NULL if none. |
1983 | */ |
1868 | */ |
1984 | |
|
|
1985 | object * |
1869 | object * |
1986 | present_in_ob (unsigned char type, const object *op) |
1870 | present_in_ob (unsigned char type, const object *op) |
1987 | { |
1871 | { |
1988 | object * |
|
|
1989 | tmp; |
|
|
1990 | |
|
|
1991 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1872 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1992 | if (tmp->type == type) |
1873 | if (tmp->type == type) |
1993 | return tmp; |
1874 | return tmp; |
|
|
1875 | |
1994 | return NULL; |
1876 | return NULL; |
1995 | } |
1877 | } |
1996 | |
1878 | |
1997 | /* |
1879 | /* |
1998 | * present_in_ob (type, str, object) searches for any objects with |
1880 | * present_in_ob (type, str, object) searches for any objects with |
… | |
… | |
2006 | * str is the string to match against. Note that we match against |
1888 | * str is the string to match against. Note that we match against |
2007 | * the object name, not the archetype name. this is so that the |
1889 | * the object name, not the archetype name. this is so that the |
2008 | * spell code can use one object type (force), but change it's name |
1890 | * spell code can use one object type (force), but change it's name |
2009 | * to be unique. |
1891 | * to be unique. |
2010 | */ |
1892 | */ |
2011 | |
|
|
2012 | object * |
1893 | object * |
2013 | present_in_ob_by_name (int type, const char *str, const object *op) |
1894 | present_in_ob_by_name (int type, const char *str, const object *op) |
2014 | { |
1895 | { |
2015 | object * |
|
|
2016 | tmp; |
|
|
2017 | |
|
|
2018 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1896 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2019 | { |
|
|
2020 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1897 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
2021 | return tmp; |
1898 | return tmp; |
2022 | } |
1899 | |
2023 | return NULL; |
1900 | return 0; |
2024 | } |
1901 | } |
2025 | |
1902 | |
2026 | /* |
1903 | /* |
2027 | * present_arch_in_ob(archetype, object) searches for any objects with |
1904 | * present_arch_in_ob(archetype, object) searches for any objects with |
2028 | * a matching archetype in the inventory of the given object. |
1905 | * a matching archetype in the inventory of the given object. |
2029 | * The first matching object is returned, or NULL if none. |
1906 | * The first matching object is returned, or NULL if none. |
2030 | */ |
1907 | */ |
2031 | |
|
|
2032 | object * |
1908 | object * |
2033 | present_arch_in_ob (const archetype *at, const object *op) |
1909 | present_arch_in_ob (const archetype *at, const object *op) |
2034 | { |
1910 | { |
2035 | object * |
|
|
2036 | tmp; |
|
|
2037 | |
|
|
2038 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1911 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2039 | if (tmp->arch == at) |
1912 | if (tmp->arch == at) |
2040 | return tmp; |
1913 | return tmp; |
|
|
1914 | |
2041 | return NULL; |
1915 | return NULL; |
2042 | } |
1916 | } |
2043 | |
1917 | |
2044 | /* |
1918 | /* |
2045 | * activate recursively a flag on an object inventory |
1919 | * activate recursively a flag on an object inventory |
2046 | */ |
1920 | */ |
2047 | void |
1921 | void |
2048 | flag_inv (object *op, int flag) |
1922 | flag_inv (object *op, int flag) |
2049 | { |
1923 | { |
2050 | object * |
|
|
2051 | tmp; |
|
|
2052 | |
|
|
2053 | if (op->inv) |
1924 | if (op->inv) |
2054 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1925 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2055 | { |
1926 | { |
2056 | SET_FLAG (tmp, flag); |
1927 | SET_FLAG (tmp, flag); |
2057 | flag_inv (tmp, flag); |
1928 | flag_inv (tmp, flag); |
2058 | } |
1929 | } |
2059 | } /* |
1930 | } |
|
|
1931 | |
|
|
1932 | /* |
2060 | * desactivate recursively a flag on an object inventory |
1933 | * deactivate recursively a flag on an object inventory |
2061 | */ |
1934 | */ |
2062 | void |
1935 | void |
2063 | unflag_inv (object *op, int flag) |
1936 | unflag_inv (object *op, int flag) |
2064 | { |
1937 | { |
2065 | object * |
|
|
2066 | tmp; |
|
|
2067 | |
|
|
2068 | if (op->inv) |
1938 | if (op->inv) |
2069 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1939 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2070 | { |
1940 | { |
2071 | CLEAR_FLAG (tmp, flag); |
1941 | CLEAR_FLAG (tmp, flag); |
2072 | unflag_inv (tmp, flag); |
1942 | unflag_inv (tmp, flag); |
2073 | } |
1943 | } |
2074 | } |
1944 | } |
… | |
… | |
2077 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1947 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
2078 | * all it's inventory (recursively). |
1948 | * all it's inventory (recursively). |
2079 | * If checksums are used, a player will get set_cheat called for |
1949 | * If checksums are used, a player will get set_cheat called for |
2080 | * him/her-self and all object carried by a call to this function. |
1950 | * him/her-self and all object carried by a call to this function. |
2081 | */ |
1951 | */ |
2082 | |
|
|
2083 | void |
1952 | void |
2084 | set_cheat (object *op) |
1953 | set_cheat (object *op) |
2085 | { |
1954 | { |
2086 | SET_FLAG (op, FLAG_WAS_WIZ); |
1955 | SET_FLAG (op, FLAG_WAS_WIZ); |
2087 | flag_inv (op, FLAG_WAS_WIZ); |
1956 | flag_inv (op, FLAG_WAS_WIZ); |
… | |
… | |
2106 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1975 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2107 | * to know if the space in question will block the object. We can't use |
1976 | * to know if the space in question will block the object. We can't use |
2108 | * the archetype because that isn't correct if the monster has been |
1977 | * the archetype because that isn't correct if the monster has been |
2109 | * customized, changed states, etc. |
1978 | * customized, changed states, etc. |
2110 | */ |
1979 | */ |
2111 | |
|
|
2112 | int |
1980 | int |
2113 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1981 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2114 | { |
1982 | { |
2115 | int |
|
|
2116 | i, |
|
|
2117 | index = 0, flag; |
1983 | int index = 0, flag; |
2118 | static int |
|
|
2119 | altern[SIZEOFFREE]; |
1984 | int altern[SIZEOFFREE]; |
2120 | |
1985 | |
2121 | for (i = start; i < stop; i++) |
1986 | for (int i = start; i < stop; i++) |
2122 | { |
1987 | { |
2123 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
1988 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2124 | if (!flag) |
1989 | if (!flag) |
2125 | altern[index++] = i; |
1990 | altern [index++] = i; |
2126 | |
1991 | |
2127 | /* Basically, if we find a wall on a space, we cut down the search size. |
1992 | /* Basically, if we find a wall on a space, we cut down the search size. |
2128 | * In this way, we won't return spaces that are on another side of a wall. |
1993 | * In this way, we won't return spaces that are on another side of a wall. |
2129 | * This mostly work, but it cuts down the search size in all directions - |
1994 | * This mostly work, but it cuts down the search size in all directions - |
2130 | * if the space being examined only has a wall to the north and empty |
1995 | * if the space being examined only has a wall to the north and empty |
2131 | * spaces in all the other directions, this will reduce the search space |
1996 | * spaces in all the other directions, this will reduce the search space |
2132 | * to only the spaces immediately surrounding the target area, and |
1997 | * to only the spaces immediately surrounding the target area, and |
2133 | * won't look 2 spaces south of the target space. |
1998 | * won't look 2 spaces south of the target space. |
2134 | */ |
1999 | */ |
2135 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2000 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2136 | stop = maxfree[i]; |
2001 | stop = maxfree[i]; |
2137 | } |
2002 | } |
|
|
2003 | |
2138 | if (!index) |
2004 | if (!index) |
2139 | return -1; |
2005 | return -1; |
|
|
2006 | |
2140 | return altern[RANDOM () % index]; |
2007 | return altern[RANDOM () % index]; |
2141 | } |
2008 | } |
2142 | |
2009 | |
2143 | /* |
2010 | /* |
2144 | * find_first_free_spot(archetype, maptile, x, y) works like |
2011 | * find_first_free_spot(archetype, maptile, x, y) works like |
2145 | * find_free_spot(), but it will search max number of squares. |
2012 | * find_free_spot(), but it will search max number of squares. |
2146 | * But it will return the first available spot, not a random choice. |
2013 | * But it will return the first available spot, not a random choice. |
2147 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2014 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2148 | */ |
2015 | */ |
2149 | |
|
|
2150 | int |
2016 | int |
2151 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2017 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2152 | { |
2018 | { |
2153 | int |
|
|
2154 | i; |
|
|
2155 | |
|
|
2156 | for (i = 0; i < SIZEOFFREE; i++) |
2019 | for (int i = 0; i < SIZEOFFREE; i++) |
2157 | { |
|
|
2158 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2020 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2159 | return i; |
2021 | return i; |
2160 | } |
2022 | |
2161 | return -1; |
2023 | return -1; |
2162 | } |
2024 | } |
2163 | |
2025 | |
2164 | /* |
2026 | /* |
2165 | * The function permute(arr, begin, end) randomly reorders the array |
2027 | * The function permute(arr, begin, end) randomly reorders the array |
2166 | * arr[begin..end-1]. |
2028 | * arr[begin..end-1]. |
|
|
2029 | * now uses a fisher-yates shuffle, old permute was broken |
2167 | */ |
2030 | */ |
2168 | static void |
2031 | static void |
2169 | permute (int *arr, int begin, int end) |
2032 | permute (int *arr, int begin, int end) |
2170 | { |
2033 | { |
2171 | int |
2034 | arr += begin; |
2172 | i, |
|
|
2173 | j, |
|
|
2174 | tmp, |
|
|
2175 | len; |
|
|
2176 | |
|
|
2177 | len = end - begin; |
2035 | end -= begin; |
2178 | for (i = begin; i < end; i++) |
|
|
2179 | { |
|
|
2180 | j = begin + RANDOM () % len; |
|
|
2181 | |
2036 | |
2182 | tmp = arr[i]; |
2037 | while (--end) |
2183 | arr[i] = arr[j]; |
2038 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2184 | arr[j] = tmp; |
|
|
2185 | } |
|
|
2186 | } |
2039 | } |
2187 | |
2040 | |
2188 | /* new function to make monster searching more efficient, and effective! |
2041 | /* new function to make monster searching more efficient, and effective! |
2189 | * This basically returns a randomized array (in the passed pointer) of |
2042 | * This basically returns a randomized array (in the passed pointer) of |
2190 | * the spaces to find monsters. In this way, it won't always look for |
2043 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2193 | * the 3x3 area will be searched, just not in a predictable order. |
2046 | * the 3x3 area will be searched, just not in a predictable order. |
2194 | */ |
2047 | */ |
2195 | void |
2048 | void |
2196 | get_search_arr (int *search_arr) |
2049 | get_search_arr (int *search_arr) |
2197 | { |
2050 | { |
2198 | int |
2051 | int i; |
2199 | i; |
|
|
2200 | |
2052 | |
2201 | for (i = 0; i < SIZEOFFREE; i++) |
2053 | for (i = 0; i < SIZEOFFREE; i++) |
2202 | { |
|
|
2203 | search_arr[i] = i; |
2054 | search_arr[i] = i; |
2204 | } |
|
|
2205 | |
2055 | |
2206 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2056 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2207 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2057 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2208 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2058 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2209 | } |
2059 | } |
… | |
… | |
2218 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2068 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2219 | * is actually want is going to try and move there. We need this info |
2069 | * is actually want is going to try and move there. We need this info |
2220 | * because we have to know what movement the thing looking to move |
2070 | * because we have to know what movement the thing looking to move |
2221 | * there is capable of. |
2071 | * there is capable of. |
2222 | */ |
2072 | */ |
2223 | |
|
|
2224 | int |
2073 | int |
2225 | find_dir (maptile *m, int x, int y, object *exclude) |
2074 | find_dir (maptile *m, int x, int y, object *exclude) |
2226 | { |
2075 | { |
2227 | int |
|
|
2228 | i, |
|
|
2229 | max = SIZEOFFREE, mflags; |
2076 | int i, max = SIZEOFFREE, mflags; |
2230 | |
2077 | |
2231 | sint16 nx, ny; |
2078 | sint16 nx, ny; |
2232 | object * |
2079 | object *tmp; |
2233 | tmp; |
|
|
2234 | maptile * |
2080 | maptile *mp; |
2235 | mp; |
|
|
2236 | |
2081 | |
2237 | MoveType blocked, move_type; |
2082 | MoveType blocked, move_type; |
2238 | |
2083 | |
2239 | if (exclude && exclude->head) |
2084 | if (exclude && exclude->head) |
2240 | { |
2085 | { |
… | |
… | |
2252 | mp = m; |
2097 | mp = m; |
2253 | nx = x + freearr_x[i]; |
2098 | nx = x + freearr_x[i]; |
2254 | ny = y + freearr_y[i]; |
2099 | ny = y + freearr_y[i]; |
2255 | |
2100 | |
2256 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2101 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2102 | |
2257 | if (mflags & P_OUT_OF_MAP) |
2103 | if (mflags & P_OUT_OF_MAP) |
2258 | { |
|
|
2259 | max = maxfree[i]; |
2104 | max = maxfree[i]; |
2260 | } |
|
|
2261 | else |
2105 | else |
2262 | { |
2106 | { |
2263 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2107 | mapspace &ms = mp->at (nx, ny); |
|
|
2108 | |
|
|
2109 | blocked = ms.move_block; |
2264 | |
2110 | |
2265 | if ((move_type & blocked) == move_type) |
2111 | if ((move_type & blocked) == move_type) |
2266 | { |
|
|
2267 | max = maxfree[i]; |
2112 | max = maxfree[i]; |
2268 | } |
|
|
2269 | else if (mflags & P_IS_ALIVE) |
2113 | else if (mflags & P_IS_ALIVE) |
2270 | { |
2114 | { |
2271 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2115 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2272 | { |
2116 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2273 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2117 | && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2274 | { |
|
|
2275 | break; |
2118 | break; |
2276 | } |
2119 | |
2277 | } |
|
|
2278 | if (tmp) |
2120 | if (tmp) |
2279 | { |
|
|
2280 | return freedir[i]; |
2121 | return freedir[i]; |
2281 | } |
|
|
2282 | } |
2122 | } |
2283 | } |
2123 | } |
2284 | } |
2124 | } |
|
|
2125 | |
2285 | return 0; |
2126 | return 0; |
2286 | } |
2127 | } |
2287 | |
2128 | |
2288 | /* |
2129 | /* |
2289 | * distance(object 1, object 2) will return the square of the |
2130 | * distance(object 1, object 2) will return the square of the |
2290 | * distance between the two given objects. |
2131 | * distance between the two given objects. |
2291 | */ |
2132 | */ |
2292 | |
|
|
2293 | int |
2133 | int |
2294 | distance (const object *ob1, const object *ob2) |
2134 | distance (const object *ob1, const object *ob2) |
2295 | { |
2135 | { |
2296 | int |
|
|
2297 | i; |
|
|
2298 | |
|
|
2299 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2136 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2300 | return i; |
|
|
2301 | } |
2137 | } |
2302 | |
2138 | |
2303 | /* |
2139 | /* |
2304 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2140 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2305 | * an object which has subtracted the x and y coordinates of another |
2141 | * an object which has subtracted the x and y coordinates of another |
2306 | * object, needs to travel toward it. |
2142 | * object, needs to travel toward it. |
2307 | */ |
2143 | */ |
2308 | |
|
|
2309 | int |
2144 | int |
2310 | find_dir_2 (int x, int y) |
2145 | find_dir_2 (int x, int y) |
2311 | { |
2146 | { |
2312 | int |
2147 | int q; |
2313 | q; |
|
|
2314 | |
2148 | |
2315 | if (y) |
2149 | if (y) |
2316 | q = x * 100 / y; |
2150 | q = x * 100 / y; |
2317 | else if (x) |
2151 | else if (x) |
2318 | q = -300 * x; |
2152 | q = -300 * x; |
… | |
… | |
2353 | int |
2187 | int |
2354 | absdir (int d) |
2188 | absdir (int d) |
2355 | { |
2189 | { |
2356 | while (d < 1) |
2190 | while (d < 1) |
2357 | d += 8; |
2191 | d += 8; |
|
|
2192 | |
2358 | while (d > 8) |
2193 | while (d > 8) |
2359 | d -= 8; |
2194 | d -= 8; |
|
|
2195 | |
2360 | return d; |
2196 | return d; |
2361 | } |
2197 | } |
2362 | |
2198 | |
2363 | /* |
2199 | /* |
2364 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2200 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
… | |
… | |
2366 | */ |
2202 | */ |
2367 | |
2203 | |
2368 | int |
2204 | int |
2369 | dirdiff (int dir1, int dir2) |
2205 | dirdiff (int dir1, int dir2) |
2370 | { |
2206 | { |
2371 | int |
2207 | int d; |
2372 | d; |
|
|
2373 | |
2208 | |
2374 | d = abs (dir1 - dir2); |
2209 | d = abs (dir1 - dir2); |
2375 | if (d > 4) |
2210 | if (d > 4) |
2376 | d = 8 - d; |
2211 | d = 8 - d; |
|
|
2212 | |
2377 | return d; |
2213 | return d; |
2378 | } |
2214 | } |
2379 | |
2215 | |
2380 | /* peterm: |
2216 | /* peterm: |
2381 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2217 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
… | |
… | |
2384 | * This basically means that if direction is 15, then it could either go |
2220 | * This basically means that if direction is 15, then it could either go |
2385 | * direction 4, 14, or 16 to get back to where we are. |
2221 | * direction 4, 14, or 16 to get back to where we are. |
2386 | * Moved from spell_util.c to object.c with the other related direction |
2222 | * Moved from spell_util.c to object.c with the other related direction |
2387 | * functions. |
2223 | * functions. |
2388 | */ |
2224 | */ |
2389 | |
|
|
2390 | int |
|
|
2391 | reduction_dir[SIZEOFFREE][3] = { |
2225 | int reduction_dir[SIZEOFFREE][3] = { |
2392 | {0, 0, 0}, /* 0 */ |
2226 | {0, 0, 0}, /* 0 */ |
2393 | {0, 0, 0}, /* 1 */ |
2227 | {0, 0, 0}, /* 1 */ |
2394 | {0, 0, 0}, /* 2 */ |
2228 | {0, 0, 0}, /* 2 */ |
2395 | {0, 0, 0}, /* 3 */ |
2229 | {0, 0, 0}, /* 3 */ |
2396 | {0, 0, 0}, /* 4 */ |
2230 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2444 | * find a path to that monster that we found. If not, |
2278 | * find a path to that monster that we found. If not, |
2445 | * we don't bother going toward it. Returns 1 if we |
2279 | * we don't bother going toward it. Returns 1 if we |
2446 | * can see a direct way to get it |
2280 | * can see a direct way to get it |
2447 | * Modified to be map tile aware -.MSW |
2281 | * Modified to be map tile aware -.MSW |
2448 | */ |
2282 | */ |
2449 | |
|
|
2450 | |
|
|
2451 | int |
2283 | int |
2452 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2284 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2453 | { |
2285 | { |
2454 | sint16 dx, dy; |
2286 | sint16 dx, dy; |
2455 | int |
|
|
2456 | mflags; |
2287 | int mflags; |
2457 | |
2288 | |
2458 | if (dir < 0) |
2289 | if (dir < 0) |
2459 | return 0; /* exit condition: invalid direction */ |
2290 | return 0; /* exit condition: invalid direction */ |
2460 | |
2291 | |
2461 | dx = x + freearr_x[dir]; |
2292 | dx = x + freearr_x[dir]; |
… | |
… | |
2474 | return 0; |
2305 | return 0; |
2475 | |
2306 | |
2476 | /* yes, can see. */ |
2307 | /* yes, can see. */ |
2477 | if (dir < 9) |
2308 | if (dir < 9) |
2478 | return 1; |
2309 | return 1; |
|
|
2310 | |
2479 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2311 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2480 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2312 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2313 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2481 | } |
2314 | } |
2482 | |
|
|
2483 | |
|
|
2484 | |
2315 | |
2485 | /* |
2316 | /* |
2486 | * can_pick(picker, item): finds out if an object is possible to be |
2317 | * can_pick(picker, item): finds out if an object is possible to be |
2487 | * picked up by the picker. Returnes 1 if it can be |
2318 | * picked up by the picker. Returnes 1 if it can be |
2488 | * picked up, otherwise 0. |
2319 | * picked up, otherwise 0. |
… | |
… | |
2499 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2330 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2500 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2331 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2501 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2332 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2502 | } |
2333 | } |
2503 | |
2334 | |
2504 | |
|
|
2505 | /* |
2335 | /* |
2506 | * create clone from object to another |
2336 | * create clone from object to another |
2507 | */ |
2337 | */ |
2508 | object * |
2338 | object * |
2509 | object_create_clone (object *asrc) |
2339 | object_create_clone (object *asrc) |
… | |
… | |
2518 | src = src->head; |
2348 | src = src->head; |
2519 | |
2349 | |
2520 | prev = 0; |
2350 | prev = 0; |
2521 | for (part = src; part; part = part->more) |
2351 | for (part = src; part; part = part->more) |
2522 | { |
2352 | { |
2523 | tmp = object::create (); |
2353 | tmp = part->clone (); |
2524 | part->copy_to (tmp); |
|
|
2525 | tmp->x -= src->x; |
2354 | tmp->x -= src->x; |
2526 | tmp->y -= src->y; |
2355 | tmp->y -= src->y; |
2527 | |
2356 | |
2528 | if (!part->head) |
2357 | if (!part->head) |
2529 | { |
2358 | { |
2530 | dst = tmp; |
2359 | dst = tmp; |
2531 | tmp->head = 0; |
2360 | tmp->head = 0; |
2532 | } |
2361 | } |
2533 | else |
2362 | else |
2534 | { |
|
|
2535 | tmp->head = dst; |
2363 | tmp->head = dst; |
2536 | } |
|
|
2537 | |
2364 | |
2538 | tmp->more = 0; |
2365 | tmp->more = 0; |
2539 | |
2366 | |
2540 | if (prev) |
2367 | if (prev) |
2541 | prev->more = tmp; |
2368 | prev->more = tmp; |
… | |
… | |
2553 | /* Basically, we save the content of the string to a temp file, then call */ |
2380 | /* Basically, we save the content of the string to a temp file, then call */ |
2554 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2381 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2555 | /* but it was simple to make and allows reusing the load_object function. */ |
2382 | /* but it was simple to make and allows reusing the load_object function. */ |
2556 | /* Remember not to use load_object_str in a time-critical situation. */ |
2383 | /* Remember not to use load_object_str in a time-critical situation. */ |
2557 | /* Also remember that multiparts objects are not supported for now. */ |
2384 | /* Also remember that multiparts objects are not supported for now. */ |
2558 | |
|
|
2559 | object * |
2385 | object * |
2560 | load_object_str (const char *obstr) |
2386 | load_object_str (const char *obstr) |
2561 | { |
2387 | { |
2562 | object *op; |
2388 | object *op; |
2563 | char filename[MAX_BUF]; |
2389 | char filename[MAX_BUF]; |
… | |
… | |
2593 | * returns NULL if no match. |
2419 | * returns NULL if no match. |
2594 | */ |
2420 | */ |
2595 | object * |
2421 | object * |
2596 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2422 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2597 | { |
2423 | { |
2598 | object *tmp; |
|
|
2599 | |
|
|
2600 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2424 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
2601 | if (tmp->type == type && tmp->subtype == subtype) |
2425 | if (tmp->type == type && tmp->subtype == subtype) |
2602 | return tmp; |
2426 | return tmp; |
2603 | |
2427 | |
2604 | return NULL; |
2428 | return 0; |
2605 | } |
2429 | } |
2606 | |
2430 | |
2607 | /* If ob has a field named key, return the link from the list, |
2431 | /* If ob has a field named key, return the link from the list, |
2608 | * otherwise return NULL. |
2432 | * otherwise return NULL. |
2609 | * |
2433 | * |
… | |
… | |
2611 | * do the desired thing. |
2435 | * do the desired thing. |
2612 | */ |
2436 | */ |
2613 | key_value * |
2437 | key_value * |
2614 | get_ob_key_link (const object *ob, const char *key) |
2438 | get_ob_key_link (const object *ob, const char *key) |
2615 | { |
2439 | { |
2616 | key_value *link; |
|
|
2617 | |
|
|
2618 | for (link = ob->key_values; link != NULL; link = link->next) |
2440 | for (key_value *link = ob->key_values; link; link = link->next) |
2619 | if (link->key == key) |
2441 | if (link->key == key) |
2620 | return link; |
2442 | return link; |
2621 | |
2443 | |
2622 | return NULL; |
2444 | return 0; |
2623 | } |
2445 | } |
2624 | |
2446 | |
2625 | /* |
2447 | /* |
2626 | * Returns the value of op has an extra_field for key, or NULL. |
2448 | * Returns the value of op has an extra_field for key, or NULL. |
2627 | * |
2449 | * |
… | |
… | |
2667 | * Returns TRUE on success. |
2489 | * Returns TRUE on success. |
2668 | */ |
2490 | */ |
2669 | int |
2491 | int |
2670 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2492 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2671 | { |
2493 | { |
2672 | key_value * |
|
|
2673 | field = NULL, *last = NULL; |
2494 | key_value *field = NULL, *last = NULL; |
2674 | |
2495 | |
2675 | for (field = op->key_values; field != NULL; field = field->next) |
2496 | for (field = op->key_values; field != NULL; field = field->next) |
2676 | { |
2497 | { |
2677 | if (field->key != canonical_key) |
2498 | if (field->key != canonical_key) |
2678 | { |
2499 | { |
… | |
… | |
2706 | /* IF we get here, key doesn't exist */ |
2527 | /* IF we get here, key doesn't exist */ |
2707 | |
2528 | |
2708 | /* No field, we'll have to add it. */ |
2529 | /* No field, we'll have to add it. */ |
2709 | |
2530 | |
2710 | if (!add_key) |
2531 | if (!add_key) |
2711 | { |
|
|
2712 | return FALSE; |
2532 | return FALSE; |
2713 | } |
2533 | |
2714 | /* There isn't any good reason to store a null |
2534 | /* There isn't any good reason to store a null |
2715 | * value in the key/value list. If the archetype has |
2535 | * value in the key/value list. If the archetype has |
2716 | * this key, then we should also have it, so shouldn't |
2536 | * this key, then we should also have it, so shouldn't |
2717 | * be here. If user wants to store empty strings, |
2537 | * be here. If user wants to store empty strings, |
2718 | * should pass in "" |
2538 | * should pass in "" |