… | |
… | |
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 () |
… | |
… | |
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 | |
|
|
194 | bool object::can_merge (object *ob1, object *ob2) |
195 | bool object::can_merge_slow (object *ob1, object *ob2) |
195 | { |
196 | { |
196 | /* A couple quicksanity checks */ |
197 | /* A couple quicksanity checks */ |
197 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
198 | if (ob1 == ob2 |
|
|
199 | || ob1->type != ob2->type |
|
|
200 | || ob1->speed != ob2->speed |
|
|
201 | || ob1->value != ob2->value |
|
|
202 | || ob1->name != ob2->name) |
198 | return 0; |
203 | return 0; |
199 | |
204 | |
200 | if (ob1->speed != ob2->speed) |
205 | //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 |
206 | /* 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 |
207 | * value could not be stored in a sint32 (which unfortunately sometimes is |
205 | * used to store nrof). |
208 | * used to store nrof). |
206 | */ |
209 | */ |
207 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
210 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
217 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
220 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
218 | |
221 | |
219 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
222 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
220 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
223 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
221 | |
224 | |
222 | |
225 | 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 |
226 | || 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) || |
227 | || ob1->name != ob2->name |
233 | (ob1->title != ob2->title) || |
228 | || ob1->title != ob2->title |
234 | (ob1->msg != ob2->msg) || |
229 | || ob1->msg != ob2->msg |
235 | (ob1->weight != ob2->weight) || |
230 | || ob1->weight != ob2->weight |
236 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
231 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
237 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
238 | (ob1->attacktype != ob2->attacktype) || |
233 | || ob1->attacktype != ob2->attacktype |
239 | (ob1->magic != ob2->magic) || |
234 | || ob1->magic != ob2->magic |
240 | (ob1->slaying != ob2->slaying) || |
235 | || ob1->slaying != ob2->slaying |
241 | (ob1->skill != ob2->skill) || |
236 | || ob1->skill != ob2->skill |
242 | (ob1->value != ob2->value) || |
237 | || ob1->value != ob2->value |
243 | (ob1->animation_id != ob2->animation_id) || |
238 | || ob1->animation_id != ob2->animation_id |
244 | (ob1->client_type != ob2->client_type) || |
239 | || ob1->client_type != ob2->client_type |
245 | (ob1->materialname != ob2->materialname) || |
240 | || ob1->materialname != ob2->materialname |
246 | (ob1->lore != ob2->lore) || |
241 | || ob1->lore != ob2->lore |
247 | (ob1->subtype != ob2->subtype) || |
242 | || ob1->subtype != ob2->subtype |
248 | (ob1->move_type != ob2->move_type) || |
243 | || ob1->move_type != ob2->move_type |
249 | (ob1->move_block != ob2->move_block) || |
244 | || ob1->move_block != ob2->move_block |
250 | (ob1->move_allow != ob2->move_allow) || |
245 | || ob1->move_allow != ob2->move_allow |
251 | (ob1->move_on != ob2->move_on) || |
246 | || 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)) |
247 | || ob1->move_off != ob2->move_off |
|
|
248 | || ob1->move_slow != ob2->move_slow |
|
|
249 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
253 | return 0; |
250 | return 0; |
254 | |
251 | |
255 | /* This is really a spellbook check - really, we should |
252 | /* This is really a spellbook check - really, we should |
256 | * check all objects in the inventory. |
253 | * check all objects in the inventory. |
257 | */ |
254 | */ |
… | |
… | |
260 | /* if one object has inventory but the other doesn't, not equiv */ |
257 | /* if one object has inventory but the other doesn't, not equiv */ |
261 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
258 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
262 | return 0; |
259 | return 0; |
263 | |
260 | |
264 | /* Now check to see if the two inventory objects could merge */ |
261 | /* Now check to see if the two inventory objects could merge */ |
265 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
262 | if (!object::can_merge (ob1->inv, ob2->inv)) |
266 | return 0; |
263 | return 0; |
267 | |
264 | |
268 | /* inventory ok - still need to check rest of this object to see |
265 | /* inventory ok - still need to check rest of this object to see |
269 | * if it is valid. |
266 | * if it is valid. |
270 | */ |
267 | */ |
… | |
… | |
279 | |
276 | |
280 | /* Note sure why the following is the case - either the object has to |
277 | /* Note sure why the following is the case - either the object has to |
281 | * be animated or have a very low speed. Is this an attempted monster |
278 | * be animated or have a very low speed. Is this an attempted monster |
282 | * check? |
279 | * check? |
283 | */ |
280 | */ |
284 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
281 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
285 | return 0; |
282 | return 0; |
286 | |
283 | |
287 | switch (ob1->type) |
284 | switch (ob1->type) |
288 | { |
285 | { |
289 | case SCROLL: |
286 | case SCROLL: |
… | |
… | |
354 | op = op->env; |
351 | op = op->env; |
355 | return op; |
352 | return op; |
356 | } |
353 | } |
357 | |
354 | |
358 | /* |
355 | /* |
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. |
356 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
375 | * Some error messages. |
357 | * Some error messages. |
376 | * The result of the dump is stored in the static global errmsg array. |
358 | * The result of the dump is stored in the static global errmsg array. |
377 | */ |
359 | */ |
378 | |
360 | |
… | |
… | |
381 | { |
363 | { |
382 | if (!op) |
364 | if (!op) |
383 | return strdup ("[NULLOBJ]"); |
365 | return strdup ("[NULLOBJ]"); |
384 | |
366 | |
385 | object_freezer freezer; |
367 | object_freezer freezer; |
386 | save_object (freezer, op, 3); |
368 | save_object (freezer, op, 1); |
387 | return freezer.as_string (); |
369 | return freezer.as_string (); |
388 | } |
370 | } |
389 | |
371 | |
390 | /* |
372 | /* |
391 | * get_nearest_part(multi-object, object 2) returns the part of the |
373 | * get_nearest_part(multi-object, object 2) returns the part of the |
… | |
… | |
484 | } |
466 | } |
485 | |
467 | |
486 | op->key_values = 0; |
468 | op->key_values = 0; |
487 | } |
469 | } |
488 | |
470 | |
489 | void object::clear () |
|
|
490 | { |
|
|
491 | attachable_base::clear (); |
|
|
492 | |
|
|
493 | free_key_values (this); |
|
|
494 | |
|
|
495 | owner = 0; |
|
|
496 | name = 0; |
|
|
497 | name_pl = 0; |
|
|
498 | title = 0; |
|
|
499 | race = 0; |
|
|
500 | slaying = 0; |
|
|
501 | skill = 0; |
|
|
502 | msg = 0; |
|
|
503 | lore = 0; |
|
|
504 | custom_name = 0; |
|
|
505 | materialname = 0; |
|
|
506 | contr = 0; |
|
|
507 | below = 0; |
|
|
508 | above = 0; |
|
|
509 | inv = 0; |
|
|
510 | container = 0; |
|
|
511 | env = 0; |
|
|
512 | more = 0; |
|
|
513 | head = 0; |
|
|
514 | map = 0; |
|
|
515 | active_next = 0; |
|
|
516 | active_prev = 0; |
|
|
517 | |
|
|
518 | memset (static_cast<object_pod *>(this), 0, sizeof (object_pod)); |
|
|
519 | |
|
|
520 | SET_FLAG (this, FLAG_REMOVED); |
|
|
521 | |
|
|
522 | /* What is not cleared is next, prev, and count */ |
|
|
523 | |
|
|
524 | expmul = 1.0; |
|
|
525 | face = blank_face; |
|
|
526 | |
|
|
527 | if (settings.casting_time) |
|
|
528 | casting_time = -1; |
|
|
529 | } |
|
|
530 | |
|
|
531 | void object::clone (object *destination) |
|
|
532 | { |
|
|
533 | *(object_copy *)destination = *this; |
|
|
534 | *(object_pod *)destination = *this; |
|
|
535 | |
|
|
536 | if (self || cb) |
|
|
537 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
538 | } |
|
|
539 | |
|
|
540 | /* |
471 | /* |
541 | * copy object first frees everything allocated by the second object, |
472 | * copy_to first frees everything allocated by the dst object, |
542 | * and then copies the contends of the first object into the second |
473 | * and then copies the contents of itself into the second |
543 | * object, allocating what needs to be allocated. Basically, any |
474 | * object, allocating what needs to be allocated. Basically, any |
544 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
475 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
545 | * if the first object is freed, the pointers in the new object |
476 | * if the first object is freed, the pointers in the new object |
546 | * will point at garbage. |
477 | * will point at garbage. |
547 | */ |
478 | */ |
548 | void |
479 | void |
549 | copy_object (object *op2, object *op) |
480 | object::copy_to (object *dst) |
550 | { |
481 | { |
551 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
482 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
552 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
483 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
553 | |
484 | |
554 | op2->clone (op); |
485 | *(object_copy *)dst = *this; |
555 | |
486 | |
556 | if (is_freed) |
487 | if (is_freed) |
557 | SET_FLAG (op, FLAG_FREED); |
488 | SET_FLAG (dst, FLAG_FREED); |
|
|
489 | |
558 | if (is_removed) |
490 | if (is_removed) |
559 | SET_FLAG (op, FLAG_REMOVED); |
491 | SET_FLAG (dst, FLAG_REMOVED); |
560 | |
492 | |
561 | if (op2->speed < 0) |
493 | if (speed < 0) |
562 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
494 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
563 | |
495 | |
564 | /* Copy over key_values, if any. */ |
496 | /* Copy over key_values, if any. */ |
565 | if (op2->key_values) |
497 | if (key_values) |
566 | { |
498 | { |
567 | key_value *tail = 0; |
499 | key_value *tail = 0; |
568 | key_value *i; |
500 | key_value *i; |
569 | |
501 | |
570 | op->key_values = 0; |
502 | dst->key_values = 0; |
571 | |
503 | |
572 | for (i = op2->key_values; i; i = i->next) |
504 | for (i = key_values; i; i = i->next) |
573 | { |
505 | { |
574 | key_value *new_link = new key_value; |
506 | key_value *new_link = new key_value; |
575 | |
507 | |
576 | new_link->next = 0; |
508 | new_link->next = 0; |
577 | new_link->key = i->key; |
509 | new_link->key = i->key; |
578 | new_link->value = i->value; |
510 | new_link->value = i->value; |
579 | |
511 | |
580 | /* Try and be clever here, too. */ |
512 | /* Try and be clever here, too. */ |
581 | if (!op->key_values) |
513 | if (!dst->key_values) |
582 | { |
514 | { |
583 | op->key_values = new_link; |
515 | dst->key_values = new_link; |
584 | tail = new_link; |
516 | tail = new_link; |
585 | } |
517 | } |
586 | else |
518 | else |
587 | { |
519 | { |
588 | tail->next = new_link; |
520 | tail->next = new_link; |
589 | tail = new_link; |
521 | tail = new_link; |
590 | } |
522 | } |
591 | } |
523 | } |
592 | } |
524 | } |
593 | |
525 | |
594 | update_ob_speed (op); |
526 | dst->set_speed (dst->speed); |
|
|
527 | } |
|
|
528 | |
|
|
529 | object * |
|
|
530 | object::clone () |
|
|
531 | { |
|
|
532 | object *neu = create (); |
|
|
533 | copy_to (neu); |
|
|
534 | return neu; |
595 | } |
535 | } |
596 | |
536 | |
597 | /* |
537 | /* |
598 | * If an object with the IS_TURNABLE() flag needs to be turned due |
538 | * If an object with the IS_TURNABLE() flag needs to be turned due |
599 | * to the closest player being on the other side, this function can |
539 | * to the closest player being on the other side, this function can |
600 | * be called to update the face variable, _and_ how it looks on the map. |
540 | * be called to update the face variable, _and_ how it looks on the map. |
601 | */ |
541 | */ |
602 | |
|
|
603 | void |
542 | void |
604 | update_turn_face (object *op) |
543 | update_turn_face (object *op) |
605 | { |
544 | { |
606 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) |
545 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
607 | return; |
546 | return; |
|
|
547 | |
608 | SET_ANIMATION (op, op->direction); |
548 | SET_ANIMATION (op, op->direction); |
609 | update_object (op, UP_OBJ_FACE); |
549 | update_object (op, UP_OBJ_FACE); |
610 | } |
550 | } |
611 | |
551 | |
612 | /* |
552 | /* |
613 | * Updates the speed of an object. If the speed changes from 0 to another |
553 | * Updates the speed of an object. If the speed changes from 0 to another |
614 | * value, or vice versa, then add/remove the object from the active list. |
554 | * value, or vice versa, then add/remove the object from the active list. |
615 | * This function needs to be called whenever the speed of an object changes. |
555 | * This function needs to be called whenever the speed of an object changes. |
616 | */ |
556 | */ |
617 | void |
557 | void |
618 | update_ob_speed (object *op) |
558 | object::set_speed (float speed) |
619 | { |
559 | { |
620 | extern int arch_init; |
560 | if (flag [FLAG_FREED] && speed) |
621 | |
|
|
622 | /* No reason putting the archetypes objects on the speed list, |
|
|
623 | * since they never really need to be updated. |
|
|
624 | */ |
|
|
625 | |
|
|
626 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
|
|
627 | { |
561 | { |
628 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
562 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
629 | #ifdef MANY_CORES |
|
|
630 | abort (); |
|
|
631 | #else |
|
|
632 | op->speed = 0; |
563 | speed = 0; |
633 | #endif |
|
|
634 | } |
|
|
635 | |
|
|
636 | if (arch_init) |
|
|
637 | return; |
|
|
638 | |
|
|
639 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
|
|
640 | { |
564 | } |
641 | /* If already on active list, don't do anything */ |
|
|
642 | if (op->active_next || op->active_prev || op == active_objects) |
|
|
643 | return; |
|
|
644 | |
565 | |
645 | /* process_events() expects us to insert the object at the beginning |
566 | this->speed = speed; |
646 | * of the list. */ |
|
|
647 | op->active_next = active_objects; |
|
|
648 | |
567 | |
649 | if (op->active_next != NULL) |
568 | if (has_active_speed ()) |
650 | op->active_next->active_prev = op; |
569 | activate (false); |
651 | |
|
|
652 | active_objects = op; |
|
|
653 | } |
|
|
654 | else |
570 | else |
655 | { |
571 | deactivate (false); |
656 | /* If not on the active list, nothing needs to be done */ |
|
|
657 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
658 | return; |
|
|
659 | |
|
|
660 | if (op->active_prev == NULL) |
|
|
661 | { |
|
|
662 | active_objects = op->active_next; |
|
|
663 | |
|
|
664 | if (op->active_next != NULL) |
|
|
665 | op->active_next->active_prev = NULL; |
|
|
666 | } |
|
|
667 | else |
|
|
668 | { |
|
|
669 | op->active_prev->active_next = op->active_next; |
|
|
670 | |
|
|
671 | if (op->active_next) |
|
|
672 | op->active_next->active_prev = op->active_prev; |
|
|
673 | } |
|
|
674 | |
|
|
675 | op->active_next = NULL; |
|
|
676 | op->active_prev = NULL; |
|
|
677 | } |
|
|
678 | } |
572 | } |
679 | |
573 | |
680 | /* This function removes object 'op' from the list of active |
|
|
681 | * objects. |
|
|
682 | * This should only be used for style maps or other such |
|
|
683 | * reference maps where you don't want an object that isn't |
|
|
684 | * in play chewing up cpu time getting processed. |
|
|
685 | * The reverse of this is to call update_ob_speed, which |
|
|
686 | * will do the right thing based on the speed of the object. |
|
|
687 | */ |
|
|
688 | void |
|
|
689 | remove_from_active_list (object *op) |
|
|
690 | { |
|
|
691 | /* If not on the active list, nothing needs to be done */ |
|
|
692 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
693 | return; |
|
|
694 | |
|
|
695 | if (op->active_prev == NULL) |
|
|
696 | { |
|
|
697 | active_objects = op->active_next; |
|
|
698 | if (op->active_next != NULL) |
|
|
699 | op->active_next->active_prev = NULL; |
|
|
700 | } |
|
|
701 | else |
|
|
702 | { |
|
|
703 | op->active_prev->active_next = op->active_next; |
|
|
704 | if (op->active_next) |
|
|
705 | op->active_next->active_prev = op->active_prev; |
|
|
706 | } |
|
|
707 | op->active_next = NULL; |
|
|
708 | op->active_prev = NULL; |
|
|
709 | } |
|
|
710 | |
|
|
711 | /* |
574 | /* |
712 | * update_object() updates the array which represents the map. |
575 | * update_object() updates the the map. |
713 | * It takes into account invisible objects (and represent squares covered |
576 | * It takes into account invisible objects (and represent squares covered |
714 | * by invisible objects by whatever is below them (unless it's another |
577 | * by invisible objects by whatever is below them (unless it's another |
715 | * invisible object, etc...) |
578 | * invisible object, etc...) |
716 | * If the object being updated is beneath a player, the look-window |
579 | * If the object being updated is beneath a player, the look-window |
717 | * of that player is updated (this might be a suboptimal way of |
580 | * of that player is updated (this might be a suboptimal way of |
718 | * updating that window, though, since update_object() is called _often_) |
581 | * updating that window, though, since update_object() is called _often_) |
719 | * |
582 | * |
720 | * action is a hint of what the caller believes need to be done. |
583 | * action is a hint of what the caller believes need to be done. |
721 | * For example, if the only thing that has changed is the face (due to |
|
|
722 | * an animation), we don't need to call update_position until that actually |
|
|
723 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
724 | * of walls or living creatures may need us to update the flags now. |
|
|
725 | * current action are: |
584 | * current action are: |
726 | * UP_OBJ_INSERT: op was inserted |
585 | * UP_OBJ_INSERT: op was inserted |
727 | * UP_OBJ_REMOVE: op was removed |
586 | * UP_OBJ_REMOVE: op was removed |
728 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
587 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
729 | * as that is easier than trying to look at what may have changed. |
588 | * as that is easier than trying to look at what may have changed. |
730 | * UP_OBJ_FACE: only the objects face has changed. |
589 | * UP_OBJ_FACE: only the objects face has changed. |
731 | */ |
590 | */ |
732 | |
|
|
733 | void |
591 | void |
734 | update_object (object *op, int action) |
592 | update_object (object *op, int action) |
735 | { |
593 | { |
736 | int update_now = 0, flags; |
|
|
737 | MoveType move_on, move_off, move_block, move_slow; |
594 | MoveType move_on, move_off, move_block, move_slow; |
738 | |
595 | |
739 | if (op == NULL) |
596 | if (op == NULL) |
740 | { |
597 | { |
741 | /* this should never happen */ |
598 | /* this should never happen */ |
742 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
599 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
743 | return; |
600 | return; |
744 | } |
601 | } |
745 | |
602 | |
746 | if (op->env != NULL) |
603 | if (op->env) |
747 | { |
604 | { |
748 | /* Animation is currently handled by client, so nothing |
605 | /* Animation is currently handled by client, so nothing |
749 | * to do in this case. |
606 | * to do in this case. |
750 | */ |
607 | */ |
751 | return; |
608 | return; |
… | |
… | |
756 | */ |
613 | */ |
757 | if (!op->map || op->map->in_memory == MAP_SAVING) |
614 | if (!op->map || op->map->in_memory == MAP_SAVING) |
758 | return; |
615 | return; |
759 | |
616 | |
760 | /* make sure the object is within map boundaries */ |
617 | /* make sure the object is within map boundaries */ |
761 | if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) |
618 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
762 | { |
619 | { |
763 | LOG (llevError, "update_object() called for object out of map!\n"); |
620 | LOG (llevError, "update_object() called for object out of map!\n"); |
764 | #ifdef MANY_CORES |
621 | #ifdef MANY_CORES |
765 | abort (); |
622 | abort (); |
766 | #endif |
623 | #endif |
767 | return; |
624 | return; |
768 | } |
625 | } |
769 | |
626 | |
770 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
627 | mapspace &m = op->ms (); |
771 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
772 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
773 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
774 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
775 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
776 | |
628 | |
|
|
629 | if (m.flags_ & P_NEED_UPDATE) |
|
|
630 | /* nop */; |
777 | if (action == UP_OBJ_INSERT) |
631 | else if (action == UP_OBJ_INSERT) |
778 | { |
632 | { |
|
|
633 | // this is likely overkill, TODO: revisit (schmorp) |
779 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
634 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
780 | update_now = 1; |
|
|
781 | |
|
|
782 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
635 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
783 | update_now = 1; |
636 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
784 | |
637 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
638 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
785 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
639 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
786 | update_now = 1; |
|
|
787 | |
|
|
788 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
789 | update_now = 1; |
|
|
790 | |
|
|
791 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
792 | update_now = 1; |
|
|
793 | |
|
|
794 | if ((move_on | op->move_on) != move_on) |
640 | || (m.move_on | op->move_on ) != m.move_on |
795 | update_now = 1; |
|
|
796 | |
|
|
797 | if ((move_off | op->move_off) != move_off) |
641 | || (m.move_off | op->move_off ) != m.move_off |
798 | update_now = 1; |
642 | || (m.move_slow | op->move_slow) != m.move_slow |
799 | |
|
|
800 | /* This isn't perfect, but I don't expect a lot of objects to |
643 | /* This isn't perfect, but I don't expect a lot of objects to |
801 | * to have move_allow right now. |
644 | * to have move_allow right now. |
802 | */ |
645 | */ |
803 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
646 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
804 | update_now = 1; |
647 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
805 | |
648 | m.flags_ = P_NEED_UPDATE; |
806 | if ((move_slow | op->move_slow) != move_slow) |
|
|
807 | update_now = 1; |
|
|
808 | } |
649 | } |
809 | /* if the object is being removed, we can't make intelligent |
650 | /* if the object is being removed, we can't make intelligent |
810 | * decisions, because remove_ob can't really pass the object |
651 | * decisions, because remove_ob can't really pass the object |
811 | * that is being removed. |
652 | * that is being removed. |
812 | */ |
653 | */ |
813 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
654 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
814 | update_now = 1; |
655 | m.flags_ = P_NEED_UPDATE; |
815 | else if (action == UP_OBJ_FACE) |
656 | else if (action == UP_OBJ_FACE) |
816 | /* Nothing to do for that case */ ; |
657 | /* Nothing to do for that case */ ; |
817 | else |
658 | else |
818 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
659 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
819 | |
660 | |
820 | if (update_now) |
|
|
821 | { |
|
|
822 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
823 | update_position (op->map, op->x, op->y); |
|
|
824 | } |
|
|
825 | |
|
|
826 | if (op->more != NULL) |
661 | if (op->more) |
827 | update_object (op->more, action); |
662 | update_object (op->more, action); |
828 | } |
663 | } |
829 | |
664 | |
830 | object::vector object::mortals; |
|
|
831 | object::vector object::objects; // not yet used |
665 | object::vector object::objects; // not yet used |
832 | object *object::first; |
666 | object *object::first; |
833 | |
|
|
834 | void object::free_mortals () |
|
|
835 | { |
|
|
836 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
|
|
837 | if ((*i)->refcnt) |
|
|
838 | ++i; // further delay freeing |
|
|
839 | else |
|
|
840 | { |
|
|
841 | delete *i; |
|
|
842 | mortals.erase (i); |
|
|
843 | } |
|
|
844 | } |
|
|
845 | |
667 | |
846 | object::object () |
668 | object::object () |
847 | { |
669 | { |
848 | SET_FLAG (this, FLAG_REMOVED); |
670 | SET_FLAG (this, FLAG_REMOVED); |
849 | |
671 | |
… | |
… | |
881 | |
703 | |
882 | prev = 0; |
704 | prev = 0; |
883 | next = 0; |
705 | next = 0; |
884 | } |
706 | } |
885 | |
707 | |
|
|
708 | void |
|
|
709 | object::activate (bool recursive) |
|
|
710 | { |
|
|
711 | if (has_active_speed ()) |
|
|
712 | { |
|
|
713 | /* If already on active list, don't do anything */ |
|
|
714 | if (active_next || active_prev || this == active_objects) |
|
|
715 | return; |
|
|
716 | |
|
|
717 | /* process_events() expects us to insert the object at the beginning |
|
|
718 | * of the list. */ |
|
|
719 | active_next = active_objects; |
|
|
720 | |
|
|
721 | if (active_next) |
|
|
722 | active_next->active_prev = this; |
|
|
723 | |
|
|
724 | active_objects = this; |
|
|
725 | } |
|
|
726 | |
|
|
727 | if (recursive) |
|
|
728 | for (object *op = inv; op; op = op->above) |
|
|
729 | op->activate (1); |
|
|
730 | } |
|
|
731 | |
|
|
732 | /* This function removes object 'op' from the list of active |
|
|
733 | * objects. |
|
|
734 | * This should only be used for style maps or other such |
|
|
735 | * reference maps where you don't want an object that isn't |
|
|
736 | * in play chewing up cpu time getting processed. |
|
|
737 | * The reverse of this is to call update_ob_speed, which |
|
|
738 | * will do the right thing based on the speed of the object. |
|
|
739 | */ |
|
|
740 | void |
|
|
741 | object::deactivate (bool recursive) |
|
|
742 | { |
|
|
743 | /* If not on the active list, nothing needs to be done */ |
|
|
744 | if (!active_next && !active_prev && this != active_objects) |
|
|
745 | return; |
|
|
746 | |
|
|
747 | if (active_prev == 0) |
|
|
748 | { |
|
|
749 | active_objects = active_next; |
|
|
750 | if (active_next) |
|
|
751 | active_next->active_prev = 0; |
|
|
752 | } |
|
|
753 | else |
|
|
754 | { |
|
|
755 | active_prev->active_next = active_next; |
|
|
756 | if (active_next) |
|
|
757 | active_next->active_prev = active_prev; |
|
|
758 | } |
|
|
759 | |
|
|
760 | active_next = 0; |
|
|
761 | active_prev = 0; |
|
|
762 | |
|
|
763 | if (recursive) |
|
|
764 | for (object *op = inv; op; op = op->above) |
|
|
765 | op->deactivate (1); |
|
|
766 | } |
|
|
767 | |
|
|
768 | /* |
|
|
769 | * Remove and free all objects in the inventory of the given object. |
|
|
770 | * object.c ? |
|
|
771 | */ |
|
|
772 | void |
|
|
773 | object::destroy_inv (bool drop_to_ground) |
|
|
774 | { |
|
|
775 | // need to check first, because the checks below might segfault |
|
|
776 | // as we might be on an invalid mapspace and crossfire code |
|
|
777 | // is too buggy to ensure that the inventory is empty. |
|
|
778 | // corollary: if you create arrows etc. with stuff in tis inventory, |
|
|
779 | // cf will crash below with off-map x and y |
|
|
780 | if (!inv) |
|
|
781 | return; |
|
|
782 | |
|
|
783 | /* Only if the space blocks everything do we not process - |
|
|
784 | * if some form of movement is allowed, let objects |
|
|
785 | * drop on that space. |
|
|
786 | */ |
|
|
787 | if (!drop_to_ground |
|
|
788 | || !map |
|
|
789 | || map->in_memory != MAP_IN_MEMORY |
|
|
790 | || ms ().move_block == MOVE_ALL) |
|
|
791 | { |
|
|
792 | while (inv) |
|
|
793 | { |
|
|
794 | inv->destroy_inv (drop_to_ground); |
|
|
795 | inv->destroy (); |
|
|
796 | } |
|
|
797 | } |
|
|
798 | else |
|
|
799 | { /* Put objects in inventory onto this space */ |
|
|
800 | while (inv) |
|
|
801 | { |
|
|
802 | object *op = inv; |
|
|
803 | |
|
|
804 | if (op->flag [FLAG_STARTEQUIP] |
|
|
805 | || op->flag [FLAG_NO_DROP] |
|
|
806 | || op->type == RUNE |
|
|
807 | || op->type == TRAP |
|
|
808 | || op->flag [FLAG_IS_A_TEMPLATE]) |
|
|
809 | op->destroy (); |
|
|
810 | else |
|
|
811 | map->insert (op, x, y); |
|
|
812 | } |
|
|
813 | } |
|
|
814 | } |
|
|
815 | |
886 | object *object::create () |
816 | object *object::create () |
887 | { |
817 | { |
888 | object *op = new object; |
818 | object *op = new object; |
889 | op->link (); |
819 | op->link (); |
890 | return op; |
820 | return op; |
891 | } |
821 | } |
892 | |
822 | |
893 | /* |
823 | void |
894 | * free_object() frees everything allocated by an object, removes |
824 | object::do_destroy () |
895 | * it from the list of used objects, and puts it on the list of |
|
|
896 | * free objects. The IS_FREED() flag is set in the object. |
|
|
897 | * The object must have been removed by remove_ob() first for |
|
|
898 | * this function to succeed. |
|
|
899 | * |
|
|
900 | * If destroy_inventory is set, free inventory as well. Else drop items in |
|
|
901 | * inventory to the ground. |
|
|
902 | */ |
|
|
903 | void object::destroy (bool destroy_inventory) |
|
|
904 | { |
825 | { |
905 | if (QUERY_FLAG (this, FLAG_FREED)) |
826 | if (flag [FLAG_IS_LINKED]) |
|
|
827 | remove_button_link (this); |
|
|
828 | |
|
|
829 | if (flag [FLAG_FRIENDLY]) |
|
|
830 | remove_friendly_object (this); |
|
|
831 | |
|
|
832 | if (!flag [FLAG_REMOVED]) |
|
|
833 | remove (); |
|
|
834 | |
|
|
835 | if (flag [FLAG_FREED]) |
906 | return; |
836 | return; |
907 | |
837 | |
908 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
838 | set_speed (0); |
909 | remove_friendly_object (this); |
|
|
910 | |
839 | |
911 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
840 | flag [FLAG_FREED] = 1; |
912 | remove_ob (this); |
|
|
913 | |
841 | |
914 | SET_FLAG (this, FLAG_FREED); |
842 | attachable::do_destroy (); |
915 | |
843 | |
916 | if (more) |
844 | destroy_inv (true); |
917 | { |
845 | unlink (); |
918 | more->destroy (destroy_inventory); |
|
|
919 | more = 0; |
|
|
920 | } |
|
|
921 | |
|
|
922 | if (inv) |
|
|
923 | { |
|
|
924 | /* Only if the space blocks everything do we not process - |
|
|
925 | * if some form of movement is allowed, let objects |
|
|
926 | * drop on that space. |
|
|
927 | */ |
|
|
928 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
929 | { |
|
|
930 | object *op = inv; |
|
|
931 | |
|
|
932 | while (op) |
|
|
933 | { |
|
|
934 | object *tmp = op->below; |
|
|
935 | op->destroy (destroy_inventory); |
|
|
936 | op = tmp; |
|
|
937 | } |
|
|
938 | } |
|
|
939 | else |
|
|
940 | { /* Put objects in inventory onto this space */ |
|
|
941 | object *op = inv; |
|
|
942 | |
|
|
943 | while (op) |
|
|
944 | { |
|
|
945 | object *tmp = op->below; |
|
|
946 | |
|
|
947 | remove_ob (op); |
|
|
948 | |
|
|
949 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
|
|
950 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
|
|
951 | free_object (op); |
|
|
952 | else |
|
|
953 | { |
|
|
954 | op->x = x; |
|
|
955 | op->y = y; |
|
|
956 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
957 | } |
|
|
958 | |
|
|
959 | op = tmp; |
|
|
960 | } |
|
|
961 | } |
|
|
962 | } |
|
|
963 | |
846 | |
964 | // hack to ensure that freed objects still have a valid map |
847 | // hack to ensure that freed objects still have a valid map |
965 | { |
848 | { |
966 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
849 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
967 | |
850 | |
… | |
… | |
971 | |
854 | |
972 | freed_map->name = "/internal/freed_objects_map"; |
855 | freed_map->name = "/internal/freed_objects_map"; |
973 | freed_map->width = 3; |
856 | freed_map->width = 3; |
974 | freed_map->height = 3; |
857 | freed_map->height = 3; |
975 | |
858 | |
976 | freed_map->allocate (); |
859 | freed_map->alloc (); |
977 | } |
860 | } |
978 | |
861 | |
979 | map = freed_map; |
862 | map = freed_map; |
980 | x = 1; |
863 | x = 1; |
981 | y = 1; |
864 | y = 1; |
982 | } |
865 | } |
983 | |
866 | |
|
|
867 | head = 0; |
|
|
868 | |
|
|
869 | if (more) |
|
|
870 | { |
|
|
871 | more->destroy (); |
|
|
872 | more = 0; |
|
|
873 | } |
|
|
874 | |
984 | // clear those pointers that likely might have circular references to us |
875 | // clear those pointers that likely might have circular references to us |
985 | owner = 0; |
876 | owner = 0; |
986 | enemy = 0; |
877 | enemy = 0; |
987 | attacked_by = 0; |
878 | attacked_by = 0; |
988 | |
879 | |
989 | // only relevant for players(?), but make sure of it anyways |
880 | // only relevant for players(?), but make sure of it anyways |
990 | contr = 0; |
881 | contr = 0; |
|
|
882 | } |
991 | |
883 | |
992 | /* Remove object from the active list */ |
884 | void |
993 | speed = 0; |
885 | object::destroy (bool destroy_inventory) |
994 | update_ob_speed (this); |
886 | { |
|
|
887 | if (destroyed ()) |
|
|
888 | return; |
995 | |
889 | |
996 | unlink (); |
890 | if (destroy_inventory) |
|
|
891 | destroy_inv (false); |
997 | |
892 | |
998 | mortals.push_back (this); |
893 | attachable::destroy (); |
999 | } |
894 | } |
1000 | |
895 | |
1001 | /* |
896 | /* |
1002 | * sub_weight() recursively (outwards) subtracts a number from the |
897 | * sub_weight() recursively (outwards) subtracts a number from the |
1003 | * weight of an object (and what is carried by it's environment(s)). |
898 | * weight of an object (and what is carried by it's environment(s)). |
1004 | */ |
899 | */ |
1005 | |
|
|
1006 | void |
900 | void |
1007 | sub_weight (object *op, signed long weight) |
901 | sub_weight (object *op, signed long weight) |
1008 | { |
902 | { |
1009 | while (op != NULL) |
903 | while (op != NULL) |
1010 | { |
904 | { |
… | |
… | |
1014 | op->carrying -= weight; |
908 | op->carrying -= weight; |
1015 | op = op->env; |
909 | op = op->env; |
1016 | } |
910 | } |
1017 | } |
911 | } |
1018 | |
912 | |
1019 | /* remove_ob(op): |
913 | /* op->remove (): |
1020 | * This function removes the object op from the linked list of objects |
914 | * This function removes the object op from the linked list of objects |
1021 | * which it is currently tied to. When this function is done, the |
915 | * which it is currently tied to. When this function is done, the |
1022 | * object will have no environment. If the object previously had an |
916 | * object will have no environment. If the object previously had an |
1023 | * environment, the x and y coordinates will be updated to |
917 | * environment, the x and y coordinates will be updated to |
1024 | * the previous environment. |
918 | * the previous environment. |
1025 | * Beware: This function is called from the editor as well! |
919 | * Beware: This function is called from the editor as well! |
1026 | */ |
920 | */ |
1027 | |
|
|
1028 | void |
921 | void |
1029 | remove_ob (object *op) |
922 | object::remove () |
1030 | { |
923 | { |
1031 | object *tmp, *last = 0; |
924 | object *tmp, *last = 0; |
1032 | object *otmp; |
925 | object *otmp; |
1033 | |
926 | |
1034 | int check_walk_off; |
|
|
1035 | maptile *m; |
|
|
1036 | |
|
|
1037 | sint16 x, y; |
|
|
1038 | |
|
|
1039 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
927 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1040 | return; |
928 | return; |
1041 | |
929 | |
1042 | SET_FLAG (op, FLAG_REMOVED); |
930 | SET_FLAG (this, FLAG_REMOVED); |
|
|
931 | INVOKE_OBJECT (REMOVE, this); |
1043 | |
932 | |
1044 | if (op->more != NULL) |
933 | if (more) |
1045 | remove_ob (op->more); |
934 | more->remove (); |
1046 | |
935 | |
1047 | /* |
936 | /* |
1048 | * In this case, the object to be removed is in someones |
937 | * In this case, the object to be removed is in someones |
1049 | * inventory. |
938 | * inventory. |
1050 | */ |
939 | */ |
1051 | if (op->env != NULL) |
940 | if (env) |
1052 | { |
941 | { |
1053 | if (op->nrof) |
942 | if (nrof) |
1054 | sub_weight (op->env, op->weight * op->nrof); |
943 | sub_weight (env, weight * nrof); |
1055 | else |
944 | else |
1056 | sub_weight (op->env, op->weight + op->carrying); |
945 | sub_weight (env, weight + carrying); |
1057 | |
946 | |
1058 | /* NO_FIX_PLAYER is set when a great many changes are being |
947 | /* NO_FIX_PLAYER is set when a great many changes are being |
1059 | * made to players inventory. If set, avoiding the call |
948 | * made to players inventory. If set, avoiding the call |
1060 | * to save cpu time. |
949 | * to save cpu time. |
1061 | */ |
950 | */ |
1062 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
951 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1063 | fix_player (otmp); |
952 | otmp->update_stats (); |
1064 | |
953 | |
1065 | if (op->above != NULL) |
954 | if (above) |
1066 | op->above->below = op->below; |
955 | above->below = below; |
1067 | else |
956 | else |
1068 | op->env->inv = op->below; |
957 | env->inv = below; |
1069 | |
958 | |
1070 | if (op->below != NULL) |
959 | if (below) |
1071 | op->below->above = op->above; |
960 | below->above = above; |
1072 | |
961 | |
1073 | /* we set up values so that it could be inserted into |
962 | /* we set up values so that it could be inserted into |
1074 | * the map, but we don't actually do that - it is up |
963 | * the map, but we don't actually do that - it is up |
1075 | * to the caller to decide what we want to do. |
964 | * to the caller to decide what we want to do. |
1076 | */ |
965 | */ |
1077 | op->x = op->env->x, op->y = op->env->y; |
966 | x = env->x, y = env->y; |
1078 | op->map = op->env->map; |
967 | map = env->map; |
1079 | op->above = NULL, op->below = NULL; |
968 | above = 0, below = 0; |
1080 | op->env = NULL; |
969 | env = 0; |
1081 | } |
970 | } |
1082 | else if (op->map) |
971 | else if (map) |
1083 | { |
972 | { |
1084 | x = op->x; |
973 | if (type == PLAYER) |
1085 | y = op->y; |
|
|
1086 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1087 | |
|
|
1088 | if (!m) |
|
|
1089 | { |
|
|
1090 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1091 | op->map->path, op->x, op->y); |
|
|
1092 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1093 | * it seems if we get into this case, something is probablye |
|
|
1094 | * screwed up and should be fixed. |
|
|
1095 | */ |
|
|
1096 | abort (); |
|
|
1097 | } |
974 | { |
1098 | |
975 | --map->players; |
1099 | if (op->map != m) |
976 | map->last_access = runtime; |
1100 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1101 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1102 | |
|
|
1103 | /* Re did the following section of code - it looks like it had |
|
|
1104 | * lots of logic for things we no longer care about |
|
|
1105 | */ |
977 | } |
|
|
978 | |
1106 | |
979 | |
1107 | /* link the object above us */ |
980 | /* link the object above us */ |
1108 | if (op->above) |
981 | if (above) |
1109 | op->above->below = op->below; |
982 | above->below = below; |
1110 | else |
983 | else |
1111 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
984 | map->at (x, y).top = below; /* we were top, set new top */ |
1112 | |
985 | |
1113 | /* Relink the object below us, if there is one */ |
986 | /* Relink the object below us, if there is one */ |
1114 | if (op->below) |
987 | if (below) |
1115 | op->below->above = op->above; |
988 | below->above = above; |
1116 | else |
989 | else |
1117 | { |
990 | { |
1118 | /* Nothing below, which means we need to relink map object for this space |
991 | /* Nothing below, which means we need to relink map object for this space |
1119 | * use translated coordinates in case some oddness with map tiling is |
992 | * use translated coordinates in case some oddness with map tiling is |
1120 | * evident |
993 | * evident |
1121 | */ |
994 | */ |
1122 | if (GET_MAP_OB (m, x, y) != op) |
995 | if (GET_MAP_OB (map, x, y) != this) |
1123 | { |
996 | { |
1124 | char *dump = dump_object (op); |
997 | char *dump = dump_object (this); |
1125 | LOG (llevError, |
998 | LOG (llevError, |
1126 | "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); |
999 | "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); |
1127 | free (dump); |
1000 | free (dump); |
1128 | dump = dump_object (GET_MAP_OB (m, x, y)); |
1001 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1129 | LOG (llevError, "%s\n", dump); |
1002 | LOG (llevError, "%s\n", dump); |
1130 | free (dump); |
1003 | free (dump); |
1131 | } |
1004 | } |
1132 | |
1005 | |
1133 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1006 | map->at (x, y).bot = above; /* goes on above it. */ |
1134 | } |
1007 | } |
1135 | |
1008 | |
1136 | op->above = 0; |
1009 | above = 0; |
1137 | op->below = 0; |
1010 | below = 0; |
1138 | |
1011 | |
1139 | if (op->map->in_memory == MAP_SAVING) |
1012 | if (map->in_memory == MAP_SAVING) |
1140 | return; |
1013 | return; |
1141 | |
1014 | |
1142 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1015 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1143 | |
1016 | |
1144 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1017 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1145 | { |
1018 | { |
1146 | /* No point updating the players look faces if he is the object |
1019 | /* No point updating the players look faces if he is the object |
1147 | * being removed. |
1020 | * being removed. |
1148 | */ |
1021 | */ |
1149 | |
1022 | |
1150 | if (tmp->type == PLAYER && tmp != op) |
1023 | if (tmp->type == PLAYER && tmp != this) |
1151 | { |
1024 | { |
1152 | /* If a container that the player is currently using somehow gets |
1025 | /* If a container that the player is currently using somehow gets |
1153 | * removed (most likely destroyed), update the player view |
1026 | * removed (most likely destroyed), update the player view |
1154 | * appropriately. |
1027 | * appropriately. |
1155 | */ |
1028 | */ |
1156 | if (tmp->container == op) |
1029 | if (tmp->container == this) |
1157 | { |
1030 | { |
1158 | CLEAR_FLAG (op, FLAG_APPLIED); |
1031 | flag [FLAG_APPLIED] = 0; |
1159 | tmp->container = NULL; |
1032 | tmp->container = 0; |
1160 | } |
1033 | } |
1161 | |
1034 | |
1162 | tmp->contr->socket.update_look = 1; |
1035 | if (tmp->contr->ns) |
|
|
1036 | tmp->contr->ns->floorbox_update (); |
1163 | } |
1037 | } |
1164 | |
1038 | |
1165 | /* See if player moving off should effect something */ |
1039 | /* See if object moving off should effect something */ |
1166 | if (check_walk_off |
1040 | if (check_walk_off |
1167 | && ((op->move_type & tmp->move_off) |
1041 | && ((move_type & tmp->move_off) |
1168 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1042 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1169 | { |
1043 | { |
1170 | move_apply (tmp, op, NULL); |
1044 | move_apply (tmp, this, 0); |
1171 | |
1045 | |
1172 | if (op->destroyed ()) |
1046 | if (destroyed ()) |
1173 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1047 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1174 | } |
1048 | } |
1175 | |
1049 | |
1176 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1050 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1177 | |
1051 | //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp) |
1178 | if (tmp->above == tmp) |
1052 | if (tmp->above == tmp) |
1179 | tmp->above = NULL; |
1053 | tmp->above = 0; |
1180 | |
1054 | |
1181 | last = tmp; |
1055 | last = tmp; |
1182 | } |
1056 | } |
1183 | |
1057 | |
1184 | /* last == NULL of there are no objects on this space */ |
1058 | /* last == NULL if there are no objects on this space */ |
|
|
1059 | //TODO: this makes little sense, why only update the topmost object? |
1185 | if (last == NULL) |
1060 | if (!last) |
1186 | { |
1061 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1187 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1188 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1189 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1190 | * be correct anyways. |
|
|
1191 | */ |
|
|
1192 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
|
|
1193 | update_position (op->map, op->x, op->y); |
|
|
1194 | } |
|
|
1195 | else |
1062 | else |
1196 | update_object (last, UP_OBJ_REMOVE); |
1063 | update_object (last, UP_OBJ_REMOVE); |
1197 | |
1064 | |
1198 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1065 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1199 | update_all_los (op->map, op->x, op->y); |
1066 | update_all_los (map, x, y); |
1200 | } |
1067 | } |
1201 | } |
1068 | } |
1202 | |
1069 | |
1203 | /* |
1070 | /* |
1204 | * merge_ob(op,top): |
1071 | * merge_ob(op,top): |
… | |
… | |
1212 | merge_ob (object *op, object *top) |
1079 | merge_ob (object *op, object *top) |
1213 | { |
1080 | { |
1214 | if (!op->nrof) |
1081 | if (!op->nrof) |
1215 | return 0; |
1082 | return 0; |
1216 | |
1083 | |
1217 | if (top == NULL) |
1084 | if (top) |
1218 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1085 | for (top = op; top && top->above; top = top->above) |
|
|
1086 | ; |
1219 | |
1087 | |
1220 | for (; top != NULL; top = top->below) |
1088 | for (; top; top = top->below) |
1221 | { |
1089 | { |
1222 | if (top == op) |
1090 | if (top == op) |
1223 | continue; |
1091 | continue; |
1224 | if (CAN_MERGE (op, top)) |
1092 | |
|
|
1093 | if (object::can_merge (op, top)) |
1225 | { |
1094 | { |
1226 | top->nrof += op->nrof; |
1095 | top->nrof += op->nrof; |
1227 | |
1096 | |
1228 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1097 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1229 | op->weight = 0; /* Don't want any adjustements now */ |
1098 | op->weight = 0; /* Don't want any adjustements now */ |
1230 | remove_ob (op); |
1099 | op->destroy (); |
1231 | free_object (op); |
|
|
1232 | return top; |
1100 | return top; |
1233 | } |
1101 | } |
1234 | } |
1102 | } |
1235 | |
1103 | |
1236 | return 0; |
1104 | return 0; |
… | |
… | |
1241 | * job preparing multi-part monsters |
1109 | * job preparing multi-part monsters |
1242 | */ |
1110 | */ |
1243 | object * |
1111 | object * |
1244 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1112 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1245 | { |
1113 | { |
1246 | object *tmp; |
|
|
1247 | |
|
|
1248 | if (op->head) |
|
|
1249 | op = op->head; |
|
|
1250 | |
|
|
1251 | for (tmp = op; tmp; tmp = tmp->more) |
1114 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1252 | { |
1115 | { |
1253 | tmp->x = x + tmp->arch->clone.x; |
1116 | tmp->x = x + tmp->arch->clone.x; |
1254 | tmp->y = y + tmp->arch->clone.y; |
1117 | tmp->y = y + tmp->arch->clone.y; |
1255 | } |
1118 | } |
1256 | |
1119 | |
… | |
… | |
1275 | * Return value: |
1138 | * Return value: |
1276 | * new object if 'op' was merged with other object |
1139 | * new object if 'op' was merged with other object |
1277 | * NULL if 'op' was destroyed |
1140 | * NULL if 'op' was destroyed |
1278 | * just 'op' otherwise |
1141 | * just 'op' otherwise |
1279 | */ |
1142 | */ |
1280 | |
|
|
1281 | object * |
1143 | object * |
1282 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1144 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1283 | { |
1145 | { |
1284 | object *tmp, *top, *floor = NULL; |
1146 | object *tmp, *top, *floor = NULL; |
1285 | sint16 x, y; |
1147 | sint16 x, y; |
… | |
… | |
1288 | { |
1150 | { |
1289 | LOG (llevError, "Trying to insert freed object!\n"); |
1151 | LOG (llevError, "Trying to insert freed object!\n"); |
1290 | return NULL; |
1152 | return NULL; |
1291 | } |
1153 | } |
1292 | |
1154 | |
1293 | if (m == NULL) |
1155 | if (!m) |
1294 | { |
1156 | { |
1295 | char *dump = dump_object (op); |
1157 | char *dump = dump_object (op); |
1296 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1158 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1297 | free (dump); |
1159 | free (dump); |
1298 | return op; |
1160 | return op; |
… | |
… | |
1319 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1181 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1320 | free (dump); |
1182 | free (dump); |
1321 | return op; |
1183 | return op; |
1322 | } |
1184 | } |
1323 | |
1185 | |
1324 | if (op->more != NULL) |
1186 | if (op->more) |
1325 | { |
1187 | { |
1326 | /* The part may be on a different map. */ |
1188 | /* The part may be on a different map. */ |
1327 | |
1189 | |
1328 | object *more = op->more; |
1190 | object *more = op->more; |
1329 | |
1191 | |
… | |
… | |
1345 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1207 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1346 | { |
1208 | { |
1347 | if (!op->head) |
1209 | if (!op->head) |
1348 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1210 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1349 | |
1211 | |
1350 | return NULL; |
1212 | return 0; |
1351 | } |
1213 | } |
1352 | } |
1214 | } |
1353 | |
1215 | |
1354 | CLEAR_FLAG (op, FLAG_REMOVED); |
1216 | CLEAR_FLAG (op, FLAG_REMOVED); |
1355 | |
1217 | |
… | |
… | |
1362 | y = op->y; |
1224 | y = op->y; |
1363 | |
1225 | |
1364 | /* this has to be done after we translate the coordinates. |
1226 | /* this has to be done after we translate the coordinates. |
1365 | */ |
1227 | */ |
1366 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1228 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1367 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1229 | for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) |
1368 | if (CAN_MERGE (op, tmp)) |
1230 | if (object::can_merge (op, tmp)) |
1369 | { |
1231 | { |
1370 | op->nrof += tmp->nrof; |
1232 | op->nrof += tmp->nrof; |
1371 | remove_ob (tmp); |
1233 | tmp->destroy (); |
1372 | free_object (tmp); |
|
|
1373 | } |
1234 | } |
1374 | |
1235 | |
1375 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1236 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1376 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1237 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1377 | |
1238 | |
… | |
… | |
1390 | op->below = originator->below; |
1251 | op->below = originator->below; |
1391 | |
1252 | |
1392 | if (op->below) |
1253 | if (op->below) |
1393 | op->below->above = op; |
1254 | op->below->above = op; |
1394 | else |
1255 | else |
1395 | SET_MAP_OB (op->map, op->x, op->y, op); |
1256 | op->ms ().bot = op; |
1396 | |
1257 | |
1397 | /* since *below* originator, no need to update top */ |
1258 | /* since *below* originator, no need to update top */ |
1398 | originator->below = op; |
1259 | originator->below = op; |
1399 | } |
1260 | } |
1400 | else |
1261 | else |
1401 | { |
1262 | { |
1402 | /* If there are other objects, then */ |
1263 | /* If there are other objects, then */ |
1403 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1264 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1404 | { |
1265 | { |
1405 | object *last = NULL; |
1266 | object *last = 0; |
1406 | |
1267 | |
1407 | /* |
1268 | /* |
1408 | * If there are multiple objects on this space, we do some trickier handling. |
1269 | * If there are multiple objects on this space, we do some trickier handling. |
1409 | * We've already dealt with merging if appropriate. |
1270 | * We've already dealt with merging if appropriate. |
1410 | * Generally, we want to put the new object on top. But if |
1271 | * Generally, we want to put the new object on top. But if |
… | |
… | |
1414 | * once we get to them. This reduces the need to traverse over all of |
1275 | * once we get to them. This reduces the need to traverse over all of |
1415 | * them when adding another one - this saves quite a bit of cpu time |
1276 | * them when adding another one - this saves quite a bit of cpu time |
1416 | * when lots of spells are cast in one area. Currently, it is presumed |
1277 | * when lots of spells are cast in one area. Currently, it is presumed |
1417 | * that flying non pickable objects are spell objects. |
1278 | * that flying non pickable objects are spell objects. |
1418 | */ |
1279 | */ |
1419 | |
|
|
1420 | while (top != NULL) |
1280 | while (top) |
1421 | { |
1281 | { |
1422 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1282 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1423 | floor = top; |
1283 | floor = top; |
1424 | |
1284 | |
1425 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1285 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
… | |
… | |
1446 | * If INS_ON_TOP is used, don't do this processing |
1306 | * If INS_ON_TOP is used, don't do this processing |
1447 | * Need to find the object that in fact blocks view, otherwise |
1307 | * Need to find the object that in fact blocks view, otherwise |
1448 | * stacking is a bit odd. |
1308 | * stacking is a bit odd. |
1449 | */ |
1309 | */ |
1450 | if (!(flag & INS_ON_TOP) && |
1310 | if (!(flag & INS_ON_TOP) && |
1451 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1311 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1452 | { |
1312 | { |
1453 | for (last = top; last != floor; last = last->below) |
1313 | for (last = top; last != floor; last = last->below) |
1454 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1314 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1455 | break; |
1315 | break; |
1456 | /* Check to see if we found the object that blocks view, |
1316 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1478 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1338 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1479 | |
1339 | |
1480 | if (op->above) |
1340 | if (op->above) |
1481 | op->above->below = op; |
1341 | op->above->below = op; |
1482 | |
1342 | |
1483 | op->below = NULL; |
1343 | op->below = 0; |
1484 | SET_MAP_OB (op->map, op->x, op->y, op); |
1344 | op->ms ().bot = op; |
1485 | } |
1345 | } |
1486 | else |
1346 | else |
1487 | { /* get inserted into the stack above top */ |
1347 | { /* get inserted into the stack above top */ |
1488 | op->above = top->above; |
1348 | op->above = top->above; |
1489 | |
1349 | |
… | |
… | |
1492 | |
1352 | |
1493 | op->below = top; |
1353 | op->below = top; |
1494 | top->above = op; |
1354 | top->above = op; |
1495 | } |
1355 | } |
1496 | |
1356 | |
1497 | if (op->above == NULL) |
1357 | if (!op->above) |
1498 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1358 | op->ms ().top = op; |
1499 | } /* else not INS_BELOW_ORIGINATOR */ |
1359 | } /* else not INS_BELOW_ORIGINATOR */ |
1500 | |
1360 | |
1501 | if (op->type == PLAYER) |
1361 | if (op->type == PLAYER) |
|
|
1362 | { |
1502 | op->contr->do_los = 1; |
1363 | op->contr->do_los = 1; |
|
|
1364 | ++op->map->players; |
|
|
1365 | op->map->last_access = runtime; |
|
|
1366 | } |
1503 | |
1367 | |
1504 | /* If we have a floor, we know the player, if any, will be above |
1368 | /* If we have a floor, we know the player, if any, will be above |
1505 | * it, so save a few ticks and start from there. |
1369 | * it, so save a few ticks and start from there. |
1506 | */ |
1370 | */ |
1507 | if (!(flag & INS_MAP_LOAD)) |
1371 | if (!(flag & INS_MAP_LOAD)) |
1508 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1372 | if (object *pl = op->ms ().player ()) |
1509 | if (tmp->type == PLAYER) |
1373 | if (pl->contr->ns) |
1510 | tmp->contr->socket.update_look = 1; |
1374 | pl->contr->ns->floorbox_update (); |
1511 | |
1375 | |
1512 | /* If this object glows, it may affect lighting conditions that are |
1376 | /* If this object glows, it may affect lighting conditions that are |
1513 | * visible to others on this map. But update_all_los is really |
1377 | * visible to others on this map. But update_all_los is really |
1514 | * an inefficient way to do this, as it means los for all players |
1378 | * an inefficient way to do this, as it means los for all players |
1515 | * on the map will get recalculated. The players could very well |
1379 | * on the map will get recalculated. The players could very well |
1516 | * be far away from this change and not affected in any way - |
1380 | * be far away from this change and not affected in any way - |
1517 | * this should get redone to only look for players within range, |
1381 | * this should get redone to only look for players within range, |
1518 | * or just updating the P_NEED_UPDATE for spaces within this area |
1382 | * or just updating the P_NEED_UPDATE for spaces within this area |
1519 | * of effect may be sufficient. |
1383 | * of effect may be sufficient. |
1520 | */ |
1384 | */ |
1521 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1385 | if (op->map->darkness && (op->glow_radius != 0)) |
1522 | update_all_los (op->map, op->x, op->y); |
1386 | update_all_los (op->map, op->x, op->y); |
1523 | |
1387 | |
1524 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1388 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1525 | update_object (op, UP_OBJ_INSERT); |
1389 | update_object (op, UP_OBJ_INSERT); |
1526 | |
1390 | |
|
|
1391 | INVOKE_OBJECT (INSERT, op); |
|
|
1392 | |
1527 | /* Don't know if moving this to the end will break anything. However, |
1393 | /* Don't know if moving this to the end will break anything. However, |
1528 | * we want to have update_look set above before calling this. |
1394 | * we want to have floorbox_update called before calling this. |
1529 | * |
1395 | * |
1530 | * check_move_on() must be after this because code called from |
1396 | * check_move_on() must be after this because code called from |
1531 | * check_move_on() depends on correct map flags (so functions like |
1397 | * check_move_on() depends on correct map flags (so functions like |
1532 | * blocked() and wall() work properly), and these flags are updated by |
1398 | * blocked() and wall() work properly), and these flags are updated by |
1533 | * update_object(). |
1399 | * update_object(). |
… | |
… | |
1535 | |
1401 | |
1536 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1402 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1537 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1403 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1538 | { |
1404 | { |
1539 | if (check_move_on (op, originator)) |
1405 | if (check_move_on (op, originator)) |
1540 | return NULL; |
1406 | return 0; |
1541 | |
1407 | |
1542 | /* If we are a multi part object, lets work our way through the check |
1408 | /* If we are a multi part object, lets work our way through the check |
1543 | * walk on's. |
1409 | * walk on's. |
1544 | */ |
1410 | */ |
1545 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1411 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1546 | if (check_move_on (tmp, originator)) |
1412 | if (check_move_on (tmp, originator)) |
1547 | return NULL; |
1413 | return 0; |
1548 | } |
1414 | } |
1549 | |
1415 | |
1550 | return op; |
1416 | return op; |
1551 | } |
1417 | } |
1552 | |
1418 | |
1553 | /* this function inserts an object in the map, but if it |
1419 | /* this function inserts an object in the map, but if it |
1554 | * finds an object of its own type, it'll remove that one first. |
1420 | * finds an object of its own type, it'll remove that one first. |
1555 | * op is the object to insert it under: supplies x and the map. |
1421 | * op is the object to insert it under: supplies x and the map. |
1556 | */ |
1422 | */ |
1557 | void |
1423 | void |
1558 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1424 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1559 | { |
1425 | { |
1560 | object * |
1426 | object *tmp, *tmp1; |
1561 | tmp; |
|
|
1562 | object * |
|
|
1563 | tmp1; |
|
|
1564 | |
1427 | |
1565 | /* first search for itself and remove any old instances */ |
1428 | /* first search for itself and remove any old instances */ |
1566 | |
1429 | |
1567 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1430 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1568 | { |
|
|
1569 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1431 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1570 | { |
1432 | tmp->destroy (); |
1571 | remove_ob (tmp); |
|
|
1572 | free_object (tmp); |
|
|
1573 | } |
|
|
1574 | } |
|
|
1575 | |
1433 | |
1576 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1434 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1577 | |
1435 | |
1578 | tmp1->x = op->x; |
1436 | tmp1->x = op->x; |
1579 | tmp1->y = op->y; |
1437 | tmp1->y = op->y; |
1580 | insert_ob_in_map (tmp1, op->map, op, 0); |
1438 | insert_ob_in_map (tmp1, op->map, op, 0); |
|
|
1439 | } |
|
|
1440 | |
|
|
1441 | object * |
|
|
1442 | object::insert_at (object *where, object *originator, int flags) |
|
|
1443 | { |
|
|
1444 | where->map->insert (this, where->x, where->y, originator, flags); |
1581 | } |
1445 | } |
1582 | |
1446 | |
1583 | /* |
1447 | /* |
1584 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1448 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1585 | * is returned contains nr objects, and the remaining parts contains |
1449 | * is returned contains nr objects, and the remaining parts contains |
1586 | * the rest (or is removed and freed if that number is 0). |
1450 | * the rest (or is removed and freed if that number is 0). |
1587 | * On failure, NULL is returned, and the reason put into the |
1451 | * On failure, NULL is returned, and the reason put into the |
1588 | * global static errmsg array. |
1452 | * global static errmsg array. |
1589 | */ |
1453 | */ |
1590 | |
|
|
1591 | object * |
1454 | object * |
1592 | get_split_ob (object *orig_ob, uint32 nr) |
1455 | get_split_ob (object *orig_ob, uint32 nr) |
1593 | { |
1456 | { |
1594 | object * |
1457 | object *newob; |
1595 | newob; |
|
|
1596 | int |
|
|
1597 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1458 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1598 | |
1459 | |
1599 | if (orig_ob->nrof < nr) |
1460 | if (orig_ob->nrof < nr) |
1600 | { |
1461 | { |
1601 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1462 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1602 | return NULL; |
1463 | return NULL; |
1603 | } |
1464 | } |
1604 | |
1465 | |
1605 | newob = object_create_clone (orig_ob); |
1466 | newob = object_create_clone (orig_ob); |
1606 | |
1467 | |
1607 | if ((orig_ob->nrof -= nr) < 1) |
1468 | if ((orig_ob->nrof -= nr) < 1) |
1608 | { |
1469 | orig_ob->destroy (1); |
1609 | if (!is_removed) |
|
|
1610 | remove_ob (orig_ob); |
|
|
1611 | free_object2 (orig_ob, 1); |
|
|
1612 | } |
|
|
1613 | else if (!is_removed) |
1470 | else if (!is_removed) |
1614 | { |
1471 | { |
1615 | if (orig_ob->env != NULL) |
1472 | if (orig_ob->env != NULL) |
1616 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1473 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1617 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1474 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1637 | |
1494 | |
1638 | object * |
1495 | object * |
1639 | decrease_ob_nr (object *op, uint32 i) |
1496 | decrease_ob_nr (object *op, uint32 i) |
1640 | { |
1497 | { |
1641 | object *tmp; |
1498 | object *tmp; |
1642 | player *pl; |
|
|
1643 | |
1499 | |
1644 | if (i == 0) /* objects with op->nrof require this check */ |
1500 | if (i == 0) /* objects with op->nrof require this check */ |
1645 | return op; |
1501 | return op; |
1646 | |
1502 | |
1647 | if (i > op->nrof) |
1503 | if (i > op->nrof) |
1648 | i = op->nrof; |
1504 | i = op->nrof; |
1649 | |
1505 | |
1650 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1506 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1651 | op->nrof -= i; |
1507 | op->nrof -= i; |
1652 | else if (op->env != NULL) |
1508 | else if (op->env) |
1653 | { |
1509 | { |
1654 | /* is this object in the players inventory, or sub container |
1510 | /* is this object in the players inventory, or sub container |
1655 | * therein? |
1511 | * therein? |
1656 | */ |
1512 | */ |
1657 | tmp = is_player_inv (op->env); |
1513 | tmp = op->in_player (); |
1658 | /* nope. Is this a container the player has opened? |
1514 | /* nope. Is this a container the player has opened? |
1659 | * If so, set tmp to that player. |
1515 | * If so, set tmp to that player. |
1660 | * IMO, searching through all the players will mostly |
1516 | * IMO, searching through all the players will mostly |
1661 | * likely be quicker than following op->env to the map, |
1517 | * likely be quicker than following op->env to the map, |
1662 | * and then searching the map for a player. |
1518 | * and then searching the map for a player. |
1663 | */ |
1519 | */ |
1664 | if (!tmp) |
1520 | if (!tmp) |
1665 | { |
1521 | for_all_players (pl) |
1666 | for (pl = first_player; pl; pl = pl->next) |
|
|
1667 | if (pl->ob->container == op->env) |
1522 | if (pl->ob->container == op->env) |
|
|
1523 | { |
|
|
1524 | tmp = pl->ob; |
1668 | break; |
1525 | break; |
1669 | if (pl) |
|
|
1670 | tmp = pl->ob; |
|
|
1671 | else |
|
|
1672 | tmp = NULL; |
|
|
1673 | } |
1526 | } |
1674 | |
1527 | |
1675 | if (i < op->nrof) |
1528 | if (i < op->nrof) |
1676 | { |
1529 | { |
1677 | sub_weight (op->env, op->weight * i); |
1530 | sub_weight (op->env, op->weight * i); |
1678 | op->nrof -= i; |
1531 | op->nrof -= i; |
1679 | if (tmp) |
1532 | if (tmp) |
1680 | { |
|
|
1681 | esrv_send_item (tmp, op); |
1533 | esrv_send_item (tmp, op); |
1682 | } |
|
|
1683 | } |
1534 | } |
1684 | else |
1535 | else |
1685 | { |
1536 | { |
1686 | remove_ob (op); |
1537 | op->remove (); |
1687 | op->nrof = 0; |
1538 | op->nrof = 0; |
1688 | if (tmp) |
1539 | if (tmp) |
1689 | { |
|
|
1690 | esrv_del_item (tmp->contr, op->count); |
1540 | esrv_del_item (tmp->contr, op->count); |
1691 | } |
|
|
1692 | } |
1541 | } |
1693 | } |
1542 | } |
1694 | else |
1543 | else |
1695 | { |
1544 | { |
1696 | object *above = op->above; |
1545 | object *above = op->above; |
1697 | |
1546 | |
1698 | if (i < op->nrof) |
1547 | if (i < op->nrof) |
1699 | op->nrof -= i; |
1548 | op->nrof -= i; |
1700 | else |
1549 | else |
1701 | { |
1550 | { |
1702 | remove_ob (op); |
1551 | op->remove (); |
1703 | op->nrof = 0; |
1552 | op->nrof = 0; |
1704 | } |
1553 | } |
1705 | |
1554 | |
1706 | /* Since we just removed op, op->above is null */ |
1555 | /* Since we just removed op, op->above is null */ |
1707 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1556 | for (tmp = above; tmp; tmp = tmp->above) |
1708 | if (tmp->type == PLAYER) |
1557 | if (tmp->type == PLAYER) |
1709 | { |
1558 | { |
1710 | if (op->nrof) |
1559 | if (op->nrof) |
1711 | esrv_send_item (tmp, op); |
1560 | esrv_send_item (tmp, op); |
1712 | else |
1561 | else |
… | |
… | |
1716 | |
1565 | |
1717 | if (op->nrof) |
1566 | if (op->nrof) |
1718 | return op; |
1567 | return op; |
1719 | else |
1568 | else |
1720 | { |
1569 | { |
1721 | free_object (op); |
1570 | op->destroy (); |
1722 | return NULL; |
1571 | return 0; |
1723 | } |
1572 | } |
1724 | } |
1573 | } |
1725 | |
1574 | |
1726 | /* |
1575 | /* |
1727 | * add_weight(object, weight) adds the specified weight to an object, |
1576 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1739 | op->carrying += weight; |
1588 | op->carrying += weight; |
1740 | op = op->env; |
1589 | op = op->env; |
1741 | } |
1590 | } |
1742 | } |
1591 | } |
1743 | |
1592 | |
1744 | /* |
|
|
1745 | * insert_ob_in_ob(op,environment): |
|
|
1746 | * This function inserts the object op in the linked list |
|
|
1747 | * inside the object environment. |
|
|
1748 | * |
|
|
1749 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1750 | * the inventory at the last position or next to other objects of the same |
|
|
1751 | * type. |
|
|
1752 | * Frank: Now sorted by type, archetype and magic! |
|
|
1753 | * |
|
|
1754 | * The function returns now pointer to inserted item, and return value can |
|
|
1755 | * be != op, if items are merged. -Tero |
|
|
1756 | */ |
|
|
1757 | |
|
|
1758 | object * |
1593 | object * |
1759 | insert_ob_in_ob (object *op, object *where) |
1594 | insert_ob_in_ob (object *op, object *where) |
1760 | { |
1595 | { |
1761 | object * |
1596 | if (!where) |
1762 | tmp, * |
|
|
1763 | otmp; |
|
|
1764 | |
|
|
1765 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1766 | { |
|
|
1767 | char *dump = dump_object (op); |
|
|
1768 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump); |
|
|
1769 | free (dump); |
|
|
1770 | return op; |
|
|
1771 | } |
|
|
1772 | |
|
|
1773 | if (where == NULL) |
|
|
1774 | { |
1597 | { |
1775 | char *dump = dump_object (op); |
1598 | char *dump = dump_object (op); |
1776 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1599 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1777 | free (dump); |
1600 | free (dump); |
1778 | return op; |
1601 | return op; |
1779 | } |
1602 | } |
1780 | |
1603 | |
1781 | if (where->head) |
1604 | if (where->head) |
1782 | { |
1605 | { |
1783 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
1606 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1784 | where = where->head; |
1607 | where = where->head; |
1785 | } |
1608 | } |
|
|
1609 | |
|
|
1610 | return where->insert (op); |
|
|
1611 | } |
|
|
1612 | |
|
|
1613 | /* |
|
|
1614 | * env->insert (op) |
|
|
1615 | * This function inserts the object op in the linked list |
|
|
1616 | * inside the object environment. |
|
|
1617 | * |
|
|
1618 | * The function returns now pointer to inserted item, and return value can |
|
|
1619 | * be != op, if items are merged. -Tero |
|
|
1620 | */ |
|
|
1621 | |
|
|
1622 | object * |
|
|
1623 | object::insert (object *op) |
|
|
1624 | { |
|
|
1625 | object *tmp, *otmp; |
|
|
1626 | |
|
|
1627 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1628 | op->remove (); |
1786 | |
1629 | |
1787 | if (op->more) |
1630 | if (op->more) |
1788 | { |
1631 | { |
1789 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1632 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1790 | return op; |
1633 | return op; |
… | |
… | |
1792 | |
1635 | |
1793 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1636 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1794 | CLEAR_FLAG (op, FLAG_REMOVED); |
1637 | CLEAR_FLAG (op, FLAG_REMOVED); |
1795 | if (op->nrof) |
1638 | if (op->nrof) |
1796 | { |
1639 | { |
1797 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1640 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1798 | if (CAN_MERGE (tmp, op)) |
1641 | if (object::can_merge (tmp, op)) |
1799 | { |
1642 | { |
1800 | /* return the original object and remove inserted object |
1643 | /* return the original object and remove inserted object |
1801 | (client needs the original object) */ |
1644 | (client needs the original object) */ |
1802 | tmp->nrof += op->nrof; |
1645 | tmp->nrof += op->nrof; |
1803 | /* Weight handling gets pretty funky. Since we are adding to |
1646 | /* Weight handling gets pretty funky. Since we are adding to |
1804 | * tmp->nrof, we need to increase the weight. |
1647 | * tmp->nrof, we need to increase the weight. |
1805 | */ |
1648 | */ |
1806 | add_weight (where, op->weight * op->nrof); |
1649 | add_weight (this, op->weight * op->nrof); |
1807 | SET_FLAG (op, FLAG_REMOVED); |
1650 | SET_FLAG (op, FLAG_REMOVED); |
1808 | free_object (op); /* free the inserted object */ |
1651 | op->destroy (); /* free the inserted object */ |
1809 | op = tmp; |
1652 | op = tmp; |
1810 | remove_ob (op); /* and fix old object's links */ |
1653 | op->remove (); /* and fix old object's links */ |
1811 | CLEAR_FLAG (op, FLAG_REMOVED); |
1654 | CLEAR_FLAG (op, FLAG_REMOVED); |
1812 | break; |
1655 | break; |
1813 | } |
1656 | } |
1814 | |
1657 | |
1815 | /* I assume combined objects have no inventory |
1658 | /* I assume combined objects have no inventory |
1816 | * We add the weight - this object could have just been removed |
1659 | * We add the weight - this object could have just been removed |
1817 | * (if it was possible to merge). calling remove_ob will subtract |
1660 | * (if it was possible to merge). calling remove_ob will subtract |
1818 | * the weight, so we need to add it in again, since we actually do |
1661 | * the weight, so we need to add it in again, since we actually do |
1819 | * the linking below |
1662 | * the linking below |
1820 | */ |
1663 | */ |
1821 | add_weight (where, op->weight * op->nrof); |
1664 | add_weight (this, op->weight * op->nrof); |
1822 | } |
1665 | } |
1823 | else |
1666 | else |
1824 | add_weight (where, (op->weight + op->carrying)); |
1667 | add_weight (this, (op->weight + op->carrying)); |
1825 | |
1668 | |
1826 | otmp = is_player_inv (where); |
1669 | otmp = this->in_player (); |
1827 | if (otmp && otmp->contr != NULL) |
1670 | if (otmp && otmp->contr) |
1828 | { |
|
|
1829 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1671 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1830 | fix_player (otmp); |
1672 | otmp->update_stats (); |
1831 | } |
|
|
1832 | |
1673 | |
1833 | op->map = NULL; |
1674 | op->map = 0; |
1834 | op->env = where; |
1675 | op->env = this; |
1835 | op->above = NULL; |
1676 | op->above = 0; |
1836 | op->below = NULL; |
1677 | op->below = 0; |
1837 | op->x = 0, op->y = 0; |
1678 | op->x = 0, op->y = 0; |
1838 | |
1679 | |
1839 | /* reset the light list and los of the players on the map */ |
1680 | /* reset the light list and los of the players on the map */ |
1840 | if ((op->glow_radius != 0) && where->map) |
1681 | if ((op->glow_radius != 0) && map) |
1841 | { |
1682 | { |
1842 | #ifdef DEBUG_LIGHTS |
1683 | #ifdef DEBUG_LIGHTS |
1843 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1684 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1844 | #endif /* DEBUG_LIGHTS */ |
1685 | #endif /* DEBUG_LIGHTS */ |
1845 | if (MAP_DARKNESS (where->map)) |
1686 | if (map->darkness) |
1846 | update_all_los (where->map, where->x, where->y); |
1687 | update_all_los (map, x, y); |
1847 | } |
1688 | } |
1848 | |
1689 | |
1849 | /* Client has no idea of ordering so lets not bother ordering it here. |
1690 | /* Client has no idea of ordering so lets not bother ordering it here. |
1850 | * It sure simplifies this function... |
1691 | * It sure simplifies this function... |
1851 | */ |
1692 | */ |
1852 | if (where->inv == NULL) |
1693 | if (!inv) |
1853 | where->inv = op; |
1694 | inv = op; |
1854 | else |
1695 | else |
1855 | { |
1696 | { |
1856 | op->below = where->inv; |
1697 | op->below = inv; |
1857 | op->below->above = op; |
1698 | op->below->above = op; |
1858 | where->inv = op; |
1699 | inv = op; |
1859 | } |
1700 | } |
|
|
1701 | |
|
|
1702 | INVOKE_OBJECT (INSERT, this); |
|
|
1703 | |
1860 | return op; |
1704 | return op; |
1861 | } |
1705 | } |
1862 | |
1706 | |
1863 | /* |
1707 | /* |
1864 | * Checks if any objects has a move_type that matches objects |
1708 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1878 | * |
1722 | * |
1879 | * MSW 2001-07-08: Check all objects on space, not just those below |
1723 | * MSW 2001-07-08: Check all objects on space, not just those below |
1880 | * object being inserted. insert_ob_in_map may not put new objects |
1724 | * object being inserted. insert_ob_in_map may not put new objects |
1881 | * on top. |
1725 | * on top. |
1882 | */ |
1726 | */ |
1883 | |
|
|
1884 | int |
1727 | int |
1885 | check_move_on (object *op, object *originator) |
1728 | check_move_on (object *op, object *originator) |
1886 | { |
1729 | { |
1887 | object *tmp; |
1730 | object *tmp; |
1888 | maptile *m = op->map; |
1731 | maptile *m = op->map; |
… | |
… | |
1915 | |
1758 | |
1916 | /* The objects have to be checked from top to bottom. |
1759 | /* The objects have to be checked from top to bottom. |
1917 | * Hence, we first go to the top: |
1760 | * Hence, we first go to the top: |
1918 | */ |
1761 | */ |
1919 | |
1762 | |
1920 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
1763 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1921 | { |
1764 | { |
1922 | /* Trim the search when we find the first other spell effect |
1765 | /* Trim the search when we find the first other spell effect |
1923 | * this helps performance so that if a space has 50 spell objects, |
1766 | * this helps performance so that if a space has 50 spell objects, |
1924 | * we don't need to check all of them. |
1767 | * we don't need to check all of them. |
1925 | */ |
1768 | */ |
… | |
… | |
1980 | /* |
1823 | /* |
1981 | * present_arch(arch, map, x, y) searches for any objects with |
1824 | * present_arch(arch, map, x, y) searches for any objects with |
1982 | * a matching archetype at the given map and coordinates. |
1825 | * a matching archetype at the given map and coordinates. |
1983 | * The first matching object is returned, or NULL if none. |
1826 | * The first matching object is returned, or NULL if none. |
1984 | */ |
1827 | */ |
1985 | |
|
|
1986 | object * |
1828 | object * |
1987 | present_arch (const archetype *at, maptile *m, int x, int y) |
1829 | present_arch (const archetype *at, maptile *m, int x, int y) |
1988 | { |
1830 | { |
1989 | object * |
|
|
1990 | tmp; |
|
|
1991 | |
|
|
1992 | if (m == NULL || out_of_map (m, x, y)) |
1831 | if (m == NULL || out_of_map (m, x, y)) |
1993 | { |
1832 | { |
1994 | LOG (llevError, "Present_arch called outside map.\n"); |
1833 | LOG (llevError, "Present_arch called outside map.\n"); |
1995 | return NULL; |
1834 | return NULL; |
1996 | } |
1835 | } |
|
|
1836 | |
1997 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1837 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1998 | if (tmp->arch == at) |
1838 | if (tmp->arch == at) |
1999 | return tmp; |
1839 | return tmp; |
|
|
1840 | |
2000 | return NULL; |
1841 | return NULL; |
2001 | } |
1842 | } |
2002 | |
1843 | |
2003 | /* |
1844 | /* |
2004 | * present(type, map, x, y) searches for any objects with |
1845 | * present(type, map, x, y) searches for any objects with |
2005 | * a matching type variable at the given map and coordinates. |
1846 | * a matching type variable at the given map and coordinates. |
2006 | * The first matching object is returned, or NULL if none. |
1847 | * The first matching object is returned, or NULL if none. |
2007 | */ |
1848 | */ |
2008 | |
|
|
2009 | object * |
1849 | object * |
2010 | present (unsigned char type, maptile *m, int x, int y) |
1850 | present (unsigned char type, maptile *m, int x, int y) |
2011 | { |
1851 | { |
2012 | object * |
|
|
2013 | tmp; |
|
|
2014 | |
|
|
2015 | if (out_of_map (m, x, y)) |
1852 | if (out_of_map (m, x, y)) |
2016 | { |
1853 | { |
2017 | LOG (llevError, "Present called outside map.\n"); |
1854 | LOG (llevError, "Present called outside map.\n"); |
2018 | return NULL; |
1855 | return NULL; |
2019 | } |
1856 | } |
|
|
1857 | |
2020 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1858 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
2021 | if (tmp->type == type) |
1859 | if (tmp->type == type) |
2022 | return tmp; |
1860 | return tmp; |
|
|
1861 | |
2023 | return NULL; |
1862 | return NULL; |
2024 | } |
1863 | } |
2025 | |
1864 | |
2026 | /* |
1865 | /* |
2027 | * present_in_ob(type, object) searches for any objects with |
1866 | * present_in_ob(type, object) searches for any objects with |
2028 | * a matching type variable in the inventory of the given object. |
1867 | * a matching type variable in the inventory of the given object. |
2029 | * The first matching object is returned, or NULL if none. |
1868 | * The first matching object is returned, or NULL if none. |
2030 | */ |
1869 | */ |
2031 | |
|
|
2032 | object * |
1870 | object * |
2033 | present_in_ob (unsigned char type, const object *op) |
1871 | present_in_ob (unsigned char type, const object *op) |
2034 | { |
1872 | { |
2035 | object * |
|
|
2036 | tmp; |
|
|
2037 | |
|
|
2038 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1873 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2039 | if (tmp->type == type) |
1874 | if (tmp->type == type) |
2040 | return tmp; |
1875 | return tmp; |
|
|
1876 | |
2041 | return NULL; |
1877 | return NULL; |
2042 | } |
1878 | } |
2043 | |
1879 | |
2044 | /* |
1880 | /* |
2045 | * present_in_ob (type, str, object) searches for any objects with |
1881 | * present_in_ob (type, str, object) searches for any objects with |
… | |
… | |
2053 | * str is the string to match against. Note that we match against |
1889 | * str is the string to match against. Note that we match against |
2054 | * the object name, not the archetype name. this is so that the |
1890 | * the object name, not the archetype name. this is so that the |
2055 | * spell code can use one object type (force), but change it's name |
1891 | * spell code can use one object type (force), but change it's name |
2056 | * to be unique. |
1892 | * to be unique. |
2057 | */ |
1893 | */ |
2058 | |
|
|
2059 | object * |
1894 | object * |
2060 | present_in_ob_by_name (int type, const char *str, const object *op) |
1895 | present_in_ob_by_name (int type, const char *str, const object *op) |
2061 | { |
1896 | { |
2062 | object * |
|
|
2063 | tmp; |
|
|
2064 | |
|
|
2065 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1897 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2066 | { |
|
|
2067 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1898 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
2068 | return tmp; |
1899 | return tmp; |
2069 | } |
1900 | |
2070 | return NULL; |
1901 | return 0; |
2071 | } |
1902 | } |
2072 | |
1903 | |
2073 | /* |
1904 | /* |
2074 | * present_arch_in_ob(archetype, object) searches for any objects with |
1905 | * present_arch_in_ob(archetype, object) searches for any objects with |
2075 | * a matching archetype in the inventory of the given object. |
1906 | * a matching archetype in the inventory of the given object. |
2076 | * The first matching object is returned, or NULL if none. |
1907 | * The first matching object is returned, or NULL if none. |
2077 | */ |
1908 | */ |
2078 | |
|
|
2079 | object * |
1909 | object * |
2080 | present_arch_in_ob (const archetype *at, const object *op) |
1910 | present_arch_in_ob (const archetype *at, const object *op) |
2081 | { |
1911 | { |
2082 | object * |
|
|
2083 | tmp; |
|
|
2084 | |
|
|
2085 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1912 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2086 | if (tmp->arch == at) |
1913 | if (tmp->arch == at) |
2087 | return tmp; |
1914 | return tmp; |
|
|
1915 | |
2088 | return NULL; |
1916 | return NULL; |
2089 | } |
1917 | } |
2090 | |
1918 | |
2091 | /* |
1919 | /* |
2092 | * activate recursively a flag on an object inventory |
1920 | * activate recursively a flag on an object inventory |
2093 | */ |
1921 | */ |
2094 | void |
1922 | void |
2095 | flag_inv (object *op, int flag) |
1923 | flag_inv (object *op, int flag) |
2096 | { |
1924 | { |
2097 | object * |
|
|
2098 | tmp; |
|
|
2099 | |
|
|
2100 | if (op->inv) |
1925 | if (op->inv) |
2101 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1926 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2102 | { |
1927 | { |
2103 | SET_FLAG (tmp, flag); |
1928 | SET_FLAG (tmp, flag); |
2104 | flag_inv (tmp, flag); |
1929 | flag_inv (tmp, flag); |
2105 | } |
1930 | } |
2106 | } /* |
1931 | } |
|
|
1932 | |
|
|
1933 | /* |
2107 | * desactivate recursively a flag on an object inventory |
1934 | * deactivate recursively a flag on an object inventory |
2108 | */ |
1935 | */ |
2109 | void |
1936 | void |
2110 | unflag_inv (object *op, int flag) |
1937 | unflag_inv (object *op, int flag) |
2111 | { |
1938 | { |
2112 | object * |
|
|
2113 | tmp; |
|
|
2114 | |
|
|
2115 | if (op->inv) |
1939 | if (op->inv) |
2116 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1940 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2117 | { |
1941 | { |
2118 | CLEAR_FLAG (tmp, flag); |
1942 | CLEAR_FLAG (tmp, flag); |
2119 | unflag_inv (tmp, flag); |
1943 | unflag_inv (tmp, flag); |
2120 | } |
1944 | } |
2121 | } |
1945 | } |
… | |
… | |
2124 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1948 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
2125 | * all it's inventory (recursively). |
1949 | * all it's inventory (recursively). |
2126 | * If checksums are used, a player will get set_cheat called for |
1950 | * If checksums are used, a player will get set_cheat called for |
2127 | * him/her-self and all object carried by a call to this function. |
1951 | * him/her-self and all object carried by a call to this function. |
2128 | */ |
1952 | */ |
2129 | |
|
|
2130 | void |
1953 | void |
2131 | set_cheat (object *op) |
1954 | set_cheat (object *op) |
2132 | { |
1955 | { |
2133 | SET_FLAG (op, FLAG_WAS_WIZ); |
1956 | SET_FLAG (op, FLAG_WAS_WIZ); |
2134 | flag_inv (op, FLAG_WAS_WIZ); |
1957 | flag_inv (op, FLAG_WAS_WIZ); |
… | |
… | |
2153 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1976 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2154 | * to know if the space in question will block the object. We can't use |
1977 | * to know if the space in question will block the object. We can't use |
2155 | * the archetype because that isn't correct if the monster has been |
1978 | * the archetype because that isn't correct if the monster has been |
2156 | * customized, changed states, etc. |
1979 | * customized, changed states, etc. |
2157 | */ |
1980 | */ |
2158 | |
|
|
2159 | int |
1981 | int |
2160 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1982 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2161 | { |
1983 | { |
2162 | int |
|
|
2163 | i, |
|
|
2164 | index = 0, flag; |
1984 | int index = 0, flag; |
2165 | static int |
|
|
2166 | altern[SIZEOFFREE]; |
1985 | int altern[SIZEOFFREE]; |
2167 | |
1986 | |
2168 | for (i = start; i < stop; i++) |
1987 | for (int i = start; i < stop; i++) |
2169 | { |
1988 | { |
2170 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
1989 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2171 | if (!flag) |
1990 | if (!flag) |
2172 | altern[index++] = i; |
1991 | altern [index++] = i; |
2173 | |
1992 | |
2174 | /* Basically, if we find a wall on a space, we cut down the search size. |
1993 | /* Basically, if we find a wall on a space, we cut down the search size. |
2175 | * In this way, we won't return spaces that are on another side of a wall. |
1994 | * In this way, we won't return spaces that are on another side of a wall. |
2176 | * This mostly work, but it cuts down the search size in all directions - |
1995 | * This mostly work, but it cuts down the search size in all directions - |
2177 | * if the space being examined only has a wall to the north and empty |
1996 | * if the space being examined only has a wall to the north and empty |
2178 | * spaces in all the other directions, this will reduce the search space |
1997 | * spaces in all the other directions, this will reduce the search space |
2179 | * to only the spaces immediately surrounding the target area, and |
1998 | * to only the spaces immediately surrounding the target area, and |
2180 | * won't look 2 spaces south of the target space. |
1999 | * won't look 2 spaces south of the target space. |
2181 | */ |
2000 | */ |
2182 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2001 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2183 | stop = maxfree[i]; |
2002 | stop = maxfree[i]; |
2184 | } |
2003 | } |
|
|
2004 | |
2185 | if (!index) |
2005 | if (!index) |
2186 | return -1; |
2006 | return -1; |
|
|
2007 | |
2187 | return altern[RANDOM () % index]; |
2008 | return altern[RANDOM () % index]; |
2188 | } |
2009 | } |
2189 | |
2010 | |
2190 | /* |
2011 | /* |
2191 | * find_first_free_spot(archetype, maptile, x, y) works like |
2012 | * find_first_free_spot(archetype, maptile, x, y) works like |
2192 | * find_free_spot(), but it will search max number of squares. |
2013 | * find_free_spot(), but it will search max number of squares. |
2193 | * But it will return the first available spot, not a random choice. |
2014 | * But it will return the first available spot, not a random choice. |
2194 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2015 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2195 | */ |
2016 | */ |
2196 | |
|
|
2197 | int |
2017 | int |
2198 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2018 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2199 | { |
2019 | { |
2200 | int |
|
|
2201 | i; |
|
|
2202 | |
|
|
2203 | for (i = 0; i < SIZEOFFREE; i++) |
2020 | for (int i = 0; i < SIZEOFFREE; i++) |
2204 | { |
|
|
2205 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2021 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2206 | return i; |
2022 | return i; |
2207 | } |
2023 | |
2208 | return -1; |
2024 | return -1; |
2209 | } |
2025 | } |
2210 | |
2026 | |
2211 | /* |
2027 | /* |
2212 | * The function permute(arr, begin, end) randomly reorders the array |
2028 | * The function permute(arr, begin, end) randomly reorders the array |
2213 | * arr[begin..end-1]. |
2029 | * arr[begin..end-1]. |
|
|
2030 | * now uses a fisher-yates shuffle, old permute was broken |
2214 | */ |
2031 | */ |
2215 | static void |
2032 | static void |
2216 | permute (int *arr, int begin, int end) |
2033 | permute (int *arr, int begin, int end) |
2217 | { |
2034 | { |
2218 | int |
2035 | arr += begin; |
2219 | i, |
|
|
2220 | j, |
|
|
2221 | tmp, |
|
|
2222 | len; |
|
|
2223 | |
|
|
2224 | len = end - begin; |
2036 | end -= begin; |
2225 | for (i = begin; i < end; i++) |
|
|
2226 | { |
|
|
2227 | j = begin + RANDOM () % len; |
|
|
2228 | |
2037 | |
2229 | tmp = arr[i]; |
2038 | while (--end) |
2230 | arr[i] = arr[j]; |
2039 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2231 | arr[j] = tmp; |
|
|
2232 | } |
|
|
2233 | } |
2040 | } |
2234 | |
2041 | |
2235 | /* new function to make monster searching more efficient, and effective! |
2042 | /* new function to make monster searching more efficient, and effective! |
2236 | * This basically returns a randomized array (in the passed pointer) of |
2043 | * This basically returns a randomized array (in the passed pointer) of |
2237 | * the spaces to find monsters. In this way, it won't always look for |
2044 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2240 | * the 3x3 area will be searched, just not in a predictable order. |
2047 | * the 3x3 area will be searched, just not in a predictable order. |
2241 | */ |
2048 | */ |
2242 | void |
2049 | void |
2243 | get_search_arr (int *search_arr) |
2050 | get_search_arr (int *search_arr) |
2244 | { |
2051 | { |
2245 | int |
2052 | int i; |
2246 | i; |
|
|
2247 | |
2053 | |
2248 | for (i = 0; i < SIZEOFFREE; i++) |
2054 | for (i = 0; i < SIZEOFFREE; i++) |
2249 | { |
|
|
2250 | search_arr[i] = i; |
2055 | search_arr[i] = i; |
2251 | } |
|
|
2252 | |
2056 | |
2253 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2057 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2254 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2058 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2255 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2059 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2256 | } |
2060 | } |
… | |
… | |
2265 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2069 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2266 | * is actually want is going to try and move there. We need this info |
2070 | * is actually want is going to try and move there. We need this info |
2267 | * because we have to know what movement the thing looking to move |
2071 | * because we have to know what movement the thing looking to move |
2268 | * there is capable of. |
2072 | * there is capable of. |
2269 | */ |
2073 | */ |
2270 | |
|
|
2271 | int |
2074 | int |
2272 | find_dir (maptile *m, int x, int y, object *exclude) |
2075 | find_dir (maptile *m, int x, int y, object *exclude) |
2273 | { |
2076 | { |
2274 | int |
|
|
2275 | i, |
|
|
2276 | max = SIZEOFFREE, mflags; |
2077 | int i, max = SIZEOFFREE, mflags; |
2277 | |
2078 | |
2278 | sint16 nx, ny; |
2079 | sint16 nx, ny; |
2279 | object * |
2080 | object *tmp; |
2280 | tmp; |
|
|
2281 | maptile * |
2081 | maptile *mp; |
2282 | mp; |
|
|
2283 | |
2082 | |
2284 | MoveType blocked, move_type; |
2083 | MoveType blocked, move_type; |
2285 | |
2084 | |
2286 | if (exclude && exclude->head) |
2085 | if (exclude && exclude->head) |
2287 | { |
2086 | { |
… | |
… | |
2299 | mp = m; |
2098 | mp = m; |
2300 | nx = x + freearr_x[i]; |
2099 | nx = x + freearr_x[i]; |
2301 | ny = y + freearr_y[i]; |
2100 | ny = y + freearr_y[i]; |
2302 | |
2101 | |
2303 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2102 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2103 | |
2304 | if (mflags & P_OUT_OF_MAP) |
2104 | if (mflags & P_OUT_OF_MAP) |
2305 | { |
|
|
2306 | max = maxfree[i]; |
2105 | max = maxfree[i]; |
2307 | } |
|
|
2308 | else |
2106 | else |
2309 | { |
2107 | { |
2310 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2108 | mapspace &ms = mp->at (nx, ny); |
|
|
2109 | |
|
|
2110 | blocked = ms.move_block; |
2311 | |
2111 | |
2312 | if ((move_type & blocked) == move_type) |
2112 | if ((move_type & blocked) == move_type) |
2313 | { |
|
|
2314 | max = maxfree[i]; |
2113 | max = maxfree[i]; |
2315 | } |
|
|
2316 | else if (mflags & P_IS_ALIVE) |
2114 | else if (mflags & P_IS_ALIVE) |
2317 | { |
2115 | { |
2318 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2116 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2319 | { |
2117 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2320 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2118 | && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2321 | { |
|
|
2322 | break; |
2119 | break; |
2323 | } |
2120 | |
2324 | } |
|
|
2325 | if (tmp) |
2121 | if (tmp) |
2326 | { |
|
|
2327 | return freedir[i]; |
2122 | return freedir[i]; |
2328 | } |
|
|
2329 | } |
2123 | } |
2330 | } |
2124 | } |
2331 | } |
2125 | } |
|
|
2126 | |
2332 | return 0; |
2127 | return 0; |
2333 | } |
2128 | } |
2334 | |
2129 | |
2335 | /* |
2130 | /* |
2336 | * distance(object 1, object 2) will return the square of the |
2131 | * distance(object 1, object 2) will return the square of the |
2337 | * distance between the two given objects. |
2132 | * distance between the two given objects. |
2338 | */ |
2133 | */ |
2339 | |
|
|
2340 | int |
2134 | int |
2341 | distance (const object *ob1, const object *ob2) |
2135 | distance (const object *ob1, const object *ob2) |
2342 | { |
2136 | { |
2343 | int |
|
|
2344 | i; |
|
|
2345 | |
|
|
2346 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2137 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2347 | return i; |
|
|
2348 | } |
2138 | } |
2349 | |
2139 | |
2350 | /* |
2140 | /* |
2351 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2141 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2352 | * an object which has subtracted the x and y coordinates of another |
2142 | * an object which has subtracted the x and y coordinates of another |
2353 | * object, needs to travel toward it. |
2143 | * object, needs to travel toward it. |
2354 | */ |
2144 | */ |
2355 | |
|
|
2356 | int |
2145 | int |
2357 | find_dir_2 (int x, int y) |
2146 | find_dir_2 (int x, int y) |
2358 | { |
2147 | { |
2359 | int |
2148 | int q; |
2360 | q; |
|
|
2361 | |
2149 | |
2362 | if (y) |
2150 | if (y) |
2363 | q = x * 100 / y; |
2151 | q = x * 100 / y; |
2364 | else if (x) |
2152 | else if (x) |
2365 | q = -300 * x; |
2153 | q = -300 * x; |
… | |
… | |
2400 | int |
2188 | int |
2401 | absdir (int d) |
2189 | absdir (int d) |
2402 | { |
2190 | { |
2403 | while (d < 1) |
2191 | while (d < 1) |
2404 | d += 8; |
2192 | d += 8; |
|
|
2193 | |
2405 | while (d > 8) |
2194 | while (d > 8) |
2406 | d -= 8; |
2195 | d -= 8; |
|
|
2196 | |
2407 | return d; |
2197 | return d; |
2408 | } |
2198 | } |
2409 | |
2199 | |
2410 | /* |
2200 | /* |
2411 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2201 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
… | |
… | |
2413 | */ |
2203 | */ |
2414 | |
2204 | |
2415 | int |
2205 | int |
2416 | dirdiff (int dir1, int dir2) |
2206 | dirdiff (int dir1, int dir2) |
2417 | { |
2207 | { |
2418 | int |
2208 | int d; |
2419 | d; |
|
|
2420 | |
2209 | |
2421 | d = abs (dir1 - dir2); |
2210 | d = abs (dir1 - dir2); |
2422 | if (d > 4) |
2211 | if (d > 4) |
2423 | d = 8 - d; |
2212 | d = 8 - d; |
|
|
2213 | |
2424 | return d; |
2214 | return d; |
2425 | } |
2215 | } |
2426 | |
2216 | |
2427 | /* peterm: |
2217 | /* peterm: |
2428 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2218 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
… | |
… | |
2431 | * This basically means that if direction is 15, then it could either go |
2221 | * This basically means that if direction is 15, then it could either go |
2432 | * direction 4, 14, or 16 to get back to where we are. |
2222 | * direction 4, 14, or 16 to get back to where we are. |
2433 | * Moved from spell_util.c to object.c with the other related direction |
2223 | * Moved from spell_util.c to object.c with the other related direction |
2434 | * functions. |
2224 | * functions. |
2435 | */ |
2225 | */ |
2436 | |
|
|
2437 | int |
|
|
2438 | reduction_dir[SIZEOFFREE][3] = { |
2226 | int reduction_dir[SIZEOFFREE][3] = { |
2439 | {0, 0, 0}, /* 0 */ |
2227 | {0, 0, 0}, /* 0 */ |
2440 | {0, 0, 0}, /* 1 */ |
2228 | {0, 0, 0}, /* 1 */ |
2441 | {0, 0, 0}, /* 2 */ |
2229 | {0, 0, 0}, /* 2 */ |
2442 | {0, 0, 0}, /* 3 */ |
2230 | {0, 0, 0}, /* 3 */ |
2443 | {0, 0, 0}, /* 4 */ |
2231 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2491 | * find a path to that monster that we found. If not, |
2279 | * find a path to that monster that we found. If not, |
2492 | * we don't bother going toward it. Returns 1 if we |
2280 | * we don't bother going toward it. Returns 1 if we |
2493 | * can see a direct way to get it |
2281 | * can see a direct way to get it |
2494 | * Modified to be map tile aware -.MSW |
2282 | * Modified to be map tile aware -.MSW |
2495 | */ |
2283 | */ |
2496 | |
|
|
2497 | |
|
|
2498 | int |
2284 | int |
2499 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2285 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2500 | { |
2286 | { |
2501 | sint16 dx, dy; |
2287 | sint16 dx, dy; |
2502 | int |
|
|
2503 | mflags; |
2288 | int mflags; |
2504 | |
2289 | |
2505 | if (dir < 0) |
2290 | if (dir < 0) |
2506 | return 0; /* exit condition: invalid direction */ |
2291 | return 0; /* exit condition: invalid direction */ |
2507 | |
2292 | |
2508 | dx = x + freearr_x[dir]; |
2293 | dx = x + freearr_x[dir]; |
… | |
… | |
2521 | return 0; |
2306 | return 0; |
2522 | |
2307 | |
2523 | /* yes, can see. */ |
2308 | /* yes, can see. */ |
2524 | if (dir < 9) |
2309 | if (dir < 9) |
2525 | return 1; |
2310 | return 1; |
|
|
2311 | |
2526 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2312 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2527 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2313 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2314 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2528 | } |
2315 | } |
2529 | |
|
|
2530 | |
|
|
2531 | |
2316 | |
2532 | /* |
2317 | /* |
2533 | * can_pick(picker, item): finds out if an object is possible to be |
2318 | * can_pick(picker, item): finds out if an object is possible to be |
2534 | * picked up by the picker. Returnes 1 if it can be |
2319 | * picked up by the picker. Returnes 1 if it can be |
2535 | * picked up, otherwise 0. |
2320 | * picked up, otherwise 0. |
… | |
… | |
2546 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2331 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2547 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2332 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2548 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2333 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2549 | } |
2334 | } |
2550 | |
2335 | |
2551 | |
|
|
2552 | /* |
2336 | /* |
2553 | * create clone from object to another |
2337 | * create clone from object to another |
2554 | */ |
2338 | */ |
2555 | object * |
2339 | object * |
2556 | object_create_clone (object *asrc) |
2340 | object_create_clone (object *asrc) |
2557 | { |
2341 | { |
2558 | object * |
|
|
2559 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2342 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2560 | |
2343 | |
2561 | if (!asrc) |
2344 | if (!asrc) |
2562 | return NULL; |
2345 | return 0; |
|
|
2346 | |
2563 | src = asrc; |
2347 | src = asrc; |
2564 | if (src->head) |
2348 | if (src->head) |
2565 | src = src->head; |
2349 | src = src->head; |
2566 | |
2350 | |
2567 | prev = NULL; |
2351 | prev = 0; |
2568 | for (part = src; part; part = part->more) |
2352 | for (part = src; part; part = part->more) |
2569 | { |
2353 | { |
2570 | tmp = get_object (); |
2354 | tmp = part->clone (); |
2571 | copy_object (part, tmp); |
|
|
2572 | tmp->x -= src->x; |
2355 | tmp->x -= src->x; |
2573 | tmp->y -= src->y; |
2356 | tmp->y -= src->y; |
|
|
2357 | |
2574 | if (!part->head) |
2358 | if (!part->head) |
2575 | { |
2359 | { |
2576 | dst = tmp; |
2360 | dst = tmp; |
2577 | tmp->head = NULL; |
2361 | tmp->head = 0; |
2578 | } |
2362 | } |
2579 | else |
2363 | else |
2580 | { |
|
|
2581 | tmp->head = dst; |
2364 | tmp->head = dst; |
2582 | } |
2365 | |
2583 | tmp->more = NULL; |
2366 | tmp->more = 0; |
|
|
2367 | |
2584 | if (prev) |
2368 | if (prev) |
2585 | prev->more = tmp; |
2369 | prev->more = tmp; |
|
|
2370 | |
2586 | prev = tmp; |
2371 | prev = tmp; |
2587 | } |
2372 | } |
2588 | |
2373 | |
2589 | for (item = src->inv; item; item = item->below) |
2374 | for (item = src->inv; item; item = item->below) |
2590 | insert_ob_in_ob (object_create_clone (item), dst); |
2375 | insert_ob_in_ob (object_create_clone (item), dst); |
… | |
… | |
2596 | /* Basically, we save the content of the string to a temp file, then call */ |
2381 | /* Basically, we save the content of the string to a temp file, then call */ |
2597 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2382 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2598 | /* but it was simple to make and allows reusing the load_object function. */ |
2383 | /* but it was simple to make and allows reusing the load_object function. */ |
2599 | /* Remember not to use load_object_str in a time-critical situation. */ |
2384 | /* Remember not to use load_object_str in a time-critical situation. */ |
2600 | /* Also remember that multiparts objects are not supported for now. */ |
2385 | /* Also remember that multiparts objects are not supported for now. */ |
2601 | |
|
|
2602 | object * |
2386 | object * |
2603 | load_object_str (const char *obstr) |
2387 | load_object_str (const char *obstr) |
2604 | { |
2388 | { |
2605 | object *op; |
2389 | object *op; |
2606 | char filename[MAX_BUF]; |
2390 | char filename[MAX_BUF]; |
… | |
… | |
2616 | } |
2400 | } |
2617 | |
2401 | |
2618 | fprintf (tempfile, obstr); |
2402 | fprintf (tempfile, obstr); |
2619 | fclose (tempfile); |
2403 | fclose (tempfile); |
2620 | |
2404 | |
2621 | op = get_object (); |
2405 | op = object::create (); |
2622 | |
2406 | |
2623 | object_thawer thawer (filename); |
2407 | object_thawer thawer (filename); |
2624 | |
2408 | |
2625 | if (thawer) |
2409 | if (thawer) |
2626 | load_object (thawer, op, 0); |
2410 | load_object (thawer, op, 0); |
… | |
… | |
2636 | * returns NULL if no match. |
2420 | * returns NULL if no match. |
2637 | */ |
2421 | */ |
2638 | object * |
2422 | object * |
2639 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2423 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2640 | { |
2424 | { |
2641 | object *tmp; |
|
|
2642 | |
|
|
2643 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2425 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
2644 | if (tmp->type == type && tmp->subtype == subtype) |
2426 | if (tmp->type == type && tmp->subtype == subtype) |
2645 | return tmp; |
2427 | return tmp; |
2646 | |
2428 | |
2647 | return NULL; |
2429 | return 0; |
2648 | } |
2430 | } |
2649 | |
2431 | |
2650 | /* If ob has a field named key, return the link from the list, |
2432 | /* If ob has a field named key, return the link from the list, |
2651 | * otherwise return NULL. |
2433 | * otherwise return NULL. |
2652 | * |
2434 | * |
… | |
… | |
2654 | * do the desired thing. |
2436 | * do the desired thing. |
2655 | */ |
2437 | */ |
2656 | key_value * |
2438 | key_value * |
2657 | get_ob_key_link (const object *ob, const char *key) |
2439 | get_ob_key_link (const object *ob, const char *key) |
2658 | { |
2440 | { |
2659 | key_value *link; |
|
|
2660 | |
|
|
2661 | for (link = ob->key_values; link != NULL; link = link->next) |
2441 | for (key_value *link = ob->key_values; link; link = link->next) |
2662 | if (link->key == key) |
2442 | if (link->key == key) |
2663 | return link; |
2443 | return link; |
2664 | |
2444 | |
2665 | return NULL; |
2445 | return 0; |
2666 | } |
2446 | } |
2667 | |
2447 | |
2668 | /* |
2448 | /* |
2669 | * Returns the value of op has an extra_field for key, or NULL. |
2449 | * Returns the value of op has an extra_field for key, or NULL. |
2670 | * |
2450 | * |
… | |
… | |
2710 | * Returns TRUE on success. |
2490 | * Returns TRUE on success. |
2711 | */ |
2491 | */ |
2712 | int |
2492 | int |
2713 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2493 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2714 | { |
2494 | { |
2715 | key_value * |
|
|
2716 | field = NULL, *last = NULL; |
2495 | key_value *field = NULL, *last = NULL; |
2717 | |
2496 | |
2718 | for (field = op->key_values; field != NULL; field = field->next) |
2497 | for (field = op->key_values; field != NULL; field = field->next) |
2719 | { |
2498 | { |
2720 | if (field->key != canonical_key) |
2499 | if (field->key != canonical_key) |
2721 | { |
2500 | { |
… | |
… | |
2749 | /* IF we get here, key doesn't exist */ |
2528 | /* IF we get here, key doesn't exist */ |
2750 | |
2529 | |
2751 | /* No field, we'll have to add it. */ |
2530 | /* No field, we'll have to add it. */ |
2752 | |
2531 | |
2753 | if (!add_key) |
2532 | if (!add_key) |
2754 | { |
|
|
2755 | return FALSE; |
2533 | return FALSE; |
2756 | } |
2534 | |
2757 | /* There isn't any good reason to store a null |
2535 | /* There isn't any good reason to store a null |
2758 | * value in the key/value list. If the archetype has |
2536 | * value in the key/value list. If the archetype has |
2759 | * this key, then we should also have it, so shouldn't |
2537 | * this key, then we should also have it, so shouldn't |
2760 | * be here. If user wants to store empty strings, |
2538 | * be here. If user wants to store empty strings, |
2761 | * should pass in "" |
2539 | * should pass in "" |
… | |
… | |
2810 | } |
2588 | } |
2811 | else |
2589 | else |
2812 | item = item->env; |
2590 | item = item->env; |
2813 | } |
2591 | } |
2814 | |
2592 | |
|
|
2593 | |
|
|
2594 | const char * |
|
|
2595 | object::flag_desc (char *desc, int len) const |
|
|
2596 | { |
|
|
2597 | char *p = desc; |
|
|
2598 | bool first = true; |
|
|
2599 | |
|
|
2600 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
2601 | { |
|
|
2602 | if (len <= 10) // magic constant! |
|
|
2603 | { |
|
|
2604 | snprintf (p, len, ",..."); |
|
|
2605 | break; |
|
|
2606 | } |
|
|
2607 | |
|
|
2608 | if (flag[i]) |
|
|
2609 | { |
|
|
2610 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
|
|
2611 | len -= cnt; |
|
|
2612 | p += cnt; |
|
|
2613 | first = false; |
|
|
2614 | } |
|
|
2615 | } |
|
|
2616 | |
|
|
2617 | return desc; |
|
|
2618 | } |
|
|
2619 | |
2815 | // return a suitable string describing an objetc in enough detail to find it |
2620 | // return a suitable string describing an objetc in enough detail to find it |
2816 | const char * |
2621 | const char * |
2817 | object::debug_desc (char *info) const |
2622 | object::debug_desc (char *info) const |
2818 | { |
2623 | { |
|
|
2624 | char flagdesc[512]; |
2819 | char info2[256 * 3]; |
2625 | char info2[256 * 4]; |
2820 | char *p = info; |
2626 | char *p = info; |
2821 | |
2627 | |
2822 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
2628 | p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", |
2823 | count, |
2629 | count, uuid.seq, |
2824 | &name, |
2630 | &name, |
2825 | title ? " " : "", |
2631 | title ? "\",title:" : "", |
2826 | title ? (const char *)title : ""); |
2632 | title ? (const char *)title : "", |
|
|
2633 | flag_desc (flagdesc, 512), type); |
2827 | |
2634 | |
2828 | if (env) |
2635 | if (env) |
2829 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2636 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2830 | |
2637 | |
2831 | if (map) |
2638 | if (map) |
2832 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
2639 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2833 | |
2640 | |
2834 | return info; |
2641 | return info; |
2835 | } |
2642 | } |
2836 | |
2643 | |
2837 | const char * |
2644 | const char * |