1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
… | |
… | |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * |
20 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
22 | */ |
23 | |
23 | |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
|
|
25 | sub/add_weight will transcend the environment updating the carrying |
|
|
26 | variable. */ |
|
|
27 | |
|
|
28 | #include <global.h> |
24 | #include <global.h> |
29 | #include <stdio.h> |
25 | #include <stdio.h> |
30 | #include <sys/types.h> |
26 | #include <sys/types.h> |
31 | #include <sys/uio.h> |
27 | #include <sys/uio.h> |
32 | #include <object.h> |
28 | #include <object.h> |
33 | #include <funcpoint.h> |
|
|
34 | #include <sproto.h> |
29 | #include <sproto.h> |
35 | #include <loader.h> |
30 | #include <loader.h> |
36 | |
31 | |
37 | #include <bitset> |
32 | #include <bitset> |
38 | |
33 | |
… | |
… | |
206 | || ob1->value != ob2->value |
201 | || ob1->value != ob2->value |
207 | || ob1->name != ob2->name) |
202 | || ob1->name != ob2->name) |
208 | return 0; |
203 | return 0; |
209 | |
204 | |
210 | /* Do not merge objects if nrof would overflow. First part checks |
205 | /* Do not merge objects if nrof would overflow. First part checks |
211 | * for unsigned overflow (2c), second part checks wether the result |
206 | * for unsigned overflow (2c), second part checks whether the result |
212 | * would fit into a 32 bit signed int, which is often used to hold |
207 | * would fit into a 32 bit signed int, which is often used to hold |
213 | * nrof values. |
208 | * nrof values. |
214 | */ |
209 | */ |
215 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
210 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
216 | return 0; |
211 | return 0; |
… | |
… | |
225 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
220 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
226 | |
221 | |
227 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
222 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
228 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
223 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
229 | |
224 | |
230 | if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
225 | if (ob1->arch->name != ob2->arch->name |
231 | || ob1->arch != ob2->arch |
|
|
232 | || ob1->name != ob2->name |
226 | || ob1->name != ob2->name |
233 | || ob1->title != ob2->title |
227 | || ob1->title != ob2->title |
234 | || ob1->msg != ob2->msg |
228 | || ob1->msg != ob2->msg |
235 | || ob1->weight != ob2->weight |
229 | || ob1->weight != ob2->weight |
236 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
|
|
237 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
|
|
238 | || ob1->attacktype != ob2->attacktype |
230 | || ob1->attacktype != ob2->attacktype |
239 | || ob1->magic != ob2->magic |
231 | || ob1->magic != ob2->magic |
240 | || ob1->slaying != ob2->slaying |
232 | || ob1->slaying != ob2->slaying |
241 | || ob1->skill != ob2->skill |
233 | || ob1->skill != ob2->skill |
242 | || ob1->value != ob2->value |
234 | || ob1->value != ob2->value |
… | |
… | |
249 | || ob1->move_block != ob2->move_block |
241 | || ob1->move_block != ob2->move_block |
250 | || ob1->move_allow != ob2->move_allow |
242 | || ob1->move_allow != ob2->move_allow |
251 | || ob1->move_on != ob2->move_on |
243 | || ob1->move_on != ob2->move_on |
252 | || ob1->move_off != ob2->move_off |
244 | || ob1->move_off != ob2->move_off |
253 | || ob1->move_slow != ob2->move_slow |
245 | || ob1->move_slow != ob2->move_slow |
254 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
246 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
|
|
247 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
|
|
248 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
|
|
249 | return 0; |
|
|
250 | |
|
|
251 | if ((ob1->flag ^ ob2->flag) |
|
|
252 | .reset (FLAG_INV_LOCKED) |
|
|
253 | .reset (FLAG_CLIENT_SENT) |
|
|
254 | .reset (FLAG_REMOVED) |
|
|
255 | .any ()) |
255 | return 0; |
256 | return 0; |
256 | |
257 | |
257 | /* This is really a spellbook check - we should in general |
258 | /* This is really a spellbook check - we should in general |
258 | * not merge objects with real inventories, as splitting them |
259 | * not merge objects with real inventories, as splitting them |
259 | * is hard. |
260 | * is hard. |
… | |
… | |
298 | |
299 | |
299 | if (ob1->key_values || ob2->key_values) |
300 | if (ob1->key_values || ob2->key_values) |
300 | { |
301 | { |
301 | /* At least one of these has key_values. */ |
302 | /* At least one of these has key_values. */ |
302 | if ((!ob1->key_values) != (!ob2->key_values)) |
303 | if ((!ob1->key_values) != (!ob2->key_values)) |
303 | /* One has fields, but the other one doesn't. */ |
304 | return 0; /* One has fields, but the other one doesn't. */ |
304 | return 0; |
305 | |
305 | else if (!compare_ob_value_lists (ob1, ob2)) |
306 | if (!compare_ob_value_lists (ob1, ob2)) |
306 | return 0; |
307 | return 0; |
307 | } |
308 | } |
308 | |
309 | |
309 | if (ob1->self || ob2->self) |
310 | if (ob1->self || ob2->self) |
310 | { |
311 | { |
… | |
… | |
316 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
317 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
317 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
318 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
318 | |
319 | |
319 | if (k1 != k2) |
320 | if (k1 != k2) |
320 | return 0; |
321 | return 0; |
|
|
322 | |
321 | else if (k1 == 0) |
323 | if (k1 == 0) |
322 | return 1; |
324 | return 1; |
|
|
325 | |
323 | else if (!cfperl_can_merge (ob1, ob2)) |
326 | if (!cfperl_can_merge (ob1, ob2)) |
324 | return 0; |
327 | return 0; |
325 | } |
328 | } |
326 | } |
329 | } |
327 | |
330 | |
328 | /* Everything passes, must be OK. */ |
331 | /* Everything passes, must be OK. */ |
329 | return 1; |
332 | return 1; |
330 | } |
333 | } |
331 | |
334 | |
|
|
335 | // find player who can see this object |
|
|
336 | object * |
|
|
337 | object::visible_to () const |
|
|
338 | { |
|
|
339 | if (client_visible () && !flag [FLAG_REMOVED]) |
|
|
340 | { |
|
|
341 | // see if we are in a container of sorts |
|
|
342 | if (env) |
|
|
343 | { |
|
|
344 | // the player inventory itself is always visible |
|
|
345 | if (env->type == PLAYER) |
|
|
346 | return env; |
|
|
347 | |
|
|
348 | // else a player could have our env open |
|
|
349 | object *envest = env->outer_env (); |
|
|
350 | |
|
|
351 | // the player itself is always on a map, so we will find him here |
|
|
352 | // even if our inv is in a player. |
|
|
353 | if (envest->is_on_map ()) |
|
|
354 | if (object *pl = envest->ms ().player ()) |
|
|
355 | if (pl->container == env) |
|
|
356 | return pl; |
|
|
357 | } |
|
|
358 | else |
|
|
359 | { |
|
|
360 | // maybe there is a player standing on the same mapspace |
|
|
361 | // this will catch the case where "this" is a player |
|
|
362 | if (object *pl = ms ().player ()) |
|
|
363 | if (!pl->container || this == pl->container) |
|
|
364 | return pl; |
|
|
365 | } |
|
|
366 | } |
|
|
367 | |
|
|
368 | return 0; |
|
|
369 | } |
|
|
370 | |
|
|
371 | // adjust weight per container type ("of holding") |
332 | static sint32 |
372 | static sint32 |
333 | weight_adjust (object *op, sint32 weight) |
373 | weight_adjust (object *op, sint32 weight) |
334 | { |
374 | { |
335 | return op->type == CONTAINER |
375 | return op->type == CONTAINER |
336 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
376 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
337 | : weight; |
377 | : weight; |
338 | } |
378 | } |
339 | |
379 | |
340 | /* |
380 | /* |
341 | * add_weight(object, weight) adds the specified weight to an object, |
381 | * adjust_weight(object, weight) adds the specified weight to an object, |
342 | * and also updates how much the environment(s) is/are carrying. |
382 | * and also updates how much the environment(s) is/are carrying. |
343 | */ |
383 | */ |
344 | static void |
384 | static void |
345 | add_weight (object *op, sint32 weight) |
385 | adjust_weight (object *op, sint32 weight) |
346 | { |
386 | { |
347 | while (op) |
387 | while (op) |
348 | { |
388 | { |
349 | weight = weight_adjust (op, weight); |
389 | weight = weight_adjust (op, weight); |
350 | |
390 | |
|
|
391 | if (!weight) |
|
|
392 | return; |
|
|
393 | |
351 | op->carrying += weight; |
394 | op->carrying += weight; |
|
|
395 | |
|
|
396 | if (object *pl = op->visible_to ()) |
|
|
397 | if (pl != op) // player is handled lazily |
|
|
398 | esrv_update_item (UPD_WEIGHT, pl, op); |
|
|
399 | |
352 | op = op->env; |
400 | op = op->env; |
353 | } |
401 | } |
354 | } |
|
|
355 | |
|
|
356 | /* |
|
|
357 | * sub_weight() recursively (outwards) subtracts a number from the |
|
|
358 | * weight of an object (and what is carried by it's environment(s)). |
|
|
359 | */ |
|
|
360 | static void |
|
|
361 | sub_weight (object *op, long weight) |
|
|
362 | { |
|
|
363 | add_weight (op, -weight); |
|
|
364 | } |
402 | } |
365 | |
403 | |
366 | /* |
404 | /* |
367 | * this is a recursive function which calculates the weight |
405 | * this is a recursive function which calculates the weight |
368 | * an object is carrying. It goes through op and figures out how much |
406 | * an object is carrying. It goes through op and figures out how much |
… | |
… | |
379 | op->update_weight (); |
417 | op->update_weight (); |
380 | |
418 | |
381 | sum += op->total_weight (); |
419 | sum += op->total_weight (); |
382 | } |
420 | } |
383 | |
421 | |
384 | carrying = weight_adjust (this, sum); |
422 | sum = weight_adjust (this, sum); |
385 | } |
|
|
386 | |
423 | |
|
|
424 | if (sum != carrying) |
|
|
425 | { |
|
|
426 | carrying = sum; |
|
|
427 | |
|
|
428 | if (object *pl = visible_to ()) |
|
|
429 | if (pl != this) // player is handled lazily |
|
|
430 | esrv_update_item (UPD_WEIGHT, pl, this); |
|
|
431 | } |
|
|
432 | } |
|
|
433 | |
387 | /* |
434 | /* |
388 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
435 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
389 | * Some error messages. |
|
|
390 | * The result of the dump is stored in the static global errmsg array. |
|
|
391 | */ |
436 | */ |
392 | char * |
437 | char * |
393 | dump_object (object *op) |
438 | dump_object (object *op) |
394 | { |
439 | { |
395 | if (!op) |
440 | if (!op) |
… | |
… | |
409 | get_nearest_part (object *op, const object *pl) |
454 | get_nearest_part (object *op, const object *pl) |
410 | { |
455 | { |
411 | object *tmp, *closest; |
456 | object *tmp, *closest; |
412 | int last_dist, i; |
457 | int last_dist, i; |
413 | |
458 | |
414 | if (op->more == NULL) |
459 | if (!op->more) |
415 | return op; |
460 | return op; |
|
|
461 | |
416 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) |
462 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
463 | tmp; |
|
|
464 | tmp = tmp->more) |
417 | if ((i = distance (tmp, pl)) < last_dist) |
465 | if ((i = distance (tmp, pl)) < last_dist) |
418 | closest = tmp, last_dist = i; |
466 | closest = tmp, last_dist = i; |
|
|
467 | |
419 | return closest; |
468 | return closest; |
420 | } |
469 | } |
421 | |
470 | |
422 | /* |
471 | /* |
423 | * Returns the object which has the count-variable equal to the argument. |
472 | * Returns the object which has the count-variable equal to the argument. |
|
|
473 | * VERRRY slow. |
424 | */ |
474 | */ |
425 | object * |
475 | object * |
426 | find_object (tag_t i) |
476 | find_object (tag_t i) |
427 | { |
477 | { |
428 | for_all_objects (op) |
478 | for_all_objects (op) |
… | |
… | |
556 | } |
606 | } |
557 | |
607 | |
558 | object & |
608 | object & |
559 | object::operator =(const object &src) |
609 | object::operator =(const object &src) |
560 | { |
610 | { |
561 | bool is_freed = flag [FLAG_FREED]; |
611 | remove (); |
562 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
563 | |
612 | |
564 | *(object_copy *)this = src; |
613 | *(object_copy *)this = src; |
565 | |
614 | |
566 | flag [FLAG_FREED] = is_freed; |
|
|
567 | flag [FLAG_REMOVED] = is_removed; |
615 | flag [FLAG_REMOVED] = true; |
568 | |
616 | |
569 | /* Copy over key_values, if any. */ |
617 | /* Copy over key_values, if any. */ |
570 | if (src.key_values) |
618 | if (src.key_values) |
571 | { |
619 | { |
572 | key_value *tail = 0; |
620 | key_value *tail = 0; |
… | |
… | |
636 | object * |
684 | object * |
637 | object::clone () |
685 | object::clone () |
638 | { |
686 | { |
639 | object *neu = create (); |
687 | object *neu = create (); |
640 | copy_to (neu); |
688 | copy_to (neu); |
|
|
689 | neu->map = map; // not copied by copy_to |
641 | return neu; |
690 | return neu; |
642 | } |
691 | } |
643 | |
692 | |
644 | /* |
693 | /* |
645 | * If an object with the IS_TURNABLE() flag needs to be turned due |
694 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
696 | * UP_OBJ_FACE: only the objects face has changed. |
745 | * UP_OBJ_FACE: only the objects face has changed. |
697 | */ |
746 | */ |
698 | void |
747 | void |
699 | update_object (object *op, int action) |
748 | update_object (object *op, int action) |
700 | { |
749 | { |
701 | if (op == NULL) |
750 | if (!op) |
702 | { |
751 | { |
703 | /* this should never happen */ |
752 | /* this should never happen */ |
704 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
753 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
705 | return; |
754 | return; |
706 | } |
755 | } |
707 | |
756 | |
708 | if (op->env) |
757 | if (!op->is_on_map ()) |
709 | { |
758 | { |
710 | /* Animation is currently handled by client, so nothing |
759 | /* Animation is currently handled by client, so nothing |
711 | * to do in this case. |
760 | * to do in this case. |
712 | */ |
761 | */ |
713 | return; |
762 | return; |
714 | } |
763 | } |
715 | |
|
|
716 | /* If the map is saving, don't do anything as everything is |
|
|
717 | * going to get freed anyways. |
|
|
718 | */ |
|
|
719 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
720 | return; |
|
|
721 | |
764 | |
722 | /* make sure the object is within map boundaries */ |
765 | /* make sure the object is within map boundaries */ |
723 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
766 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
724 | { |
767 | { |
725 | LOG (llevError, "update_object() called for object out of map!\n"); |
768 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
868 | object::destroy_inv (bool drop_to_ground) |
911 | object::destroy_inv (bool drop_to_ground) |
869 | { |
912 | { |
870 | // need to check first, because the checks below might segfault |
913 | // need to check first, because the checks below might segfault |
871 | // as we might be on an invalid mapspace and crossfire code |
914 | // as we might be on an invalid mapspace and crossfire code |
872 | // is too buggy to ensure that the inventory is empty. |
915 | // is too buggy to ensure that the inventory is empty. |
873 | // corollary: if you create arrows etc. with stuff in tis inventory, |
916 | // corollary: if you create arrows etc. with stuff in its inventory, |
874 | // cf will crash below with off-map x and y |
917 | // cf will crash below with off-map x and y |
875 | if (!inv) |
918 | if (!inv) |
876 | return; |
919 | return; |
877 | |
920 | |
878 | /* Only if the space blocks everything do we not process - |
921 | /* Only if the space blocks everything do we not process - |
… | |
… | |
885 | || map->nodrop |
928 | || map->nodrop |
886 | || ms ().move_block == MOVE_ALL) |
929 | || ms ().move_block == MOVE_ALL) |
887 | { |
930 | { |
888 | while (inv) |
931 | while (inv) |
889 | { |
932 | { |
890 | inv->destroy_inv (drop_to_ground); |
933 | inv->destroy_inv (false); |
891 | inv->destroy (); |
934 | inv->destroy (); |
892 | } |
935 | } |
893 | } |
936 | } |
894 | else |
937 | else |
895 | { /* Put objects in inventory onto this space */ |
938 | { /* Put objects in inventory onto this space */ |
… | |
… | |
901 | || op->flag [FLAG_NO_DROP] |
944 | || op->flag [FLAG_NO_DROP] |
902 | || op->type == RUNE |
945 | || op->type == RUNE |
903 | || op->type == TRAP |
946 | || op->type == TRAP |
904 | || op->flag [FLAG_IS_A_TEMPLATE] |
947 | || op->flag [FLAG_IS_A_TEMPLATE] |
905 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
948 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
906 | op->destroy (); |
949 | op->destroy (true); |
907 | else |
950 | else |
908 | map->insert (op, x, y); |
951 | map->insert (op, x, y); |
909 | } |
952 | } |
910 | } |
953 | } |
911 | } |
954 | } |
… | |
… | |
915 | object *op = new object; |
958 | object *op = new object; |
916 | op->link (); |
959 | op->link (); |
917 | return op; |
960 | return op; |
918 | } |
961 | } |
919 | |
962 | |
|
|
963 | static struct freed_map : maptile |
|
|
964 | { |
|
|
965 | freed_map () |
|
|
966 | { |
|
|
967 | path = "<freed objects map>"; |
|
|
968 | name = "/internal/freed_objects_map"; |
|
|
969 | width = 3; |
|
|
970 | height = 3; |
|
|
971 | nodrop = 1; |
|
|
972 | |
|
|
973 | alloc (); |
|
|
974 | in_memory = MAP_ACTIVE; |
|
|
975 | } |
|
|
976 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
977 | |
920 | void |
978 | void |
921 | object::do_destroy () |
979 | object::do_destroy () |
922 | { |
980 | { |
923 | attachable::do_destroy (); |
|
|
924 | |
|
|
925 | if (flag [FLAG_IS_LINKED]) |
981 | if (flag [FLAG_IS_LINKED]) |
926 | remove_button_link (this); |
982 | remove_button_link (this); |
927 | |
983 | |
928 | if (flag [FLAG_FRIENDLY]) |
984 | if (flag [FLAG_FRIENDLY]) |
929 | remove_friendly_object (this); |
985 | remove_friendly_object (this); |
930 | |
986 | |
931 | if (!flag [FLAG_REMOVED]) |
|
|
932 | remove (); |
987 | remove (); |
933 | |
988 | |
934 | destroy_inv (true); |
989 | attachable::do_destroy (); |
935 | |
990 | |
936 | deactivate (); |
991 | deactivate (); |
937 | unlink (); |
992 | unlink (); |
938 | |
993 | |
939 | flag [FLAG_FREED] = 1; |
994 | flag [FLAG_FREED] = 1; |
940 | |
995 | |
941 | // hack to ensure that freed objects still have a valid map |
996 | // hack to ensure that freed objects still have a valid map |
942 | { |
|
|
943 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
944 | |
|
|
945 | if (!freed_map) |
|
|
946 | { |
|
|
947 | freed_map = new maptile; |
|
|
948 | |
|
|
949 | freed_map->path = "<freed objects map>"; |
|
|
950 | freed_map->name = "/internal/freed_objects_map"; |
|
|
951 | freed_map->width = 3; |
|
|
952 | freed_map->height = 3; |
|
|
953 | freed_map->nodrop = 1; |
|
|
954 | |
|
|
955 | freed_map->alloc (); |
|
|
956 | freed_map->in_memory = MAP_ACTIVE; |
|
|
957 | } |
|
|
958 | |
|
|
959 | map = freed_map; |
997 | map = &freed_map; |
960 | x = 1; |
998 | x = 1; |
961 | y = 1; |
999 | y = 1; |
962 | } |
|
|
963 | |
1000 | |
964 | if (more) |
1001 | if (more) |
965 | { |
1002 | { |
966 | more->destroy (); |
1003 | more->destroy (); |
967 | more = 0; |
1004 | more = 0; |
… | |
… | |
980 | object::destroy (bool destroy_inventory) |
1017 | object::destroy (bool destroy_inventory) |
981 | { |
1018 | { |
982 | if (destroyed ()) |
1019 | if (destroyed ()) |
983 | return; |
1020 | return; |
984 | |
1021 | |
|
|
1022 | if (!is_head () && !head->destroyed ()) |
|
|
1023 | { |
|
|
1024 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1025 | head->destroy (destroy_inventory); |
|
|
1026 | return; |
|
|
1027 | } |
|
|
1028 | |
985 | if (destroy_inventory) |
1029 | destroy_inv (!destroy_inventory); |
986 | destroy_inv (false); |
|
|
987 | |
1030 | |
988 | if (is_head ()) |
1031 | if (is_head ()) |
989 | if (sound_destroy) |
1032 | if (sound_destroy) |
990 | play_sound (sound_destroy); |
1033 | play_sound (sound_destroy); |
991 | else if (flag [FLAG_MONSTER]) |
1034 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1005 | object::do_remove () |
1048 | object::do_remove () |
1006 | { |
1049 | { |
1007 | object *tmp, *last = 0; |
1050 | object *tmp, *last = 0; |
1008 | object *otmp; |
1051 | object *otmp; |
1009 | |
1052 | |
1010 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1053 | if (flag [FLAG_REMOVED]) |
1011 | return; |
1054 | return; |
1012 | |
1055 | |
1013 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1014 | INVOKE_OBJECT (REMOVE, this); |
1056 | INVOKE_OBJECT (REMOVE, this); |
|
|
1057 | |
|
|
1058 | flag [FLAG_REMOVED] = true; |
1015 | |
1059 | |
1016 | if (more) |
1060 | if (more) |
1017 | more->remove (); |
1061 | more->remove (); |
1018 | |
1062 | |
1019 | /* |
1063 | /* |
1020 | * In this case, the object to be removed is in someones |
1064 | * In this case, the object to be removed is in someones |
1021 | * inventory. |
1065 | * inventory. |
1022 | */ |
1066 | */ |
1023 | if (env) |
1067 | if (env) |
1024 | { |
1068 | { |
|
|
1069 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
|
|
1070 | if (object *pl = visible_to ()) |
|
|
1071 | esrv_del_item (pl->contr, count); |
|
|
1072 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1073 | |
|
|
1074 | adjust_weight (env, -total_weight ()); |
|
|
1075 | |
|
|
1076 | *(above ? &above->below : &env->inv) = below; |
|
|
1077 | |
1025 | if (nrof) |
1078 | if (below) |
1026 | sub_weight (env, weight * nrof); |
1079 | below->above = above; |
1027 | else |
1080 | |
1028 | sub_weight (env, weight + carrying); |
1081 | /* we set up values so that it could be inserted into |
|
|
1082 | * the map, but we don't actually do that - it is up |
|
|
1083 | * to the caller to decide what we want to do. |
|
|
1084 | */ |
|
|
1085 | map = env->map; |
|
|
1086 | x = env->x; |
|
|
1087 | y = env->y; |
|
|
1088 | above = 0; |
|
|
1089 | below = 0; |
|
|
1090 | env = 0; |
1029 | |
1091 | |
1030 | /* NO_FIX_PLAYER is set when a great many changes are being |
1092 | /* NO_FIX_PLAYER is set when a great many changes are being |
1031 | * made to players inventory. If set, avoiding the call |
1093 | * made to players inventory. If set, avoiding the call |
1032 | * to save cpu time. |
1094 | * to save cpu time. |
1033 | */ |
1095 | */ |
1034 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1096 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1035 | otmp->update_stats (); |
1097 | otmp->update_stats (); |
1036 | |
|
|
1037 | if (above) |
|
|
1038 | above->below = below; |
|
|
1039 | else |
|
|
1040 | env->inv = below; |
|
|
1041 | |
|
|
1042 | if (below) |
|
|
1043 | below->above = above; |
|
|
1044 | |
|
|
1045 | /* we set up values so that it could be inserted into |
|
|
1046 | * the map, but we don't actually do that - it is up |
|
|
1047 | * to the caller to decide what we want to do. |
|
|
1048 | */ |
|
|
1049 | x = env->x, y = env->y; |
|
|
1050 | map = env->map; |
|
|
1051 | above = 0, below = 0; |
|
|
1052 | env = 0; |
|
|
1053 | } |
1098 | } |
1054 | else if (map) |
1099 | else if (map) |
1055 | { |
1100 | { |
1056 | if (type == PLAYER) |
|
|
1057 | { |
|
|
1058 | // leaving a spot always closes any open container on the ground |
|
|
1059 | if (container && !container->env) |
|
|
1060 | // this causes spurious floorbox updates, but it ensures |
|
|
1061 | // that the CLOSE event is being sent. |
|
|
1062 | close_container (); |
|
|
1063 | |
|
|
1064 | --map->players; |
|
|
1065 | map->touch (); |
|
|
1066 | } |
|
|
1067 | |
|
|
1068 | map->dirty = true; |
1101 | map->dirty = true; |
1069 | mapspace &ms = this->ms (); |
1102 | mapspace &ms = this->ms (); |
|
|
1103 | |
|
|
1104 | if (object *pl = ms.player ()) |
|
|
1105 | { |
|
|
1106 | if (type == PLAYER) // this == pl(!) |
|
|
1107 | { |
|
|
1108 | // leaving a spot always closes any open container on the ground |
|
|
1109 | if (container && !container->env) |
|
|
1110 | // this causes spurious floorbox updates, but it ensures |
|
|
1111 | // that the CLOSE event is being sent. |
|
|
1112 | close_container (); |
|
|
1113 | |
|
|
1114 | --map->players; |
|
|
1115 | map->touch (); |
|
|
1116 | } |
|
|
1117 | else if (pl->container == this) |
|
|
1118 | { |
|
|
1119 | // removing a container should close it |
|
|
1120 | close_container (); |
|
|
1121 | } |
|
|
1122 | |
|
|
1123 | esrv_del_item (pl->contr, count); |
|
|
1124 | } |
1070 | |
1125 | |
1071 | /* link the object above us */ |
1126 | /* link the object above us */ |
1072 | if (above) |
1127 | if (above) |
1073 | above->below = below; |
1128 | above->below = below; |
1074 | else |
1129 | else |
… | |
… | |
1104 | * removed (most likely destroyed), update the player view |
1159 | * removed (most likely destroyed), update the player view |
1105 | * appropriately. |
1160 | * appropriately. |
1106 | */ |
1161 | */ |
1107 | pl->close_container (); |
1162 | pl->close_container (); |
1108 | |
1163 | |
|
|
1164 | //TODO: the floorbox prev/next might need updating |
|
|
1165 | //esrv_del_item (pl->contr, count); |
|
|
1166 | //TODO: update floorbox to preserve ordering |
|
|
1167 | if (pl->contr->ns) |
1109 | pl->contr->ns->floorbox_update (); |
1168 | pl->contr->ns->floorbox_update (); |
1110 | } |
1169 | } |
1111 | |
1170 | |
1112 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1171 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1113 | { |
1172 | { |
1114 | /* No point updating the players look faces if he is the object |
1173 | /* No point updating the players look faces if he is the object |
… | |
… | |
1158 | if (!top) |
1217 | if (!top) |
1159 | for (top = op; top && top->above; top = top->above) |
1218 | for (top = op; top && top->above; top = top->above) |
1160 | ; |
1219 | ; |
1161 | |
1220 | |
1162 | for (; top; top = top->below) |
1221 | for (; top; top = top->below) |
1163 | { |
|
|
1164 | if (top == op) |
|
|
1165 | continue; |
|
|
1166 | |
|
|
1167 | if (object::can_merge (op, top)) |
1222 | if (object::can_merge (op, top)) |
1168 | { |
1223 | { |
1169 | top->nrof += op->nrof; |
1224 | top->nrof += op->nrof; |
1170 | |
1225 | |
1171 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1226 | if (object *pl = top->visible_to ()) |
1172 | op->weight = 0; /* Don't want any adjustements now */ |
1227 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1228 | |
|
|
1229 | op->weight = 0; // cancel the addition above |
|
|
1230 | op->carrying = 0; // must be 0 already |
|
|
1231 | |
1173 | op->destroy (); |
1232 | op->destroy (1); |
|
|
1233 | |
1174 | return top; |
1234 | return top; |
1175 | } |
1235 | } |
1176 | } |
|
|
1177 | |
1236 | |
1178 | return 0; |
1237 | return 0; |
1179 | } |
1238 | } |
1180 | |
1239 | |
1181 | void |
1240 | void |
… | |
… | |
1240 | object * |
1299 | object * |
1241 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1300 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1242 | { |
1301 | { |
1243 | assert (!op->flag [FLAG_FREED]); |
1302 | assert (!op->flag [FLAG_FREED]); |
1244 | |
1303 | |
1245 | object *top, *floor = NULL; |
|
|
1246 | |
|
|
1247 | op->remove (); |
1304 | op->remove (); |
1248 | |
1305 | |
1249 | /* Ideally, the caller figures this out. However, it complicates a lot |
1306 | /* Ideally, the caller figures this out. However, it complicates a lot |
1250 | * of areas of callers (eg, anything that uses find_free_spot would now |
1307 | * of areas of callers (eg, anything that uses find_free_spot would now |
1251 | * need extra work |
1308 | * need extra work |
1252 | */ |
1309 | */ |
1253 | if (!xy_normalise (m, op->x, op->y)) |
1310 | if (!xy_normalise (m, op->x, op->y)) |
1254 | { |
1311 | { |
1255 | op->destroy (); |
1312 | op->destroy (1); |
1256 | return 0; |
1313 | return 0; |
1257 | } |
1314 | } |
1258 | |
1315 | |
1259 | if (object *more = op->more) |
1316 | if (object *more = op->more) |
1260 | if (!insert_ob_in_map (more, m, originator, flag)) |
1317 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1269 | */ |
1326 | */ |
1270 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1327 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1271 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1328 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1272 | if (object::can_merge (op, tmp)) |
1329 | if (object::can_merge (op, tmp)) |
1273 | { |
1330 | { |
|
|
1331 | // TODO: we atcually want to update tmp, not op, |
|
|
1332 | // but some caller surely breaks when we return tmp |
|
|
1333 | // from here :/ |
1274 | op->nrof += tmp->nrof; |
1334 | op->nrof += tmp->nrof; |
1275 | tmp->destroy (); |
1335 | tmp->destroy (1); |
1276 | } |
1336 | } |
1277 | |
1337 | |
1278 | 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 */ |
1279 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1339 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1280 | |
1340 | |
… | |
… | |
1300 | /* since *below* originator, no need to update top */ |
1360 | /* since *below* originator, no need to update top */ |
1301 | originator->below = op; |
1361 | originator->below = op; |
1302 | } |
1362 | } |
1303 | else |
1363 | else |
1304 | { |
1364 | { |
|
|
1365 | object *top, *floor = NULL; |
|
|
1366 | |
1305 | top = ms.bot; |
1367 | top = ms.bot; |
1306 | |
1368 | |
1307 | /* If there are other objects, then */ |
1369 | /* If there are other objects, then */ |
1308 | if (top) |
1370 | if (top) |
1309 | { |
1371 | { |
… | |
… | |
1408 | } |
1470 | } |
1409 | |
1471 | |
1410 | op->map->dirty = true; |
1472 | op->map->dirty = true; |
1411 | |
1473 | |
1412 | if (object *pl = ms.player ()) |
1474 | if (object *pl = ms.player ()) |
|
|
1475 | //TODO: the floorbox prev/next might need updating |
|
|
1476 | //esrv_send_item (pl, op); |
|
|
1477 | //TODO: update floorbox to preserve ordering |
|
|
1478 | if (pl->contr->ns) |
1413 | pl->contr->ns->floorbox_update (); |
1479 | pl->contr->ns->floorbox_update (); |
1414 | |
1480 | |
1415 | /* If this object glows, it may affect lighting conditions that are |
1481 | /* If this object glows, it may affect lighting conditions that are |
1416 | * visible to others on this map. But update_all_los is really |
1482 | * visible to others on this map. But update_all_los is really |
1417 | * an inefficient way to do this, as it means los for all players |
1483 | * an inefficient way to do this, as it means los for all players |
1418 | * on the map will get recalculated. The players could very well |
1484 | * on the map will get recalculated. The players could very well |
… | |
… | |
1460 | * op is the object to insert it under: supplies x and the map. |
1526 | * op is the object to insert it under: supplies x and the map. |
1461 | */ |
1527 | */ |
1462 | void |
1528 | void |
1463 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1529 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1464 | { |
1530 | { |
1465 | object *tmp, *tmp1; |
|
|
1466 | |
|
|
1467 | /* first search for itself and remove any old instances */ |
1531 | /* first search for itself and remove any old instances */ |
1468 | |
1532 | |
1469 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1533 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1470 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1534 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1471 | tmp->destroy (); |
1535 | tmp->destroy (1); |
1472 | |
1536 | |
1473 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1537 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1474 | |
1538 | |
1475 | tmp1->x = op->x; |
1539 | tmp->x = op->x; |
1476 | tmp1->y = op->y; |
1540 | tmp->y = op->y; |
|
|
1541 | |
1477 | insert_ob_in_map (tmp1, op->map, op, 0); |
1542 | insert_ob_in_map (tmp, op->map, op, 0); |
1478 | } |
1543 | } |
1479 | |
1544 | |
1480 | object * |
1545 | object * |
1481 | object::insert_at (object *where, object *originator, int flags) |
1546 | object::insert_at (object *where, object *originator, int flags) |
1482 | { |
1547 | { |
… | |
… | |
1485 | else |
1550 | else |
1486 | return where->map->insert (this, where->x, where->y, originator, flags); |
1551 | return where->map->insert (this, where->x, where->y, originator, flags); |
1487 | } |
1552 | } |
1488 | |
1553 | |
1489 | /* |
1554 | /* |
1490 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
|
|
1491 | * is returned contains nr objects, and the remaining parts contains |
|
|
1492 | * the rest (or is removed and freed if that number is 0). |
|
|
1493 | * On failure, NULL is returned, and the reason put into the |
|
|
1494 | * global static errmsg array. |
|
|
1495 | */ |
|
|
1496 | object * |
|
|
1497 | get_split_ob (object *orig_ob, uint32 nr) |
|
|
1498 | { |
|
|
1499 | object *newob; |
|
|
1500 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
|
|
1501 | |
|
|
1502 | if (orig_ob->nrof < nr) |
|
|
1503 | { |
|
|
1504 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
|
|
1505 | return NULL; |
|
|
1506 | } |
|
|
1507 | |
|
|
1508 | newob = object_create_clone (orig_ob); |
|
|
1509 | |
|
|
1510 | if ((orig_ob->nrof -= nr) < 1) |
|
|
1511 | orig_ob->destroy (1); |
|
|
1512 | else if (!is_removed) |
|
|
1513 | { |
|
|
1514 | if (orig_ob->env != NULL) |
|
|
1515 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
|
|
1516 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE) |
|
|
1517 | { |
|
|
1518 | strcpy (errmsg, "Tried to split object whose map is not in memory."); |
|
|
1519 | LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); |
|
|
1520 | return NULL; |
|
|
1521 | } |
|
|
1522 | } |
|
|
1523 | |
|
|
1524 | newob->nrof = nr; |
|
|
1525 | |
|
|
1526 | return newob; |
|
|
1527 | } |
|
|
1528 | |
|
|
1529 | /* |
|
|
1530 | * decrease_ob_nr(object, number) decreases a specified number from |
1555 | * decrease(object, number) decreases a specified number from |
1531 | * the amount of an object. If the amount reaches 0, the object |
1556 | * the amount of an object. If the amount reaches 0, the object |
1532 | * is subsequently removed and freed. |
1557 | * is subsequently removed and freed. |
1533 | * |
1558 | * |
1534 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1559 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1535 | */ |
1560 | */ |
|
|
1561 | bool |
|
|
1562 | object::decrease (sint32 nr) |
|
|
1563 | { |
|
|
1564 | if (!nr) |
|
|
1565 | return true; |
|
|
1566 | |
|
|
1567 | nr = min (nr, nrof); |
|
|
1568 | |
|
|
1569 | nrof -= nr; |
|
|
1570 | |
|
|
1571 | if (nrof) |
|
|
1572 | { |
|
|
1573 | adjust_weight (env, -weight * nr); // carrying == 0 |
|
|
1574 | |
|
|
1575 | if (object *pl = visible_to ()) |
|
|
1576 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1577 | |
|
|
1578 | return true; |
|
|
1579 | } |
|
|
1580 | else |
|
|
1581 | { |
|
|
1582 | destroy (1); |
|
|
1583 | return false; |
|
|
1584 | } |
|
|
1585 | } |
|
|
1586 | |
|
|
1587 | /* |
|
|
1588 | * split(ob,nr) splits up ob into two parts. The part which |
|
|
1589 | * is returned contains nr objects, and the remaining parts contains |
|
|
1590 | * the rest (or is removed and returned if that number is 0). |
|
|
1591 | * On failure, NULL is returned. |
|
|
1592 | */ |
1536 | object * |
1593 | object * |
1537 | decrease_ob_nr (object *op, uint32 i) |
1594 | object::split (sint32 nr) |
1538 | { |
1595 | { |
1539 | object *tmp; |
1596 | int have = number_of (); |
1540 | |
1597 | |
1541 | if (i == 0) /* objects with op->nrof require this check */ |
1598 | if (have < nr) |
1542 | return op; |
1599 | return 0; |
1543 | |
1600 | else if (have == nr) |
1544 | if (i > op->nrof) |
|
|
1545 | i = op->nrof; |
|
|
1546 | |
|
|
1547 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1548 | op->nrof -= i; |
|
|
1549 | else if (op->env) |
|
|
1550 | { |
1601 | { |
1551 | /* is this object in the players inventory, or sub container |
|
|
1552 | * therein? |
|
|
1553 | */ |
|
|
1554 | tmp = op->in_player (); |
|
|
1555 | /* nope. Is this a container the player has opened? |
|
|
1556 | * If so, set tmp to that player. |
|
|
1557 | * IMO, searching through all the players will mostly |
|
|
1558 | * likely be quicker than following op->env to the map, |
|
|
1559 | * and then searching the map for a player. |
|
|
1560 | */ |
|
|
1561 | if (!tmp) |
|
|
1562 | for_all_players (pl) |
|
|
1563 | if (pl->ob->container == op->env) |
|
|
1564 | { |
|
|
1565 | tmp = pl->ob; |
|
|
1566 | break; |
|
|
1567 | } |
|
|
1568 | |
|
|
1569 | if (i < op->nrof) |
|
|
1570 | { |
|
|
1571 | sub_weight (op->env, op->weight * i); |
|
|
1572 | op->nrof -= i; |
|
|
1573 | if (tmp) |
|
|
1574 | esrv_send_item (tmp, op); |
|
|
1575 | } |
|
|
1576 | else |
|
|
1577 | { |
|
|
1578 | op->remove (); |
1602 | remove (); |
1579 | op->nrof = 0; |
1603 | return this; |
1580 | if (tmp) |
|
|
1581 | esrv_del_item (tmp->contr, op->count); |
|
|
1582 | } |
|
|
1583 | } |
1604 | } |
1584 | else |
1605 | else |
1585 | { |
1606 | { |
1586 | object *above = op->above; |
1607 | decrease (nr); |
1587 | |
1608 | |
1588 | if (i < op->nrof) |
1609 | object *op = object_create_clone (this); |
1589 | op->nrof -= i; |
1610 | op->nrof = nr; |
1590 | else |
|
|
1591 | { |
|
|
1592 | op->remove (); |
|
|
1593 | op->nrof = 0; |
|
|
1594 | } |
|
|
1595 | |
|
|
1596 | /* Since we just removed op, op->above is null */ |
|
|
1597 | for (tmp = above; tmp; tmp = tmp->above) |
|
|
1598 | if (tmp->type == PLAYER) |
|
|
1599 | { |
|
|
1600 | if (op->nrof) |
|
|
1601 | esrv_send_item (tmp, op); |
|
|
1602 | else |
|
|
1603 | esrv_del_item (tmp->contr, op->count); |
|
|
1604 | } |
|
|
1605 | } |
|
|
1606 | |
|
|
1607 | if (op->nrof) |
|
|
1608 | return op; |
1611 | return op; |
1609 | else |
|
|
1610 | { |
|
|
1611 | op->destroy (); |
|
|
1612 | return 0; |
|
|
1613 | } |
1612 | } |
1614 | } |
1613 | } |
1615 | |
1614 | |
1616 | object * |
1615 | object * |
1617 | insert_ob_in_ob (object *op, object *where) |
1616 | insert_ob_in_ob (object *op, object *where) |
… | |
… | |
1642 | * be != op, if items are merged. -Tero |
1641 | * be != op, if items are merged. -Tero |
1643 | */ |
1642 | */ |
1644 | object * |
1643 | object * |
1645 | object::insert (object *op) |
1644 | object::insert (object *op) |
1646 | { |
1645 | { |
1647 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1648 | op->remove (); |
|
|
1649 | |
|
|
1650 | if (op->more) |
1646 | if (op->more) |
1651 | { |
1647 | { |
1652 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1648 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1653 | return op; |
1649 | return op; |
1654 | } |
1650 | } |
1655 | |
1651 | |
1656 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1652 | op->remove (); |
1657 | CLEAR_FLAG (op, FLAG_REMOVED); |
1653 | |
|
|
1654 | op->flag [FLAG_OBJ_ORIGINAL] = 0; |
1658 | |
1655 | |
1659 | if (op->nrof) |
1656 | if (op->nrof) |
1660 | { |
|
|
1661 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1657 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1662 | if (object::can_merge (tmp, op)) |
1658 | if (object::can_merge (tmp, op)) |
1663 | { |
1659 | { |
1664 | /* return the original object and remove inserted object |
1660 | /* return the original object and remove inserted object |
1665 | (client needs the original object) */ |
1661 | (client needs the original object) */ |
1666 | tmp->nrof += op->nrof; |
1662 | tmp->nrof += op->nrof; |
1667 | /* Weight handling gets pretty funky. Since we are adding to |
1663 | |
1668 | * tmp->nrof, we need to increase the weight. |
1664 | if (object *pl = tmp->visible_to ()) |
1669 | */ |
1665 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1666 | |
1670 | add_weight (this, op->weight * op->nrof); |
1667 | adjust_weight (this, op->total_weight ()); |
1671 | SET_FLAG (op, FLAG_REMOVED); |
1668 | |
1672 | op->destroy (); /* free the inserted object */ |
1669 | op->destroy (1); |
1673 | op = tmp; |
1670 | op = tmp; |
1674 | op->remove (); /* and fix old object's links */ |
1671 | goto inserted; |
1675 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1676 | break; |
|
|
1677 | } |
1672 | } |
1678 | |
1673 | |
1679 | /* I assume combined objects have no inventory |
|
|
1680 | * We add the weight - this object could have just been removed |
|
|
1681 | * (if it was possible to merge). calling remove_ob will subtract |
|
|
1682 | * the weight, so we need to add it in again, since we actually do |
|
|
1683 | * the linking below |
|
|
1684 | */ |
|
|
1685 | add_weight (this, op->weight * op->nrof); |
|
|
1686 | } |
|
|
1687 | else |
|
|
1688 | add_weight (this, (op->weight + op->carrying)); |
|
|
1689 | |
|
|
1690 | if (object *otmp = this->in_player ()) |
|
|
1691 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
|
|
1692 | otmp->update_stats (); |
|
|
1693 | |
|
|
1694 | op->owner = 0; // its his/hers now. period. |
1674 | op->owner = 0; // it's his/hers now. period. |
1695 | op->map = 0; |
1675 | op->map = 0; |
|
|
1676 | op->x = 0; |
|
|
1677 | op->y = 0; |
|
|
1678 | |
|
|
1679 | op->above = 0; |
|
|
1680 | op->below = inv; |
1696 | op->env = this; |
1681 | op->env = this; |
1697 | op->above = 0; |
|
|
1698 | op->below = 0; |
|
|
1699 | op->x = op->y = 0; |
|
|
1700 | |
1682 | |
|
|
1683 | if (inv) |
|
|
1684 | inv->above = op; |
|
|
1685 | |
|
|
1686 | inv = op; |
|
|
1687 | |
|
|
1688 | op->flag [FLAG_REMOVED] = 0; |
|
|
1689 | |
|
|
1690 | if (object *pl = op->visible_to ()) |
|
|
1691 | esrv_send_item (pl, op); |
|
|
1692 | |
|
|
1693 | adjust_weight (this, op->total_weight ()); |
|
|
1694 | |
|
|
1695 | inserted: |
1701 | /* reset the light list and los of the players on the map */ |
1696 | /* reset the light list and los of the players on the map */ |
1702 | if (op->glow_radius && map) |
1697 | if (op->glow_radius && map && map->darkness) |
1703 | { |
|
|
1704 | #ifdef DEBUG_LIGHTS |
|
|
1705 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
|
|
1706 | #endif /* DEBUG_LIGHTS */ |
|
|
1707 | if (map->darkness) |
|
|
1708 | update_all_los (map, x, y); |
1698 | update_all_los (map, x, y); |
1709 | } |
|
|
1710 | |
1699 | |
1711 | /* Client has no idea of ordering so lets not bother ordering it here. |
1700 | // if this is a player's inventory, update stats |
1712 | * It sure simplifies this function... |
1701 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1713 | */ |
1702 | update_stats (); |
1714 | if (!inv) |
|
|
1715 | inv = op; |
|
|
1716 | else |
|
|
1717 | { |
|
|
1718 | op->below = inv; |
|
|
1719 | op->below->above = op; |
|
|
1720 | inv = op; |
|
|
1721 | } |
|
|
1722 | |
1703 | |
1723 | INVOKE_OBJECT (INSERT, this); |
1704 | INVOKE_OBJECT (INSERT, this); |
1724 | |
1705 | |
1725 | return op; |
1706 | return op; |
1726 | } |
1707 | } |
… | |
… | |
2350 | * create clone from object to another |
2331 | * create clone from object to another |
2351 | */ |
2332 | */ |
2352 | object * |
2333 | object * |
2353 | object_create_clone (object *asrc) |
2334 | object_create_clone (object *asrc) |
2354 | { |
2335 | { |
2355 | object *dst = 0, *tmp, *src, *prev, *item; |
2336 | object *dst = 0; |
2356 | |
2337 | |
2357 | if (!asrc) |
2338 | if (!asrc) |
2358 | return 0; |
2339 | return 0; |
2359 | |
2340 | |
2360 | src = asrc->head_ (); |
2341 | object *src = asrc->head_ (); |
2361 | |
2342 | |
2362 | prev = 0; |
2343 | object *prev = 0; |
2363 | for (object *part = src; part; part = part->more) |
2344 | for (object *part = src; part; part = part->more) |
2364 | { |
2345 | { |
2365 | tmp = part->clone (); |
2346 | object *tmp = part->clone (); |
|
|
2347 | |
2366 | tmp->x -= src->x; |
2348 | tmp->x -= src->x; |
2367 | tmp->y -= src->y; |
2349 | tmp->y -= src->y; |
2368 | |
2350 | |
2369 | if (!part->head) |
2351 | if (!part->head) |
2370 | { |
2352 | { |
… | |
… | |
2380 | prev->more = tmp; |
2362 | prev->more = tmp; |
2381 | |
2363 | |
2382 | prev = tmp; |
2364 | prev = tmp; |
2383 | } |
2365 | } |
2384 | |
2366 | |
2385 | for (item = src->inv; item; item = item->below) |
2367 | for (object *item = src->inv; item; item = item->below) |
2386 | insert_ob_in_ob (object_create_clone (item), dst); |
2368 | insert_ob_in_ob (object_create_clone (item), dst); |
2387 | |
2369 | |
2388 | return dst; |
2370 | return dst; |
2389 | } |
2371 | } |
2390 | |
2372 | |
… | |
… | |
2604 | &name, |
2586 | &name, |
2605 | title ? "\",title:\"" : "", |
2587 | title ? "\",title:\"" : "", |
2606 | title ? (const char *)title : "", |
2588 | title ? (const char *)title : "", |
2607 | flag_desc (flagdesc, 512), type); |
2589 | flag_desc (flagdesc, 512), type); |
2608 | |
2590 | |
2609 | if (!this->flag[FLAG_REMOVED] && env) |
2591 | if (!flag[FLAG_REMOVED] && env) |
2610 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2592 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2611 | |
2593 | |
2612 | if (map) |
2594 | if (map) |
2613 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2595 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2614 | |
2596 | |
… | |
… | |
2644 | object::open_container (object *new_container) |
2626 | object::open_container (object *new_container) |
2645 | { |
2627 | { |
2646 | if (container == new_container) |
2628 | if (container == new_container) |
2647 | return; |
2629 | return; |
2648 | |
2630 | |
2649 | if (object *old_container = container) |
2631 | object *old_container = container; |
|
|
2632 | |
|
|
2633 | if (old_container) |
2650 | { |
2634 | { |
2651 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2635 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2652 | return; |
2636 | return; |
2653 | |
2637 | |
2654 | #if 0 |
2638 | #if 0 |
… | |
… | |
2656 | if (object *closer = old_container->inv) |
2640 | if (object *closer = old_container->inv) |
2657 | if (closer->type == CLOSE_CON) |
2641 | if (closer->type == CLOSE_CON) |
2658 | closer->destroy (); |
2642 | closer->destroy (); |
2659 | #endif |
2643 | #endif |
2660 | |
2644 | |
|
|
2645 | // make sure the container is available |
|
|
2646 | esrv_send_item (this, old_container); |
|
|
2647 | |
2661 | old_container->flag [FLAG_APPLIED] = 0; |
2648 | old_container->flag [FLAG_APPLIED] = false; |
2662 | container = 0; |
2649 | container = 0; |
2663 | |
2650 | |
|
|
2651 | // client needs item update to make it work, client bug requires this to be separate |
2664 | esrv_update_item (UPD_FLAGS, this, old_container); |
2652 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2653 | |
2665 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2654 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2666 | play_sound (sound_find ("chest_close")); |
2655 | play_sound (sound_find ("chest_close")); |
2667 | } |
2656 | } |
2668 | |
2657 | |
2669 | if (new_container) |
2658 | if (new_container) |
… | |
… | |
2682 | } |
2671 | } |
2683 | #endif |
2672 | #endif |
2684 | |
2673 | |
2685 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2674 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2686 | |
2675 | |
|
|
2676 | // make sure the container is available, client bug requires this to be separate |
|
|
2677 | esrv_send_item (this, new_container); |
|
|
2678 | |
2687 | new_container->flag [FLAG_APPLIED] = 1; |
2679 | new_container->flag [FLAG_APPLIED] = true; |
2688 | container = new_container; |
2680 | container = new_container; |
2689 | |
2681 | |
|
|
2682 | // client needs flag change |
2690 | esrv_update_item (UPD_FLAGS, this, new_container); |
2683 | esrv_update_item (UPD_FLAGS, this, new_container); |
2691 | esrv_send_inventory (this, new_container); |
2684 | esrv_send_inventory (this, new_container); |
2692 | play_sound (sound_find ("chest_open")); |
2685 | play_sound (sound_find ("chest_open")); |
2693 | } |
2686 | } |
|
|
2687 | // else if (!old_container->env && contr && contr->ns) |
|
|
2688 | // contr->ns->floorbox_reset (); |
2694 | } |
2689 | } |
2695 | |
2690 | |
2696 | object * |
2691 | object * |
2697 | object::force_find (const shstr name) |
2692 | object::force_find (const shstr name) |
2698 | { |
2693 | { |
… | |
… | |
2724 | |
2719 | |
2725 | insert (force); |
2720 | insert (force); |
2726 | } |
2721 | } |
2727 | |
2722 | |
2728 | void |
2723 | void |
2729 | object::play_sound (faceidx sound) const |
2724 | object::play_sound (faceidx sound) |
2730 | { |
2725 | { |
2731 | if (!sound) |
2726 | if (!sound) |
2732 | return; |
2727 | return; |
2733 | |
2728 | |
2734 | if (flag [FLAG_REMOVED]) |
2729 | if (flag [FLAG_REMOVED]) |