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 (!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 | return pl; |
|
|
364 | } |
|
|
365 | } |
|
|
366 | |
|
|
367 | return 0; |
|
|
368 | } |
|
|
369 | |
|
|
370 | // adjust weight per container type ("of holding") |
332 | static sint32 |
371 | static sint32 |
333 | weight_adjust (object *op, sint32 weight) |
372 | weight_adjust (object *op, sint32 weight) |
334 | { |
373 | { |
335 | return op->type == CONTAINER |
374 | return op->type == CONTAINER |
336 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
375 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
337 | : weight; |
376 | : weight; |
338 | } |
377 | } |
339 | |
378 | |
340 | /* |
379 | /* |
341 | * add_weight(object, weight) adds the specified weight to an object, |
380 | * adjust_weight(object, weight) adds the specified weight to an object, |
342 | * and also updates how much the environment(s) is/are carrying. |
381 | * and also updates how much the environment(s) is/are carrying. |
343 | */ |
382 | */ |
344 | static void |
383 | static void |
345 | add_weight (object *op, sint32 weight) |
384 | adjust_weight (object *op, sint32 weight) |
346 | { |
385 | { |
347 | while (op) |
386 | while (op) |
348 | { |
387 | { |
349 | weight = weight_adjust (op, weight); |
388 | weight = weight_adjust (op, weight); |
350 | |
389 | |
|
|
390 | if (!weight) |
|
|
391 | return; |
|
|
392 | |
351 | op->carrying += weight; |
393 | op->carrying += weight; |
|
|
394 | |
|
|
395 | if (object *pl = op->visible_to ()) |
|
|
396 | if (pl != op) // player is handled lazily |
|
|
397 | esrv_update_item (UPD_WEIGHT, pl, op); |
|
|
398 | |
352 | op = op->env; |
399 | op = op->env; |
353 | } |
400 | } |
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 | } |
401 | } |
365 | |
402 | |
366 | /* |
403 | /* |
367 | * this is a recursive function which calculates the weight |
404 | * this is a recursive function which calculates the weight |
368 | * an object is carrying. It goes through op and figures out how much |
405 | * an object is carrying. It goes through op and figures out how much |
… | |
… | |
379 | op->update_weight (); |
416 | op->update_weight (); |
380 | |
417 | |
381 | sum += op->total_weight (); |
418 | sum += op->total_weight (); |
382 | } |
419 | } |
383 | |
420 | |
384 | carrying = weight_adjust (this, sum); |
421 | sum = weight_adjust (this, sum); |
385 | } |
|
|
386 | |
422 | |
|
|
423 | if (sum != carrying) |
|
|
424 | { |
|
|
425 | carrying = sum; |
|
|
426 | |
|
|
427 | if (object *pl = visible_to ()) |
|
|
428 | if (pl != this) // player is handled lazily |
|
|
429 | esrv_update_item (UPD_WEIGHT, pl, this); |
|
|
430 | } |
|
|
431 | } |
|
|
432 | |
387 | /* |
433 | /* |
388 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
434 | * 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 | */ |
435 | */ |
392 | char * |
436 | char * |
393 | dump_object (object *op) |
437 | dump_object (object *op) |
394 | { |
438 | { |
395 | if (!op) |
439 | if (!op) |
… | |
… | |
409 | get_nearest_part (object *op, const object *pl) |
453 | get_nearest_part (object *op, const object *pl) |
410 | { |
454 | { |
411 | object *tmp, *closest; |
455 | object *tmp, *closest; |
412 | int last_dist, i; |
456 | int last_dist, i; |
413 | |
457 | |
414 | if (op->more == NULL) |
458 | if (!op->more) |
415 | return op; |
459 | return op; |
|
|
460 | |
416 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) |
461 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
462 | tmp; |
|
|
463 | tmp = tmp->more) |
417 | if ((i = distance (tmp, pl)) < last_dist) |
464 | if ((i = distance (tmp, pl)) < last_dist) |
418 | closest = tmp, last_dist = i; |
465 | closest = tmp, last_dist = i; |
|
|
466 | |
419 | return closest; |
467 | return closest; |
420 | } |
468 | } |
421 | |
469 | |
422 | /* |
470 | /* |
423 | * Returns the object which has the count-variable equal to the argument. |
471 | * Returns the object which has the count-variable equal to the argument. |
|
|
472 | * VERRRY slow. |
424 | */ |
473 | */ |
425 | object * |
474 | object * |
426 | find_object (tag_t i) |
475 | find_object (tag_t i) |
427 | { |
476 | { |
428 | for_all_objects (op) |
477 | for_all_objects (op) |
… | |
… | |
868 | object::destroy_inv (bool drop_to_ground) |
917 | object::destroy_inv (bool drop_to_ground) |
869 | { |
918 | { |
870 | // need to check first, because the checks below might segfault |
919 | // need to check first, because the checks below might segfault |
871 | // as we might be on an invalid mapspace and crossfire code |
920 | // as we might be on an invalid mapspace and crossfire code |
872 | // is too buggy to ensure that the inventory is empty. |
921 | // is too buggy to ensure that the inventory is empty. |
873 | // corollary: if you create arrows etc. with stuff in tis inventory, |
922 | // corollary: if you create arrows etc. with stuff in its inventory, |
874 | // cf will crash below with off-map x and y |
923 | // cf will crash below with off-map x and y |
875 | if (!inv) |
924 | if (!inv) |
876 | return; |
925 | return; |
877 | |
926 | |
878 | /* Only if the space blocks everything do we not process - |
927 | /* Only if the space blocks everything do we not process - |
… | |
… | |
885 | || map->nodrop |
934 | || map->nodrop |
886 | || ms ().move_block == MOVE_ALL) |
935 | || ms ().move_block == MOVE_ALL) |
887 | { |
936 | { |
888 | while (inv) |
937 | while (inv) |
889 | { |
938 | { |
890 | inv->destroy_inv (drop_to_ground); |
939 | inv->destroy_inv (false); |
891 | inv->destroy (); |
940 | inv->destroy (); |
892 | } |
941 | } |
893 | } |
942 | } |
894 | else |
943 | else |
895 | { /* Put objects in inventory onto this space */ |
944 | { /* Put objects in inventory onto this space */ |
… | |
… | |
901 | || op->flag [FLAG_NO_DROP] |
950 | || op->flag [FLAG_NO_DROP] |
902 | || op->type == RUNE |
951 | || op->type == RUNE |
903 | || op->type == TRAP |
952 | || op->type == TRAP |
904 | || op->flag [FLAG_IS_A_TEMPLATE] |
953 | || op->flag [FLAG_IS_A_TEMPLATE] |
905 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
954 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
906 | op->destroy (); |
955 | op->destroy (true); |
907 | else |
956 | else |
908 | map->insert (op, x, y); |
957 | map->insert (op, x, y); |
909 | } |
958 | } |
910 | } |
959 | } |
911 | } |
960 | } |
… | |
… | |
918 | } |
967 | } |
919 | |
968 | |
920 | void |
969 | void |
921 | object::do_destroy () |
970 | object::do_destroy () |
922 | { |
971 | { |
923 | attachable::do_destroy (); |
|
|
924 | |
|
|
925 | if (flag [FLAG_IS_LINKED]) |
972 | if (flag [FLAG_IS_LINKED]) |
926 | remove_button_link (this); |
973 | remove_button_link (this); |
927 | |
974 | |
928 | if (flag [FLAG_FRIENDLY]) |
975 | if (flag [FLAG_FRIENDLY]) |
929 | remove_friendly_object (this); |
976 | remove_friendly_object (this); |
930 | |
977 | |
931 | if (!flag [FLAG_REMOVED]) |
|
|
932 | remove (); |
978 | remove (); |
933 | |
979 | |
934 | destroy_inv (true); |
980 | attachable::do_destroy (); |
935 | |
981 | |
936 | deactivate (); |
982 | deactivate (); |
937 | unlink (); |
983 | unlink (); |
938 | |
984 | |
939 | flag [FLAG_FREED] = 1; |
985 | flag [FLAG_FREED] = 1; |
… | |
… | |
980 | object::destroy (bool destroy_inventory) |
1026 | object::destroy (bool destroy_inventory) |
981 | { |
1027 | { |
982 | if (destroyed ()) |
1028 | if (destroyed ()) |
983 | return; |
1029 | return; |
984 | |
1030 | |
|
|
1031 | if (!is_head () && !head->destroyed ()) |
|
|
1032 | { |
|
|
1033 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1034 | head->destroy (destroy_inventory); |
|
|
1035 | } |
|
|
1036 | |
985 | if (destroy_inventory) |
1037 | destroy_inv (!destroy_inventory); |
986 | destroy_inv (false); |
|
|
987 | |
1038 | |
988 | if (is_head ()) |
1039 | if (is_head ()) |
989 | if (sound_destroy) |
1040 | if (sound_destroy) |
990 | play_sound (sound_destroy); |
1041 | play_sound (sound_destroy); |
991 | else if (flag [FLAG_MONSTER]) |
1042 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1005 | object::do_remove () |
1056 | object::do_remove () |
1006 | { |
1057 | { |
1007 | object *tmp, *last = 0; |
1058 | object *tmp, *last = 0; |
1008 | object *otmp; |
1059 | object *otmp; |
1009 | |
1060 | |
1010 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1061 | if (flag [FLAG_REMOVED]) |
1011 | return; |
1062 | return; |
1012 | |
1063 | |
1013 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1014 | INVOKE_OBJECT (REMOVE, this); |
1064 | INVOKE_OBJECT (REMOVE, this); |
|
|
1065 | |
|
|
1066 | if (object *pl = visible_to ()) |
|
|
1067 | esrv_del_item (pl->contr, count); |
|
|
1068 | |
|
|
1069 | flag [FLAG_REMOVED] = true; |
1015 | |
1070 | |
1016 | if (more) |
1071 | if (more) |
1017 | more->remove (); |
1072 | more->remove (); |
1018 | |
1073 | |
1019 | /* |
1074 | /* |
1020 | * In this case, the object to be removed is in someones |
1075 | * In this case, the object to be removed is in someones |
1021 | * inventory. |
1076 | * inventory. |
1022 | */ |
1077 | */ |
1023 | if (env) |
1078 | if (env) |
1024 | { |
1079 | { |
|
|
1080 | adjust_weight (env, -total_weight ()); |
|
|
1081 | |
|
|
1082 | *(above ? &above->below : &env->inv) = below; |
|
|
1083 | |
1025 | if (nrof) |
1084 | if (below) |
1026 | sub_weight (env, weight * nrof); |
1085 | below->above = above; |
1027 | else |
1086 | |
1028 | sub_weight (env, weight + carrying); |
1087 | /* we set up values so that it could be inserted into |
|
|
1088 | * the map, but we don't actually do that - it is up |
|
|
1089 | * to the caller to decide what we want to do. |
|
|
1090 | */ |
|
|
1091 | map = env->map; |
|
|
1092 | x = env->x; |
|
|
1093 | y = env->y; |
|
|
1094 | above = 0; |
|
|
1095 | below = 0; |
|
|
1096 | env = 0; |
1029 | |
1097 | |
1030 | /* NO_FIX_PLAYER is set when a great many changes are being |
1098 | /* NO_FIX_PLAYER is set when a great many changes are being |
1031 | * made to players inventory. If set, avoiding the call |
1099 | * made to players inventory. If set, avoiding the call |
1032 | * to save cpu time. |
1100 | * to save cpu time. |
1033 | */ |
1101 | */ |
1034 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1102 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1035 | otmp->update_stats (); |
1103 | 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 | } |
1104 | } |
1054 | else if (map) |
1105 | else if (map) |
1055 | { |
1106 | { |
1056 | if (type == PLAYER) |
1107 | if (type == PLAYER) |
1057 | { |
1108 | { |
… | |
… | |
1104 | * removed (most likely destroyed), update the player view |
1155 | * removed (most likely destroyed), update the player view |
1105 | * appropriately. |
1156 | * appropriately. |
1106 | */ |
1157 | */ |
1107 | pl->close_container (); |
1158 | pl->close_container (); |
1108 | |
1159 | |
1109 | pl->contr->ns->floorbox_update (); |
1160 | //TODO: the floorbox prev/next might need updating |
|
|
1161 | esrv_del_item (pl->contr, count); |
1110 | } |
1162 | } |
1111 | |
1163 | |
1112 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1164 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1113 | { |
1165 | { |
1114 | /* No point updating the players look faces if he is the object |
1166 | /* No point updating the players look faces if he is the object |
… | |
… | |
1158 | if (!top) |
1210 | if (!top) |
1159 | for (top = op; top && top->above; top = top->above) |
1211 | for (top = op; top && top->above; top = top->above) |
1160 | ; |
1212 | ; |
1161 | |
1213 | |
1162 | for (; top; top = top->below) |
1214 | for (; top; top = top->below) |
1163 | { |
|
|
1164 | if (top == op) |
|
|
1165 | continue; |
|
|
1166 | |
|
|
1167 | if (object::can_merge (op, top)) |
1215 | if (object::can_merge (op, top)) |
1168 | { |
1216 | { |
1169 | top->nrof += op->nrof; |
1217 | top->nrof += op->nrof; |
1170 | |
1218 | |
1171 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1219 | if (object *pl = top->visible_to ()) |
1172 | op->weight = 0; /* Don't want any adjustements now */ |
1220 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1221 | |
|
|
1222 | op->weight = 0; // cancel the addition above |
|
|
1223 | op->carrying = 0; // must be 0 already |
|
|
1224 | |
1173 | op->destroy (); |
1225 | op->destroy (1); |
|
|
1226 | |
1174 | return top; |
1227 | return top; |
1175 | } |
1228 | } |
1176 | } |
|
|
1177 | |
1229 | |
1178 | return 0; |
1230 | return 0; |
1179 | } |
1231 | } |
1180 | |
1232 | |
1181 | void |
1233 | void |
… | |
… | |
1240 | object * |
1292 | object * |
1241 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1293 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1242 | { |
1294 | { |
1243 | assert (!op->flag [FLAG_FREED]); |
1295 | assert (!op->flag [FLAG_FREED]); |
1244 | |
1296 | |
1245 | object *top, *floor = NULL; |
|
|
1246 | |
|
|
1247 | op->remove (); |
1297 | op->remove (); |
1248 | |
1298 | |
1249 | /* Ideally, the caller figures this out. However, it complicates a lot |
1299 | /* 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 |
1300 | * of areas of callers (eg, anything that uses find_free_spot would now |
1251 | * need extra work |
1301 | * need extra work |
1252 | */ |
1302 | */ |
1253 | if (!xy_normalise (m, op->x, op->y)) |
1303 | if (!xy_normalise (m, op->x, op->y)) |
1254 | { |
1304 | { |
1255 | op->destroy (); |
1305 | op->destroy (1); |
1256 | return 0; |
1306 | return 0; |
1257 | } |
1307 | } |
1258 | |
1308 | |
1259 | if (object *more = op->more) |
1309 | if (object *more = op->more) |
1260 | if (!insert_ob_in_map (more, m, originator, flag)) |
1310 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1269 | */ |
1319 | */ |
1270 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1320 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1271 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1321 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1272 | if (object::can_merge (op, tmp)) |
1322 | if (object::can_merge (op, tmp)) |
1273 | { |
1323 | { |
|
|
1324 | // TODO: we atcually want to update tmp, not op, |
|
|
1325 | // but some caller surely breaks when we return tmp |
|
|
1326 | // from here :/ |
1274 | op->nrof += tmp->nrof; |
1327 | op->nrof += tmp->nrof; |
1275 | tmp->destroy (); |
1328 | tmp->destroy (1); |
1276 | } |
1329 | } |
1277 | |
1330 | |
1278 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1331 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1279 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1332 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1280 | |
1333 | |
… | |
… | |
1300 | /* since *below* originator, no need to update top */ |
1353 | /* since *below* originator, no need to update top */ |
1301 | originator->below = op; |
1354 | originator->below = op; |
1302 | } |
1355 | } |
1303 | else |
1356 | else |
1304 | { |
1357 | { |
|
|
1358 | object *top, *floor = NULL; |
|
|
1359 | |
1305 | top = ms.bot; |
1360 | top = ms.bot; |
1306 | |
1361 | |
1307 | /* If there are other objects, then */ |
1362 | /* If there are other objects, then */ |
1308 | if (top) |
1363 | if (top) |
1309 | { |
1364 | { |
… | |
… | |
1408 | } |
1463 | } |
1409 | |
1464 | |
1410 | op->map->dirty = true; |
1465 | op->map->dirty = true; |
1411 | |
1466 | |
1412 | if (object *pl = ms.player ()) |
1467 | if (object *pl = ms.player ()) |
1413 | pl->contr->ns->floorbox_update (); |
1468 | //TODO: the floorbox prev/next might need updating |
|
|
1469 | esrv_send_item (pl, op); |
1414 | |
1470 | |
1415 | /* If this object glows, it may affect lighting conditions that are |
1471 | /* If this object glows, it may affect lighting conditions that are |
1416 | * visible to others on this map. But update_all_los is really |
1472 | * 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 |
1473 | * 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 |
1474 | * 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. |
1516 | * op is the object to insert it under: supplies x and the map. |
1461 | */ |
1517 | */ |
1462 | void |
1518 | void |
1463 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1519 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1464 | { |
1520 | { |
1465 | object *tmp, *tmp1; |
|
|
1466 | |
|
|
1467 | /* first search for itself and remove any old instances */ |
1521 | /* first search for itself and remove any old instances */ |
1468 | |
1522 | |
1469 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1523 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1470 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1524 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1471 | tmp->destroy (); |
1525 | tmp->destroy (1); |
1472 | |
1526 | |
1473 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1527 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1474 | |
1528 | |
1475 | tmp1->x = op->x; |
1529 | tmp->x = op->x; |
1476 | tmp1->y = op->y; |
1530 | tmp->y = op->y; |
|
|
1531 | |
1477 | insert_ob_in_map (tmp1, op->map, op, 0); |
1532 | insert_ob_in_map (tmp, op->map, op, 0); |
1478 | } |
1533 | } |
1479 | |
1534 | |
1480 | object * |
1535 | object * |
1481 | object::insert_at (object *where, object *originator, int flags) |
1536 | object::insert_at (object *where, object *originator, int flags) |
1482 | { |
1537 | { |
… | |
… | |
1485 | else |
1540 | else |
1486 | return where->map->insert (this, where->x, where->y, originator, flags); |
1541 | return where->map->insert (this, where->x, where->y, originator, flags); |
1487 | } |
1542 | } |
1488 | |
1543 | |
1489 | /* |
1544 | /* |
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 |
1545 | * decrease(object, number) decreases a specified number from |
1531 | * the amount of an object. If the amount reaches 0, the object |
1546 | * the amount of an object. If the amount reaches 0, the object |
1532 | * is subsequently removed and freed. |
1547 | * is subsequently removed and freed. |
1533 | * |
1548 | * |
1534 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1549 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1535 | */ |
1550 | */ |
|
|
1551 | bool |
|
|
1552 | object::decrease (sint32 nr) |
|
|
1553 | { |
|
|
1554 | if (!nr) |
|
|
1555 | return true; |
|
|
1556 | |
|
|
1557 | nr = min (nr, nrof); |
|
|
1558 | |
|
|
1559 | nrof -= nr; |
|
|
1560 | |
|
|
1561 | if (nrof) |
|
|
1562 | { |
|
|
1563 | adjust_weight (env, -weight * nr); // carrying == 0 |
|
|
1564 | |
|
|
1565 | if (object *pl = visible_to ()) |
|
|
1566 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1567 | |
|
|
1568 | return true; |
|
|
1569 | } |
|
|
1570 | else |
|
|
1571 | { |
|
|
1572 | destroy (1); |
|
|
1573 | return false; |
|
|
1574 | } |
|
|
1575 | } |
|
|
1576 | |
|
|
1577 | /* |
|
|
1578 | * split(ob,nr) splits up ob into two parts. The part which |
|
|
1579 | * is returned contains nr objects, and the remaining parts contains |
|
|
1580 | * the rest (or is removed and returned if that number is 0). |
|
|
1581 | * On failure, NULL is returned. |
|
|
1582 | */ |
1536 | object * |
1583 | object * |
1537 | decrease_ob_nr (object *op, uint32 i) |
1584 | object::split (sint32 nr) |
1538 | { |
1585 | { |
1539 | object *tmp; |
1586 | int have = number_of (); |
1540 | |
1587 | |
1541 | if (i == 0) /* objects with op->nrof require this check */ |
1588 | if (have < nr) |
1542 | return op; |
1589 | return 0; |
1543 | |
1590 | 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 | { |
1591 | { |
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 (); |
1592 | remove (); |
1579 | op->nrof = 0; |
1593 | return this; |
1580 | if (tmp) |
|
|
1581 | esrv_del_item (tmp->contr, op->count); |
|
|
1582 | } |
|
|
1583 | } |
1594 | } |
1584 | else |
1595 | else |
1585 | { |
1596 | { |
1586 | object *above = op->above; |
1597 | decrease (nr); |
1587 | |
1598 | |
1588 | if (i < op->nrof) |
1599 | object *op = object_create_clone (this); |
1589 | op->nrof -= i; |
1600 | 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; |
1601 | return op; |
1609 | else |
|
|
1610 | { |
|
|
1611 | op->destroy (); |
|
|
1612 | return 0; |
|
|
1613 | } |
1602 | } |
1614 | } |
1603 | } |
1615 | |
1604 | |
1616 | object * |
1605 | object * |
1617 | insert_ob_in_ob (object *op, object *where) |
1606 | insert_ob_in_ob (object *op, object *where) |
… | |
… | |
1642 | * be != op, if items are merged. -Tero |
1631 | * be != op, if items are merged. -Tero |
1643 | */ |
1632 | */ |
1644 | object * |
1633 | object * |
1645 | object::insert (object *op) |
1634 | object::insert (object *op) |
1646 | { |
1635 | { |
1647 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1648 | op->remove (); |
|
|
1649 | |
|
|
1650 | if (op->more) |
1636 | if (op->more) |
1651 | { |
1637 | { |
1652 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1638 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1653 | return op; |
1639 | return op; |
1654 | } |
1640 | } |
1655 | |
1641 | |
1656 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1642 | op->remove (); |
1657 | CLEAR_FLAG (op, FLAG_REMOVED); |
1643 | |
|
|
1644 | op->flag [FLAG_OBJ_ORIGINAL] = 0; |
1658 | |
1645 | |
1659 | if (op->nrof) |
1646 | if (op->nrof) |
1660 | { |
|
|
1661 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1647 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1662 | if (object::can_merge (tmp, op)) |
1648 | if (object::can_merge (tmp, op)) |
1663 | { |
1649 | { |
1664 | /* return the original object and remove inserted object |
1650 | /* return the original object and remove inserted object |
1665 | (client needs the original object) */ |
1651 | (client needs the original object) */ |
1666 | tmp->nrof += op->nrof; |
1652 | tmp->nrof += op->nrof; |
1667 | /* Weight handling gets pretty funky. Since we are adding to |
1653 | |
1668 | * tmp->nrof, we need to increase the weight. |
1654 | if (object *pl = tmp->visible_to ()) |
1669 | */ |
1655 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1656 | |
1670 | add_weight (this, op->weight * op->nrof); |
1657 | adjust_weight (this, op->total_weight ()); |
1671 | SET_FLAG (op, FLAG_REMOVED); |
1658 | |
1672 | op->destroy (); /* free the inserted object */ |
1659 | op->destroy (1); |
1673 | op = tmp; |
1660 | op = tmp; |
1674 | op->remove (); /* and fix old object's links */ |
1661 | goto inserted; |
1675 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1676 | break; |
|
|
1677 | } |
1662 | } |
1678 | |
1663 | |
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. |
1664 | op->owner = 0; // it's his/hers now. period. |
1695 | op->map = 0; |
1665 | op->map = 0; |
|
|
1666 | op->x = 0; |
|
|
1667 | op->y = 0; |
|
|
1668 | |
|
|
1669 | op->above = 0; |
|
|
1670 | op->below = inv; |
1696 | op->env = this; |
1671 | op->env = this; |
1697 | op->above = 0; |
|
|
1698 | op->below = 0; |
|
|
1699 | op->x = op->y = 0; |
|
|
1700 | |
1672 | |
|
|
1673 | if (inv) |
|
|
1674 | inv->above = op; |
|
|
1675 | |
|
|
1676 | inv = op; |
|
|
1677 | |
|
|
1678 | op->flag [FLAG_REMOVED] = 0; |
|
|
1679 | |
|
|
1680 | if (object *pl = op->visible_to ()) |
|
|
1681 | esrv_send_item (pl, op); |
|
|
1682 | |
|
|
1683 | adjust_weight (this, op->total_weight ()); |
|
|
1684 | |
|
|
1685 | inserted: |
1701 | /* reset the light list and los of the players on the map */ |
1686 | /* reset the light list and los of the players on the map */ |
1702 | if (op->glow_radius && map) |
1687 | 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); |
1688 | update_all_los (map, x, y); |
1709 | } |
|
|
1710 | |
1689 | |
1711 | /* Client has no idea of ordering so lets not bother ordering it here. |
1690 | // if this is a player's inventory, update stats |
1712 | * It sure simplifies this function... |
1691 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1713 | */ |
1692 | 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 | |
1693 | |
1723 | INVOKE_OBJECT (INSERT, this); |
1694 | INVOKE_OBJECT (INSERT, this); |
1724 | |
1695 | |
1725 | return op; |
1696 | return op; |
1726 | } |
1697 | } |
… | |
… | |
2604 | &name, |
2575 | &name, |
2605 | title ? "\",title:\"" : "", |
2576 | title ? "\",title:\"" : "", |
2606 | title ? (const char *)title : "", |
2577 | title ? (const char *)title : "", |
2607 | flag_desc (flagdesc, 512), type); |
2578 | flag_desc (flagdesc, 512), type); |
2608 | |
2579 | |
2609 | if (!this->flag[FLAG_REMOVED] && env) |
2580 | if (!flag[FLAG_REMOVED] && env) |
2610 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2581 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2611 | |
2582 | |
2612 | if (map) |
2583 | if (map) |
2613 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2584 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2614 | |
2585 | |
… | |
… | |
2656 | if (object *closer = old_container->inv) |
2627 | if (object *closer = old_container->inv) |
2657 | if (closer->type == CLOSE_CON) |
2628 | if (closer->type == CLOSE_CON) |
2658 | closer->destroy (); |
2629 | closer->destroy (); |
2659 | #endif |
2630 | #endif |
2660 | |
2631 | |
2661 | old_container->flag [FLAG_APPLIED] = 0; |
2632 | old_container->flag [FLAG_APPLIED] = false; |
2662 | container = 0; |
2633 | container = 0; |
2663 | |
2634 | |
2664 | esrv_update_item (UPD_FLAGS, this, old_container); |
2635 | esrv_update_item (UPD_FLAGS, this, old_container); |
2665 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2636 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2666 | play_sound (sound_find ("chest_close")); |
2637 | play_sound (sound_find ("chest_close")); |
… | |
… | |
2682 | } |
2653 | } |
2683 | #endif |
2654 | #endif |
2684 | |
2655 | |
2685 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2656 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2686 | |
2657 | |
2687 | new_container->flag [FLAG_APPLIED] = 1; |
2658 | new_container->flag [FLAG_APPLIED] = true; |
2688 | container = new_container; |
2659 | container = new_container; |
2689 | |
2660 | |
2690 | esrv_update_item (UPD_FLAGS, this, new_container); |
2661 | esrv_update_item (UPD_FLAGS, this, new_container); |
2691 | esrv_send_inventory (this, new_container); |
2662 | esrv_send_inventory (this, new_container); |
2692 | play_sound (sound_find ("chest_open")); |
2663 | play_sound (sound_find ("chest_open")); |
… | |
… | |
2724 | |
2695 | |
2725 | insert (force); |
2696 | insert (force); |
2726 | } |
2697 | } |
2727 | |
2698 | |
2728 | void |
2699 | void |
2729 | object::play_sound (faceidx sound) const |
2700 | object::play_sound (faceidx sound) |
2730 | { |
2701 | { |
2731 | if (!sound) |
2702 | if (!sound) |
2732 | return; |
2703 | return; |
2733 | |
2704 | |
2734 | if (flag [FLAG_REMOVED]) |
2705 | if (flag [FLAG_REMOVED]) |