… | |
… | |
29 | #include <sys/types.h> |
29 | #include <sys/types.h> |
30 | #include <sys/uio.h> |
30 | #include <sys/uio.h> |
31 | #include <object.h> |
31 | #include <object.h> |
32 | #include <funcpoint.h> |
32 | #include <funcpoint.h> |
33 | #include <loader.h> |
33 | #include <loader.h> |
|
|
34 | |
|
|
35 | #include <bitset> |
34 | |
36 | |
35 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
36 | static UUID uuid; |
38 | static UUID uuid; |
37 | const uint64 UUID_SKIP = 1<<19; |
39 | const uint64 UUID_SKIP = 1<<19; |
38 | |
40 | |
… | |
… | |
104 | _exit (1); |
106 | _exit (1); |
105 | } |
107 | } |
106 | |
108 | |
107 | uuid.seq = uid; |
109 | uuid.seq = uid; |
108 | write_uuid (); |
110 | write_uuid (); |
109 | LOG (llevDebug, "read UID: %lld\n", uid); |
111 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
110 | fclose (fp); |
112 | fclose (fp); |
111 | } |
113 | } |
112 | |
114 | |
113 | UUID |
115 | UUID |
114 | gen_uuid () |
116 | gen_uuid () |
… | |
… | |
183 | * |
185 | * |
184 | * Note that this function appears a lot longer than the macro it |
186 | * Note that this function appears a lot longer than the macro it |
185 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
186 | * reduce this to the same efficiency. |
188 | * reduce this to the same efficiency. |
187 | * |
189 | * |
188 | * Check nrof variable *before* calling CAN_MERGE() |
190 | * Check nrof variable *before* calling can_merge() |
189 | * |
191 | * |
190 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
191 | * check weight |
193 | * check weight |
192 | */ |
194 | */ |
193 | |
195 | |
194 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
195 | { |
197 | { |
196 | /* A couple quicksanity checks */ |
198 | /* A couple quicksanity checks */ |
197 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
199 | if (ob1 == ob2 |
|
|
200 | || ob1->type != ob2->type |
|
|
201 | || ob1->speed != ob2->speed |
|
|
202 | || ob1->value != ob2->value |
|
|
203 | || ob1->name != ob2->name) |
198 | return 0; |
204 | return 0; |
199 | |
205 | |
200 | if (ob1->speed != ob2->speed) |
206 | //TODO: this ain't working well, use nicer and correct overflow check |
201 | return 0; |
|
|
202 | |
|
|
203 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
207 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
204 | * value could not be stored in a sint32 (which unfortunately sometimes is |
208 | * value could not be stored in a sint32 (which unfortunately sometimes is |
205 | * used to store nrof). |
209 | * used to store nrof). |
206 | */ |
210 | */ |
207 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
217 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
218 | |
222 | |
219 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
220 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
221 | |
225 | |
222 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
223 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
224 | * being locked in inventory should prevent merging. |
|
|
225 | * 0x4 in flags3 is CLIENT_SENT |
|
|
226 | */ |
|
|
227 | if ((ob1->arch != ob2->arch) || |
|
|
228 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
229 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
230 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
231 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
232 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
233 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
234 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
235 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
236 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
237 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
238 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
239 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
240 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
241 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
242 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
243 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
244 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
245 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
246 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
247 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
248 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
249 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
250 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
251 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
252 | (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) |
248 | || ob1->move_off != ob2->move_off |
|
|
249 | || ob1->move_slow != ob2->move_slow |
|
|
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
253 | return 0; |
251 | return 0; |
254 | |
252 | |
255 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
256 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
257 | */ |
255 | */ |
… | |
… | |
260 | /* if one object has inventory but the other doesn't, not equiv */ |
258 | /* if one object has inventory but the other doesn't, not equiv */ |
261 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
262 | return 0; |
260 | return 0; |
263 | |
261 | |
264 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
265 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
266 | return 0; |
264 | return 0; |
267 | |
265 | |
268 | /* inventory ok - still need to check rest of this object to see |
266 | /* inventory ok - still need to check rest of this object to see |
269 | * if it is valid. |
267 | * if it is valid. |
270 | */ |
268 | */ |
… | |
… | |
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 | |
379 | void |
362 | char * |
380 | dump_object2 (object *op) |
|
|
381 | { |
|
|
382 | errmsg[0] = 0; |
|
|
383 | return; |
|
|
384 | //TODO//D#d# |
|
|
385 | #if 0 |
|
|
386 | char *cp; |
|
|
387 | |
|
|
388 | /* object *tmp;*/ |
|
|
389 | |
|
|
390 | if (op->arch != NULL) |
|
|
391 | { |
|
|
392 | strcat (errmsg, "arch "); |
|
|
393 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
394 | strcat (errmsg, "\n"); |
|
|
395 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
396 | strcat (errmsg, cp); |
|
|
397 | # if 0 |
|
|
398 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
399 | * will overflow the buffer. |
|
|
400 | * Changed so that we don't dump inventory either. This may |
|
|
401 | * also overflow the buffer. |
|
|
402 | */ |
|
|
403 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
404 | strcat (errmsg, cp); |
|
|
405 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
406 | dump_object2 (tmp); |
|
|
407 | # endif |
|
|
408 | strcat (errmsg, "end\n"); |
|
|
409 | } |
|
|
410 | else |
|
|
411 | { |
|
|
412 | strcat (errmsg, "Object "); |
|
|
413 | if (op->name == NULL) |
|
|
414 | strcat (errmsg, "(null)"); |
|
|
415 | else |
|
|
416 | strcat (errmsg, op->name); |
|
|
417 | strcat (errmsg, "\n"); |
|
|
418 | # if 0 |
|
|
419 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
420 | strcat (errmsg, cp); |
|
|
421 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
422 | dump_object2 (tmp); |
|
|
423 | # endif |
|
|
424 | strcat (errmsg, "end\n"); |
|
|
425 | } |
|
|
426 | #endif |
|
|
427 | } |
|
|
428 | |
|
|
429 | /* |
|
|
430 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
431 | */ |
|
|
432 | |
|
|
433 | void |
|
|
434 | dump_object (object *op) |
363 | dump_object (object *op) |
435 | { |
364 | { |
436 | if (op == NULL) |
365 | if (!op) |
437 | { |
366 | return strdup ("[NULLOBJ]"); |
438 | strcpy (errmsg, "[NULL pointer]"); |
|
|
439 | return; |
|
|
440 | } |
|
|
441 | errmsg[0] = '\0'; |
|
|
442 | dump_object2 (op); |
|
|
443 | } |
|
|
444 | |
367 | |
445 | void |
368 | object_freezer freezer; |
446 | dump_all_objects (void) |
369 | save_object (freezer, op, 3); |
447 | { |
370 | return freezer.as_string (); |
448 | object *op; |
|
|
449 | |
|
|
450 | for (op = object::first; op != NULL; op = op->next) |
|
|
451 | { |
|
|
452 | dump_object (op); |
|
|
453 | fprintf (logfile, "Object %s\n", errmsg); |
|
|
454 | } |
|
|
455 | } |
371 | } |
456 | |
372 | |
457 | /* |
373 | /* |
458 | * get_nearest_part(multi-object, object 2) returns the part of the |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
459 | * multi-object 1 which is closest to the second object. |
375 | * multi-object 1 which is closest to the second object. |
… | |
… | |
479 | */ |
395 | */ |
480 | |
396 | |
481 | object * |
397 | object * |
482 | find_object (tag_t i) |
398 | find_object (tag_t i) |
483 | { |
399 | { |
484 | object *op; |
|
|
485 | |
|
|
486 | for (op = object::first; op != NULL; op = op->next) |
400 | for (object *op = object::first; op; op = op->next) |
487 | if (op->count == i) |
401 | if (op->count == i) |
488 | break; |
402 | return op; |
489 | |
403 | |
490 | return op; |
404 | return 0; |
491 | } |
405 | } |
492 | |
406 | |
493 | /* |
407 | /* |
494 | * Returns the first object which has a name equal to the argument. |
408 | * Returns the first object which has a name equal to the argument. |
495 | * Used only by the patch command, but not all that useful. |
409 | * Used only by the patch command, but not all that useful. |
… | |
… | |
595 | |
509 | |
596 | if (settings.casting_time) |
510 | if (settings.casting_time) |
597 | casting_time = -1; |
511 | casting_time = -1; |
598 | } |
512 | } |
599 | |
513 | |
600 | void object::clone (object *destination) |
|
|
601 | { |
|
|
602 | *(object_copy *)destination = *this; |
|
|
603 | *(object_pod *)destination = *this; |
|
|
604 | |
|
|
605 | if (self || cb) |
|
|
606 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
607 | } |
|
|
608 | |
|
|
609 | /* |
514 | /* |
610 | * copy object first frees everything allocated by the second object, |
515 | * copy_to first frees everything allocated by the dst object, |
611 | * and then copies the contends of the first object into the second |
516 | * and then copies the contents of itself into the second |
612 | * object, allocating what needs to be allocated. Basically, any |
517 | * object, allocating what needs to be allocated. Basically, any |
613 | * 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, |
614 | * 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 |
615 | * will point at garbage. |
520 | * will point at garbage. |
616 | */ |
521 | */ |
617 | void |
522 | void |
618 | copy_object (object *op2, object *op) |
523 | object::copy_to (object *dst) |
619 | { |
524 | { |
620 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
525 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
621 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
526 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
622 | |
527 | |
623 | 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)); |
624 | |
533 | |
625 | if (is_freed) |
534 | if (is_freed) |
626 | SET_FLAG (op, FLAG_FREED); |
535 | SET_FLAG (dst, FLAG_FREED); |
|
|
536 | |
627 | if (is_removed) |
537 | if (is_removed) |
628 | SET_FLAG (op, FLAG_REMOVED); |
538 | SET_FLAG (dst, FLAG_REMOVED); |
629 | |
539 | |
630 | if (op2->speed < 0) |
540 | if (speed < 0) |
631 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
541 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
632 | |
542 | |
633 | /* Copy over key_values, if any. */ |
543 | /* Copy over key_values, if any. */ |
634 | if (op2->key_values) |
544 | if (key_values) |
635 | { |
545 | { |
636 | key_value *tail = 0; |
546 | key_value *tail = 0; |
637 | key_value *i; |
547 | key_value *i; |
638 | |
548 | |
639 | op->key_values = 0; |
549 | dst->key_values = 0; |
640 | |
550 | |
641 | for (i = op2->key_values; i; i = i->next) |
551 | for (i = key_values; i; i = i->next) |
642 | { |
552 | { |
643 | key_value *new_link = new key_value; |
553 | key_value *new_link = new key_value; |
644 | |
554 | |
645 | new_link->next = 0; |
555 | new_link->next = 0; |
646 | new_link->key = i->key; |
556 | new_link->key = i->key; |
647 | new_link->value = i->value; |
557 | new_link->value = i->value; |
648 | |
558 | |
649 | /* Try and be clever here, too. */ |
559 | /* Try and be clever here, too. */ |
650 | if (!op->key_values) |
560 | if (!dst->key_values) |
651 | { |
561 | { |
652 | op->key_values = new_link; |
562 | dst->key_values = new_link; |
653 | tail = new_link; |
563 | tail = new_link; |
654 | } |
564 | } |
655 | else |
565 | else |
656 | { |
566 | { |
657 | tail->next = new_link; |
567 | tail->next = new_link; |
658 | tail = new_link; |
568 | tail = new_link; |
659 | } |
569 | } |
660 | } |
570 | } |
661 | } |
571 | } |
662 | |
572 | |
663 | 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; |
664 | } |
582 | } |
665 | |
583 | |
666 | /* |
584 | /* |
667 | * 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 |
668 | * 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 |
… | |
… | |
776 | op->active_next = NULL; |
694 | op->active_next = NULL; |
777 | op->active_prev = NULL; |
695 | op->active_prev = NULL; |
778 | } |
696 | } |
779 | |
697 | |
780 | /* |
698 | /* |
781 | * update_object() updates the array which represents the map. |
699 | * update_object() updates the the map. |
782 | * It takes into account invisible objects (and represent squares covered |
700 | * It takes into account invisible objects (and represent squares covered |
783 | * 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 |
784 | * invisible object, etc...) |
702 | * invisible object, etc...) |
785 | * 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 |
786 | * 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 |
787 | * updating that window, though, since update_object() is called _often_) |
705 | * updating that window, though, since update_object() is called _often_) |
788 | * |
706 | * |
789 | * 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. |
790 | * For example, if the only thing that has changed is the face (due to |
|
|
791 | * an animation), we don't need to call update_position until that actually |
|
|
792 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
793 | * of walls or living creatures may need us to update the flags now. |
|
|
794 | * current action are: |
708 | * current action are: |
795 | * UP_OBJ_INSERT: op was inserted |
709 | * UP_OBJ_INSERT: op was inserted |
796 | * UP_OBJ_REMOVE: op was removed |
710 | * UP_OBJ_REMOVE: op was removed |
797 | * 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 |
798 | * 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. |
799 | * UP_OBJ_FACE: only the objects face has changed. |
713 | * UP_OBJ_FACE: only the objects face has changed. |
800 | */ |
714 | */ |
801 | |
|
|
802 | void |
715 | void |
803 | update_object (object *op, int action) |
716 | update_object (object *op, int action) |
804 | { |
717 | { |
805 | int update_now = 0, flags; |
|
|
806 | MoveType move_on, move_off, move_block, move_slow; |
718 | MoveType move_on, move_off, move_block, move_slow; |
807 | |
719 | |
808 | if (op == NULL) |
720 | if (op == NULL) |
809 | { |
721 | { |
810 | /* this should never happen */ |
722 | /* this should never happen */ |
811 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
723 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
812 | return; |
724 | return; |
813 | } |
725 | } |
814 | |
726 | |
815 | if (op->env != NULL) |
727 | if (op->env) |
816 | { |
728 | { |
817 | /* Animation is currently handled by client, so nothing |
729 | /* Animation is currently handled by client, so nothing |
818 | * to do in this case. |
730 | * to do in this case. |
819 | */ |
731 | */ |
820 | return; |
732 | return; |
… | |
… | |
834 | abort (); |
746 | abort (); |
835 | #endif |
747 | #endif |
836 | return; |
748 | return; |
837 | } |
749 | } |
838 | |
750 | |
839 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
751 | mapspace &m = op->ms (); |
840 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
841 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
842 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
843 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
844 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
845 | |
752 | |
|
|
753 | if (m.flags_ & P_NEED_UPDATE) |
|
|
754 | /* nop */; |
846 | if (action == UP_OBJ_INSERT) |
755 | else if (action == UP_OBJ_INSERT) |
847 | { |
756 | { |
|
|
757 | // this is likely overkill, TODO: revisit (schmorp) |
848 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
758 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
849 | update_now = 1; |
|
|
850 | |
|
|
851 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
759 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
852 | update_now = 1; |
760 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
853 | |
761 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
762 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
854 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
763 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
855 | update_now = 1; |
|
|
856 | |
|
|
857 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
858 | update_now = 1; |
|
|
859 | |
|
|
860 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
861 | update_now = 1; |
|
|
862 | |
|
|
863 | if ((move_on | op->move_on) != move_on) |
764 | || (m.move_on | op->move_on ) != m.move_on |
864 | update_now = 1; |
|
|
865 | |
|
|
866 | if ((move_off | op->move_off) != move_off) |
765 | || (m.move_off | op->move_off ) != m.move_off |
867 | update_now = 1; |
766 | || (m.move_slow | op->move_slow) != m.move_slow |
868 | |
|
|
869 | /* This isn't perfect, but I don't expect a lot of objects to |
767 | /* This isn't perfect, but I don't expect a lot of objects to |
870 | * to have move_allow right now. |
768 | * to have move_allow right now. |
871 | */ |
769 | */ |
872 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
770 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
873 | update_now = 1; |
771 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
874 | |
772 | m.flags_ = P_NEED_UPDATE; |
875 | if ((move_slow | op->move_slow) != move_slow) |
|
|
876 | update_now = 1; |
|
|
877 | } |
773 | } |
878 | /* if the object is being removed, we can't make intelligent |
774 | /* if the object is being removed, we can't make intelligent |
879 | * decisions, because remove_ob can't really pass the object |
775 | * decisions, because remove_ob can't really pass the object |
880 | * that is being removed. |
776 | * that is being removed. |
881 | */ |
777 | */ |
882 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
778 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
883 | update_now = 1; |
779 | m.flags_ = P_NEED_UPDATE; |
884 | else if (action == UP_OBJ_FACE) |
780 | else if (action == UP_OBJ_FACE) |
885 | /* Nothing to do for that case */ ; |
781 | /* Nothing to do for that case */ ; |
886 | else |
782 | else |
887 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
783 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
888 | |
784 | |
889 | if (update_now) |
|
|
890 | { |
|
|
891 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
892 | update_position (op->map, op->x, op->y); |
|
|
893 | } |
|
|
894 | |
|
|
895 | if (op->more != NULL) |
785 | if (op->more) |
896 | update_object (op->more, action); |
786 | update_object (op->more, action); |
897 | } |
787 | } |
898 | |
788 | |
899 | object::vector object::mortals; |
789 | object::vector object::mortals; |
900 | object::vector object::objects; // not yet used |
790 | object::vector object::objects; // not yet used |
… | |
… | |
908 | else |
798 | else |
909 | { |
799 | { |
910 | delete *i; |
800 | delete *i; |
911 | mortals.erase (i); |
801 | mortals.erase (i); |
912 | } |
802 | } |
913 | |
|
|
914 | static int lastmortals = 0;//D |
|
|
915 | |
|
|
916 | if (mortals.size() != lastmortals && lastmortals > 100)//D |
|
|
917 | { |
|
|
918 | lastmortals = mortals.size ();//D |
|
|
919 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
920 | } |
|
|
921 | } |
803 | } |
922 | |
804 | |
923 | object::object () |
805 | object::object () |
924 | { |
806 | { |
925 | SET_FLAG (this, FLAG_REMOVED); |
807 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
984 | |
866 | |
985 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
867 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
986 | remove_friendly_object (this); |
868 | remove_friendly_object (this); |
987 | |
869 | |
988 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
870 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
989 | remove_ob (this); |
871 | remove (); |
990 | |
872 | |
991 | SET_FLAG (this, FLAG_FREED); |
873 | SET_FLAG (this, FLAG_FREED); |
992 | |
874 | |
993 | if (more) |
875 | if (more) |
994 | { |
876 | { |
… | |
… | |
1019 | |
901 | |
1020 | while (op) |
902 | while (op) |
1021 | { |
903 | { |
1022 | object *tmp = op->below; |
904 | object *tmp = op->below; |
1023 | |
905 | |
1024 | remove_ob (op); |
906 | op->remove (); |
1025 | |
907 | |
1026 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
908 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
1027 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
909 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
1028 | free_object (op); |
910 | op->destroy (); |
1029 | else |
911 | else |
1030 | { |
912 | { |
1031 | op->x = x; |
913 | op->x = x; |
1032 | op->y = y; |
914 | op->y = y; |
1033 | 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 */ |
… | |
… | |
1036 | op = tmp; |
918 | op = tmp; |
1037 | } |
919 | } |
1038 | } |
920 | } |
1039 | } |
921 | } |
1040 | |
922 | |
|
|
923 | // hack to ensure that freed objects still have a valid map |
|
|
924 | { |
|
|
925 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
926 | |
|
|
927 | if (!freed_map) |
|
|
928 | { |
|
|
929 | freed_map = new maptile; |
|
|
930 | |
|
|
931 | freed_map->name = "/internal/freed_objects_map"; |
|
|
932 | freed_map->width = 3; |
|
|
933 | freed_map->height = 3; |
|
|
934 | |
|
|
935 | freed_map->allocate (); |
|
|
936 | } |
|
|
937 | |
|
|
938 | map = freed_map; |
|
|
939 | x = 1; |
|
|
940 | y = 1; |
|
|
941 | } |
|
|
942 | |
1041 | // clear those pointers that likely might have circular references to us |
943 | // clear those pointers that likely might have circular references to us |
1042 | owner = 0; |
944 | owner = 0; |
1043 | enemy = 0; |
945 | enemy = 0; |
1044 | attacked_by = 0; |
946 | attacked_by = 0; |
1045 | |
947 | |
… | |
… | |
1057 | |
959 | |
1058 | /* |
960 | /* |
1059 | * sub_weight() recursively (outwards) subtracts a number from the |
961 | * sub_weight() recursively (outwards) subtracts a number from the |
1060 | * weight of an object (and what is carried by it's environment(s)). |
962 | * weight of an object (and what is carried by it's environment(s)). |
1061 | */ |
963 | */ |
1062 | |
|
|
1063 | void |
964 | void |
1064 | sub_weight (object *op, signed long weight) |
965 | sub_weight (object *op, signed long weight) |
1065 | { |
966 | { |
1066 | while (op != NULL) |
967 | while (op != NULL) |
1067 | { |
968 | { |
… | |
… | |
1071 | op->carrying -= weight; |
972 | op->carrying -= weight; |
1072 | op = op->env; |
973 | op = op->env; |
1073 | } |
974 | } |
1074 | } |
975 | } |
1075 | |
976 | |
1076 | /* remove_ob(op): |
977 | /* op->remove (): |
1077 | * This function removes the object op from the linked list of objects |
978 | * This function removes the object op from the linked list of objects |
1078 | * which it is currently tied to. When this function is done, the |
979 | * which it is currently tied to. When this function is done, the |
1079 | * object will have no environment. If the object previously had an |
980 | * object will have no environment. If the object previously had an |
1080 | * environment, the x and y coordinates will be updated to |
981 | * environment, the x and y coordinates will be updated to |
1081 | * the previous environment. |
982 | * the previous environment. |
1082 | * Beware: This function is called from the editor as well! |
983 | * Beware: This function is called from the editor as well! |
1083 | */ |
984 | */ |
1084 | |
|
|
1085 | void |
985 | void |
1086 | remove_ob (object *op) |
986 | object::remove () |
1087 | { |
987 | { |
1088 | object *tmp, *last = 0; |
988 | object *tmp, *last = 0; |
1089 | object *otmp; |
989 | object *otmp; |
1090 | |
990 | |
1091 | int check_walk_off; |
991 | int check_walk_off; |
1092 | maptile *m; |
|
|
1093 | |
992 | |
1094 | sint16 x, y; |
|
|
1095 | |
|
|
1096 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
993 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1097 | return; |
994 | return; |
1098 | |
995 | |
1099 | SET_FLAG (op, FLAG_REMOVED); |
996 | SET_FLAG (this, FLAG_REMOVED); |
1100 | |
997 | |
1101 | if (op->more != NULL) |
998 | if (more) |
1102 | remove_ob (op->more); |
999 | more->remove (); |
1103 | |
1000 | |
1104 | /* |
1001 | /* |
1105 | * In this case, the object to be removed is in someones |
1002 | * In this case, the object to be removed is in someones |
1106 | * inventory. |
1003 | * inventory. |
1107 | */ |
1004 | */ |
1108 | if (op->env != NULL) |
1005 | if (env) |
1109 | { |
1006 | { |
1110 | if (op->nrof) |
1007 | if (nrof) |
1111 | sub_weight (op->env, op->weight * op->nrof); |
1008 | sub_weight (env, weight * nrof); |
1112 | else |
1009 | else |
1113 | sub_weight (op->env, op->weight + op->carrying); |
1010 | sub_weight (env, weight + carrying); |
1114 | |
1011 | |
1115 | /* 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 |
1116 | * made to players inventory. If set, avoiding the call |
1013 | * made to players inventory. If set, avoiding the call |
1117 | * to save cpu time. |
1014 | * to save cpu time. |
1118 | */ |
1015 | */ |
1119 | if ((otmp = is_player_inv (op->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)) |
1120 | fix_player (otmp); |
1017 | fix_player (otmp); |
1121 | |
1018 | |
1122 | if (op->above != NULL) |
1019 | if (above != NULL) |
1123 | op->above->below = op->below; |
1020 | above->below = below; |
1124 | else |
1021 | else |
1125 | op->env->inv = op->below; |
1022 | env->inv = below; |
1126 | |
1023 | |
1127 | if (op->below != NULL) |
1024 | if (below != NULL) |
1128 | op->below->above = op->above; |
1025 | below->above = above; |
1129 | |
1026 | |
1130 | /* we set up values so that it could be inserted into |
1027 | /* we set up values so that it could be inserted into |
1131 | * the map, but we don't actually do that - it is up |
1028 | * the map, but we don't actually do that - it is up |
1132 | * to the caller to decide what we want to do. |
1029 | * to the caller to decide what we want to do. |
1133 | */ |
1030 | */ |
1134 | op->x = op->env->x, op->y = op->env->y; |
1031 | x = env->x, y = env->y; |
1135 | op->map = op->env->map; |
1032 | map = env->map; |
1136 | op->above = NULL, op->below = NULL; |
1033 | above = 0, below = 0; |
1137 | op->env = NULL; |
1034 | env = 0; |
1138 | } |
1035 | } |
1139 | else if (op->map) |
1036 | else if (map) |
1140 | { |
1037 | { |
1141 | x = op->x; |
|
|
1142 | y = op->y; |
|
|
1143 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1144 | |
|
|
1145 | if (!m) |
|
|
1146 | { |
|
|
1147 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1148 | op->map->path, op->x, op->y); |
|
|
1149 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1150 | * it seems if we get into this case, something is probablye |
|
|
1151 | * screwed up and should be fixed. |
|
|
1152 | */ |
|
|
1153 | abort (); |
|
|
1154 | } |
|
|
1155 | |
|
|
1156 | if (op->map != m) |
|
|
1157 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1158 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1159 | |
|
|
1160 | /* Re did the following section of code - it looks like it had |
1038 | /* Re did the following section of code - it looks like it had |
1161 | * lots of logic for things we no longer care about |
1039 | * lots of logic for things we no longer care about |
1162 | */ |
1040 | */ |
1163 | |
1041 | |
1164 | /* link the object above us */ |
1042 | /* link the object above us */ |
1165 | if (op->above) |
1043 | if (above) |
1166 | op->above->below = op->below; |
1044 | above->below = below; |
1167 | else |
1045 | else |
1168 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1046 | map->at (x, y).top = below; /* we were top, set new top */ |
1169 | |
1047 | |
1170 | /* Relink the object below us, if there is one */ |
1048 | /* Relink the object below us, if there is one */ |
1171 | if (op->below) |
1049 | if (below) |
1172 | op->below->above = op->above; |
1050 | below->above = above; |
1173 | else |
1051 | else |
1174 | { |
1052 | { |
1175 | /* Nothing below, which means we need to relink map object for this space |
1053 | /* Nothing below, which means we need to relink map object for this space |
1176 | * use translated coordinates in case some oddness with map tiling is |
1054 | * use translated coordinates in case some oddness with map tiling is |
1177 | * evident |
1055 | * evident |
1178 | */ |
1056 | */ |
1179 | if (GET_MAP_OB (m, x, y) != op) |
1057 | if (GET_MAP_OB (map, x, y) != this) |
1180 | { |
1058 | { |
1181 | dump_object (op); |
1059 | char *dump = dump_object (this); |
1182 | LOG (llevError, |
1060 | LOG (llevError, |
1183 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
1061 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); |
|
|
1062 | free (dump); |
1184 | dump_object (GET_MAP_OB (m, x, y)); |
1063 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1185 | LOG (llevError, "%s\n", errmsg); |
1064 | LOG (llevError, "%s\n", dump); |
|
|
1065 | free (dump); |
1186 | } |
1066 | } |
1187 | |
1067 | |
1188 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1068 | map->at (x, y).bottom = above; /* goes on above it. */ |
1189 | } |
1069 | } |
1190 | |
1070 | |
1191 | op->above = 0; |
1071 | above = 0; |
1192 | op->below = 0; |
1072 | below = 0; |
1193 | |
1073 | |
1194 | if (op->map->in_memory == MAP_SAVING) |
1074 | if (map->in_memory == MAP_SAVING) |
1195 | return; |
1075 | return; |
1196 | |
1076 | |
1197 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1077 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1198 | |
1078 | |
1199 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1079 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1200 | { |
1080 | { |
1201 | /* No point updating the players look faces if he is the object |
1081 | /* No point updating the players look faces if he is the object |
1202 | * being removed. |
1082 | * being removed. |
1203 | */ |
1083 | */ |
1204 | |
1084 | |
1205 | if (tmp->type == PLAYER && tmp != op) |
1085 | if (tmp->type == PLAYER && tmp != this) |
1206 | { |
1086 | { |
1207 | /* If a container that the player is currently using somehow gets |
1087 | /* If a container that the player is currently using somehow gets |
1208 | * removed (most likely destroyed), update the player view |
1088 | * removed (most likely destroyed), update the player view |
1209 | * appropriately. |
1089 | * appropriately. |
1210 | */ |
1090 | */ |
1211 | if (tmp->container == op) |
1091 | if (tmp->container == this) |
1212 | { |
1092 | { |
1213 | CLEAR_FLAG (op, FLAG_APPLIED); |
1093 | CLEAR_FLAG (this, FLAG_APPLIED); |
1214 | tmp->container = NULL; |
1094 | tmp->container = 0; |
1215 | } |
1095 | } |
1216 | |
1096 | |
1217 | tmp->contr->socket.update_look = 1; |
1097 | tmp->contr->socket->floorbox_update (); |
1218 | } |
1098 | } |
1219 | |
1099 | |
1220 | /* See if player moving off should effect something */ |
1100 | /* See if player moving off should effect something */ |
1221 | if (check_walk_off |
1101 | if (check_walk_off |
1222 | && ((op->move_type & tmp->move_off) |
1102 | && ((move_type & tmp->move_off) |
1223 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1103 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1224 | { |
1104 | { |
1225 | move_apply (tmp, op, NULL); |
1105 | move_apply (tmp, this, 0); |
1226 | |
1106 | |
1227 | if (op->destroyed ()) |
1107 | if (destroyed ()) |
1228 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1108 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1229 | } |
1109 | } |
1230 | |
1110 | |
1231 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1111 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1232 | |
1112 | |
1233 | if (tmp->above == tmp) |
1113 | if (tmp->above == tmp) |
1234 | tmp->above = NULL; |
1114 | tmp->above = 0; |
1235 | |
1115 | |
1236 | last = tmp; |
1116 | last = tmp; |
1237 | } |
1117 | } |
1238 | |
1118 | |
1239 | /* last == NULL of there are no objects on this space */ |
1119 | /* last == NULL of there are no objects on this space */ |
1240 | if (last == NULL) |
1120 | if (!last) |
1241 | { |
1121 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1242 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1243 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1244 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1245 | * be correct anyways. |
|
|
1246 | */ |
|
|
1247 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
|
|
1248 | update_position (op->map, op->x, op->y); |
|
|
1249 | } |
|
|
1250 | else |
1122 | else |
1251 | update_object (last, UP_OBJ_REMOVE); |
1123 | update_object (last, UP_OBJ_REMOVE); |
1252 | |
1124 | |
1253 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1125 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1254 | update_all_los (op->map, op->x, op->y); |
1126 | update_all_los (map, x, y); |
1255 | } |
1127 | } |
1256 | } |
1128 | } |
1257 | |
1129 | |
1258 | /* |
1130 | /* |
1259 | * merge_ob(op,top): |
1131 | * merge_ob(op,top): |
… | |
… | |
1274 | |
1146 | |
1275 | for (; top != NULL; top = top->below) |
1147 | for (; top != NULL; top = top->below) |
1276 | { |
1148 | { |
1277 | if (top == op) |
1149 | if (top == op) |
1278 | continue; |
1150 | continue; |
1279 | if (CAN_MERGE (op, top)) |
1151 | |
|
|
1152 | if (object::can_merge (op, top)) |
1280 | { |
1153 | { |
1281 | top->nrof += op->nrof; |
1154 | top->nrof += op->nrof; |
1282 | |
1155 | |
1283 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1156 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1284 | op->weight = 0; /* Don't want any adjustements now */ |
1157 | op->weight = 0; /* Don't want any adjustements now */ |
1285 | remove_ob (op); |
1158 | op->destroy (); |
1286 | free_object (op); |
|
|
1287 | return top; |
1159 | return top; |
1288 | } |
1160 | } |
1289 | } |
1161 | } |
1290 | |
1162 | |
1291 | return 0; |
1163 | return 0; |
… | |
… | |
1345 | return NULL; |
1217 | return NULL; |
1346 | } |
1218 | } |
1347 | |
1219 | |
1348 | if (m == NULL) |
1220 | if (m == NULL) |
1349 | { |
1221 | { |
1350 | dump_object (op); |
1222 | char *dump = dump_object (op); |
1351 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1223 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1224 | free (dump); |
1352 | return op; |
1225 | return op; |
1353 | } |
1226 | } |
1354 | |
1227 | |
1355 | if (out_of_map (m, op->x, op->y)) |
1228 | if (out_of_map (m, op->x, op->y)) |
1356 | { |
1229 | { |
1357 | dump_object (op); |
1230 | char *dump = dump_object (op); |
1358 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1231 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1359 | #ifdef MANY_CORES |
1232 | #ifdef MANY_CORES |
1360 | /* Better to catch this here, as otherwise the next use of this object |
1233 | /* Better to catch this here, as otherwise the next use of this object |
1361 | * is likely to cause a crash. Better to find out where it is getting |
1234 | * is likely to cause a crash. Better to find out where it is getting |
1362 | * improperly inserted. |
1235 | * improperly inserted. |
1363 | */ |
1236 | */ |
1364 | abort (); |
1237 | abort (); |
1365 | #endif |
1238 | #endif |
|
|
1239 | free (dump); |
1366 | return op; |
1240 | return op; |
1367 | } |
1241 | } |
1368 | |
1242 | |
1369 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1243 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1370 | { |
1244 | { |
1371 | dump_object (op); |
1245 | char *dump = dump_object (op); |
1372 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1246 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1247 | free (dump); |
1373 | return op; |
1248 | return op; |
1374 | } |
1249 | } |
1375 | |
1250 | |
1376 | if (op->more != NULL) |
1251 | if (op->more != NULL) |
1377 | { |
1252 | { |
… | |
… | |
1415 | |
1290 | |
1416 | /* this has to be done after we translate the coordinates. |
1291 | /* this has to be done after we translate the coordinates. |
1417 | */ |
1292 | */ |
1418 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1293 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1419 | 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) |
1420 | if (CAN_MERGE (op, tmp)) |
1295 | if (object::can_merge (op, tmp)) |
1421 | { |
1296 | { |
1422 | op->nrof += tmp->nrof; |
1297 | op->nrof += tmp->nrof; |
1423 | remove_ob (tmp); |
1298 | tmp->destroy (); |
1424 | free_object (tmp); |
|
|
1425 | } |
1299 | } |
1426 | |
1300 | |
1427 | 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 */ |
1428 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1302 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1429 | |
1303 | |
… | |
… | |
1442 | op->below = originator->below; |
1316 | op->below = originator->below; |
1443 | |
1317 | |
1444 | if (op->below) |
1318 | if (op->below) |
1445 | op->below->above = op; |
1319 | op->below->above = op; |
1446 | else |
1320 | else |
1447 | SET_MAP_OB (op->map, op->x, op->y, op); |
1321 | op->ms ().bottom = op; |
1448 | |
1322 | |
1449 | /* since *below* originator, no need to update top */ |
1323 | /* since *below* originator, no need to update top */ |
1450 | originator->below = op; |
1324 | originator->below = op; |
1451 | } |
1325 | } |
1452 | else |
1326 | else |
… | |
… | |
1498 | * If INS_ON_TOP is used, don't do this processing |
1372 | * If INS_ON_TOP is used, don't do this processing |
1499 | * Need to find the object that in fact blocks view, otherwise |
1373 | * Need to find the object that in fact blocks view, otherwise |
1500 | * stacking is a bit odd. |
1374 | * stacking is a bit odd. |
1501 | */ |
1375 | */ |
1502 | if (!(flag & INS_ON_TOP) && |
1376 | if (!(flag & INS_ON_TOP) && |
1503 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1377 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1504 | { |
1378 | { |
1505 | for (last = top; last != floor; last = last->below) |
1379 | for (last = top; last != floor; last = last->below) |
1506 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1380 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1507 | break; |
1381 | break; |
1508 | /* Check to see if we found the object that blocks view, |
1382 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1531 | |
1405 | |
1532 | if (op->above) |
1406 | if (op->above) |
1533 | op->above->below = op; |
1407 | op->above->below = op; |
1534 | |
1408 | |
1535 | op->below = NULL; |
1409 | op->below = NULL; |
1536 | SET_MAP_OB (op->map, op->x, op->y, op); |
1410 | op->ms ().bottom = op; |
1537 | } |
1411 | } |
1538 | else |
1412 | else |
1539 | { /* get inserted into the stack above top */ |
1413 | { /* get inserted into the stack above top */ |
1540 | op->above = top->above; |
1414 | op->above = top->above; |
1541 | |
1415 | |
… | |
… | |
1545 | op->below = top; |
1419 | op->below = top; |
1546 | top->above = op; |
1420 | top->above = op; |
1547 | } |
1421 | } |
1548 | |
1422 | |
1549 | if (op->above == NULL) |
1423 | if (op->above == NULL) |
1550 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1424 | op->ms ().top = op; |
1551 | } /* else not INS_BELOW_ORIGINATOR */ |
1425 | } /* else not INS_BELOW_ORIGINATOR */ |
1552 | |
1426 | |
1553 | if (op->type == PLAYER) |
1427 | if (op->type == PLAYER) |
1554 | op->contr->do_los = 1; |
1428 | op->contr->do_los = 1; |
1555 | |
1429 | |
1556 | /* 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 |
1557 | * it, so save a few ticks and start from there. |
1431 | * it, so save a few ticks and start from there. |
1558 | */ |
1432 | */ |
1559 | if (!(flag & INS_MAP_LOAD)) |
1433 | if (!(flag & INS_MAP_LOAD)) |
1560 | 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 ()) |
1561 | if (tmp->type == PLAYER) |
1435 | pl->contr->socket->floorbox_update (); |
1562 | tmp->contr->socket.update_look = 1; |
|
|
1563 | |
1436 | |
1564 | /* If this object glows, it may affect lighting conditions that are |
1437 | /* If this object glows, it may affect lighting conditions that are |
1565 | * 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 |
1566 | * 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 |
1567 | * on the map will get recalculated. The players could very well |
1440 | * on the map will get recalculated. The players could very well |
… | |
… | |
1575 | |
1448 | |
1576 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1449 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1577 | update_object (op, UP_OBJ_INSERT); |
1450 | update_object (op, UP_OBJ_INSERT); |
1578 | |
1451 | |
1579 | /* 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, |
1580 | * we want to have update_look set above before calling this. |
1453 | * we want to have floorbox_update called before calling this. |
1581 | * |
1454 | * |
1582 | * check_move_on() must be after this because code called from |
1455 | * check_move_on() must be after this because code called from |
1583 | * check_move_on() depends on correct map flags (so functions like |
1456 | * check_move_on() depends on correct map flags (so functions like |
1584 | * blocked() and wall() work properly), and these flags are updated by |
1457 | * blocked() and wall() work properly), and these flags are updated by |
1585 | * update_object(). |
1458 | * update_object(). |
… | |
… | |
1601 | |
1474 | |
1602 | return op; |
1475 | return op; |
1603 | } |
1476 | } |
1604 | |
1477 | |
1605 | /* this function inserts an object in the map, but if it |
1478 | /* this function inserts an object in the map, but if it |
1606 | * finds an object of its own type, it'll remove that one first. |
1479 | * finds an object of its own type, it'll remove that one first. |
1607 | * op is the object to insert it under: supplies x and the map. |
1480 | * op is the object to insert it under: supplies x and the map. |
1608 | */ |
1481 | */ |
1609 | void |
1482 | void |
1610 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1483 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1611 | { |
1484 | { |
1612 | object * |
1485 | object *tmp, *tmp1; |
1613 | tmp; |
|
|
1614 | object * |
|
|
1615 | tmp1; |
|
|
1616 | |
1486 | |
1617 | /* first search for itself and remove any old instances */ |
1487 | /* first search for itself and remove any old instances */ |
1618 | |
1488 | |
1619 | 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) |
1620 | { |
|
|
1621 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1490 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1622 | { |
1491 | tmp->destroy (); |
1623 | remove_ob (tmp); |
|
|
1624 | free_object (tmp); |
|
|
1625 | } |
|
|
1626 | } |
|
|
1627 | |
1492 | |
1628 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1493 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1629 | |
1494 | |
1630 | tmp1->x = op->x; |
1495 | tmp1->x = op->x; |
1631 | tmp1->y = op->y; |
1496 | tmp1->y = op->y; |
… | |
… | |
1641 | */ |
1506 | */ |
1642 | |
1507 | |
1643 | object * |
1508 | object * |
1644 | get_split_ob (object *orig_ob, uint32 nr) |
1509 | get_split_ob (object *orig_ob, uint32 nr) |
1645 | { |
1510 | { |
1646 | object * |
1511 | object *newob; |
1647 | newob; |
|
|
1648 | int |
|
|
1649 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1512 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1650 | |
1513 | |
1651 | if (orig_ob->nrof < nr) |
1514 | if (orig_ob->nrof < nr) |
1652 | { |
1515 | { |
1653 | 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); |
1654 | return NULL; |
1517 | return NULL; |
1655 | } |
1518 | } |
1656 | |
1519 | |
1657 | newob = object_create_clone (orig_ob); |
1520 | newob = object_create_clone (orig_ob); |
1658 | |
1521 | |
1659 | if ((orig_ob->nrof -= nr) < 1) |
1522 | if ((orig_ob->nrof -= nr) < 1) |
1660 | { |
1523 | orig_ob->destroy (1); |
1661 | if (!is_removed) |
|
|
1662 | remove_ob (orig_ob); |
|
|
1663 | free_object2 (orig_ob, 1); |
|
|
1664 | } |
|
|
1665 | else if (!is_removed) |
1524 | else if (!is_removed) |
1666 | { |
1525 | { |
1667 | if (orig_ob->env != NULL) |
1526 | if (orig_ob->env != NULL) |
1668 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1527 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1669 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1528 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1699 | if (i > op->nrof) |
1558 | if (i > op->nrof) |
1700 | i = op->nrof; |
1559 | i = op->nrof; |
1701 | |
1560 | |
1702 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1561 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1703 | op->nrof -= i; |
1562 | op->nrof -= i; |
1704 | else if (op->env != NULL) |
1563 | else if (op->env) |
1705 | { |
1564 | { |
1706 | /* is this object in the players inventory, or sub container |
1565 | /* is this object in the players inventory, or sub container |
1707 | * therein? |
1566 | * therein? |
1708 | */ |
1567 | */ |
1709 | tmp = is_player_inv (op->env); |
1568 | tmp = op->in_player (); |
1710 | /* nope. Is this a container the player has opened? |
1569 | /* nope. Is this a container the player has opened? |
1711 | * If so, set tmp to that player. |
1570 | * If so, set tmp to that player. |
1712 | * IMO, searching through all the players will mostly |
1571 | * IMO, searching through all the players will mostly |
1713 | * likely be quicker than following op->env to the map, |
1572 | * likely be quicker than following op->env to the map, |
1714 | * and then searching the map for a player. |
1573 | * and then searching the map for a player. |
1715 | */ |
1574 | */ |
1716 | if (!tmp) |
1575 | if (!tmp) |
1717 | { |
1576 | { |
1718 | for (pl = first_player; pl; pl = pl->next) |
1577 | for (pl = first_player; pl; pl = pl->next) |
1719 | if (pl->ob->container == op->env) |
1578 | if (pl->ob->container == op->env) |
|
|
1579 | { |
|
|
1580 | tmp = pl->ob; |
1720 | break; |
1581 | break; |
1721 | if (pl) |
1582 | } |
1722 | tmp = pl->ob; |
|
|
1723 | else |
|
|
1724 | tmp = NULL; |
|
|
1725 | } |
1583 | } |
1726 | |
1584 | |
1727 | if (i < op->nrof) |
1585 | if (i < op->nrof) |
1728 | { |
1586 | { |
1729 | sub_weight (op->env, op->weight * i); |
1587 | sub_weight (op->env, op->weight * i); |
1730 | op->nrof -= i; |
1588 | op->nrof -= i; |
1731 | if (tmp) |
1589 | if (tmp) |
1732 | { |
|
|
1733 | esrv_send_item (tmp, op); |
1590 | esrv_send_item (tmp, op); |
1734 | } |
|
|
1735 | } |
1591 | } |
1736 | else |
1592 | else |
1737 | { |
1593 | { |
1738 | remove_ob (op); |
1594 | op->remove (); |
1739 | op->nrof = 0; |
1595 | op->nrof = 0; |
1740 | if (tmp) |
1596 | if (tmp) |
1741 | { |
|
|
1742 | esrv_del_item (tmp->contr, op->count); |
1597 | esrv_del_item (tmp->contr, op->count); |
1743 | } |
|
|
1744 | } |
1598 | } |
1745 | } |
1599 | } |
1746 | else |
1600 | else |
1747 | { |
1601 | { |
1748 | object *above = op->above; |
1602 | object *above = op->above; |
1749 | |
1603 | |
1750 | if (i < op->nrof) |
1604 | if (i < op->nrof) |
1751 | op->nrof -= i; |
1605 | op->nrof -= i; |
1752 | else |
1606 | else |
1753 | { |
1607 | { |
1754 | remove_ob (op); |
1608 | op->remove (); |
1755 | op->nrof = 0; |
1609 | op->nrof = 0; |
1756 | } |
1610 | } |
1757 | |
1611 | |
1758 | /* Since we just removed op, op->above is null */ |
1612 | /* Since we just removed op, op->above is null */ |
1759 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1613 | for (tmp = above; tmp; tmp = tmp->above) |
1760 | if (tmp->type == PLAYER) |
1614 | if (tmp->type == PLAYER) |
1761 | { |
1615 | { |
1762 | if (op->nrof) |
1616 | if (op->nrof) |
1763 | esrv_send_item (tmp, op); |
1617 | esrv_send_item (tmp, op); |
1764 | else |
1618 | else |
… | |
… | |
1768 | |
1622 | |
1769 | if (op->nrof) |
1623 | if (op->nrof) |
1770 | return op; |
1624 | return op; |
1771 | else |
1625 | else |
1772 | { |
1626 | { |
1773 | free_object (op); |
1627 | op->destroy (); |
1774 | return NULL; |
1628 | return 0; |
1775 | } |
1629 | } |
1776 | } |
1630 | } |
1777 | |
1631 | |
1778 | /* |
1632 | /* |
1779 | * add_weight(object, weight) adds the specified weight to an object, |
1633 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1791 | op->carrying += weight; |
1645 | op->carrying += weight; |
1792 | op = op->env; |
1646 | op = op->env; |
1793 | } |
1647 | } |
1794 | } |
1648 | } |
1795 | |
1649 | |
|
|
1650 | object * |
|
|
1651 | insert_ob_in_ob (object *op, object *where) |
|
|
1652 | { |
|
|
1653 | if (!where) |
|
|
1654 | { |
|
|
1655 | char *dump = dump_object (op); |
|
|
1656 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1657 | free (dump); |
|
|
1658 | return op; |
|
|
1659 | } |
|
|
1660 | |
|
|
1661 | if (where->head) |
|
|
1662 | { |
|
|
1663 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1664 | where = where->head; |
|
|
1665 | } |
|
|
1666 | |
|
|
1667 | return where->insert (op); |
|
|
1668 | } |
|
|
1669 | |
1796 | /* |
1670 | /* |
1797 | * insert_ob_in_ob(op,environment): |
1671 | * env->insert (op) |
1798 | * This function inserts the object op in the linked list |
1672 | * This function inserts the object op in the linked list |
1799 | * inside the object environment. |
1673 | * inside the object environment. |
1800 | * |
1674 | * |
1801 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1802 | * the inventory at the last position or next to other objects of the same |
|
|
1803 | * type. |
|
|
1804 | * Frank: Now sorted by type, archetype and magic! |
|
|
1805 | * |
|
|
1806 | * The function returns now pointer to inserted item, and return value can |
1675 | * The function returns now pointer to inserted item, and return value can |
1807 | * be != op, if items are merged. -Tero |
1676 | * be != op, if items are merged. -Tero |
1808 | */ |
1677 | */ |
1809 | |
1678 | |
1810 | object * |
1679 | object * |
1811 | insert_ob_in_ob (object *op, object *where) |
1680 | object::insert (object *op) |
1812 | { |
1681 | { |
1813 | object * |
1682 | object *tmp, *otmp; |
1814 | tmp, * |
|
|
1815 | otmp; |
|
|
1816 | |
1683 | |
1817 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1684 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1818 | { |
1685 | op->remove (); |
1819 | dump_object (op); |
|
|
1820 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1821 | return op; |
|
|
1822 | } |
|
|
1823 | |
|
|
1824 | if (where == NULL) |
|
|
1825 | { |
|
|
1826 | dump_object (op); |
|
|
1827 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1828 | return op; |
|
|
1829 | } |
|
|
1830 | |
|
|
1831 | if (where->head) |
|
|
1832 | { |
|
|
1833 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1834 | where = where->head; |
|
|
1835 | } |
|
|
1836 | |
1686 | |
1837 | if (op->more) |
1687 | if (op->more) |
1838 | { |
1688 | { |
1839 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1689 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1840 | return op; |
1690 | return op; |
… | |
… | |
1842 | |
1692 | |
1843 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1693 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1844 | CLEAR_FLAG (op, FLAG_REMOVED); |
1694 | CLEAR_FLAG (op, FLAG_REMOVED); |
1845 | if (op->nrof) |
1695 | if (op->nrof) |
1846 | { |
1696 | { |
1847 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1697 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1848 | if (CAN_MERGE (tmp, op)) |
1698 | if (object::can_merge (tmp, op)) |
1849 | { |
1699 | { |
1850 | /* return the original object and remove inserted object |
1700 | /* return the original object and remove inserted object |
1851 | (client needs the original object) */ |
1701 | (client needs the original object) */ |
1852 | tmp->nrof += op->nrof; |
1702 | tmp->nrof += op->nrof; |
1853 | /* Weight handling gets pretty funky. Since we are adding to |
1703 | /* Weight handling gets pretty funky. Since we are adding to |
1854 | * tmp->nrof, we need to increase the weight. |
1704 | * tmp->nrof, we need to increase the weight. |
1855 | */ |
1705 | */ |
1856 | add_weight (where, op->weight * op->nrof); |
1706 | add_weight (this, op->weight * op->nrof); |
1857 | SET_FLAG (op, FLAG_REMOVED); |
1707 | SET_FLAG (op, FLAG_REMOVED); |
1858 | free_object (op); /* free the inserted object */ |
1708 | op->destroy (); /* free the inserted object */ |
1859 | op = tmp; |
1709 | op = tmp; |
1860 | remove_ob (op); /* and fix old object's links */ |
1710 | op->remove (); /* and fix old object's links */ |
1861 | CLEAR_FLAG (op, FLAG_REMOVED); |
1711 | CLEAR_FLAG (op, FLAG_REMOVED); |
1862 | break; |
1712 | break; |
1863 | } |
1713 | } |
1864 | |
1714 | |
1865 | /* I assume combined objects have no inventory |
1715 | /* I assume combined objects have no inventory |
1866 | * We add the weight - this object could have just been removed |
1716 | * We add the weight - this object could have just been removed |
1867 | * (if it was possible to merge). calling remove_ob will subtract |
1717 | * (if it was possible to merge). calling remove_ob will subtract |
1868 | * the weight, so we need to add it in again, since we actually do |
1718 | * the weight, so we need to add it in again, since we actually do |
1869 | * the linking below |
1719 | * the linking below |
1870 | */ |
1720 | */ |
1871 | add_weight (where, op->weight * op->nrof); |
1721 | add_weight (this, op->weight * op->nrof); |
1872 | } |
1722 | } |
1873 | else |
1723 | else |
1874 | add_weight (where, (op->weight + op->carrying)); |
1724 | add_weight (this, (op->weight + op->carrying)); |
1875 | |
1725 | |
1876 | otmp = is_player_inv (where); |
1726 | otmp = this->in_player (); |
1877 | if (otmp && otmp->contr != NULL) |
1727 | if (otmp && otmp->contr) |
1878 | { |
|
|
1879 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1728 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1880 | fix_player (otmp); |
1729 | fix_player (otmp); |
1881 | } |
|
|
1882 | |
1730 | |
1883 | op->map = NULL; |
1731 | op->map = 0; |
1884 | op->env = where; |
1732 | op->env = this; |
1885 | op->above = NULL; |
1733 | op->above = 0; |
1886 | op->below = NULL; |
1734 | op->below = 0; |
1887 | op->x = 0, op->y = 0; |
1735 | op->x = 0, op->y = 0; |
1888 | |
1736 | |
1889 | /* 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 */ |
1890 | if ((op->glow_radius != 0) && where->map) |
1738 | if ((op->glow_radius != 0) && map) |
1891 | { |
1739 | { |
1892 | #ifdef DEBUG_LIGHTS |
1740 | #ifdef DEBUG_LIGHTS |
1893 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1741 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1894 | #endif /* DEBUG_LIGHTS */ |
1742 | #endif /* DEBUG_LIGHTS */ |
1895 | if (MAP_DARKNESS (where->map)) |
1743 | if (MAP_DARKNESS (map)) |
1896 | update_all_los (where->map, where->x, where->y); |
1744 | update_all_los (map, x, y); |
1897 | } |
1745 | } |
1898 | |
1746 | |
1899 | /* Client has no idea of ordering so lets not bother ordering it here. |
1747 | /* Client has no idea of ordering so lets not bother ordering it here. |
1900 | * It sure simplifies this function... |
1748 | * It sure simplifies this function... |
1901 | */ |
1749 | */ |
1902 | if (where->inv == NULL) |
1750 | if (!inv) |
1903 | where->inv = op; |
1751 | inv = op; |
1904 | else |
1752 | else |
1905 | { |
1753 | { |
1906 | op->below = where->inv; |
1754 | op->below = inv; |
1907 | op->below->above = op; |
1755 | op->below->above = op; |
1908 | where->inv = op; |
1756 | inv = op; |
1909 | } |
1757 | } |
|
|
1758 | |
1910 | return op; |
1759 | return op; |
1911 | } |
1760 | } |
1912 | |
1761 | |
1913 | /* |
1762 | /* |
1914 | * Checks if any objects has a move_type that matches objects |
1763 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
2227 | * if the space being examined only has a wall to the north and empty |
2076 | * if the space being examined only has a wall to the north and empty |
2228 | * spaces in all the other directions, this will reduce the search space |
2077 | * spaces in all the other directions, this will reduce the search space |
2229 | * to only the spaces immediately surrounding the target area, and |
2078 | * to only the spaces immediately surrounding the target area, and |
2230 | * won't look 2 spaces south of the target space. |
2079 | * won't look 2 spaces south of the target space. |
2231 | */ |
2080 | */ |
2232 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2081 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2233 | stop = maxfree[i]; |
2082 | stop = maxfree[i]; |
2234 | } |
2083 | } |
|
|
2084 | |
2235 | if (!index) |
2085 | if (!index) |
2236 | return -1; |
2086 | return -1; |
|
|
2087 | |
2237 | return altern[RANDOM () % index]; |
2088 | return altern[RANDOM () % index]; |
2238 | } |
2089 | } |
2239 | |
2090 | |
2240 | /* |
2091 | /* |
2241 | * find_first_free_spot(archetype, maptile, x, y) works like |
2092 | * find_first_free_spot(archetype, maptile, x, y) works like |
… | |
… | |
2349 | mp = m; |
2200 | mp = m; |
2350 | nx = x + freearr_x[i]; |
2201 | nx = x + freearr_x[i]; |
2351 | ny = y + freearr_y[i]; |
2202 | ny = y + freearr_y[i]; |
2352 | |
2203 | |
2353 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2204 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2205 | |
2354 | if (mflags & P_OUT_OF_MAP) |
2206 | if (mflags & P_OUT_OF_MAP) |
2355 | { |
|
|
2356 | max = maxfree[i]; |
2207 | max = maxfree[i]; |
2357 | } |
|
|
2358 | else |
2208 | else |
2359 | { |
2209 | { |
2360 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2210 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2361 | |
2211 | |
2362 | if ((move_type & blocked) == move_type) |
2212 | if ((move_type & blocked) == move_type) |
2363 | { |
|
|
2364 | max = maxfree[i]; |
2213 | max = maxfree[i]; |
2365 | } |
|
|
2366 | else if (mflags & P_IS_ALIVE) |
2214 | else if (mflags & P_IS_ALIVE) |
2367 | { |
2215 | { |
2368 | 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) |
2369 | { |
|
|
2370 | 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))) |
2371 | { |
|
|
2372 | break; |
2218 | break; |
2373 | } |
2219 | |
2374 | } |
|
|
2375 | if (tmp) |
2220 | if (tmp) |
2376 | { |
|
|
2377 | return freedir[i]; |
2221 | return freedir[i]; |
2378 | } |
|
|
2379 | } |
2222 | } |
2380 | } |
2223 | } |
2381 | } |
2224 | } |
|
|
2225 | |
2382 | return 0; |
2226 | return 0; |
2383 | } |
2227 | } |
2384 | |
2228 | |
2385 | /* |
2229 | /* |
2386 | * distance(object 1, object 2) will return the square of the |
2230 | * distance(object 1, object 2) will return the square of the |
… | |
… | |
2388 | */ |
2232 | */ |
2389 | |
2233 | |
2390 | int |
2234 | int |
2391 | distance (const object *ob1, const object *ob2) |
2235 | distance (const object *ob1, const object *ob2) |
2392 | { |
2236 | { |
2393 | int |
2237 | int i; |
2394 | i; |
|
|
2395 | |
2238 | |
2396 | 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); |
2397 | return i; |
2240 | return i; |
2398 | } |
2241 | } |
2399 | |
2242 | |
… | |
… | |
2404 | */ |
2247 | */ |
2405 | |
2248 | |
2406 | int |
2249 | int |
2407 | find_dir_2 (int x, int y) |
2250 | find_dir_2 (int x, int y) |
2408 | { |
2251 | { |
2409 | int |
2252 | int q; |
2410 | q; |
|
|
2411 | |
2253 | |
2412 | if (y) |
2254 | if (y) |
2413 | q = x * 100 / y; |
2255 | q = x * 100 / y; |
2414 | else if (x) |
2256 | else if (x) |
2415 | q = -300 * x; |
2257 | q = -300 * x; |
… | |
… | |
2541 | * find a path to that monster that we found. If not, |
2383 | * find a path to that monster that we found. If not, |
2542 | * we don't bother going toward it. Returns 1 if we |
2384 | * we don't bother going toward it. Returns 1 if we |
2543 | * can see a direct way to get it |
2385 | * can see a direct way to get it |
2544 | * Modified to be map tile aware -.MSW |
2386 | * Modified to be map tile aware -.MSW |
2545 | */ |
2387 | */ |
2546 | |
|
|
2547 | |
|
|
2548 | int |
2388 | int |
2549 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2389 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2550 | { |
2390 | { |
2551 | sint16 dx, dy; |
2391 | sint16 dx, dy; |
2552 | int |
|
|
2553 | mflags; |
2392 | int mflags; |
2554 | |
2393 | |
2555 | if (dir < 0) |
2394 | if (dir < 0) |
2556 | return 0; /* exit condition: invalid direction */ |
2395 | return 0; /* exit condition: invalid direction */ |
2557 | |
2396 | |
2558 | dx = x + freearr_x[dir]; |
2397 | dx = x + freearr_x[dir]; |
… | |
… | |
2571 | return 0; |
2410 | return 0; |
2572 | |
2411 | |
2573 | /* yes, can see. */ |
2412 | /* yes, can see. */ |
2574 | if (dir < 9) |
2413 | if (dir < 9) |
2575 | return 1; |
2414 | return 1; |
|
|
2415 | |
2576 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2416 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2577 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2417 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2418 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2578 | } |
2419 | } |
2579 | |
|
|
2580 | |
|
|
2581 | |
2420 | |
2582 | /* |
2421 | /* |
2583 | * 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 |
2584 | * picked up by the picker. Returnes 1 if it can be |
2423 | * picked up by the picker. Returnes 1 if it can be |
2585 | * picked up, otherwise 0. |
2424 | * picked up, otherwise 0. |
… | |
… | |
2596 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2435 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2597 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2436 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2598 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2437 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2599 | } |
2438 | } |
2600 | |
2439 | |
2601 | |
|
|
2602 | /* |
2440 | /* |
2603 | * create clone from object to another |
2441 | * create clone from object to another |
2604 | */ |
2442 | */ |
2605 | object * |
2443 | object * |
2606 | object_create_clone (object *asrc) |
2444 | object_create_clone (object *asrc) |
2607 | { |
2445 | { |
2608 | object * |
|
|
2609 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2446 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2610 | |
2447 | |
2611 | if (!asrc) |
2448 | if (!asrc) |
2612 | return NULL; |
2449 | return 0; |
|
|
2450 | |
2613 | src = asrc; |
2451 | src = asrc; |
2614 | if (src->head) |
2452 | if (src->head) |
2615 | src = src->head; |
2453 | src = src->head; |
2616 | |
2454 | |
2617 | prev = NULL; |
2455 | prev = 0; |
2618 | for (part = src; part; part = part->more) |
2456 | for (part = src; part; part = part->more) |
2619 | { |
2457 | { |
2620 | tmp = get_object (); |
2458 | tmp = part->clone (); |
2621 | copy_object (part, tmp); |
|
|
2622 | tmp->x -= src->x; |
2459 | tmp->x -= src->x; |
2623 | tmp->y -= src->y; |
2460 | tmp->y -= src->y; |
|
|
2461 | |
2624 | if (!part->head) |
2462 | if (!part->head) |
2625 | { |
2463 | { |
2626 | dst = tmp; |
2464 | dst = tmp; |
2627 | tmp->head = NULL; |
2465 | tmp->head = 0; |
2628 | } |
2466 | } |
2629 | else |
2467 | else |
2630 | { |
|
|
2631 | tmp->head = dst; |
2468 | tmp->head = dst; |
2632 | } |
2469 | |
2633 | tmp->more = NULL; |
2470 | tmp->more = 0; |
|
|
2471 | |
2634 | if (prev) |
2472 | if (prev) |
2635 | prev->more = tmp; |
2473 | prev->more = tmp; |
|
|
2474 | |
2636 | prev = tmp; |
2475 | prev = tmp; |
2637 | } |
2476 | } |
2638 | |
2477 | |
2639 | for (item = src->inv; item; item = item->below) |
2478 | for (item = src->inv; item; item = item->below) |
2640 | insert_ob_in_ob (object_create_clone (item), dst); |
2479 | insert_ob_in_ob (object_create_clone (item), dst); |
… | |
… | |
2666 | } |
2505 | } |
2667 | |
2506 | |
2668 | fprintf (tempfile, obstr); |
2507 | fprintf (tempfile, obstr); |
2669 | fclose (tempfile); |
2508 | fclose (tempfile); |
2670 | |
2509 | |
2671 | op = get_object (); |
2510 | op = object::create (); |
2672 | |
2511 | |
2673 | object_thawer thawer (filename); |
2512 | object_thawer thawer (filename); |
2674 | |
2513 | |
2675 | if (thawer) |
2514 | if (thawer) |
2676 | load_object (thawer, op, 0); |
2515 | load_object (thawer, op, 0); |