… | |
… | |
139 | |
139 | |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
141 | static bool |
141 | static bool |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
143 | { |
143 | { |
144 | key_value *wants_field; |
|
|
145 | |
|
|
146 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
144 | /* n-squared behaviour (see kv_get), but I'm hoping both |
147 | * objects with lists are rare, and lists stay short. If not, use a |
145 | * objects with lists are rare, and lists stay short. If not, use a |
148 | * different structure or at least keep the lists sorted... |
146 | * different structure or at least keep the lists sorted... |
149 | */ |
147 | */ |
150 | |
148 | |
151 | /* For each field in wants, */ |
149 | /* For each field in wants, */ |
152 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
150 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
153 | { |
151 | if (has->kv_get (kv->key) != kv->value) |
154 | key_value *has_field; |
152 | return false; |
155 | |
|
|
156 | /* Look for a field in has with the same key. */ |
|
|
157 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
158 | |
|
|
159 | if (!has_field) |
|
|
160 | return 0; /* No field with that name. */ |
|
|
161 | |
|
|
162 | /* Found the matching field. */ |
|
|
163 | if (has_field->value != wants_field->value) |
|
|
164 | return 0; /* Values don't match, so this half of the comparison is false. */ |
|
|
165 | |
|
|
166 | /* If we get here, we found a match. Now for the next field in wants. */ |
|
|
167 | } |
|
|
168 | |
153 | |
169 | /* If we get here, every field in wants has a matching field in has. */ |
154 | /* If we get here, every field in wants has a matching field in has. */ |
170 | return 1; |
155 | return true; |
171 | } |
156 | } |
172 | |
157 | |
173 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
158 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
174 | static bool |
159 | static bool |
175 | compare_ob_value_lists (const object *ob1, const object *ob2) |
160 | compare_ob_value_lists (const object *ob1, const object *ob2) |
176 | { |
161 | { |
177 | /* However, there may be fields in has which aren't partnered in wants, |
162 | /* However, there may be fields in has which aren't partnered in wants, |
178 | * so we need to run the comparison *twice*. :( |
163 | * so we need to run the comparison *twice*. :( |
179 | */ |
164 | */ |
180 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
165 | return compare_ob_value_lists_one (ob1, ob2) |
|
|
166 | && compare_ob_value_lists_one (ob2, ob1); |
181 | } |
167 | } |
182 | |
168 | |
183 | /* Function examines the 2 objects given to it, and returns true if |
169 | /* Function examines the 2 objects given to it, and returns true if |
184 | * they can be merged together. |
170 | * they can be merged together. |
185 | * |
171 | * |
… | |
… | |
220 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | |
207 | |
222 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | |
210 | |
225 | if (ob1->arch->name != ob2->arch->name |
211 | if (ob1->arch->archname != ob2->arch->archname |
226 | || ob1->name != ob2->name |
212 | || ob1->name != ob2->name |
227 | || ob1->title != ob2->title |
213 | || ob1->title != ob2->title |
228 | || ob1->msg != ob2->msg |
214 | || ob1->msg != ob2->msg |
229 | || ob1->weight != ob2->weight |
215 | || ob1->weight != ob2->weight |
230 | || ob1->attacktype != ob2->attacktype |
216 | || ob1->attacktype != ob2->attacktype |
231 | || ob1->magic != ob2->magic |
217 | || ob1->magic != ob2->magic |
232 | || ob1->slaying != ob2->slaying |
218 | || ob1->slaying != ob2->slaying |
233 | || ob1->skill != ob2->skill |
219 | || ob1->skill != ob2->skill |
234 | || ob1->value != ob2->value |
220 | || ob1->value != ob2->value |
235 | || ob1->animation_id != ob2->animation_id |
221 | || ob1->animation_id != ob2->animation_id |
|
|
222 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
236 | || ob1->client_type != ob2->client_type |
223 | || ob1->client_type != ob2->client_type |
237 | || ob1->materialname != ob2->materialname |
224 | || ob1->materialname != ob2->materialname |
238 | || ob1->lore != ob2->lore |
225 | || ob1->lore != ob2->lore |
239 | || ob1->subtype != ob2->subtype |
226 | || ob1->subtype != ob2->subtype |
240 | || ob1->move_type != ob2->move_type |
227 | || ob1->move_type != ob2->move_type |
… | |
… | |
330 | |
317 | |
331 | /* Everything passes, must be OK. */ |
318 | /* Everything passes, must be OK. */ |
332 | return 1; |
319 | return 1; |
333 | } |
320 | } |
334 | |
321 | |
|
|
322 | // find player who can see this object |
|
|
323 | object * |
|
|
324 | object::visible_to () const |
|
|
325 | { |
|
|
326 | if (client_visible () && !flag [FLAG_REMOVED]) |
|
|
327 | { |
|
|
328 | // see if we are in a container of sorts |
|
|
329 | if (env) |
|
|
330 | { |
|
|
331 | // the player inventory itself is always visible |
|
|
332 | if (env->type == PLAYER) |
|
|
333 | return env; |
|
|
334 | |
|
|
335 | // else a player could have our env open |
|
|
336 | object *envest = env->outer_env (); |
|
|
337 | |
|
|
338 | // the player itself is always on a map, so we will find him here |
|
|
339 | // even if our inv is in a player. |
|
|
340 | if (envest->is_on_map ()) |
|
|
341 | if (object *pl = envest->ms ().player ()) |
|
|
342 | if (pl->container == env) |
|
|
343 | return pl; |
|
|
344 | } |
|
|
345 | else |
|
|
346 | { |
|
|
347 | // maybe there is a player standing on the same mapspace |
|
|
348 | // this will catch the case where "this" is a player |
|
|
349 | if (object *pl = ms ().player ()) |
|
|
350 | if (!pl->container || this == pl->container) |
|
|
351 | return pl; |
|
|
352 | } |
|
|
353 | } |
|
|
354 | |
|
|
355 | return 0; |
|
|
356 | } |
|
|
357 | |
335 | // adjust weight per container type ("of holding") |
358 | // adjust weight per container type ("of holding") |
336 | static sint32 |
359 | static sint32 |
337 | weight_adjust (object *op, sint32 weight) |
360 | weight_adjust_for (object *op, sint32 weight) |
338 | { |
361 | { |
339 | return op->type == CONTAINER |
362 | return op->type == CONTAINER |
340 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
363 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
341 | : weight; |
364 | : weight; |
342 | } |
365 | } |
… | |
… | |
348 | static void |
371 | static void |
349 | adjust_weight (object *op, sint32 weight) |
372 | adjust_weight (object *op, sint32 weight) |
350 | { |
373 | { |
351 | while (op) |
374 | while (op) |
352 | { |
375 | { |
|
|
376 | // adjust by actual difference to account for rounding errors |
|
|
377 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
353 | weight = weight_adjust (op, weight); |
378 | weight = weight_adjust_for (op, op->carrying) |
|
|
379 | - weight_adjust_for (op, op->carrying - weight); |
354 | |
380 | |
355 | if (!weight) |
381 | if (!weight) |
356 | return; |
382 | return; |
357 | |
383 | |
358 | op->carrying += weight; |
384 | op->carrying += weight; |
359 | |
385 | |
360 | if (object *pl = op->visible_to ()) |
386 | if (object *pl = op->visible_to ()) |
|
|
387 | if (pl != op) // player is handled lazily |
361 | esrv_update_item (UPD_WEIGHT, pl, op); |
388 | esrv_update_item (UPD_WEIGHT, pl, op); |
362 | |
389 | |
363 | op = op->env; |
390 | op = op->env; |
364 | } |
391 | } |
365 | } |
392 | } |
366 | |
393 | |
… | |
… | |
380 | op->update_weight (); |
407 | op->update_weight (); |
381 | |
408 | |
382 | sum += op->total_weight (); |
409 | sum += op->total_weight (); |
383 | } |
410 | } |
384 | |
411 | |
385 | sum = weight_adjust (this, sum); |
412 | sum = weight_adjust_for (this, sum); |
386 | |
413 | |
387 | if (sum != carrying) |
414 | if (sum != carrying) |
388 | { |
415 | { |
389 | carrying = sum; |
416 | carrying = sum; |
390 | |
417 | |
391 | if (object *pl = visible_to ()) |
418 | if (object *pl = visible_to ()) |
|
|
419 | if (pl != this) // player is handled lazily |
392 | esrv_update_item (UPD_WEIGHT, pl, this); |
420 | esrv_update_item (UPD_WEIGHT, pl, this); |
393 | } |
421 | } |
394 | } |
422 | } |
395 | |
423 | |
396 | /* |
424 | /* |
397 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
425 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
… | |
… | |
451 | */ |
479 | */ |
452 | object * |
480 | object * |
453 | find_object_name (const char *str) |
481 | find_object_name (const char *str) |
454 | { |
482 | { |
455 | shstr_cmp str_ (str); |
483 | shstr_cmp str_ (str); |
456 | object *op; |
|
|
457 | |
484 | |
|
|
485 | if (str_) |
458 | for_all_objects (op) |
486 | for_all_objects (op) |
459 | if (op->name == str_) |
487 | if (op->name == str_) |
460 | break; |
488 | return op; |
461 | |
489 | |
462 | return op; |
490 | return 0; |
463 | } |
491 | } |
464 | |
492 | |
465 | /* |
493 | /* |
466 | * Sets the owner and sets the skill and exp pointers to owner's current |
494 | * Sets the owner and sets the skill and exp pointers to owner's current |
467 | * skill and experience objects. |
495 | * skill and experience objects. |
… | |
… | |
565 | } |
593 | } |
566 | |
594 | |
567 | op->key_values = 0; |
595 | op->key_values = 0; |
568 | } |
596 | } |
569 | |
597 | |
570 | object & |
598 | /* |
571 | object::operator =(const object &src) |
599 | * copy_to first frees everything allocated by the dst object, |
|
|
600 | * and then copies the contents of itself into the second |
|
|
601 | * object, allocating what needs to be allocated. Basically, any |
|
|
602 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
603 | * if the first object is freed, the pointers in the new object |
|
|
604 | * will point at garbage. |
|
|
605 | */ |
|
|
606 | void |
|
|
607 | object::copy_to (object *dst) |
572 | { |
608 | { |
573 | bool is_freed = flag [FLAG_FREED]; |
609 | dst->remove (); |
574 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
575 | |
|
|
576 | *(object_copy *)this = src; |
610 | *(object_copy *)dst = *this; |
577 | |
|
|
578 | flag [FLAG_FREED] = is_freed; |
|
|
579 | flag [FLAG_REMOVED] = is_removed; |
611 | dst->flag [FLAG_REMOVED] = true; |
580 | |
612 | |
581 | /* Copy over key_values, if any. */ |
613 | /* Copy over key_values, if any. */ |
582 | if (src.key_values) |
614 | if (key_values) |
583 | { |
615 | { |
584 | key_value *tail = 0; |
616 | key_value *tail = 0; |
585 | key_values = 0; |
617 | dst->key_values = 0; |
586 | |
618 | |
587 | for (key_value *i = src.key_values; i; i = i->next) |
619 | for (key_value *i = key_values; i; i = i->next) |
588 | { |
620 | { |
589 | key_value *new_link = new key_value; |
621 | key_value *new_link = new key_value; |
590 | |
622 | |
591 | new_link->next = 0; |
623 | new_link->next = 0; |
592 | new_link->key = i->key; |
624 | new_link->key = i->key; |
593 | new_link->value = i->value; |
625 | new_link->value = i->value; |
594 | |
626 | |
595 | /* Try and be clever here, too. */ |
627 | /* Try and be clever here, too. */ |
596 | if (!key_values) |
628 | if (!dst->key_values) |
597 | { |
629 | { |
598 | key_values = new_link; |
630 | dst->key_values = new_link; |
599 | tail = new_link; |
631 | tail = new_link; |
600 | } |
632 | } |
601 | else |
633 | else |
602 | { |
634 | { |
603 | tail->next = new_link; |
635 | tail->next = new_link; |
604 | tail = new_link; |
636 | tail = new_link; |
605 | } |
637 | } |
606 | } |
638 | } |
607 | } |
639 | } |
608 | } |
|
|
609 | |
|
|
610 | /* |
|
|
611 | * copy_to first frees everything allocated by the dst object, |
|
|
612 | * and then copies the contents of itself into the second |
|
|
613 | * object, allocating what needs to be allocated. Basically, any |
|
|
614 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
615 | * if the first object is freed, the pointers in the new object |
|
|
616 | * will point at garbage. |
|
|
617 | */ |
|
|
618 | void |
|
|
619 | object::copy_to (object *dst) |
|
|
620 | { |
|
|
621 | *dst = *this; |
|
|
622 | |
640 | |
623 | if (speed < 0) |
641 | if (speed < 0) |
624 | dst->speed_left -= rndm (); |
642 | dst->speed_left -= rndm (); |
625 | |
643 | |
626 | dst->set_speed (dst->speed); |
644 | dst->set_speed (dst->speed); |
… | |
… | |
648 | object * |
666 | object * |
649 | object::clone () |
667 | object::clone () |
650 | { |
668 | { |
651 | object *neu = create (); |
669 | object *neu = create (); |
652 | copy_to (neu); |
670 | copy_to (neu); |
|
|
671 | neu->map = map; // not copied by copy_to |
653 | return neu; |
672 | return neu; |
654 | } |
673 | } |
655 | |
674 | |
656 | /* |
675 | /* |
657 | * If an object with the IS_TURNABLE() flag needs to be turned due |
676 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
708 | * UP_OBJ_FACE: only the objects face has changed. |
727 | * UP_OBJ_FACE: only the objects face has changed. |
709 | */ |
728 | */ |
710 | void |
729 | void |
711 | update_object (object *op, int action) |
730 | update_object (object *op, int action) |
712 | { |
731 | { |
713 | if (op == NULL) |
732 | if (!op) |
714 | { |
733 | { |
715 | /* this should never happen */ |
734 | /* this should never happen */ |
716 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
735 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
717 | return; |
736 | return; |
718 | } |
737 | } |
719 | |
738 | |
720 | if (op->env) |
739 | if (!op->is_on_map ()) |
721 | { |
740 | { |
722 | /* Animation is currently handled by client, so nothing |
741 | /* Animation is currently handled by client, so nothing |
723 | * to do in this case. |
742 | * to do in this case. |
724 | */ |
743 | */ |
725 | return; |
744 | return; |
726 | } |
745 | } |
727 | |
|
|
728 | /* If the map is saving, don't do anything as everything is |
|
|
729 | * going to get freed anyways. |
|
|
730 | */ |
|
|
731 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
732 | return; |
|
|
733 | |
746 | |
734 | /* make sure the object is within map boundaries */ |
747 | /* make sure the object is within map boundaries */ |
735 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
748 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
736 | { |
749 | { |
737 | LOG (llevError, "update_object() called for object out of map!\n"); |
750 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
880 | object::destroy_inv (bool drop_to_ground) |
893 | object::destroy_inv (bool drop_to_ground) |
881 | { |
894 | { |
882 | // need to check first, because the checks below might segfault |
895 | // need to check first, because the checks below might segfault |
883 | // as we might be on an invalid mapspace and crossfire code |
896 | // as we might be on an invalid mapspace and crossfire code |
884 | // is too buggy to ensure that the inventory is empty. |
897 | // is too buggy to ensure that the inventory is empty. |
885 | // corollary: if you create arrows etc. with stuff in tis inventory, |
898 | // corollary: if you create arrows etc. with stuff in its inventory, |
886 | // cf will crash below with off-map x and y |
899 | // cf will crash below with off-map x and y |
887 | if (!inv) |
900 | if (!inv) |
888 | return; |
901 | return; |
889 | |
902 | |
890 | /* Only if the space blocks everything do we not process - |
903 | /* Only if the space blocks everything do we not process - |
… | |
… | |
892 | * drop on that space. |
905 | * drop on that space. |
893 | */ |
906 | */ |
894 | if (!drop_to_ground |
907 | if (!drop_to_ground |
895 | || !map |
908 | || !map |
896 | || map->in_memory != MAP_ACTIVE |
909 | || map->in_memory != MAP_ACTIVE |
897 | || map->nodrop |
910 | || map->no_drop |
898 | || ms ().move_block == MOVE_ALL) |
911 | || ms ().move_block == MOVE_ALL) |
899 | { |
912 | { |
900 | while (inv) |
913 | while (inv) |
901 | { |
914 | { |
902 | inv->destroy_inv (drop_to_ground); |
915 | inv->destroy_inv (false); |
903 | inv->destroy (); |
916 | inv->destroy (); |
904 | } |
917 | } |
905 | } |
918 | } |
906 | else |
919 | else |
907 | { /* Put objects in inventory onto this space */ |
920 | { /* Put objects in inventory onto this space */ |
… | |
… | |
913 | || op->flag [FLAG_NO_DROP] |
926 | || op->flag [FLAG_NO_DROP] |
914 | || op->type == RUNE |
927 | || op->type == RUNE |
915 | || op->type == TRAP |
928 | || op->type == TRAP |
916 | || op->flag [FLAG_IS_A_TEMPLATE] |
929 | || op->flag [FLAG_IS_A_TEMPLATE] |
917 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
930 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
918 | op->destroy (); |
931 | op->destroy (true); |
919 | else |
932 | else |
920 | map->insert (op, x, y); |
933 | map->insert (op, x, y); |
921 | } |
934 | } |
922 | } |
935 | } |
923 | } |
936 | } |
… | |
… | |
927 | object *op = new object; |
940 | object *op = new object; |
928 | op->link (); |
941 | op->link (); |
929 | return op; |
942 | return op; |
930 | } |
943 | } |
931 | |
944 | |
|
|
945 | static struct freed_map : maptile |
|
|
946 | { |
|
|
947 | freed_map () |
|
|
948 | { |
|
|
949 | path = "<freed objects map>"; |
|
|
950 | name = "/internal/freed_objects_map"; |
|
|
951 | width = 3; |
|
|
952 | height = 3; |
|
|
953 | no_drop = 1; |
|
|
954 | no_reset = 1; |
|
|
955 | |
|
|
956 | alloc (); |
|
|
957 | in_memory = MAP_ACTIVE; |
|
|
958 | } |
|
|
959 | |
|
|
960 | ~freed_map () |
|
|
961 | { |
|
|
962 | destroy (); |
|
|
963 | } |
|
|
964 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
965 | |
932 | void |
966 | void |
933 | object::do_destroy () |
967 | object::do_destroy () |
934 | { |
968 | { |
935 | if (object *pl = visible_to ()) |
|
|
936 | esrv_del_item (pl->contr, count); |
|
|
937 | |
|
|
938 | attachable::do_destroy (); |
|
|
939 | |
|
|
940 | if (flag [FLAG_IS_LINKED]) |
969 | if (flag [FLAG_IS_LINKED]) |
941 | remove_button_link (this); |
970 | remove_button_link (this); |
942 | |
971 | |
943 | if (flag [FLAG_FRIENDLY]) |
972 | if (flag [FLAG_FRIENDLY]) |
944 | remove_friendly_object (this); |
973 | remove_friendly_object (this); |
945 | |
974 | |
946 | if (!flag [FLAG_REMOVED]) |
|
|
947 | remove (); |
975 | remove (); |
948 | |
976 | |
949 | destroy_inv (true); |
977 | attachable::do_destroy (); |
950 | |
978 | |
951 | deactivate (); |
979 | deactivate (); |
952 | unlink (); |
980 | unlink (); |
953 | |
981 | |
954 | flag [FLAG_FREED] = 1; |
982 | flag [FLAG_FREED] = 1; |
955 | |
983 | |
956 | // hack to ensure that freed objects still have a valid map |
984 | // hack to ensure that freed objects still have a valid map |
957 | { |
|
|
958 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
959 | |
|
|
960 | if (!freed_map) |
|
|
961 | { |
|
|
962 | freed_map = new maptile; |
|
|
963 | |
|
|
964 | freed_map->path = "<freed objects map>"; |
|
|
965 | freed_map->name = "/internal/freed_objects_map"; |
|
|
966 | freed_map->width = 3; |
|
|
967 | freed_map->height = 3; |
|
|
968 | freed_map->nodrop = 1; |
|
|
969 | |
|
|
970 | freed_map->alloc (); |
|
|
971 | freed_map->in_memory = MAP_ACTIVE; |
|
|
972 | } |
|
|
973 | |
|
|
974 | map = freed_map; |
985 | map = &freed_map; |
975 | x = 1; |
986 | x = 1; |
976 | y = 1; |
987 | y = 1; |
977 | } |
|
|
978 | |
988 | |
979 | if (more) |
989 | if (more) |
980 | { |
990 | { |
981 | more->destroy (); |
991 | more->destroy (); |
982 | more = 0; |
992 | more = 0; |
… | |
… | |
995 | object::destroy (bool destroy_inventory) |
1005 | object::destroy (bool destroy_inventory) |
996 | { |
1006 | { |
997 | if (destroyed ()) |
1007 | if (destroyed ()) |
998 | return; |
1008 | return; |
999 | |
1009 | |
|
|
1010 | if (!is_head () && !head->destroyed ()) |
|
|
1011 | { |
|
|
1012 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1013 | head->destroy (destroy_inventory); |
|
|
1014 | return; |
|
|
1015 | } |
|
|
1016 | |
1000 | if (destroy_inventory) |
1017 | destroy_inv (!destroy_inventory); |
1001 | destroy_inv (false); |
|
|
1002 | |
1018 | |
1003 | if (is_head ()) |
1019 | if (is_head ()) |
1004 | if (sound_destroy) |
1020 | if (sound_destroy) |
1005 | play_sound (sound_destroy); |
1021 | play_sound (sound_destroy); |
1006 | else if (flag [FLAG_MONSTER]) |
1022 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1020 | object::do_remove () |
1036 | object::do_remove () |
1021 | { |
1037 | { |
1022 | object *tmp, *last = 0; |
1038 | object *tmp, *last = 0; |
1023 | object *otmp; |
1039 | object *otmp; |
1024 | |
1040 | |
1025 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1041 | if (flag [FLAG_REMOVED]) |
1026 | return; |
1042 | return; |
1027 | |
1043 | |
1028 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1029 | INVOKE_OBJECT (REMOVE, this); |
1044 | INVOKE_OBJECT (REMOVE, this); |
|
|
1045 | |
|
|
1046 | flag [FLAG_REMOVED] = true; |
1030 | |
1047 | |
1031 | if (more) |
1048 | if (more) |
1032 | more->remove (); |
1049 | more->remove (); |
1033 | |
1050 | |
1034 | /* |
1051 | /* |
1035 | * In this case, the object to be removed is in someones |
1052 | * In this case, the object to be removed is in someones |
1036 | * inventory. |
1053 | * inventory. |
1037 | */ |
1054 | */ |
1038 | if (env) |
1055 | if (env) |
1039 | { |
1056 | { |
|
|
1057 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
|
|
1058 | if (object *pl = visible_to ()) |
|
|
1059 | esrv_del_item (pl->contr, count); |
|
|
1060 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1061 | |
1040 | adjust_weight (env, -total_weight ()); |
1062 | adjust_weight (env, -total_weight ()); |
1041 | |
|
|
1042 | *(above ? &above->below : &env->inv) = below; |
|
|
1043 | |
|
|
1044 | if (below) |
|
|
1045 | below->above = above; |
|
|
1046 | |
1063 | |
1047 | /* we set up values so that it could be inserted into |
1064 | /* we set up values so that it could be inserted into |
1048 | * the map, but we don't actually do that - it is up |
1065 | * the map, but we don't actually do that - it is up |
1049 | * to the caller to decide what we want to do. |
1066 | * to the caller to decide what we want to do. |
1050 | */ |
1067 | */ |
1051 | map = env->map; |
1068 | map = env->map; |
1052 | x = env->x; |
1069 | x = env->x; |
1053 | y = env->y; |
1070 | y = env->y; |
|
|
1071 | |
|
|
1072 | // make sure cmov optimisation is applicable |
|
|
1073 | *(above ? &above->below : &env->inv) = below; |
|
|
1074 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1075 | |
1054 | above = 0; |
1076 | above = 0; |
1055 | below = 0; |
1077 | below = 0; |
1056 | env = 0; |
1078 | env = 0; |
1057 | |
1079 | |
1058 | /* NO_FIX_PLAYER is set when a great many changes are being |
1080 | /* NO_FIX_PLAYER is set when a great many changes are being |
… | |
… | |
1062 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1084 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1063 | otmp->update_stats (); |
1085 | otmp->update_stats (); |
1064 | } |
1086 | } |
1065 | else if (map) |
1087 | else if (map) |
1066 | { |
1088 | { |
1067 | if (type == PLAYER) |
|
|
1068 | { |
|
|
1069 | // leaving a spot always closes any open container on the ground |
|
|
1070 | if (container && !container->env) |
|
|
1071 | // this causes spurious floorbox updates, but it ensures |
|
|
1072 | // that the CLOSE event is being sent. |
|
|
1073 | close_container (); |
|
|
1074 | |
|
|
1075 | --map->players; |
|
|
1076 | map->touch (); |
|
|
1077 | } |
|
|
1078 | |
|
|
1079 | map->dirty = true; |
1089 | map->dirty = true; |
1080 | mapspace &ms = this->ms (); |
1090 | mapspace &ms = this->ms (); |
1081 | |
1091 | |
|
|
1092 | if (object *pl = ms.player ()) |
|
|
1093 | { |
|
|
1094 | if (type == PLAYER) // this == pl(!) |
|
|
1095 | { |
|
|
1096 | // leaving a spot always closes any open container on the ground |
|
|
1097 | if (container && !container->env) |
|
|
1098 | // this causes spurious floorbox updates, but it ensures |
|
|
1099 | // that the CLOSE event is being sent. |
|
|
1100 | close_container (); |
|
|
1101 | |
|
|
1102 | --map->players; |
|
|
1103 | map->touch (); |
|
|
1104 | } |
|
|
1105 | else if (pl->container == this) |
|
|
1106 | { |
|
|
1107 | // removing a container should close it |
|
|
1108 | close_container (); |
|
|
1109 | } |
|
|
1110 | |
|
|
1111 | esrv_del_item (pl->contr, count); |
|
|
1112 | } |
|
|
1113 | |
1082 | /* link the object above us */ |
1114 | /* link the object above us */ |
1083 | if (above) |
1115 | // re-link, make sure compiler can easily use cmove |
1084 | above->below = below; |
1116 | *(above ? &above->below : &ms.top) = below; |
1085 | else |
1117 | *(below ? &below->above : &ms.bot) = above; |
1086 | ms.top = below; /* we were top, set new top */ |
|
|
1087 | |
|
|
1088 | /* Relink the object below us, if there is one */ |
|
|
1089 | if (below) |
|
|
1090 | below->above = above; |
|
|
1091 | else |
|
|
1092 | { |
|
|
1093 | /* Nothing below, which means we need to relink map object for this space |
|
|
1094 | * use translated coordinates in case some oddness with map tiling is |
|
|
1095 | * evident |
|
|
1096 | */ |
|
|
1097 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1098 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ()); |
|
|
1099 | |
|
|
1100 | ms.bot = above; /* goes on above it. */ |
|
|
1101 | } |
|
|
1102 | |
1118 | |
1103 | above = 0; |
1119 | above = 0; |
1104 | below = 0; |
1120 | below = 0; |
1105 | |
1121 | |
1106 | if (map->in_memory == MAP_SAVING) |
1122 | if (map->in_memory == MAP_SAVING) |
… | |
… | |
1115 | * removed (most likely destroyed), update the player view |
1131 | * removed (most likely destroyed), update the player view |
1116 | * appropriately. |
1132 | * appropriately. |
1117 | */ |
1133 | */ |
1118 | pl->close_container (); |
1134 | pl->close_container (); |
1119 | |
1135 | |
|
|
1136 | //TODO: the floorbox prev/next might need updating |
|
|
1137 | //esrv_del_item (pl->contr, count); |
|
|
1138 | //TODO: update floorbox to preserve ordering |
|
|
1139 | if (pl->contr->ns) |
1120 | pl->contr->ns->floorbox_update (); |
1140 | pl->contr->ns->floorbox_update (); |
1121 | } |
1141 | } |
1122 | |
1142 | |
1123 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1143 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1124 | { |
1144 | { |
1125 | /* No point updating the players look faces if he is the object |
1145 | /* No point updating the players look faces if he is the object |
… | |
… | |
1169 | if (!top) |
1189 | if (!top) |
1170 | for (top = op; top && top->above; top = top->above) |
1190 | for (top = op; top && top->above; top = top->above) |
1171 | ; |
1191 | ; |
1172 | |
1192 | |
1173 | for (; top; top = top->below) |
1193 | for (; top; top = top->below) |
1174 | { |
|
|
1175 | if (top == op) |
|
|
1176 | continue; |
|
|
1177 | |
|
|
1178 | if (object::can_merge (op, top)) |
1194 | if (object::can_merge (op, top)) |
1179 | { |
1195 | { |
1180 | top->nrof += op->nrof; |
1196 | top->nrof += op->nrof; |
1181 | |
1197 | |
1182 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1198 | if (object *pl = top->visible_to ()) |
1183 | op->weight = 0; /* Don't want any adjustements now */ |
1199 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1200 | |
|
|
1201 | op->weight = 0; // cancel the addition above |
|
|
1202 | op->carrying = 0; // must be 0 already |
|
|
1203 | |
1184 | op->destroy (); |
1204 | op->destroy (1); |
|
|
1205 | |
1185 | return top; |
1206 | return top; |
1186 | } |
1207 | } |
1187 | } |
|
|
1188 | |
1208 | |
1189 | return 0; |
1209 | return 0; |
1190 | } |
1210 | } |
1191 | |
1211 | |
1192 | void |
1212 | void |
… | |
… | |
1217 | * job preparing multi-part monsters. |
1237 | * job preparing multi-part monsters. |
1218 | */ |
1238 | */ |
1219 | object * |
1239 | object * |
1220 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1240 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1221 | { |
1241 | { |
|
|
1242 | op->remove (); |
|
|
1243 | |
1222 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1244 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1223 | { |
1245 | { |
1224 | tmp->x = x + tmp->arch->x; |
1246 | tmp->x = x + tmp->arch->x; |
1225 | tmp->y = y + tmp->arch->y; |
1247 | tmp->y = y + tmp->arch->y; |
1226 | } |
1248 | } |
… | |
… | |
1249 | * just 'op' otherwise |
1271 | * just 'op' otherwise |
1250 | */ |
1272 | */ |
1251 | object * |
1273 | object * |
1252 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1274 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1253 | { |
1275 | { |
1254 | assert (!op->flag [FLAG_FREED]); |
1276 | if (op->is_on_map ()) |
|
|
1277 | { |
|
|
1278 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1279 | abort (); |
|
|
1280 | } |
1255 | |
1281 | |
1256 | object *top, *floor = NULL; |
1282 | if (op->env) |
1257 | |
1283 | { |
|
|
1284 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1258 | op->remove (); |
1285 | op->remove (); |
|
|
1286 | } |
|
|
1287 | |
|
|
1288 | if (op->face && !face_info (op->face))//D TODO: remove soon |
|
|
1289 | {//D |
|
|
1290 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
|
|
1291 | op->face = 1;//D |
|
|
1292 | }//D |
1259 | |
1293 | |
1260 | /* Ideally, the caller figures this out. However, it complicates a lot |
1294 | /* Ideally, the caller figures this out. However, it complicates a lot |
1261 | * of areas of callers (eg, anything that uses find_free_spot would now |
1295 | * of areas of callers (eg, anything that uses find_free_spot would now |
1262 | * need extra work |
1296 | * need extra work |
1263 | */ |
1297 | */ |
1264 | if (!xy_normalise (m, op->x, op->y)) |
1298 | if (!xy_normalise (m, op->x, op->y)) |
1265 | { |
1299 | { |
1266 | op->destroy (); |
1300 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1267 | return 0; |
1301 | return 0; |
1268 | } |
1302 | } |
1269 | |
1303 | |
1270 | if (object *more = op->more) |
1304 | if (object *more = op->more) |
1271 | if (!insert_ob_in_map (more, m, originator, flag)) |
1305 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1280 | */ |
1314 | */ |
1281 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1315 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1282 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1316 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1283 | if (object::can_merge (op, tmp)) |
1317 | if (object::can_merge (op, tmp)) |
1284 | { |
1318 | { |
|
|
1319 | // TODO: we actually want to update tmp, not op, |
|
|
1320 | // but some caller surely breaks when we return tmp |
|
|
1321 | // from here :/ |
1285 | op->nrof += tmp->nrof; |
1322 | op->nrof += tmp->nrof; |
1286 | tmp->destroy (1); |
1323 | tmp->destroy (1); |
1287 | } |
1324 | } |
1288 | |
1325 | |
1289 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1326 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
… | |
… | |
1298 | { |
1335 | { |
1299 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1336 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1300 | abort (); |
1337 | abort (); |
1301 | } |
1338 | } |
1302 | |
1339 | |
|
|
1340 | if (!originator->is_on_map ()) |
|
|
1341 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1342 | op->debug_desc (), originator->debug_desc ()); |
|
|
1343 | |
1303 | op->above = originator; |
1344 | op->above = originator; |
1304 | op->below = originator->below; |
1345 | op->below = originator->below; |
1305 | |
|
|
1306 | if (op->below) |
|
|
1307 | op->below->above = op; |
|
|
1308 | else |
|
|
1309 | ms.bot = op; |
|
|
1310 | |
|
|
1311 | /* since *below* originator, no need to update top */ |
|
|
1312 | originator->below = op; |
1346 | originator->below = op; |
|
|
1347 | |
|
|
1348 | *(op->below ? &op->below->above : &ms.bot) = op; |
1313 | } |
1349 | } |
1314 | else |
1350 | else |
1315 | { |
1351 | { |
1316 | top = ms.bot; |
1352 | object *floor = 0; |
|
|
1353 | object *top = ms.top; |
1317 | |
1354 | |
1318 | /* If there are other objects, then */ |
1355 | /* If there are other objects, then */ |
1319 | if (top) |
1356 | if (top) |
1320 | { |
1357 | { |
1321 | object *last = 0; |
|
|
1322 | |
|
|
1323 | /* |
1358 | /* |
1324 | * If there are multiple objects on this space, we do some trickier handling. |
1359 | * If there are multiple objects on this space, we do some trickier handling. |
1325 | * We've already dealt with merging if appropriate. |
1360 | * We've already dealt with merging if appropriate. |
1326 | * Generally, we want to put the new object on top. But if |
1361 | * Generally, we want to put the new object on top. But if |
1327 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1362 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1330 | * once we get to them. This reduces the need to traverse over all of |
1365 | * once we get to them. This reduces the need to traverse over all of |
1331 | * them when adding another one - this saves quite a bit of cpu time |
1366 | * them when adding another one - this saves quite a bit of cpu time |
1332 | * when lots of spells are cast in one area. Currently, it is presumed |
1367 | * when lots of spells are cast in one area. Currently, it is presumed |
1333 | * that flying non pickable objects are spell objects. |
1368 | * that flying non pickable objects are spell objects. |
1334 | */ |
1369 | */ |
1335 | for (top = ms.bot; top; top = top->above) |
1370 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1336 | { |
1371 | { |
1337 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1372 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1338 | floor = top; |
1373 | floor = tmp; |
1339 | |
1374 | |
1340 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1375 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1341 | { |
1376 | { |
1342 | /* We insert above top, so we want this object below this */ |
1377 | /* We insert above top, so we want this object below this */ |
1343 | top = top->below; |
1378 | top = tmp->below; |
1344 | break; |
1379 | break; |
1345 | } |
1380 | } |
1346 | |
1381 | |
1347 | last = top; |
1382 | top = tmp; |
1348 | } |
1383 | } |
1349 | |
|
|
1350 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1351 | top = last; |
|
|
1352 | |
1384 | |
1353 | /* We let update_position deal with figuring out what the space |
1385 | /* We let update_position deal with figuring out what the space |
1354 | * looks like instead of lots of conditions here. |
1386 | * looks like instead of lots of conditions here. |
1355 | * makes things faster, and effectively the same result. |
1387 | * makes things faster, and effectively the same result. |
1356 | */ |
1388 | */ |
… | |
… | |
1363 | */ |
1395 | */ |
1364 | if (!(flag & INS_ON_TOP) |
1396 | if (!(flag & INS_ON_TOP) |
1365 | && ms.flags () & P_BLOCKSVIEW |
1397 | && ms.flags () & P_BLOCKSVIEW |
1366 | && (op->face && !faces [op->face].visibility)) |
1398 | && (op->face && !faces [op->face].visibility)) |
1367 | { |
1399 | { |
|
|
1400 | object *last; |
|
|
1401 | |
1368 | for (last = top; last != floor; last = last->below) |
1402 | for (last = top; last != floor; last = last->below) |
1369 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1403 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1370 | break; |
1404 | break; |
1371 | |
1405 | |
1372 | /* Check to see if we found the object that blocks view, |
1406 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1380 | } /* If objects on this space */ |
1414 | } /* If objects on this space */ |
1381 | |
1415 | |
1382 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1416 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1383 | top = floor; |
1417 | top = floor; |
1384 | |
1418 | |
1385 | /* Top is the object that our object (op) is going to get inserted above. |
1419 | // insert object above top, or bottom-most if top = 0 |
1386 | */ |
|
|
1387 | |
|
|
1388 | /* First object on this space */ |
|
|
1389 | if (!top) |
1420 | if (!top) |
1390 | { |
1421 | { |
|
|
1422 | op->below = 0; |
1391 | op->above = ms.bot; |
1423 | op->above = ms.bot; |
1392 | |
|
|
1393 | if (op->above) |
|
|
1394 | op->above->below = op; |
|
|
1395 | |
|
|
1396 | op->below = 0; |
|
|
1397 | ms.bot = op; |
1424 | ms.bot = op; |
|
|
1425 | |
|
|
1426 | *(op->above ? &op->above->below : &ms.top) = op; |
1398 | } |
1427 | } |
1399 | else |
1428 | else |
1400 | { /* get inserted into the stack above top */ |
1429 | { |
1401 | op->above = top->above; |
1430 | op->above = top->above; |
1402 | |
|
|
1403 | if (op->above) |
|
|
1404 | op->above->below = op; |
1431 | top->above = op; |
1405 | |
1432 | |
1406 | op->below = top; |
1433 | op->below = top; |
1407 | top->above = op; |
1434 | *(op->above ? &op->above->below : &ms.top) = op; |
1408 | } |
1435 | } |
1409 | |
1436 | } |
1410 | if (!op->above) |
|
|
1411 | ms.top = op; |
|
|
1412 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1413 | |
1437 | |
1414 | if (op->type == PLAYER) |
1438 | if (op->type == PLAYER) |
1415 | { |
1439 | { |
1416 | op->contr->do_los = 1; |
1440 | op->contr->do_los = 1; |
1417 | ++op->map->players; |
1441 | ++op->map->players; |
… | |
… | |
1419 | } |
1443 | } |
1420 | |
1444 | |
1421 | op->map->dirty = true; |
1445 | op->map->dirty = true; |
1422 | |
1446 | |
1423 | if (object *pl = ms.player ()) |
1447 | if (object *pl = ms.player ()) |
|
|
1448 | //TODO: the floorbox prev/next might need updating |
|
|
1449 | //esrv_send_item (pl, op); |
|
|
1450 | //TODO: update floorbox to preserve ordering |
|
|
1451 | if (pl->contr->ns) |
1424 | pl->contr->ns->floorbox_update (); |
1452 | pl->contr->ns->floorbox_update (); |
1425 | |
1453 | |
1426 | /* If this object glows, it may affect lighting conditions that are |
1454 | /* If this object glows, it may affect lighting conditions that are |
1427 | * visible to others on this map. But update_all_los is really |
1455 | * visible to others on this map. But update_all_los is really |
1428 | * an inefficient way to do this, as it means los for all players |
1456 | * an inefficient way to do this, as it means los for all players |
1429 | * on the map will get recalculated. The players could very well |
1457 | * on the map will get recalculated. The players could very well |
… | |
… | |
1494 | return where->env->insert (this); |
1522 | return where->env->insert (this); |
1495 | else |
1523 | else |
1496 | return where->map->insert (this, where->x, where->y, originator, flags); |
1524 | return where->map->insert (this, where->x, where->y, originator, flags); |
1497 | } |
1525 | } |
1498 | |
1526 | |
1499 | // find player who can see this object |
|
|
1500 | object * |
|
|
1501 | object::visible_to () const |
|
|
1502 | { |
|
|
1503 | if (!flag [FLAG_REMOVED]) |
|
|
1504 | { |
|
|
1505 | // see if we are in a container of sorts |
|
|
1506 | if (env) |
|
|
1507 | { |
|
|
1508 | // the player inventory itself is always visible |
|
|
1509 | if (env->type == PLAYER) |
|
|
1510 | return env; |
|
|
1511 | |
|
|
1512 | // else a player could have our env open |
|
|
1513 | object *envest = env->outer_env (); |
|
|
1514 | |
|
|
1515 | // the player itself is always on a map, so we will find him here |
|
|
1516 | // even if our inv is in a player. |
|
|
1517 | if (envest->is_on_map ()) |
|
|
1518 | if (object *pl = envest->ms ().player ()) |
|
|
1519 | if (pl->container == env) |
|
|
1520 | return pl; |
|
|
1521 | } |
|
|
1522 | else |
|
|
1523 | { |
|
|
1524 | // maybe there is a player standing on the same mapspace |
|
|
1525 | // this will catch the case where "this" is a player |
|
|
1526 | if (object *pl = ms ().player ()) |
|
|
1527 | return pl; |
|
|
1528 | } |
|
|
1529 | } |
|
|
1530 | |
|
|
1531 | return 0; |
|
|
1532 | } |
|
|
1533 | |
|
|
1534 | /* |
1527 | /* |
1535 | * decrease(object, number) decreases a specified number from |
1528 | * decrease(object, number) decreases a specified number from |
1536 | * the amount of an object. If the amount reaches 0, the object |
1529 | * the amount of an object. If the amount reaches 0, the object |
1537 | * is subsequently removed and freed. |
1530 | * is subsequently removed and freed. |
1538 | * |
1531 | * |
… | |
… | |
1548 | |
1541 | |
1549 | nrof -= nr; |
1542 | nrof -= nr; |
1550 | |
1543 | |
1551 | if (nrof) |
1544 | if (nrof) |
1552 | { |
1545 | { |
1553 | adjust_weight (env, -weight * nr); // carrying == 0 |
1546 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1554 | |
1547 | |
1555 | if (object *pl = visible_to ()) |
1548 | if (object *pl = visible_to ()) |
1556 | esrv_update_item (UPD_NROF, pl, this); |
1549 | esrv_update_item (UPD_NROF, pl, this); |
1557 | |
1550 | |
1558 | return true; |
1551 | return true; |
… | |
… | |
1584 | } |
1577 | } |
1585 | else |
1578 | else |
1586 | { |
1579 | { |
1587 | decrease (nr); |
1580 | decrease (nr); |
1588 | |
1581 | |
1589 | object *op = object_create_clone (this); |
1582 | object *op = deep_clone (); |
1590 | op->nrof = nr; |
1583 | op->nrof = nr; |
1591 | return op; |
1584 | return op; |
1592 | } |
1585 | } |
1593 | } |
1586 | } |
1594 | |
1587 | |
… | |
… | |
1638 | if (object::can_merge (tmp, op)) |
1631 | if (object::can_merge (tmp, op)) |
1639 | { |
1632 | { |
1640 | /* return the original object and remove inserted object |
1633 | /* return the original object and remove inserted object |
1641 | (client needs the original object) */ |
1634 | (client needs the original object) */ |
1642 | tmp->nrof += op->nrof; |
1635 | tmp->nrof += op->nrof; |
|
|
1636 | |
|
|
1637 | if (object *pl = tmp->visible_to ()) |
|
|
1638 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1639 | |
1643 | adjust_weight (this, op->total_weight ()); |
1640 | adjust_weight (this, op->total_weight ()); |
1644 | |
1641 | |
1645 | op->destroy (1); |
1642 | op->destroy (1); |
1646 | op = tmp; |
1643 | op = tmp; |
1647 | goto inserted; |
1644 | goto inserted; |
… | |
… | |
1661 | |
1658 | |
1662 | inv = op; |
1659 | inv = op; |
1663 | |
1660 | |
1664 | op->flag [FLAG_REMOVED] = 0; |
1661 | op->flag [FLAG_REMOVED] = 0; |
1665 | |
1662 | |
|
|
1663 | if (object *pl = op->visible_to ()) |
|
|
1664 | esrv_send_item (pl, op); |
|
|
1665 | |
1666 | adjust_weight (this, op->total_weight ()); |
1666 | adjust_weight (this, op->total_weight ()); |
1667 | |
1667 | |
1668 | inserted: |
1668 | inserted: |
1669 | /* reset the light list and los of the players on the map */ |
1669 | /* reset the light list and los of the players on the map */ |
1670 | if (op->glow_radius && map && map->darkness) |
1670 | if (op->glow_radius && map && map->darkness) |
1671 | update_all_los (map, x, y); |
1671 | update_all_los (map, x, y); |
1672 | |
1672 | |
1673 | if (object *otmp = in_player ()) |
1673 | // if this is a player's inventory, update stats |
1674 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1674 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1675 | otmp->update_stats (); |
1675 | update_stats (); |
1676 | |
1676 | |
1677 | INVOKE_OBJECT (INSERT, this); |
1677 | INVOKE_OBJECT (INSERT, this); |
1678 | |
1678 | |
1679 | return op; |
1679 | return op; |
1680 | } |
1680 | } |
… | |
… | |
1808 | LOG (llevError, "Present_arch called outside map.\n"); |
1808 | LOG (llevError, "Present_arch called outside map.\n"); |
1809 | return NULL; |
1809 | return NULL; |
1810 | } |
1810 | } |
1811 | |
1811 | |
1812 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1812 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1813 | if (tmp->arch == at) |
1813 | if (tmp->arch->archname == at->archname) |
1814 | return tmp; |
1814 | return tmp; |
1815 | |
1815 | |
1816 | return NULL; |
1816 | return NULL; |
1817 | } |
1817 | } |
1818 | |
1818 | |
… | |
… | |
1882 | * The first matching object is returned, or NULL if none. |
1882 | * The first matching object is returned, or NULL if none. |
1883 | */ |
1883 | */ |
1884 | object * |
1884 | object * |
1885 | present_arch_in_ob (const archetype *at, const object *op) |
1885 | present_arch_in_ob (const archetype *at, const object *op) |
1886 | { |
1886 | { |
1887 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1887 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1888 | if (tmp->arch == at) |
1888 | if (tmp->arch->archname == at->archname) |
1889 | return tmp; |
1889 | return tmp; |
1890 | |
1890 | |
1891 | return NULL; |
1891 | return NULL; |
1892 | } |
1892 | } |
1893 | |
1893 | |
… | |
… | |
2302 | |
2302 | |
2303 | /* |
2303 | /* |
2304 | * create clone from object to another |
2304 | * create clone from object to another |
2305 | */ |
2305 | */ |
2306 | object * |
2306 | object * |
2307 | object_create_clone (object *asrc) |
2307 | object::deep_clone () |
2308 | { |
2308 | { |
2309 | object *dst = 0, *tmp, *src, *prev, *item; |
2309 | assert (("deep_clone called on non-head object", is_head ())); |
2310 | |
2310 | |
2311 | if (!asrc) |
2311 | object *dst = clone (); |
2312 | return 0; |
|
|
2313 | |
2312 | |
2314 | src = asrc->head_ (); |
2313 | object *prev = dst; |
2315 | |
|
|
2316 | prev = 0; |
|
|
2317 | for (object *part = src; part; part = part->more) |
2314 | for (object *part = this->more; part; part = part->more) |
2318 | { |
2315 | { |
2319 | tmp = part->clone (); |
2316 | object *tmp = part->clone (); |
2320 | tmp->x -= src->x; |
|
|
2321 | tmp->y -= src->y; |
|
|
2322 | |
|
|
2323 | if (!part->head) |
|
|
2324 | { |
|
|
2325 | dst = tmp; |
|
|
2326 | tmp->head = 0; |
|
|
2327 | } |
|
|
2328 | else |
|
|
2329 | tmp->head = dst; |
2317 | tmp->head = dst; |
2330 | |
|
|
2331 | tmp->more = 0; |
|
|
2332 | |
|
|
2333 | if (prev) |
|
|
2334 | prev->more = tmp; |
2318 | prev->more = tmp; |
2335 | |
|
|
2336 | prev = tmp; |
2319 | prev = tmp; |
2337 | } |
2320 | } |
2338 | |
2321 | |
2339 | for (item = src->inv; item; item = item->below) |
2322 | for (object *item = inv; item; item = item->below) |
2340 | insert_ob_in_ob (object_create_clone (item), dst); |
2323 | insert_ob_in_ob (item->deep_clone (), dst); |
2341 | |
2324 | |
2342 | return dst; |
2325 | return dst; |
2343 | } |
2326 | } |
2344 | |
2327 | |
2345 | /* This returns the first object in who's inventory that |
2328 | /* This returns the first object in who's inventory that |
… | |
… | |
2354 | return tmp; |
2337 | return tmp; |
2355 | |
2338 | |
2356 | return 0; |
2339 | return 0; |
2357 | } |
2340 | } |
2358 | |
2341 | |
2359 | /* If ob has a field named key, return the link from the list, |
2342 | const shstr & |
2360 | * otherwise return NULL. |
2343 | object::kv_get (const shstr &key) const |
2361 | * |
|
|
2362 | * key must be a passed in shared string - otherwise, this won't |
|
|
2363 | * do the desired thing. |
|
|
2364 | */ |
|
|
2365 | key_value * |
|
|
2366 | get_ob_key_link (const object *ob, const char *key) |
|
|
2367 | { |
2344 | { |
2368 | for (key_value *link = ob->key_values; link; link = link->next) |
2345 | for (key_value *kv = key_values; kv; kv = kv->next) |
2369 | if (link->key == key) |
2346 | if (kv->key == key) |
2370 | return link; |
|
|
2371 | |
|
|
2372 | return 0; |
|
|
2373 | } |
|
|
2374 | |
|
|
2375 | /* |
|
|
2376 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2377 | * |
|
|
2378 | * The argument doesn't need to be a shared string. |
|
|
2379 | * |
|
|
2380 | * The returned string is shared. |
|
|
2381 | */ |
|
|
2382 | const char * |
|
|
2383 | get_ob_key_value (const object *op, const char *const key) |
|
|
2384 | { |
|
|
2385 | key_value *link; |
|
|
2386 | shstr_cmp canonical_key (key); |
|
|
2387 | |
|
|
2388 | if (!canonical_key) |
|
|
2389 | { |
|
|
2390 | /* 1. There being a field named key on any object |
|
|
2391 | * implies there'd be a shared string to find. |
|
|
2392 | * 2. Since there isn't, no object has this field. |
|
|
2393 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2394 | */ |
|
|
2395 | return 0; |
|
|
2396 | } |
|
|
2397 | |
|
|
2398 | /* This is copied from get_ob_key_link() above - |
|
|
2399 | * only 4 lines, and saves the function call overhead. |
|
|
2400 | */ |
|
|
2401 | for (link = op->key_values; link; link = link->next) |
|
|
2402 | if (link->key == canonical_key) |
|
|
2403 | return link->value; |
2347 | return kv->value; |
2404 | |
2348 | |
2405 | return 0; |
2349 | return shstr_null; |
2406 | } |
2350 | } |
2407 | |
2351 | |
2408 | /* |
2352 | void |
2409 | * Updates the canonical_key in op to value. |
2353 | object::kv_set (const shstr &key, const shstr &value) |
2410 | * |
|
|
2411 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2412 | * |
|
|
2413 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2414 | * keys. |
|
|
2415 | * |
|
|
2416 | * Returns TRUE on success. |
|
|
2417 | */ |
|
|
2418 | int |
|
|
2419 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2420 | { |
2354 | { |
2421 | key_value *field = NULL, *last = NULL; |
2355 | for (key_value *kv = key_values; kv; kv = kv->next) |
2422 | |
2356 | if (kv->key == key) |
2423 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2424 | { |
|
|
2425 | if (field->key != canonical_key) |
|
|
2426 | { |
2357 | { |
2427 | last = field; |
2358 | kv->value = value; |
2428 | continue; |
2359 | return; |
2429 | } |
2360 | } |
2430 | |
2361 | |
2431 | if (value) |
2362 | key_value *kv = new key_value; |
2432 | field->value = value; |
2363 | |
2433 | else |
2364 | kv->next = key_values; |
|
|
2365 | kv->key = key; |
|
|
2366 | kv->value = value; |
|
|
2367 | |
|
|
2368 | key_values = kv; |
|
|
2369 | } |
|
|
2370 | |
|
|
2371 | void |
|
|
2372 | object::kv_del (const shstr &key) |
|
|
2373 | { |
|
|
2374 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2375 | if ((*kvp)->key == key) |
2434 | { |
2376 | { |
2435 | /* Basically, if the archetype has this key set, |
2377 | key_value *kv = *kvp; |
2436 | * we need to store the null value so when we save |
2378 | *kvp = (*kvp)->next; |
2437 | * it, we save the empty value so that when we load, |
2379 | delete kv; |
2438 | * we get this value back again. |
2380 | return; |
2439 | */ |
|
|
2440 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2441 | field->value = 0; |
|
|
2442 | else |
|
|
2443 | { |
|
|
2444 | if (last) |
|
|
2445 | last->next = field->next; |
|
|
2446 | else |
|
|
2447 | op->key_values = field->next; |
|
|
2448 | |
|
|
2449 | delete field; |
|
|
2450 | } |
|
|
2451 | } |
2381 | } |
2452 | return TRUE; |
|
|
2453 | } |
|
|
2454 | /* IF we get here, key doesn't exist */ |
|
|
2455 | |
|
|
2456 | /* No field, we'll have to add it. */ |
|
|
2457 | |
|
|
2458 | if (!add_key) |
|
|
2459 | return FALSE; |
|
|
2460 | |
|
|
2461 | /* There isn't any good reason to store a null |
|
|
2462 | * value in the key/value list. If the archetype has |
|
|
2463 | * this key, then we should also have it, so shouldn't |
|
|
2464 | * be here. If user wants to store empty strings, |
|
|
2465 | * should pass in "" |
|
|
2466 | */ |
|
|
2467 | if (value == NULL) |
|
|
2468 | return TRUE; |
|
|
2469 | |
|
|
2470 | field = new key_value; |
|
|
2471 | |
|
|
2472 | field->key = canonical_key; |
|
|
2473 | field->value = value; |
|
|
2474 | /* Usual prepend-addition. */ |
|
|
2475 | field->next = op->key_values; |
|
|
2476 | op->key_values = field; |
|
|
2477 | |
|
|
2478 | return TRUE; |
|
|
2479 | } |
|
|
2480 | |
|
|
2481 | /* |
|
|
2482 | * Updates the key in op to value. |
|
|
2483 | * |
|
|
2484 | * If add_key is FALSE, this will only update existing keys, |
|
|
2485 | * and not add new ones. |
|
|
2486 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2487 | * |
|
|
2488 | * Returns TRUE on success. |
|
|
2489 | */ |
|
|
2490 | int |
|
|
2491 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2492 | { |
|
|
2493 | shstr key_ (key); |
|
|
2494 | |
|
|
2495 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2496 | } |
2382 | } |
2497 | |
2383 | |
2498 | object::depth_iterator::depth_iterator (object *container) |
2384 | object::depth_iterator::depth_iterator (object *container) |
2499 | : iterator_base (container) |
2385 | : iterator_base (container) |
2500 | { |
2386 | { |
… | |
… | |
2550 | { |
2436 | { |
2551 | char flagdesc[512]; |
2437 | char flagdesc[512]; |
2552 | char info2[256 * 4]; |
2438 | char info2[256 * 4]; |
2553 | char *p = info; |
2439 | char *p = info; |
2554 | |
2440 | |
2555 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2441 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2556 | count, |
2442 | count, |
2557 | uuid.c_str (), |
2443 | uuid.c_str (), |
2558 | &name, |
2444 | &name, |
2559 | title ? "\",title:\"" : "", |
2445 | title ? ",title:\"" : "", |
2560 | title ? (const char *)title : "", |
2446 | title ? (const char *)title : "", |
|
|
2447 | title ? "\"" : "", |
2561 | flag_desc (flagdesc, 512), type); |
2448 | flag_desc (flagdesc, 512), type); |
2562 | |
2449 | |
2563 | if (!this->flag[FLAG_REMOVED] && env) |
2450 | if (!flag[FLAG_REMOVED] && env) |
2564 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2451 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2565 | |
2452 | |
2566 | if (map) |
2453 | if (map) |
2567 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2454 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2568 | |
2455 | |
… | |
… | |
2598 | object::open_container (object *new_container) |
2485 | object::open_container (object *new_container) |
2599 | { |
2486 | { |
2600 | if (container == new_container) |
2487 | if (container == new_container) |
2601 | return; |
2488 | return; |
2602 | |
2489 | |
2603 | if (object *old_container = container) |
2490 | object *old_container = container; |
|
|
2491 | |
|
|
2492 | if (old_container) |
2604 | { |
2493 | { |
2605 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2494 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2606 | return; |
2495 | return; |
2607 | |
2496 | |
2608 | #if 0 |
2497 | #if 0 |
… | |
… | |
2610 | if (object *closer = old_container->inv) |
2499 | if (object *closer = old_container->inv) |
2611 | if (closer->type == CLOSE_CON) |
2500 | if (closer->type == CLOSE_CON) |
2612 | closer->destroy (); |
2501 | closer->destroy (); |
2613 | #endif |
2502 | #endif |
2614 | |
2503 | |
|
|
2504 | // make sure the container is available |
|
|
2505 | esrv_send_item (this, old_container); |
|
|
2506 | |
2615 | old_container->flag [FLAG_APPLIED] = 0; |
2507 | old_container->flag [FLAG_APPLIED] = false; |
2616 | container = 0; |
2508 | container = 0; |
2617 | |
2509 | |
|
|
2510 | // client needs item update to make it work, client bug requires this to be separate |
2618 | esrv_update_item (UPD_FLAGS, this, old_container); |
2511 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2512 | |
2619 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2513 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2620 | play_sound (sound_find ("chest_close")); |
2514 | play_sound (sound_find ("chest_close")); |
2621 | } |
2515 | } |
2622 | |
2516 | |
2623 | if (new_container) |
2517 | if (new_container) |
… | |
… | |
2636 | } |
2530 | } |
2637 | #endif |
2531 | #endif |
2638 | |
2532 | |
2639 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2533 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2640 | |
2534 | |
|
|
2535 | // make sure the container is available, client bug requires this to be separate |
|
|
2536 | esrv_send_item (this, new_container); |
|
|
2537 | |
2641 | new_container->flag [FLAG_APPLIED] = 1; |
2538 | new_container->flag [FLAG_APPLIED] = true; |
2642 | container = new_container; |
2539 | container = new_container; |
2643 | |
2540 | |
|
|
2541 | // client needs flag change |
2644 | esrv_update_item (UPD_FLAGS, this, new_container); |
2542 | esrv_update_item (UPD_FLAGS, this, new_container); |
2645 | esrv_send_inventory (this, new_container); |
2543 | esrv_send_inventory (this, new_container); |
2646 | play_sound (sound_find ("chest_open")); |
2544 | play_sound (sound_find ("chest_open")); |
2647 | } |
2545 | } |
|
|
2546 | // else if (!old_container->env && contr && contr->ns) |
|
|
2547 | // contr->ns->floorbox_reset (); |
2648 | } |
2548 | } |
2649 | |
2549 | |
2650 | object * |
2550 | object * |
2651 | object::force_find (const shstr name) |
2551 | object::force_find (const shstr name) |
2652 | { |
2552 | { |