1 | |
|
|
2 | /* |
1 | /* |
3 | CrossFire, A Multiplayer game for X-windows |
2 | CrossFire, A Multiplayer game for X-windows |
4 | |
3 | |
5 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
5 | Copyright (C) 1992 Frank Tore Johansen |
… | |
… | |
17 | |
16 | |
18 | You should have received a copy of the GNU General Public License |
17 | You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software |
18 | along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
20 | |
22 | The authors can be reached via e-mail at crossfire-devel@real-time.com |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
26 | sub/add_weight will transcend the environment updating the carrying |
25 | sub/add_weight will transcend the environment updating the carrying |
27 | variable. */ |
26 | variable. */ |
… | |
… | |
30 | #include <sys/types.h> |
29 | #include <sys/types.h> |
31 | #include <sys/uio.h> |
30 | #include <sys/uio.h> |
32 | #include <object.h> |
31 | #include <object.h> |
33 | #include <funcpoint.h> |
32 | #include <funcpoint.h> |
34 | #include <loader.h> |
33 | #include <loader.h> |
|
|
34 | |
|
|
35 | #include <bitset> |
35 | |
36 | |
36 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
37 | static UUID uuid; |
38 | static UUID uuid; |
38 | const uint64 UUID_SKIP = 1<<19; |
39 | const uint64 UUID_SKIP = 1<<19; |
39 | |
40 | |
… | |
… | |
105 | _exit (1); |
106 | _exit (1); |
106 | } |
107 | } |
107 | |
108 | |
108 | uuid.seq = uid; |
109 | uuid.seq = uid; |
109 | write_uuid (); |
110 | write_uuid (); |
110 | LOG (llevDebug, "read UID: %lld\n", uid); |
111 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
111 | fclose (fp); |
112 | fclose (fp); |
112 | } |
113 | } |
113 | |
114 | |
114 | UUID |
115 | UUID |
115 | gen_uuid () |
116 | gen_uuid () |
… | |
… | |
184 | * |
185 | * |
185 | * 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 |
186 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * reduce this to the same efficiency. |
188 | * reduce this to the same efficiency. |
188 | * |
189 | * |
189 | * Check nrof variable *before* calling CAN_MERGE() |
190 | * Check nrof variable *before* calling can_merge() |
190 | * |
191 | * |
191 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
192 | * check weight |
193 | * check weight |
193 | */ |
194 | */ |
194 | |
195 | |
195 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
196 | { |
197 | { |
197 | /* A couple quicksanity checks */ |
198 | /* A couple quicksanity checks */ |
198 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
199 | if (ob1 == ob2 |
|
|
200 | || ob1->type != ob2->type |
|
|
201 | || ob1->speed != ob2->speed |
|
|
202 | || ob1->value != ob2->value |
|
|
203 | || ob1->name != ob2->name) |
199 | return 0; |
204 | return 0; |
200 | |
205 | |
201 | if (ob1->speed != ob2->speed) |
206 | //TODO: this ain't working well, use nicer and correct overflow check |
202 | return 0; |
|
|
203 | |
|
|
204 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
207 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
205 | * value could not be stored in a sint32 (which unfortunately sometimes is |
208 | * value could not be stored in a sint32 (which unfortunately sometimes is |
206 | * used to store nrof). |
209 | * used to store nrof). |
207 | */ |
210 | */ |
208 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
218 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
219 | |
222 | |
220 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
221 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
222 | |
225 | |
223 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
224 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
225 | * being locked in inventory should prevent merging. |
|
|
226 | * 0x4 in flags3 is CLIENT_SENT |
|
|
227 | */ |
|
|
228 | if ((ob1->arch != ob2->arch) || |
|
|
229 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
230 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
231 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
232 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
233 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
234 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
235 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
236 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
237 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
238 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
239 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
240 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
241 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
242 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
243 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
244 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
245 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
246 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
247 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
248 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
249 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
250 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
251 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
252 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
253 | (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) |
248 | || ob1->move_off != ob2->move_off |
|
|
249 | || ob1->move_slow != ob2->move_slow |
|
|
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
254 | return 0; |
251 | return 0; |
255 | |
252 | |
256 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
257 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
258 | */ |
255 | */ |
… | |
… | |
261 | /* if one object has inventory but the other doesn't, not equiv */ |
258 | /* if one object has inventory but the other doesn't, not equiv */ |
262 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
263 | return 0; |
260 | return 0; |
264 | |
261 | |
265 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
266 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
267 | return 0; |
264 | return 0; |
268 | |
265 | |
269 | /* inventory ok - still need to check rest of this object to see |
266 | /* inventory ok - still need to check rest of this object to see |
270 | * if it is valid. |
267 | * if it is valid. |
271 | */ |
268 | */ |
… | |
… | |
355 | op = op->env; |
352 | op = op->env; |
356 | return op; |
353 | return op; |
357 | } |
354 | } |
358 | |
355 | |
359 | /* |
356 | /* |
360 | * Eneq(@csd.uu.se): Since we can have items buried in a character we need |
|
|
361 | * a better check. We basically keeping traversing up until we can't |
|
|
362 | * or find a player. |
|
|
363 | */ |
|
|
364 | |
|
|
365 | object * |
|
|
366 | is_player_inv (object *op) |
|
|
367 | { |
|
|
368 | for (; op != NULL && op->type != PLAYER; op = op->env) |
|
|
369 | if (op->env == op) |
|
|
370 | op->env = NULL; |
|
|
371 | return op; |
|
|
372 | } |
|
|
373 | |
|
|
374 | /* |
|
|
375 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
376 | * Some error messages. |
358 | * Some error messages. |
377 | * The result of the dump is stored in the static global errmsg array. |
359 | * The result of the dump is stored in the static global errmsg array. |
378 | */ |
360 | */ |
379 | |
361 | |
380 | void |
362 | char * |
381 | dump_object2 (object *op) |
|
|
382 | { |
|
|
383 | errmsg[0] = 0; |
|
|
384 | return; |
|
|
385 | //TODO//D#d# |
|
|
386 | #if 0 |
|
|
387 | char *cp; |
|
|
388 | |
|
|
389 | /* object *tmp;*/ |
|
|
390 | |
|
|
391 | if (op->arch != NULL) |
|
|
392 | { |
|
|
393 | strcat (errmsg, "arch "); |
|
|
394 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
395 | strcat (errmsg, "\n"); |
|
|
396 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
397 | strcat (errmsg, cp); |
|
|
398 | # if 0 |
|
|
399 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
400 | * will overflow the buffer. |
|
|
401 | * Changed so that we don't dump inventory either. This may |
|
|
402 | * also overflow the buffer. |
|
|
403 | */ |
|
|
404 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
405 | strcat (errmsg, cp); |
|
|
406 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
407 | dump_object2 (tmp); |
|
|
408 | # endif |
|
|
409 | strcat (errmsg, "end\n"); |
|
|
410 | } |
|
|
411 | else |
|
|
412 | { |
|
|
413 | strcat (errmsg, "Object "); |
|
|
414 | if (op->name == NULL) |
|
|
415 | strcat (errmsg, "(null)"); |
|
|
416 | else |
|
|
417 | strcat (errmsg, op->name); |
|
|
418 | strcat (errmsg, "\n"); |
|
|
419 | # if 0 |
|
|
420 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
421 | strcat (errmsg, cp); |
|
|
422 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
423 | dump_object2 (tmp); |
|
|
424 | # endif |
|
|
425 | strcat (errmsg, "end\n"); |
|
|
426 | } |
|
|
427 | #endif |
|
|
428 | } |
|
|
429 | |
|
|
430 | /* |
|
|
431 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
432 | */ |
|
|
433 | |
|
|
434 | void |
|
|
435 | dump_object (object *op) |
363 | dump_object (object *op) |
436 | { |
364 | { |
437 | if (op == NULL) |
365 | if (!op) |
438 | { |
366 | return strdup ("[NULLOBJ]"); |
439 | strcpy (errmsg, "[NULL pointer]"); |
|
|
440 | return; |
|
|
441 | } |
|
|
442 | errmsg[0] = '\0'; |
|
|
443 | dump_object2 (op); |
|
|
444 | } |
|
|
445 | |
367 | |
446 | void |
368 | object_freezer freezer; |
447 | dump_all_objects (void) |
369 | save_object (freezer, op, 3); |
448 | { |
370 | return freezer.as_string (); |
449 | object *op; |
|
|
450 | |
|
|
451 | for (op = object::first; op != NULL; op = op->next) |
|
|
452 | { |
|
|
453 | dump_object (op); |
|
|
454 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
|
|
455 | } |
|
|
456 | } |
371 | } |
457 | |
372 | |
458 | /* |
373 | /* |
459 | * get_nearest_part(multi-object, object 2) returns the part of the |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
460 | * multi-object 1 which is closest to the second object. |
375 | * multi-object 1 which is closest to the second object. |
… | |
… | |
480 | */ |
395 | */ |
481 | |
396 | |
482 | object * |
397 | object * |
483 | find_object (tag_t i) |
398 | find_object (tag_t i) |
484 | { |
399 | { |
485 | object *op; |
|
|
486 | |
|
|
487 | for (op = object::first; op != NULL; op = op->next) |
400 | for (object *op = object::first; op; op = op->next) |
488 | if (op->count == i) |
401 | if (op->count == i) |
489 | break; |
402 | return op; |
|
|
403 | |
490 | return op; |
404 | return 0; |
491 | } |
405 | } |
492 | |
406 | |
493 | /* |
407 | /* |
494 | * Returns the first object which has a name equal to the argument. |
408 | * Returns the first object which has a name equal to the argument. |
495 | * Used only by the patch command, but not all that useful. |
409 | * Used only by the patch command, but not all that useful. |
… | |
… | |
595 | |
509 | |
596 | if (settings.casting_time) |
510 | if (settings.casting_time) |
597 | casting_time = -1; |
511 | casting_time = -1; |
598 | } |
512 | } |
599 | |
513 | |
600 | void object::clone (object *destination) |
|
|
601 | { |
|
|
602 | *(object_copy *)destination = *this; |
|
|
603 | *(object_pod *)destination = *this; |
|
|
604 | |
|
|
605 | if (self || cb) |
|
|
606 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
607 | } |
|
|
608 | |
|
|
609 | /* |
514 | /* |
610 | * copy object first frees everything allocated by the second object, |
515 | * copy_to first frees everything allocated by the dst object, |
611 | * and then copies the contends of the first object into the second |
516 | * and then copies the contents of itself into the second |
612 | * object, allocating what needs to be allocated. Basically, any |
517 | * object, allocating what needs to be allocated. Basically, any |
613 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
518 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
614 | * if the first object is freed, the pointers in the new object |
519 | * if the first object is freed, the pointers in the new object |
615 | * will point at garbage. |
520 | * will point at garbage. |
616 | */ |
521 | */ |
617 | void |
522 | void |
618 | copy_object (object *op2, object *op) |
523 | object::copy_to (object *dst) |
619 | { |
524 | { |
620 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
525 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
621 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
526 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
622 | |
527 | |
623 | op2->clone (op); |
528 | *(object_copy *)dst = *this; |
|
|
529 | *(object_pod *)dst = *this; |
|
|
530 | |
|
|
531 | if (self || cb) |
|
|
532 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
624 | |
533 | |
625 | if (is_freed) |
534 | if (is_freed) |
626 | SET_FLAG (op, FLAG_FREED); |
535 | SET_FLAG (dst, FLAG_FREED); |
|
|
536 | |
627 | if (is_removed) |
537 | if (is_removed) |
628 | SET_FLAG (op, FLAG_REMOVED); |
538 | SET_FLAG (dst, FLAG_REMOVED); |
629 | |
539 | |
630 | if (op2->speed < 0) |
540 | if (speed < 0) |
631 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
541 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
632 | |
542 | |
633 | /* Copy over key_values, if any. */ |
543 | /* Copy over key_values, if any. */ |
634 | if (op2->key_values) |
544 | if (key_values) |
635 | { |
545 | { |
636 | key_value *tail = 0; |
546 | key_value *tail = 0; |
637 | key_value *i; |
547 | key_value *i; |
638 | |
548 | |
639 | op->key_values = 0; |
549 | dst->key_values = 0; |
640 | |
550 | |
641 | for (i = op2->key_values; i; i = i->next) |
551 | for (i = key_values; i; i = i->next) |
642 | { |
552 | { |
643 | key_value *new_link = new key_value; |
553 | key_value *new_link = new key_value; |
644 | |
554 | |
645 | new_link->next = 0; |
555 | new_link->next = 0; |
646 | new_link->key = i->key; |
556 | new_link->key = i->key; |
647 | new_link->value = i->value; |
557 | new_link->value = i->value; |
648 | |
558 | |
649 | /* Try and be clever here, too. */ |
559 | /* Try and be clever here, too. */ |
650 | if (!op->key_values) |
560 | if (!dst->key_values) |
651 | { |
561 | { |
652 | op->key_values = new_link; |
562 | dst->key_values = new_link; |
653 | tail = new_link; |
563 | tail = new_link; |
654 | } |
564 | } |
655 | else |
565 | else |
656 | { |
566 | { |
657 | tail->next = new_link; |
567 | tail->next = new_link; |
658 | tail = new_link; |
568 | tail = new_link; |
659 | } |
569 | } |
660 | } |
570 | } |
661 | } |
571 | } |
662 | |
572 | |
663 | update_ob_speed (op); |
573 | update_ob_speed (dst); |
|
|
574 | } |
|
|
575 | |
|
|
576 | object * |
|
|
577 | object::clone () |
|
|
578 | { |
|
|
579 | object *neu = create (); |
|
|
580 | copy_to (neu); |
|
|
581 | return neu; |
664 | } |
582 | } |
665 | |
583 | |
666 | /* |
584 | /* |
667 | * If an object with the IS_TURNABLE() flag needs to be turned due |
585 | * If an object with the IS_TURNABLE() flag needs to be turned due |
668 | * to the closest player being on the other side, this function can |
586 | * to the closest player being on the other side, this function can |
… | |
… | |
873 | update_now = 1; |
791 | update_now = 1; |
874 | |
792 | |
875 | if ((move_slow | op->move_slow) != move_slow) |
793 | if ((move_slow | op->move_slow) != move_slow) |
876 | update_now = 1; |
794 | update_now = 1; |
877 | } |
795 | } |
|
|
796 | |
878 | /* if the object is being removed, we can't make intelligent |
797 | /* if the object is being removed, we can't make intelligent |
879 | * decisions, because remove_ob can't really pass the object |
798 | * decisions, because remove_ob can't really pass the object |
880 | * that is being removed. |
799 | * that is being removed. |
881 | */ |
800 | */ |
882 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
801 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
… | |
… | |
908 | else |
827 | else |
909 | { |
828 | { |
910 | delete *i; |
829 | delete *i; |
911 | mortals.erase (i); |
830 | mortals.erase (i); |
912 | } |
831 | } |
913 | |
|
|
914 | static int lastmortals = 0;//D |
|
|
915 | |
|
|
916 | if (mortals.size() != lastmortals)//D |
|
|
917 | { |
|
|
918 | lastmortals = mortals.size ();//D |
|
|
919 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
920 | } |
|
|
921 | } |
832 | } |
922 | |
833 | |
923 | object::object () |
834 | object::object () |
924 | { |
835 | { |
925 | SET_FLAG (this, FLAG_REMOVED); |
836 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
947 | object::first = this; |
858 | object::first = this; |
948 | } |
859 | } |
949 | |
860 | |
950 | void object::unlink () |
861 | void object::unlink () |
951 | { |
862 | { |
952 | //count = 0;//D |
|
|
953 | if (!prev && !next) return;//D |
|
|
954 | |
|
|
955 | if (this == object::first) |
863 | if (this == object::first) |
956 | object::first = next; |
864 | object::first = next; |
957 | |
865 | |
958 | /* Remove this object from the list of used objects */ |
866 | /* Remove this object from the list of used objects */ |
959 | if (prev) prev->next = next; |
867 | if (prev) prev->next = next; |
… | |
… | |
975 | * it from the list of used objects, and puts it on the list of |
883 | * it from the list of used objects, and puts it on the list of |
976 | * free objects. The IS_FREED() flag is set in the object. |
884 | * free objects. The IS_FREED() flag is set in the object. |
977 | * The object must have been removed by remove_ob() first for |
885 | * The object must have been removed by remove_ob() first for |
978 | * this function to succeed. |
886 | * this function to succeed. |
979 | * |
887 | * |
980 | * If free_inventory is set, free inventory as well. Else drop items in |
888 | * If destroy_inventory is set, free inventory as well. Else drop items in |
981 | * inventory to the ground. |
889 | * inventory to the ground. |
982 | */ |
890 | */ |
983 | void object::free (bool free_inventory) |
891 | void object::destroy (bool destroy_inventory) |
984 | { |
892 | { |
985 | if (QUERY_FLAG (this, FLAG_FREED)) |
893 | if (QUERY_FLAG (this, FLAG_FREED)) |
986 | return; |
894 | return; |
987 | |
895 | |
988 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
896 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
989 | remove_friendly_object (this); |
897 | remove_friendly_object (this); |
990 | |
898 | |
991 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
899 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
992 | remove_ob (this); |
900 | remove (); |
993 | |
901 | |
994 | SET_FLAG (this, FLAG_FREED); |
902 | SET_FLAG (this, FLAG_FREED); |
995 | |
903 | |
996 | if (more) |
904 | if (more) |
997 | { |
905 | { |
998 | more->free (free_inventory); |
906 | more->destroy (destroy_inventory); |
999 | more = 0; |
907 | more = 0; |
1000 | } |
908 | } |
1001 | |
909 | |
1002 | if (inv) |
910 | if (inv) |
1003 | { |
911 | { |
1004 | /* Only if the space blocks everything do we not process - |
912 | /* Only if the space blocks everything do we not process - |
1005 | * if some form of movement is allowed, let objects |
913 | * if some form of movement is allowed, let objects |
1006 | * drop on that space. |
914 | * drop on that space. |
1007 | */ |
915 | */ |
1008 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
916 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
1009 | { |
917 | { |
1010 | object *op = inv; |
918 | object *op = inv; |
1011 | |
919 | |
1012 | while (op) |
920 | while (op) |
1013 | { |
921 | { |
1014 | object *tmp = op->below; |
922 | object *tmp = op->below; |
1015 | op->free (free_inventory); |
923 | op->destroy (destroy_inventory); |
1016 | op = tmp; |
924 | op = tmp; |
1017 | } |
925 | } |
1018 | } |
926 | } |
1019 | else |
927 | else |
1020 | { /* Put objects in inventory onto this space */ |
928 | { /* Put objects in inventory onto this space */ |
… | |
… | |
1022 | |
930 | |
1023 | while (op) |
931 | while (op) |
1024 | { |
932 | { |
1025 | object *tmp = op->below; |
933 | object *tmp = op->below; |
1026 | |
934 | |
1027 | remove_ob (op); |
935 | op->remove (); |
1028 | |
936 | |
1029 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
937 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
1030 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
938 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
1031 | free_object (op); |
939 | op->destroy (); |
1032 | else |
940 | else |
1033 | { |
941 | { |
1034 | op->x = x; |
942 | op->x = x; |
1035 | op->y = y; |
943 | op->y = y; |
1036 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
944 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
… | |
… | |
1039 | op = tmp; |
947 | op = tmp; |
1040 | } |
948 | } |
1041 | } |
949 | } |
1042 | } |
950 | } |
1043 | |
951 | |
|
|
952 | // hack to ensure that freed objects still have a valid map |
|
|
953 | { |
|
|
954 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
955 | |
|
|
956 | if (!freed_map) |
|
|
957 | { |
|
|
958 | freed_map = new maptile; |
|
|
959 | |
|
|
960 | freed_map->name = "/internal/freed_objects_map"; |
|
|
961 | freed_map->width = 3; |
|
|
962 | freed_map->height = 3; |
|
|
963 | |
|
|
964 | freed_map->allocate (); |
|
|
965 | } |
|
|
966 | |
|
|
967 | map = freed_map; |
|
|
968 | x = 1; |
|
|
969 | y = 1; |
|
|
970 | } |
|
|
971 | |
1044 | // clear those pointers that likely might have circular references to us |
972 | // clear those pointers that likely might have circular references to us |
1045 | owner = 0; |
973 | owner = 0; |
1046 | enemy = 0; |
974 | enemy = 0; |
1047 | attacked_by = 0; |
975 | attacked_by = 0; |
1048 | |
976 | |
|
|
977 | // only relevant for players(?), but make sure of it anyways |
|
|
978 | contr = 0; |
|
|
979 | |
1049 | /* Remove object from the active list */ |
980 | /* Remove object from the active list */ |
1050 | speed = 0; |
981 | speed = 0; |
1051 | update_ob_speed (this); |
982 | update_ob_speed (this); |
1052 | |
983 | |
1053 | unlink (); |
984 | unlink (); |
… | |
… | |
1057 | |
988 | |
1058 | /* |
989 | /* |
1059 | * sub_weight() recursively (outwards) subtracts a number from the |
990 | * sub_weight() recursively (outwards) subtracts a number from the |
1060 | * weight of an object (and what is carried by it's environment(s)). |
991 | * weight of an object (and what is carried by it's environment(s)). |
1061 | */ |
992 | */ |
1062 | |
|
|
1063 | void |
993 | void |
1064 | sub_weight (object *op, signed long weight) |
994 | sub_weight (object *op, signed long weight) |
1065 | { |
995 | { |
1066 | while (op != NULL) |
996 | while (op != NULL) |
1067 | { |
997 | { |
… | |
… | |
1071 | op->carrying -= weight; |
1001 | op->carrying -= weight; |
1072 | op = op->env; |
1002 | op = op->env; |
1073 | } |
1003 | } |
1074 | } |
1004 | } |
1075 | |
1005 | |
1076 | /* remove_ob(op): |
1006 | /* op->remove (): |
1077 | * This function removes the object op from the linked list of objects |
1007 | * This function removes the object op from the linked list of objects |
1078 | * which it is currently tied to. When this function is done, the |
1008 | * which it is currently tied to. When this function is done, the |
1079 | * object will have no environment. If the object previously had an |
1009 | * object will have no environment. If the object previously had an |
1080 | * environment, the x and y coordinates will be updated to |
1010 | * environment, the x and y coordinates will be updated to |
1081 | * the previous environment. |
1011 | * the previous environment. |
1082 | * Beware: This function is called from the editor as well! |
1012 | * Beware: This function is called from the editor as well! |
1083 | */ |
1013 | */ |
1084 | |
|
|
1085 | void |
1014 | void |
1086 | remove_ob (object *op) |
1015 | object::remove () |
1087 | { |
1016 | { |
1088 | object *tmp, *last = 0; |
1017 | object *tmp, *last = 0; |
1089 | object *otmp; |
1018 | object *otmp; |
1090 | |
1019 | |
1091 | tag_t tag; |
|
|
1092 | int check_walk_off; |
1020 | int check_walk_off; |
1093 | mapstruct *m; |
|
|
1094 | |
1021 | |
1095 | sint16 x, y; |
|
|
1096 | |
|
|
1097 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1022 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1098 | return; |
1023 | return; |
1099 | |
1024 | |
1100 | SET_FLAG (op, FLAG_REMOVED); |
1025 | SET_FLAG (this, FLAG_REMOVED); |
1101 | |
1026 | |
1102 | if (op->more != NULL) |
1027 | if (more) |
1103 | remove_ob (op->more); |
1028 | more->remove (); |
1104 | |
1029 | |
1105 | /* |
1030 | /* |
1106 | * In this case, the object to be removed is in someones |
1031 | * In this case, the object to be removed is in someones |
1107 | * inventory. |
1032 | * inventory. |
1108 | */ |
1033 | */ |
1109 | if (op->env != NULL) |
1034 | if (env) |
1110 | { |
1035 | { |
1111 | if (op->nrof) |
1036 | if (nrof) |
1112 | sub_weight (op->env, op->weight * op->nrof); |
1037 | sub_weight (env, weight * nrof); |
1113 | else |
1038 | else |
1114 | sub_weight (op->env, op->weight + op->carrying); |
1039 | sub_weight (env, weight + carrying); |
1115 | |
1040 | |
1116 | /* NO_FIX_PLAYER is set when a great many changes are being |
1041 | /* NO_FIX_PLAYER is set when a great many changes are being |
1117 | * made to players inventory. If set, avoiding the call |
1042 | * made to players inventory. If set, avoiding the call |
1118 | * to save cpu time. |
1043 | * to save cpu time. |
1119 | */ |
1044 | */ |
1120 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1045 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1121 | fix_player (otmp); |
1046 | fix_player (otmp); |
1122 | |
1047 | |
1123 | if (op->above != NULL) |
1048 | if (above != NULL) |
1124 | op->above->below = op->below; |
1049 | above->below = below; |
1125 | else |
1050 | else |
1126 | op->env->inv = op->below; |
1051 | env->inv = below; |
1127 | |
1052 | |
1128 | if (op->below != NULL) |
1053 | if (below != NULL) |
1129 | op->below->above = op->above; |
1054 | below->above = above; |
1130 | |
1055 | |
1131 | /* we set up values so that it could be inserted into |
1056 | /* we set up values so that it could be inserted into |
1132 | * the map, but we don't actually do that - it is up |
1057 | * the map, but we don't actually do that - it is up |
1133 | * to the caller to decide what we want to do. |
1058 | * to the caller to decide what we want to do. |
1134 | */ |
1059 | */ |
1135 | op->x = op->env->x, op->y = op->env->y; |
1060 | x = env->x, y = env->y; |
1136 | op->map = op->env->map; |
1061 | map = env->map; |
1137 | op->above = NULL, op->below = NULL; |
1062 | above = 0, below = 0; |
1138 | op->env = NULL; |
1063 | env = 0; |
1139 | } |
1064 | } |
1140 | else if (op->map) |
1065 | else if (map) |
1141 | { |
1066 | { |
1142 | x = op->x; |
|
|
1143 | y = op->y; |
|
|
1144 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1145 | |
|
|
1146 | if (!m) |
|
|
1147 | { |
|
|
1148 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1149 | op->map->path, op->x, op->y); |
|
|
1150 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1151 | * it seems if we get into this case, something is probablye |
|
|
1152 | * screwed up and should be fixed. |
|
|
1153 | */ |
|
|
1154 | abort (); |
|
|
1155 | } |
|
|
1156 | |
|
|
1157 | if (op->map != m) |
|
|
1158 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1159 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1160 | |
|
|
1161 | /* Re did the following section of code - it looks like it had |
1067 | /* Re did the following section of code - it looks like it had |
1162 | * lots of logic for things we no longer care about |
1068 | * lots of logic for things we no longer care about |
1163 | */ |
1069 | */ |
1164 | |
1070 | |
1165 | /* link the object above us */ |
1071 | /* link the object above us */ |
1166 | if (op->above) |
1072 | if (above) |
1167 | op->above->below = op->below; |
1073 | above->below = below; |
1168 | else |
1074 | else |
1169 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1075 | SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ |
1170 | |
1076 | |
1171 | /* Relink the object below us, if there is one */ |
1077 | /* Relink the object below us, if there is one */ |
1172 | if (op->below) |
1078 | if (below) |
1173 | op->below->above = op->above; |
1079 | below->above = above; |
1174 | else |
1080 | else |
1175 | { |
1081 | { |
1176 | /* Nothing below, which means we need to relink map object for this space |
1082 | /* Nothing below, which means we need to relink map object for this space |
1177 | * use translated coordinates in case some oddness with map tiling is |
1083 | * use translated coordinates in case some oddness with map tiling is |
1178 | * evident |
1084 | * evident |
1179 | */ |
1085 | */ |
1180 | if (GET_MAP_OB (m, x, y) != op) |
1086 | if (GET_MAP_OB (map, x, y) != this) |
1181 | { |
1087 | { |
1182 | dump_object (op); |
1088 | char *dump = dump_object (this); |
1183 | LOG (llevError, |
1089 | LOG (llevError, |
1184 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
1090 | "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); |
|
|
1091 | free (dump); |
1185 | dump_object (GET_MAP_OB (m, x, y)); |
1092 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1186 | LOG (llevError, "%s\n", errmsg); |
1093 | LOG (llevError, "%s\n", dump); |
|
|
1094 | free (dump); |
1187 | } |
1095 | } |
1188 | |
1096 | |
1189 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1097 | SET_MAP_OB (map, x, y, above); /* goes on above it. */ |
1190 | } |
1098 | } |
1191 | |
1099 | |
1192 | op->above = 0; |
1100 | above = 0; |
1193 | op->below = 0; |
1101 | below = 0; |
1194 | |
1102 | |
1195 | if (op->map->in_memory == MAP_SAVING) |
1103 | if (map->in_memory == MAP_SAVING) |
1196 | return; |
1104 | return; |
1197 | |
1105 | |
1198 | tag = op->count; |
|
|
1199 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1106 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1200 | |
1107 | |
1201 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1108 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1202 | { |
1109 | { |
1203 | /* No point updating the players look faces if he is the object |
1110 | /* No point updating the players look faces if he is the object |
1204 | * being removed. |
1111 | * being removed. |
1205 | */ |
1112 | */ |
1206 | |
1113 | |
1207 | if (tmp->type == PLAYER && tmp != op) |
1114 | if (tmp->type == PLAYER && tmp != this) |
1208 | { |
1115 | { |
1209 | /* If a container that the player is currently using somehow gets |
1116 | /* If a container that the player is currently using somehow gets |
1210 | * removed (most likely destroyed), update the player view |
1117 | * removed (most likely destroyed), update the player view |
1211 | * appropriately. |
1118 | * appropriately. |
1212 | */ |
1119 | */ |
1213 | if (tmp->container == op) |
1120 | if (tmp->container == this) |
1214 | { |
1121 | { |
1215 | CLEAR_FLAG (op, FLAG_APPLIED); |
1122 | CLEAR_FLAG (this, FLAG_APPLIED); |
1216 | tmp->container = NULL; |
1123 | tmp->container = 0; |
1217 | } |
1124 | } |
1218 | |
1125 | |
1219 | tmp->contr->socket.update_look = 1; |
1126 | tmp->contr->socket->floorbox_update (); |
1220 | } |
1127 | } |
1221 | |
1128 | |
1222 | /* See if player moving off should effect something */ |
1129 | /* See if player moving off should effect something */ |
1223 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1130 | if (check_walk_off |
|
|
1131 | && ((move_type & tmp->move_off) |
|
|
1132 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1224 | { |
1133 | { |
1225 | move_apply (tmp, op, NULL); |
1134 | move_apply (tmp, this, 0); |
1226 | |
1135 | |
1227 | if (was_destroyed (op, tag)) |
1136 | if (destroyed ()) |
1228 | { |
|
|
1229 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1137 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1230 | } |
|
|
1231 | } |
1138 | } |
1232 | |
1139 | |
1233 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1140 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1234 | |
1141 | |
1235 | if (tmp->above == tmp) |
1142 | if (tmp->above == tmp) |
1236 | tmp->above = NULL; |
1143 | tmp->above = 0; |
1237 | |
1144 | |
1238 | last = tmp; |
1145 | last = tmp; |
1239 | } |
1146 | } |
1240 | |
1147 | |
1241 | /* last == NULL of there are no objects on this space */ |
1148 | /* last == NULL of there are no objects on this space */ |
1242 | if (last == NULL) |
1149 | if (!last) |
1243 | { |
1150 | { |
1244 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1151 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1245 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1152 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1246 | * those out anyways, and if there are any flags set right now, they won't |
1153 | * those out anyways, and if there are any flags set right now, they won't |
1247 | * be correct anyways. |
1154 | * be correct anyways. |
1248 | */ |
1155 | */ |
1249 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1156 | SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE); |
1250 | update_position (op->map, op->x, op->y); |
1157 | update_position (map, x, y); |
1251 | } |
1158 | } |
1252 | else |
1159 | else |
1253 | update_object (last, UP_OBJ_REMOVE); |
1160 | update_object (last, UP_OBJ_REMOVE); |
1254 | |
1161 | |
1255 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1162 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1256 | update_all_los (op->map, op->x, op->y); |
1163 | update_all_los (map, x, y); |
1257 | } |
1164 | } |
1258 | } |
1165 | } |
1259 | |
1166 | |
1260 | /* |
1167 | /* |
1261 | * merge_ob(op,top): |
1168 | * merge_ob(op,top): |
… | |
… | |
1276 | |
1183 | |
1277 | for (; top != NULL; top = top->below) |
1184 | for (; top != NULL; top = top->below) |
1278 | { |
1185 | { |
1279 | if (top == op) |
1186 | if (top == op) |
1280 | continue; |
1187 | continue; |
1281 | if (CAN_MERGE (op, top)) |
1188 | |
|
|
1189 | if (object::can_merge (op, top)) |
1282 | { |
1190 | { |
1283 | top->nrof += op->nrof; |
1191 | top->nrof += op->nrof; |
1284 | |
1192 | |
1285 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1193 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1286 | op->weight = 0; /* Don't want any adjustements now */ |
1194 | op->weight = 0; /* Don't want any adjustements now */ |
1287 | remove_ob (op); |
1195 | op->destroy (); |
1288 | free_object (op); |
|
|
1289 | return top; |
1196 | return top; |
1290 | } |
1197 | } |
1291 | } |
1198 | } |
1292 | |
1199 | |
1293 | return 0; |
1200 | return 0; |
… | |
… | |
1296 | /* |
1203 | /* |
1297 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1204 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1298 | * job preparing multi-part monsters |
1205 | * job preparing multi-part monsters |
1299 | */ |
1206 | */ |
1300 | object * |
1207 | object * |
1301 | insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) |
1208 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1302 | { |
1209 | { |
1303 | object *tmp; |
1210 | object *tmp; |
1304 | |
1211 | |
1305 | if (op->head) |
1212 | if (op->head) |
1306 | op = op->head; |
1213 | op = op->head; |
… | |
… | |
1334 | * NULL if 'op' was destroyed |
1241 | * NULL if 'op' was destroyed |
1335 | * just 'op' otherwise |
1242 | * just 'op' otherwise |
1336 | */ |
1243 | */ |
1337 | |
1244 | |
1338 | object * |
1245 | object * |
1339 | insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1246 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1340 | { |
1247 | { |
1341 | object *tmp, *top, *floor = NULL; |
1248 | object *tmp, *top, *floor = NULL; |
1342 | sint16 x, y; |
1249 | sint16 x, y; |
1343 | |
1250 | |
1344 | if (QUERY_FLAG (op, FLAG_FREED)) |
1251 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1347 | return NULL; |
1254 | return NULL; |
1348 | } |
1255 | } |
1349 | |
1256 | |
1350 | if (m == NULL) |
1257 | if (m == NULL) |
1351 | { |
1258 | { |
1352 | dump_object (op); |
1259 | char *dump = dump_object (op); |
1353 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1260 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1261 | free (dump); |
1354 | return op; |
1262 | return op; |
1355 | } |
1263 | } |
1356 | |
1264 | |
1357 | if (out_of_map (m, op->x, op->y)) |
1265 | if (out_of_map (m, op->x, op->y)) |
1358 | { |
1266 | { |
1359 | dump_object (op); |
1267 | char *dump = dump_object (op); |
1360 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1268 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1361 | #ifdef MANY_CORES |
1269 | #ifdef MANY_CORES |
1362 | /* Better to catch this here, as otherwise the next use of this object |
1270 | /* Better to catch this here, as otherwise the next use of this object |
1363 | * is likely to cause a crash. Better to find out where it is getting |
1271 | * is likely to cause a crash. Better to find out where it is getting |
1364 | * improperly inserted. |
1272 | * improperly inserted. |
1365 | */ |
1273 | */ |
1366 | abort (); |
1274 | abort (); |
1367 | #endif |
1275 | #endif |
|
|
1276 | free (dump); |
1368 | return op; |
1277 | return op; |
1369 | } |
1278 | } |
1370 | |
1279 | |
1371 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1280 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1372 | { |
1281 | { |
1373 | dump_object (op); |
1282 | char *dump = dump_object (op); |
1374 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1283 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1284 | free (dump); |
1375 | return op; |
1285 | return op; |
1376 | } |
1286 | } |
1377 | |
1287 | |
1378 | if (op->more != NULL) |
1288 | if (op->more != NULL) |
1379 | { |
1289 | { |
… | |
… | |
1417 | |
1327 | |
1418 | /* this has to be done after we translate the coordinates. |
1328 | /* this has to be done after we translate the coordinates. |
1419 | */ |
1329 | */ |
1420 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1330 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1421 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1331 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1422 | if (CAN_MERGE (op, tmp)) |
1332 | if (object::can_merge (op, tmp)) |
1423 | { |
1333 | { |
1424 | op->nrof += tmp->nrof; |
1334 | op->nrof += tmp->nrof; |
1425 | remove_ob (tmp); |
1335 | tmp->destroy (); |
1426 | free_object (tmp); |
|
|
1427 | } |
1336 | } |
1428 | |
1337 | |
1429 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1338 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1430 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1339 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1431 | |
1340 | |
… | |
… | |
1559 | * it, so save a few ticks and start from there. |
1468 | * it, so save a few ticks and start from there. |
1560 | */ |
1469 | */ |
1561 | if (!(flag & INS_MAP_LOAD)) |
1470 | if (!(flag & INS_MAP_LOAD)) |
1562 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1471 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1563 | if (tmp->type == PLAYER) |
1472 | if (tmp->type == PLAYER) |
1564 | tmp->contr->socket.update_look = 1; |
1473 | tmp->contr->socket->floorbox_update (); |
1565 | |
1474 | |
1566 | /* If this object glows, it may affect lighting conditions that are |
1475 | /* If this object glows, it may affect lighting conditions that are |
1567 | * visible to others on this map. But update_all_los is really |
1476 | * visible to others on this map. But update_all_los is really |
1568 | * an inefficient way to do this, as it means los for all players |
1477 | * an inefficient way to do this, as it means los for all players |
1569 | * on the map will get recalculated. The players could very well |
1478 | * on the map will get recalculated. The players could very well |
… | |
… | |
1577 | |
1486 | |
1578 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1487 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1579 | update_object (op, UP_OBJ_INSERT); |
1488 | update_object (op, UP_OBJ_INSERT); |
1580 | |
1489 | |
1581 | /* Don't know if moving this to the end will break anything. However, |
1490 | /* Don't know if moving this to the end will break anything. However, |
1582 | * we want to have update_look set above before calling this. |
1491 | * we want to have floorbox_update called before calling this. |
1583 | * |
1492 | * |
1584 | * check_move_on() must be after this because code called from |
1493 | * check_move_on() must be after this because code called from |
1585 | * check_move_on() depends on correct map flags (so functions like |
1494 | * check_move_on() depends on correct map flags (so functions like |
1586 | * blocked() and wall() work properly), and these flags are updated by |
1495 | * blocked() and wall() work properly), and these flags are updated by |
1587 | * update_object(). |
1496 | * update_object(). |
… | |
… | |
1617 | tmp1; |
1526 | tmp1; |
1618 | |
1527 | |
1619 | /* first search for itself and remove any old instances */ |
1528 | /* first search for itself and remove any old instances */ |
1620 | |
1529 | |
1621 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1530 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1622 | { |
|
|
1623 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1531 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1624 | { |
1532 | tmp->destroy (); |
1625 | remove_ob (tmp); |
|
|
1626 | free_object (tmp); |
|
|
1627 | } |
|
|
1628 | } |
|
|
1629 | |
1533 | |
1630 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1534 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1631 | |
1535 | |
1632 | tmp1->x = op->x; |
1536 | tmp1->x = op->x; |
1633 | tmp1->y = op->y; |
1537 | tmp1->y = op->y; |
1634 | insert_ob_in_map (tmp1, op->map, op, 0); |
1538 | insert_ob_in_map (tmp1, op->map, op, 0); |
1635 | } |
1539 | } |
… | |
… | |
1643 | */ |
1547 | */ |
1644 | |
1548 | |
1645 | object * |
1549 | object * |
1646 | get_split_ob (object *orig_ob, uint32 nr) |
1550 | get_split_ob (object *orig_ob, uint32 nr) |
1647 | { |
1551 | { |
1648 | object * |
1552 | object *newob; |
1649 | newob; |
|
|
1650 | int |
|
|
1651 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1553 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1652 | |
1554 | |
1653 | if (orig_ob->nrof < nr) |
1555 | if (orig_ob->nrof < nr) |
1654 | { |
1556 | { |
1655 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1557 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1656 | return NULL; |
1558 | return NULL; |
1657 | } |
1559 | } |
1658 | |
1560 | |
1659 | newob = object_create_clone (orig_ob); |
1561 | newob = object_create_clone (orig_ob); |
1660 | |
1562 | |
1661 | if ((orig_ob->nrof -= nr) < 1) |
1563 | if ((orig_ob->nrof -= nr) < 1) |
1662 | { |
1564 | orig_ob->destroy (1); |
1663 | if (!is_removed) |
|
|
1664 | remove_ob (orig_ob); |
|
|
1665 | free_object2 (orig_ob, 1); |
|
|
1666 | } |
|
|
1667 | else if (!is_removed) |
1565 | else if (!is_removed) |
1668 | { |
1566 | { |
1669 | if (orig_ob->env != NULL) |
1567 | if (orig_ob->env != NULL) |
1670 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1568 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1671 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1569 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1701 | if (i > op->nrof) |
1599 | if (i > op->nrof) |
1702 | i = op->nrof; |
1600 | i = op->nrof; |
1703 | |
1601 | |
1704 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1602 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1705 | op->nrof -= i; |
1603 | op->nrof -= i; |
1706 | else if (op->env != NULL) |
1604 | else if (op->env) |
1707 | { |
1605 | { |
1708 | /* is this object in the players inventory, or sub container |
1606 | /* is this object in the players inventory, or sub container |
1709 | * therein? |
1607 | * therein? |
1710 | */ |
1608 | */ |
1711 | tmp = is_player_inv (op->env); |
1609 | tmp = op->in_player (); |
1712 | /* nope. Is this a container the player has opened? |
1610 | /* nope. Is this a container the player has opened? |
1713 | * If so, set tmp to that player. |
1611 | * If so, set tmp to that player. |
1714 | * IMO, searching through all the players will mostly |
1612 | * IMO, searching through all the players will mostly |
1715 | * likely be quicker than following op->env to the map, |
1613 | * likely be quicker than following op->env to the map, |
1716 | * and then searching the map for a player. |
1614 | * and then searching the map for a player. |
1717 | */ |
1615 | */ |
1718 | if (!tmp) |
1616 | if (!tmp) |
1719 | { |
1617 | { |
1720 | for (pl = first_player; pl; pl = pl->next) |
1618 | for (pl = first_player; pl; pl = pl->next) |
1721 | if (pl->ob->container == op->env) |
1619 | if (pl->ob->container == op->env) |
|
|
1620 | { |
|
|
1621 | tmp = pl->ob; |
1722 | break; |
1622 | break; |
1723 | if (pl) |
1623 | } |
1724 | tmp = pl->ob; |
|
|
1725 | else |
|
|
1726 | tmp = NULL; |
|
|
1727 | } |
1624 | } |
1728 | |
1625 | |
1729 | if (i < op->nrof) |
1626 | if (i < op->nrof) |
1730 | { |
1627 | { |
1731 | sub_weight (op->env, op->weight * i); |
1628 | sub_weight (op->env, op->weight * i); |
1732 | op->nrof -= i; |
1629 | op->nrof -= i; |
1733 | if (tmp) |
1630 | if (tmp) |
1734 | { |
|
|
1735 | esrv_send_item (tmp, op); |
1631 | esrv_send_item (tmp, op); |
1736 | } |
|
|
1737 | } |
1632 | } |
1738 | else |
1633 | else |
1739 | { |
1634 | { |
1740 | remove_ob (op); |
1635 | op->remove (); |
1741 | op->nrof = 0; |
1636 | op->nrof = 0; |
1742 | if (tmp) |
1637 | if (tmp) |
1743 | { |
|
|
1744 | esrv_del_item (tmp->contr, op->count); |
1638 | esrv_del_item (tmp->contr, op->count); |
1745 | } |
|
|
1746 | } |
1639 | } |
1747 | } |
1640 | } |
1748 | else |
1641 | else |
1749 | { |
1642 | { |
1750 | object *above = op->above; |
1643 | object *above = op->above; |
1751 | |
1644 | |
1752 | if (i < op->nrof) |
1645 | if (i < op->nrof) |
1753 | op->nrof -= i; |
1646 | op->nrof -= i; |
1754 | else |
1647 | else |
1755 | { |
1648 | { |
1756 | remove_ob (op); |
1649 | op->remove (); |
1757 | op->nrof = 0; |
1650 | op->nrof = 0; |
1758 | } |
1651 | } |
1759 | |
1652 | |
1760 | /* Since we just removed op, op->above is null */ |
1653 | /* Since we just removed op, op->above is null */ |
1761 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1654 | for (tmp = above; tmp; tmp = tmp->above) |
1762 | if (tmp->type == PLAYER) |
1655 | if (tmp->type == PLAYER) |
1763 | { |
1656 | { |
1764 | if (op->nrof) |
1657 | if (op->nrof) |
1765 | esrv_send_item (tmp, op); |
1658 | esrv_send_item (tmp, op); |
1766 | else |
1659 | else |
… | |
… | |
1770 | |
1663 | |
1771 | if (op->nrof) |
1664 | if (op->nrof) |
1772 | return op; |
1665 | return op; |
1773 | else |
1666 | else |
1774 | { |
1667 | { |
1775 | free_object (op); |
1668 | op->destroy (); |
1776 | return NULL; |
1669 | return 0; |
1777 | } |
1670 | } |
1778 | } |
1671 | } |
1779 | |
1672 | |
1780 | /* |
1673 | /* |
1781 | * add_weight(object, weight) adds the specified weight to an object, |
1674 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1793 | op->carrying += weight; |
1686 | op->carrying += weight; |
1794 | op = op->env; |
1687 | op = op->env; |
1795 | } |
1688 | } |
1796 | } |
1689 | } |
1797 | |
1690 | |
|
|
1691 | object * |
|
|
1692 | insert_ob_in_ob (object *op, object *where) |
|
|
1693 | { |
|
|
1694 | if (!where) |
|
|
1695 | { |
|
|
1696 | char *dump = dump_object (op); |
|
|
1697 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1698 | free (dump); |
|
|
1699 | return op; |
|
|
1700 | } |
|
|
1701 | |
|
|
1702 | if (where->head) |
|
|
1703 | { |
|
|
1704 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1705 | where = where->head; |
|
|
1706 | } |
|
|
1707 | |
|
|
1708 | return where->insert (op); |
|
|
1709 | } |
|
|
1710 | |
1798 | /* |
1711 | /* |
1799 | * insert_ob_in_ob(op,environment): |
1712 | * env->insert (op) |
1800 | * This function inserts the object op in the linked list |
1713 | * This function inserts the object op in the linked list |
1801 | * inside the object environment. |
1714 | * inside the object environment. |
1802 | * |
1715 | * |
1803 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1804 | * the inventory at the last position or next to other objects of the same |
|
|
1805 | * type. |
|
|
1806 | * Frank: Now sorted by type, archetype and magic! |
|
|
1807 | * |
|
|
1808 | * The function returns now pointer to inserted item, and return value can |
1716 | * The function returns now pointer to inserted item, and return value can |
1809 | * be != op, if items are merged. -Tero |
1717 | * be != op, if items are merged. -Tero |
1810 | */ |
1718 | */ |
1811 | |
1719 | |
1812 | object * |
1720 | object * |
1813 | insert_ob_in_ob (object *op, object *where) |
1721 | object::insert (object *op) |
1814 | { |
1722 | { |
1815 | object * |
1723 | object *tmp, *otmp; |
1816 | tmp, * |
|
|
1817 | otmp; |
|
|
1818 | |
1724 | |
1819 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1725 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1820 | { |
1726 | op->remove (); |
1821 | dump_object (op); |
|
|
1822 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1823 | return op; |
|
|
1824 | } |
|
|
1825 | |
|
|
1826 | if (where == NULL) |
|
|
1827 | { |
|
|
1828 | dump_object (op); |
|
|
1829 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1830 | return op; |
|
|
1831 | } |
|
|
1832 | |
|
|
1833 | if (where->head) |
|
|
1834 | { |
|
|
1835 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1836 | where = where->head; |
|
|
1837 | } |
|
|
1838 | |
1727 | |
1839 | if (op->more) |
1728 | if (op->more) |
1840 | { |
1729 | { |
1841 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1730 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1842 | return op; |
1731 | return op; |
… | |
… | |
1844 | |
1733 | |
1845 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1734 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1846 | CLEAR_FLAG (op, FLAG_REMOVED); |
1735 | CLEAR_FLAG (op, FLAG_REMOVED); |
1847 | if (op->nrof) |
1736 | if (op->nrof) |
1848 | { |
1737 | { |
1849 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1738 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1850 | if (CAN_MERGE (tmp, op)) |
1739 | if (object::can_merge (tmp, op)) |
1851 | { |
1740 | { |
1852 | /* return the original object and remove inserted object |
1741 | /* return the original object and remove inserted object |
1853 | (client needs the original object) */ |
1742 | (client needs the original object) */ |
1854 | tmp->nrof += op->nrof; |
1743 | tmp->nrof += op->nrof; |
1855 | /* Weight handling gets pretty funky. Since we are adding to |
1744 | /* Weight handling gets pretty funky. Since we are adding to |
1856 | * tmp->nrof, we need to increase the weight. |
1745 | * tmp->nrof, we need to increase the weight. |
1857 | */ |
1746 | */ |
1858 | add_weight (where, op->weight * op->nrof); |
1747 | add_weight (this, op->weight * op->nrof); |
1859 | SET_FLAG (op, FLAG_REMOVED); |
1748 | SET_FLAG (op, FLAG_REMOVED); |
1860 | free_object (op); /* free the inserted object */ |
1749 | op->destroy (); /* free the inserted object */ |
1861 | op = tmp; |
1750 | op = tmp; |
1862 | remove_ob (op); /* and fix old object's links */ |
1751 | op->remove (); /* and fix old object's links */ |
1863 | CLEAR_FLAG (op, FLAG_REMOVED); |
1752 | CLEAR_FLAG (op, FLAG_REMOVED); |
1864 | break; |
1753 | break; |
1865 | } |
1754 | } |
1866 | |
1755 | |
1867 | /* I assume combined objects have no inventory |
1756 | /* I assume combined objects have no inventory |
1868 | * We add the weight - this object could have just been removed |
1757 | * We add the weight - this object could have just been removed |
1869 | * (if it was possible to merge). calling remove_ob will subtract |
1758 | * (if it was possible to merge). calling remove_ob will subtract |
1870 | * the weight, so we need to add it in again, since we actually do |
1759 | * the weight, so we need to add it in again, since we actually do |
1871 | * the linking below |
1760 | * the linking below |
1872 | */ |
1761 | */ |
1873 | add_weight (where, op->weight * op->nrof); |
1762 | add_weight (this, op->weight * op->nrof); |
1874 | } |
1763 | } |
1875 | else |
1764 | else |
1876 | add_weight (where, (op->weight + op->carrying)); |
1765 | add_weight (this, (op->weight + op->carrying)); |
1877 | |
1766 | |
1878 | otmp = is_player_inv (where); |
1767 | otmp = this->in_player (); |
1879 | if (otmp && otmp->contr != NULL) |
1768 | if (otmp && otmp->contr) |
1880 | { |
|
|
1881 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1769 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1882 | fix_player (otmp); |
1770 | fix_player (otmp); |
1883 | } |
|
|
1884 | |
1771 | |
1885 | op->map = NULL; |
1772 | op->map = 0; |
1886 | op->env = where; |
1773 | op->env = this; |
1887 | op->above = NULL; |
1774 | op->above = 0; |
1888 | op->below = NULL; |
1775 | op->below = 0; |
1889 | op->x = 0, op->y = 0; |
1776 | op->x = 0, op->y = 0; |
1890 | |
1777 | |
1891 | /* reset the light list and los of the players on the map */ |
1778 | /* reset the light list and los of the players on the map */ |
1892 | if ((op->glow_radius != 0) && where->map) |
1779 | if ((op->glow_radius != 0) && map) |
1893 | { |
1780 | { |
1894 | #ifdef DEBUG_LIGHTS |
1781 | #ifdef DEBUG_LIGHTS |
1895 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1782 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1896 | #endif /* DEBUG_LIGHTS */ |
1783 | #endif /* DEBUG_LIGHTS */ |
1897 | if (MAP_DARKNESS (where->map)) |
1784 | if (MAP_DARKNESS (map)) |
1898 | update_all_los (where->map, where->x, where->y); |
1785 | update_all_los (map, x, y); |
1899 | } |
1786 | } |
1900 | |
1787 | |
1901 | /* Client has no idea of ordering so lets not bother ordering it here. |
1788 | /* Client has no idea of ordering so lets not bother ordering it here. |
1902 | * It sure simplifies this function... |
1789 | * It sure simplifies this function... |
1903 | */ |
1790 | */ |
1904 | if (where->inv == NULL) |
1791 | if (!inv) |
1905 | where->inv = op; |
1792 | inv = op; |
1906 | else |
1793 | else |
1907 | { |
1794 | { |
1908 | op->below = where->inv; |
1795 | op->below = inv; |
1909 | op->below->above = op; |
1796 | op->below->above = op; |
1910 | where->inv = op; |
1797 | inv = op; |
1911 | } |
1798 | } |
|
|
1799 | |
1912 | return op; |
1800 | return op; |
1913 | } |
1801 | } |
1914 | |
1802 | |
1915 | /* |
1803 | /* |
1916 | * Checks if any objects has a move_type that matches objects |
1804 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1934 | */ |
1822 | */ |
1935 | |
1823 | |
1936 | int |
1824 | int |
1937 | check_move_on (object *op, object *originator) |
1825 | check_move_on (object *op, object *originator) |
1938 | { |
1826 | { |
1939 | object * |
1827 | object *tmp; |
1940 | tmp; |
1828 | maptile *m = op->map; |
1941 | tag_t |
|
|
1942 | tag; |
|
|
1943 | mapstruct * |
|
|
1944 | m = op->map; |
|
|
1945 | int |
|
|
1946 | x = op->x, y = op->y; |
1829 | int x = op->x, y = op->y; |
1947 | |
1830 | |
1948 | MoveType |
1831 | MoveType move_on, move_slow, move_block; |
1949 | move_on, |
|
|
1950 | move_slow, |
|
|
1951 | move_block; |
|
|
1952 | |
1832 | |
1953 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1833 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1954 | return 0; |
1834 | return 0; |
1955 | |
|
|
1956 | tag = op->count; |
|
|
1957 | |
1835 | |
1958 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1836 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1959 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1837 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1960 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1838 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1961 | |
1839 | |
… | |
… | |
2022 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1900 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2023 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1901 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
2024 | { |
1902 | { |
2025 | move_apply (tmp, op, originator); |
1903 | move_apply (tmp, op, originator); |
2026 | |
1904 | |
2027 | if (was_destroyed (op, tag)) |
1905 | if (op->destroyed ()) |
2028 | return 1; |
1906 | return 1; |
2029 | |
1907 | |
2030 | /* what the person/creature stepped onto has moved the object |
1908 | /* what the person/creature stepped onto has moved the object |
2031 | * someplace new. Don't process any further - if we did, |
1909 | * someplace new. Don't process any further - if we did, |
2032 | * have a feeling strange problems would result. |
1910 | * have a feeling strange problems would result. |
… | |
… | |
2044 | * a matching archetype at the given map and coordinates. |
1922 | * a matching archetype at the given map and coordinates. |
2045 | * The first matching object is returned, or NULL if none. |
1923 | * The first matching object is returned, or NULL if none. |
2046 | */ |
1924 | */ |
2047 | |
1925 | |
2048 | object * |
1926 | object * |
2049 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
1927 | present_arch (const archetype *at, maptile *m, int x, int y) |
2050 | { |
1928 | { |
2051 | object * |
1929 | object * |
2052 | tmp; |
1930 | tmp; |
2053 | |
1931 | |
2054 | if (m == NULL || out_of_map (m, x, y)) |
1932 | if (m == NULL || out_of_map (m, x, y)) |
… | |
… | |
2067 | * a matching type variable at the given map and coordinates. |
1945 | * a matching type variable at the given map and coordinates. |
2068 | * The first matching object is returned, or NULL if none. |
1946 | * The first matching object is returned, or NULL if none. |
2069 | */ |
1947 | */ |
2070 | |
1948 | |
2071 | object * |
1949 | object * |
2072 | present (unsigned char type, mapstruct *m, int x, int y) |
1950 | present (unsigned char type, maptile *m, int x, int y) |
2073 | { |
1951 | { |
2074 | object * |
1952 | object * |
2075 | tmp; |
1953 | tmp; |
2076 | |
1954 | |
2077 | if (out_of_map (m, x, y)) |
1955 | if (out_of_map (m, x, y)) |
… | |
… | |
2217 | * the archetype because that isn't correct if the monster has been |
2095 | * the archetype because that isn't correct if the monster has been |
2218 | * customized, changed states, etc. |
2096 | * customized, changed states, etc. |
2219 | */ |
2097 | */ |
2220 | |
2098 | |
2221 | int |
2099 | int |
2222 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
2100 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2223 | { |
2101 | { |
2224 | int |
2102 | int |
2225 | i, |
2103 | i, |
2226 | index = 0, flag; |
2104 | index = 0, flag; |
2227 | static int |
2105 | static int |
… | |
… | |
2239 | * if the space being examined only has a wall to the north and empty |
2117 | * if the space being examined only has a wall to the north and empty |
2240 | * spaces in all the other directions, this will reduce the search space |
2118 | * spaces in all the other directions, this will reduce the search space |
2241 | * to only the spaces immediately surrounding the target area, and |
2119 | * to only the spaces immediately surrounding the target area, and |
2242 | * won't look 2 spaces south of the target space. |
2120 | * won't look 2 spaces south of the target space. |
2243 | */ |
2121 | */ |
2244 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2122 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2245 | stop = maxfree[i]; |
2123 | stop = maxfree[i]; |
2246 | } |
2124 | } |
|
|
2125 | |
2247 | if (!index) |
2126 | if (!index) |
2248 | return -1; |
2127 | return -1; |
|
|
2128 | |
2249 | return altern[RANDOM () % index]; |
2129 | return altern[RANDOM () % index]; |
2250 | } |
2130 | } |
2251 | |
2131 | |
2252 | /* |
2132 | /* |
2253 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2133 | * find_first_free_spot(archetype, maptile, x, y) works like |
2254 | * find_free_spot(), but it will search max number of squares. |
2134 | * find_free_spot(), but it will search max number of squares. |
2255 | * But it will return the first available spot, not a random choice. |
2135 | * But it will return the first available spot, not a random choice. |
2256 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2136 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2257 | */ |
2137 | */ |
2258 | |
2138 | |
2259 | int |
2139 | int |
2260 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
2140 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2261 | { |
2141 | { |
2262 | int |
2142 | int |
2263 | i; |
2143 | i; |
2264 | |
2144 | |
2265 | for (i = 0; i < SIZEOFFREE; i++) |
2145 | for (i = 0; i < SIZEOFFREE; i++) |
… | |
… | |
2329 | * because we have to know what movement the thing looking to move |
2209 | * because we have to know what movement the thing looking to move |
2330 | * there is capable of. |
2210 | * there is capable of. |
2331 | */ |
2211 | */ |
2332 | |
2212 | |
2333 | int |
2213 | int |
2334 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2214 | find_dir (maptile *m, int x, int y, object *exclude) |
2335 | { |
2215 | { |
2336 | int |
2216 | int |
2337 | i, |
2217 | i, |
2338 | max = SIZEOFFREE, mflags; |
2218 | max = SIZEOFFREE, mflags; |
2339 | |
2219 | |
2340 | sint16 nx, ny; |
2220 | sint16 nx, ny; |
2341 | object * |
2221 | object * |
2342 | tmp; |
2222 | tmp; |
2343 | mapstruct * |
2223 | maptile * |
2344 | mp; |
2224 | mp; |
2345 | |
2225 | |
2346 | MoveType blocked, move_type; |
2226 | MoveType blocked, move_type; |
2347 | |
2227 | |
2348 | if (exclude && exclude->head) |
2228 | if (exclude && exclude->head) |
… | |
… | |
2556 | * Modified to be map tile aware -.MSW |
2436 | * Modified to be map tile aware -.MSW |
2557 | */ |
2437 | */ |
2558 | |
2438 | |
2559 | |
2439 | |
2560 | int |
2440 | int |
2561 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2441 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2562 | { |
2442 | { |
2563 | sint16 dx, dy; |
2443 | sint16 dx, dy; |
2564 | int |
2444 | int |
2565 | mflags; |
2445 | mflags; |
2566 | |
2446 | |
… | |
… | |
2615 | * create clone from object to another |
2495 | * create clone from object to another |
2616 | */ |
2496 | */ |
2617 | object * |
2497 | object * |
2618 | object_create_clone (object *asrc) |
2498 | object_create_clone (object *asrc) |
2619 | { |
2499 | { |
2620 | object * |
|
|
2621 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2500 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2622 | |
2501 | |
2623 | if (!asrc) |
2502 | if (!asrc) |
2624 | return NULL; |
2503 | return 0; |
|
|
2504 | |
2625 | src = asrc; |
2505 | src = asrc; |
2626 | if (src->head) |
2506 | if (src->head) |
2627 | src = src->head; |
2507 | src = src->head; |
2628 | |
2508 | |
2629 | prev = NULL; |
2509 | prev = 0; |
2630 | for (part = src; part; part = part->more) |
2510 | for (part = src; part; part = part->more) |
2631 | { |
2511 | { |
2632 | tmp = get_object (); |
2512 | tmp = part->clone (); |
2633 | copy_object (part, tmp); |
|
|
2634 | tmp->x -= src->x; |
2513 | tmp->x -= src->x; |
2635 | tmp->y -= src->y; |
2514 | tmp->y -= src->y; |
|
|
2515 | |
2636 | if (!part->head) |
2516 | if (!part->head) |
2637 | { |
2517 | { |
2638 | dst = tmp; |
2518 | dst = tmp; |
2639 | tmp->head = NULL; |
2519 | tmp->head = 0; |
2640 | } |
2520 | } |
2641 | else |
2521 | else |
2642 | { |
2522 | { |
2643 | tmp->head = dst; |
2523 | tmp->head = dst; |
2644 | } |
2524 | } |
|
|
2525 | |
2645 | tmp->more = NULL; |
2526 | tmp->more = 0; |
|
|
2527 | |
2646 | if (prev) |
2528 | if (prev) |
2647 | prev->more = tmp; |
2529 | prev->more = tmp; |
|
|
2530 | |
2648 | prev = tmp; |
2531 | prev = tmp; |
2649 | } |
2532 | } |
2650 | |
2533 | |
2651 | /*** copy inventory ***/ |
|
|
2652 | for (item = src->inv; item; item = item->below) |
2534 | for (item = src->inv; item; item = item->below) |
2653 | { |
|
|
2654 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2535 | insert_ob_in_ob (object_create_clone (item), dst); |
2655 | } |
|
|
2656 | |
2536 | |
2657 | return dst; |
2537 | return dst; |
2658 | } |
2538 | } |
2659 | |
2539 | |
2660 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2661 | int |
|
|
2662 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2663 | { |
|
|
2664 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2665 | * robust */ |
|
|
2666 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2667 | } |
|
|
2668 | |
|
|
2669 | /* GROS - Creates an object using a string representing its content. */ |
2540 | /* GROS - Creates an object using a string representing its content. */ |
2670 | |
|
|
2671 | /* Basically, we save the content of the string to a temp file, then call */ |
2541 | /* Basically, we save the content of the string to a temp file, then call */ |
2672 | |
|
|
2673 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2542 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2674 | |
|
|
2675 | /* but it was simple to make and allows reusing the load_object function. */ |
2543 | /* but it was simple to make and allows reusing the load_object function. */ |
2676 | |
|
|
2677 | /* Remember not to use load_object_str in a time-critical situation. */ |
2544 | /* Remember not to use load_object_str in a time-critical situation. */ |
2678 | |
|
|
2679 | /* Also remember that multiparts objects are not supported for now. */ |
2545 | /* Also remember that multiparts objects are not supported for now. */ |
2680 | |
2546 | |
2681 | object * |
2547 | object * |
2682 | load_object_str (const char *obstr) |
2548 | load_object_str (const char *obstr) |
2683 | { |
2549 | { |
2684 | object * |
2550 | object *op; |
2685 | op; |
|
|
2686 | char |
|
|
2687 | filename[MAX_BUF]; |
2551 | char filename[MAX_BUF]; |
2688 | |
2552 | |
2689 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2553 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2690 | |
2554 | |
2691 | FILE * |
|
|
2692 | tempfile = fopen (filename, "w"); |
2555 | FILE *tempfile = fopen (filename, "w"); |
2693 | |
2556 | |
2694 | if (tempfile == NULL) |
2557 | if (tempfile == NULL) |
2695 | { |
2558 | { |
2696 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2559 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2697 | return NULL; |
2560 | return NULL; |
2698 | } |
2561 | } |
2699 | |
2562 | |
2700 | fprintf (tempfile, obstr); |
2563 | fprintf (tempfile, obstr); |
2701 | fclose (tempfile); |
2564 | fclose (tempfile); |
2702 | |
2565 | |
2703 | op = get_object (); |
2566 | op = object::create (); |
2704 | |
2567 | |
2705 | object_thawer thawer (filename); |
2568 | object_thawer thawer (filename); |
2706 | |
2569 | |
2707 | if (thawer) |
2570 | if (thawer) |
2708 | load_object (thawer, op, 0); |
2571 | load_object (thawer, op, 0); |
… | |
… | |
2718 | * returns NULL if no match. |
2581 | * returns NULL if no match. |
2719 | */ |
2582 | */ |
2720 | object * |
2583 | object * |
2721 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2584 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2722 | { |
2585 | { |
2723 | object * |
2586 | object *tmp; |
2724 | tmp; |
|
|
2725 | |
2587 | |
2726 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2588 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2727 | if (tmp->type == type && tmp->subtype == subtype) |
2589 | if (tmp->type == type && tmp->subtype == subtype) |
2728 | return tmp; |
2590 | return tmp; |
2729 | |
2591 | |
… | |
… | |
2737 | * do the desired thing. |
2599 | * do the desired thing. |
2738 | */ |
2600 | */ |
2739 | key_value * |
2601 | key_value * |
2740 | get_ob_key_link (const object *ob, const char *key) |
2602 | get_ob_key_link (const object *ob, const char *key) |
2741 | { |
2603 | { |
2742 | key_value * |
2604 | key_value *link; |
2743 | link; |
|
|
2744 | |
2605 | |
2745 | for (link = ob->key_values; link != NULL; link = link->next) |
2606 | for (link = ob->key_values; link != NULL; link = link->next) |
2746 | { |
|
|
2747 | if (link->key == key) |
2607 | if (link->key == key) |
2748 | { |
|
|
2749 | return link; |
2608 | return link; |
2750 | } |
|
|
2751 | } |
|
|
2752 | |
2609 | |
2753 | return NULL; |
2610 | return NULL; |
2754 | } |
2611 | } |
2755 | |
2612 | |
2756 | /* |
2613 | /* |