ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.137 by root, Mon Apr 16 06:23:40 2007 UTC vs.
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38int nrofallocobjects = 0;
… …
254 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 255 * check all objects in the inventory.
256 */ 256 */
257 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
258 { 258 {
259 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
261 return 0;
262 261
263 /* Now check to see if the two inventory objects could merge */ 262 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */
264
264 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 266 return 0; /* inventory objexts differ */
266 267
267 /* inventory ok - still need to check rest of this object to see 268 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 269 * if it is valid.
269 */ 270 */
270 } 271 }
… …
299 return 0; 300 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 301 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 302 return 0;
302 } 303 }
303 304
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 305 if (ob1->self || ob2->self)
306 { 306 {
307 ob1->optimise (); 307 ob1->optimise ();
308 ob2->optimise (); 308 ob2->optimise ();
309 309
310 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
311 {
312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314
315 if (k1 != k2)
311 return 0; 316 return 0;
317 else if (k1 == 0)
318 return 1;
319 else if (!cfperl_can_merge (ob1, ob2))
320 return 0;
321 }
312 } 322 }
313 323
314 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
315 return 1; 325 return 1;
316} 326}
… …
324sum_weight (object *op) 334sum_weight (object *op)
325{ 335{
326 long sum; 336 long sum;
327 object *inv; 337 object *inv;
328 338
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 339 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 340 {
331 if (inv->inv) 341 if (inv->inv)
332 sum_weight (inv); 342 sum_weight (inv);
343
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 344 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 345 }
335 346
336 if (op->type == CONTAINER && op->stats.Str) 347 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 348 sum = (sum * (100 - op->stats.Str)) / 100;
… …
373/* 384/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 385 * get_nearest_part(multi-object, object 2) returns the part of the
375 * multi-object 1 which is closest to the second object. 386 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 387 * If it's not a multi-object, it is returned.
377 */ 388 */
378
379object * 389object *
380get_nearest_part (object *op, const object *pl) 390get_nearest_part (object *op, const object *pl)
381{ 391{
382 object *tmp, *closest; 392 object *tmp, *closest;
383 int last_dist, i; 393 int last_dist, i;
… …
428} 438}
429 439
430/* 440/*
431 * Sets the owner and sets the skill and exp pointers to owner's current 441 * Sets the owner and sets the skill and exp pointers to owner's current
432 * skill and experience objects. 442 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO
433 */ 444 */
434void 445void
435object::set_owner (object *owner) 446object::set_owner (object *owner)
436{ 447{
448 // allow objects which own objects
437 if (!owner) 449 if (owner)
438 return;
439
440 /* next line added to allow objects which own objects */
441 /* Add a check for ownercounts in here, as I got into an endless loop
442 * with the fireball owning a poison cloud which then owned the
443 * fireball. I believe that was caused by one of the objects getting
444 * freed and then another object replacing it. Since the ownercounts
445 * didn't match, this check is valid and I believe that cause is valid.
446 */
447 while (owner->owner) 450 while (owner->owner)
448 owner = owner->owner; 451 owner = owner->owner;
452
453 if (flag [FLAG_FREED])
454 {
455 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
456 return;
457 }
449 458
450 this->owner = owner; 459 this->owner = owner;
460}
461
462int
463object::slottype () const
464{
465 if (type == SKILL)
466 {
467 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
468 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
469 }
470 else
471 {
472 if (slot [body_combat].info) return slot_combat;
473 if (slot [body_range ].info) return slot_ranged;
474 }
475
476 return slot_none;
477}
478
479bool
480object::change_weapon (object *ob)
481{
482 if (current_weapon == ob)
483 return true;
484
485 if (chosen_skill)
486 chosen_skill->flag [FLAG_APPLIED] = false;
487
488 current_weapon = ob;
489 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
490
491 if (chosen_skill)
492 chosen_skill->flag [FLAG_APPLIED] = true;
493
494 update_stats ();
495
496 if (ob)
497 {
498 // now check wether any body locations became invalid, in which case
499 // we cannot apply the weapon at the moment.
500 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
501 if (slot[i].used < 0)
502 {
503 current_weapon = chosen_skill = 0;
504 update_stats ();
505
506 new_draw_info_format (NDI_UNIQUE, 0, this,
507 "You try to balance all your items at once, "
508 "but the %s is just too much for your body. "
509 "[You need to unapply some items first.]", &ob->name);
510 return false;
511 }
512
513 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
514 }
515 else
516 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
517
518 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
519 {
520 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
521 &name, ob->debug_desc ());
522 return false;
523 }
524
525 return true;
451} 526}
452 527
453/* Zero the key_values on op, decrementing the shared-string 528/* Zero the key_values on op, decrementing the shared-string
454 * refcounts and freeing the links. 529 * refcounts and freeing the links.
455 */ 530 */
… …
519object::copy_to (object *dst) 594object::copy_to (object *dst)
520{ 595{
521 *dst = *this; 596 *dst = *this;
522 597
523 if (speed < 0) 598 if (speed < 0)
524 dst->speed_left = speed_left - rndm (); 599 dst->speed_left -= rndm ();
525 600
526 dst->set_speed (dst->speed); 601 dst->set_speed (dst->speed);
527} 602}
528 603
529void 604void
… …
537 * need for monsters, but doesn't hurt to do it for everything. 612 * need for monsters, but doesn't hurt to do it for everything.
538 * by doing so, when a monster is created, it has good starting 613 * by doing so, when a monster is created, it has good starting
539 * values for the body_used info, so when items are created 614 * values for the body_used info, so when items are created
540 * for it, they can be properly equipped. 615 * for it, they can be properly equipped.
541 */ 616 */
542 memcpy (body_used, body_info, sizeof (body_used)); 617 for (int i = NUM_BODY_LOCATIONS; i--; )
618 slot[i].used = slot[i].info;
543 619
544 attachable::instantiate (); 620 attachable::instantiate ();
545} 621}
546 622
547object * 623object *
… …
835 911
836 if (flag [FLAG_IS_LINKED]) 912 if (flag [FLAG_IS_LINKED])
837 remove_button_link (this); 913 remove_button_link (this);
838 914
839 if (flag [FLAG_FRIENDLY]) 915 if (flag [FLAG_FRIENDLY])
840 {
841 remove_friendly_object (this); 916 remove_friendly_object (this);
842
843 if (type == GOLEM
844 && owner
845 && owner->type == PLAYER
846 && owner->contr->ranges[range_golem] == this)
847 owner->contr->ranges[range_golem] = 0;
848 }
849 917
850 if (!flag [FLAG_REMOVED]) 918 if (!flag [FLAG_REMOVED])
851 remove (); 919 remove ();
852 920
853 destroy_inv (true); 921 destroy_inv (true);
… …
863 931
864 if (!freed_map) 932 if (!freed_map)
865 { 933 {
866 freed_map = new maptile; 934 freed_map = new maptile;
867 935
936 freed_map->path = "<freed objects map>";
868 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
869 freed_map->width = 3; 938 freed_map->width = 3;
870 freed_map->height = 3; 939 freed_map->height = 3;
940 freed_map->nodrop = 1;
871 941
872 freed_map->alloc (); 942 freed_map->alloc ();
873 freed_map->in_memory = MAP_IN_MEMORY; 943 freed_map->in_memory = MAP_IN_MEMORY;
874 } 944 }
875 945
876 map = freed_map; 946 map = freed_map;
877 x = 1; 947 x = 1;
878 y = 1; 948 y = 1;
879 } 949 }
880 950
881 head = 0;
882
883 if (more) 951 if (more)
884 { 952 {
885 more->destroy (); 953 more->destroy ();
886 more = 0; 954 more = 0;
887 } 955 }
888 956
957 head = 0;
958
889 // clear those pointers that likely might have circular references to us 959 // clear those pointers that likely might cause circular references
890 owner = 0; 960 owner = 0;
891 enemy = 0; 961 enemy = 0;
892 attacked_by = 0; 962 attacked_by = 0;
963 current_weapon = 0;
893} 964}
894 965
895void 966void
896object::destroy (bool destroy_inventory) 967object::destroy (bool destroy_inventory)
897{ 968{
898 if (destroyed ()) 969 if (destroyed ())
899 return; 970 return;
900 971
901 if (destroy_inventory) 972 if (destroy_inventory)
902 destroy_inv (false); 973 destroy_inv (false);
974
975 if (is_head ())
976 if (sound_destroy)
977 play_sound (sound_destroy);
978 else if (flag [FLAG_MONSTER])
979 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
903 980
904 attachable::destroy (); 981 attachable::destroy ();
905} 982}
906 983
907/* 984/*
… …
1022 if (map->in_memory == MAP_SAVING) 1099 if (map->in_memory == MAP_SAVING)
1023 return; 1100 return;
1024 1101
1025 int check_walk_off = !flag [FLAG_NO_APPLY]; 1102 int check_walk_off = !flag [FLAG_NO_APPLY];
1026 1103
1104 if (object *pl = ms.player ())
1105 {
1106 if (pl->container == this)
1107 /* If a container that the player is currently using somehow gets
1108 * removed (most likely destroyed), update the player view
1109 * appropriately.
1110 */
1111 pl->close_container ();
1112
1113 pl->contr->ns->floorbox_update ();
1114 }
1115
1027 for (tmp = ms.bot; tmp; tmp = tmp->above) 1116 for (tmp = ms.bot; tmp; tmp = tmp->above)
1028 { 1117 {
1029 /* No point updating the players look faces if he is the object 1118 /* No point updating the players look faces if he is the object
1030 * being removed. 1119 * being removed.
1031 */ 1120 */
1032
1033 if (tmp->type == PLAYER && tmp != this)
1034 {
1035 /* If a container that the player is currently using somehow gets
1036 * removed (most likely destroyed), update the player view
1037 * appropriately.
1038 */
1039 if (tmp->container == this)
1040 {
1041 flag [FLAG_APPLIED] = 0;
1042 tmp->container = 0;
1043 }
1044
1045 if (tmp->contr->ns)
1046 tmp->contr->ns->floorbox_update ();
1047 }
1048 1121
1049 /* See if object moving off should effect something */ 1122 /* See if object moving off should effect something */
1050 if (check_walk_off 1123 if (check_walk_off
1051 && ((move_type & tmp->move_off) 1124 && ((move_type & tmp->move_off)
1052 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1125 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1055 1128
1056 if (destroyed ()) 1129 if (destroyed ())
1057 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1130 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1058 } 1131 }
1059 1132
1060 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1061 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1062 if (tmp->above == tmp)
1063 tmp->above = 0;
1064
1065 last = tmp; 1133 last = tmp;
1066 } 1134 }
1067 1135
1068 /* last == NULL if there are no objects on this space */ 1136 /* last == NULL if there are no objects on this space */
1069 //TODO: this makes little sense, why only update the topmost object? 1137 //TODO: this makes little sense, why only update the topmost object?
… …
1089merge_ob (object *op, object *top) 1157merge_ob (object *op, object *top)
1090{ 1158{
1091 if (!op->nrof) 1159 if (!op->nrof)
1092 return 0; 1160 return 0;
1093 1161
1094 if (top) 1162 if (!top)
1095 for (top = op; top && top->above; top = top->above) 1163 for (top = op; top && top->above; top = top->above)
1096 ; 1164 ;
1097 1165
1098 for (; top; top = top->below) 1166 for (; top; top = top->below)
1099 { 1167 {
… …
1112 } 1180 }
1113 1181
1114 return 0; 1182 return 0;
1115} 1183}
1116 1184
1185void
1186object::expand_tail ()
1187{
1188 if (more)
1189 return;
1190
1191 object *prev = this;
1192
1193 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1194 {
1195 object *op = arch_to_object (at);
1196
1197 op->name = name;
1198 op->name_pl = name_pl;
1199 op->title = title;
1200
1201 op->head = this;
1202 prev->more = op;
1203
1204 prev = op;
1205 }
1206}
1207
1117/* 1208/*
1118 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1209 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1119 * job preparing multi-part monsters. 1210 * job preparing multi-part monsters.
1120 */ 1211 */
1121object * 1212object *
1122insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1213insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1123{ 1214{
1124 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1215 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1125 { 1216 {
1126 tmp->x = x + tmp->arch->clone.x; 1217 tmp->x = x + tmp->arch->x;
1127 tmp->y = y + tmp->arch->clone.y; 1218 tmp->y = y + tmp->arch->y;
1128 } 1219 }
1129 1220
1130 return insert_ob_in_map (op, m, originator, flag); 1221 return insert_ob_in_map (op, m, originator, flag);
1131} 1222}
1132 1223
… …
1151 * just 'op' otherwise 1242 * just 'op' otherwise
1152 */ 1243 */
1153object * 1244object *
1154insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1245insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1155{ 1246{
1247 assert (!op->flag [FLAG_FREED]);
1248
1156 object *tmp, *top, *floor = NULL; 1249 object *top, *floor = NULL;
1157
1158 if (QUERY_FLAG (op, FLAG_FREED))
1159 {
1160 LOG (llevError, "Trying to insert freed object!\n");
1161 return NULL;
1162 }
1163
1164 if (!QUERY_FLAG (op, FLAG_REMOVED))
1165 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1166 1250
1167 op->remove (); 1251 op->remove ();
1168
1169 if (!m)
1170 {
1171 char *dump = dump_object (op);
1172 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1173 free (dump);
1174 return op;
1175 }
1176
1177 if (out_of_map (m, op->x, op->y))
1178 {
1179 char *dump = dump_object (op);
1180 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1181#ifdef MANY_CORES
1182 /* Better to catch this here, as otherwise the next use of this object
1183 * is likely to cause a crash. Better to find out where it is getting
1184 * improperly inserted.
1185 */
1186 abort ();
1187#endif
1188 free (dump);
1189 return op;
1190 }
1191
1192 if (object *more = op->more)
1193 {
1194 if (!insert_ob_in_map (more, m, originator, flag))
1195 {
1196 if (!op->head)
1197 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1198
1199 return 0;
1200 }
1201 }
1202
1203 CLEAR_FLAG (op, FLAG_REMOVED);
1204 1252
1205 /* Ideally, the caller figures this out. However, it complicates a lot 1253 /* Ideally, the caller figures this out. However, it complicates a lot
1206 * of areas of callers (eg, anything that uses find_free_spot would now 1254 * of areas of callers (eg, anything that uses find_free_spot would now
1207 * need extra work 1255 * need extra work
1208 */ 1256 */
1209 if (!xy_normalise (m, op->x, op->y)) 1257 if (!xy_normalise (m, op->x, op->y))
1258 {
1259 op->destroy ();
1210 return 0; 1260 return 0;
1261 }
1262
1263 if (object *more = op->more)
1264 if (!insert_ob_in_map (more, m, originator, flag))
1265 return 0;
1266
1267 CLEAR_FLAG (op, FLAG_REMOVED);
1211 1268
1212 op->map = m; 1269 op->map = m;
1213 mapspace &ms = op->ms (); 1270 mapspace &ms = op->ms ();
1214 1271
1215 /* this has to be done after we translate the coordinates. 1272 /* this has to be done after we translate the coordinates.
1216 */ 1273 */
1217 if (op->nrof && !(flag & INS_NO_MERGE)) 1274 if (op->nrof && !(flag & INS_NO_MERGE))
1218 for (tmp = ms.bot; tmp; tmp = tmp->above) 1275 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1219 if (object::can_merge (op, tmp)) 1276 if (object::can_merge (op, tmp))
1220 { 1277 {
1221 op->nrof += tmp->nrof; 1278 op->nrof += tmp->nrof;
1222 tmp->destroy (); 1279 tmp->destroy ();
1223 } 1280 }
… …
1250 else 1307 else
1251 { 1308 {
1252 top = ms.bot; 1309 top = ms.bot;
1253 1310
1254 /* If there are other objects, then */ 1311 /* If there are other objects, then */
1255 if ((!(flag & INS_MAP_LOAD)) && top) 1312 if (top)
1256 { 1313 {
1257 object *last = 0; 1314 object *last = 0;
1258 1315
1259 /* 1316 /*
1260 * If there are multiple objects on this space, we do some trickier handling. 1317 * If there are multiple objects on this space, we do some trickier handling.
… …
1313 if (last && last->below && last != floor) 1370 if (last && last->below && last != floor)
1314 top = last->below; 1371 top = last->below;
1315 } 1372 }
1316 } /* If objects on this space */ 1373 } /* If objects on this space */
1317 1374
1318 if (flag & INS_MAP_LOAD)
1319 top = ms.top;
1320
1321 if (flag & INS_ABOVE_FLOOR_ONLY) 1375 if (flag & INS_ABOVE_FLOOR_ONLY)
1322 top = floor; 1376 top = floor;
1323 1377
1324 /* Top is the object that our object (op) is going to get inserted above. 1378 /* Top is the object that our object (op) is going to get inserted above.
1325 */ 1379 */
… …
1357 op->map->touch (); 1411 op->map->touch ();
1358 } 1412 }
1359 1413
1360 op->map->dirty = true; 1414 op->map->dirty = true;
1361 1415
1362 /* If we have a floor, we know the player, if any, will be above
1363 * it, so save a few ticks and start from there.
1364 */
1365 if (!(flag & INS_MAP_LOAD))
1366 if (object *pl = ms.player ()) 1416 if (object *pl = ms.player ())
1367 if (pl->contr->ns)
1368 pl->contr->ns->floorbox_update (); 1417 pl->contr->ns->floorbox_update ();
1369 1418
1370 /* If this object glows, it may affect lighting conditions that are 1419 /* If this object glows, it may affect lighting conditions that are
1371 * visible to others on this map. But update_all_los is really 1420 * visible to others on this map. But update_all_los is really
1372 * an inefficient way to do this, as it means los for all players 1421 * an inefficient way to do this, as it means los for all players
1373 * on the map will get recalculated. The players could very well 1422 * on the map will get recalculated. The players could very well
… …
1392 * blocked() and wall() work properly), and these flags are updated by 1441 * blocked() and wall() work properly), and these flags are updated by
1393 * update_object(). 1442 * update_object().
1394 */ 1443 */
1395 1444
1396 /* if this is not the head or flag has been passed, don't check walk on status */ 1445 /* if this is not the head or flag has been passed, don't check walk on status */
1397 if (!(flag & INS_NO_WALK_ON) && !op->head) 1446 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1398 { 1447 {
1399 if (check_move_on (op, originator)) 1448 if (check_move_on (op, originator))
1400 return 0; 1449 return 0;
1401 1450
1402 /* If we are a multi part object, lets work our way through the check 1451 /* If we are a multi part object, lets work our way through the check
1403 * walk on's. 1452 * walk on's.
1404 */ 1453 */
1405 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1454 for (object *tmp = op->more; tmp; tmp = tmp->more)
1406 if (check_move_on (tmp, originator)) 1455 if (check_move_on (tmp, originator))
1407 return 0; 1456 return 0;
1408 } 1457 }
1409 1458
1410 return op; 1459 return op;
… …
1420 object *tmp, *tmp1; 1469 object *tmp, *tmp1;
1421 1470
1422 /* first search for itself and remove any old instances */ 1471 /* first search for itself and remove any old instances */
1423 1472
1424 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1473 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1425 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1474 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1426 tmp->destroy (); 1475 tmp->destroy ();
1427 1476
1428 tmp1 = arch_to_object (archetype::find (arch_string)); 1477 tmp1 = arch_to_object (archetype::find (arch_string));
1429 1478
1430 tmp1->x = op->x; 1479 tmp1->x = op->x;
1431 tmp1->y = op->y; 1480 tmp1->y = op->y;
1432 insert_ob_in_map (tmp1, op->map, op, 0); 1481 insert_ob_in_map (tmp1, op->map, op, 0);
1433} 1482}
1434 1483
1435// XXX: function not returning object*
1436object * 1484object *
1437object::insert_at (object *where, object *originator, int flags) 1485object::insert_at (object *where, object *originator, int flags)
1438{ 1486{
1439 where->map->insert (this, where->x, where->y, originator, flags); 1487 return where->map->insert (this, where->x, where->y, originator, flags);
1440} 1488}
1441 1489
1442/* 1490/*
1443 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1491 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1444 * is returned contains nr objects, and the remaining parts contains 1492 * is returned contains nr objects, and the remaining parts contains
… …
1484 * the amount of an object. If the amount reaches 0, the object 1532 * the amount of an object. If the amount reaches 0, the object
1485 * is subsequently removed and freed. 1533 * is subsequently removed and freed.
1486 * 1534 *
1487 * Return value: 'op' if something is left, NULL if the amount reached 0 1535 * Return value: 'op' if something is left, NULL if the amount reached 0
1488 */ 1536 */
1489
1490object * 1537object *
1491decrease_ob_nr (object *op, uint32 i) 1538decrease_ob_nr (object *op, uint32 i)
1492{ 1539{
1493 object *tmp; 1540 object *tmp;
1494 1541
… …
1569 1616
1570/* 1617/*
1571 * add_weight(object, weight) adds the specified weight to an object, 1618 * add_weight(object, weight) adds the specified weight to an object,
1572 * and also updates how much the environment(s) is/are carrying. 1619 * and also updates how much the environment(s) is/are carrying.
1573 */ 1620 */
1574
1575void 1621void
1576add_weight (object *op, signed long weight) 1622add_weight (object *op, signed long weight)
1577{ 1623{
1578 while (op != NULL) 1624 while (op != NULL)
1579 { 1625 {
… …
1594 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1640 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1595 free (dump); 1641 free (dump);
1596 return op; 1642 return op;
1597 } 1643 }
1598 1644
1599 if (where->head) 1645 if (where->head_ () != where)
1600 { 1646 {
1601 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1647 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1602 where = where->head; 1648 where = where->head;
1603 } 1649 }
1604 1650
1605 return where->insert (op); 1651 return where->insert (op);
1606} 1652}
… …
1611 * inside the object environment. 1657 * inside the object environment.
1612 * 1658 *
1613 * The function returns now pointer to inserted item, and return value can 1659 * The function returns now pointer to inserted item, and return value can
1614 * be != op, if items are merged. -Tero 1660 * be != op, if items are merged. -Tero
1615 */ 1661 */
1616
1617object * 1662object *
1618object::insert (object *op) 1663object::insert (object *op)
1619{ 1664{
1620 object *tmp, *otmp;
1621
1622 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1623 op->remove (); 1666 op->remove ();
1624 1667
1625 if (op->more) 1668 if (op->more)
1626 { 1669 {
… …
1628 return op; 1671 return op;
1629 } 1672 }
1630 1673
1631 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1632 CLEAR_FLAG (op, FLAG_REMOVED); 1675 CLEAR_FLAG (op, FLAG_REMOVED);
1676
1633 if (op->nrof) 1677 if (op->nrof)
1634 { 1678 {
1635 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1679 for (object *tmp = inv; tmp; tmp = tmp->below)
1636 if (object::can_merge (tmp, op)) 1680 if (object::can_merge (tmp, op))
1637 { 1681 {
1638 /* return the original object and remove inserted object 1682 /* return the original object and remove inserted object
1639 (client needs the original object) */ 1683 (client needs the original object) */
1640 tmp->nrof += op->nrof; 1684 tmp->nrof += op->nrof;
… …
1659 add_weight (this, op->weight * op->nrof); 1703 add_weight (this, op->weight * op->nrof);
1660 } 1704 }
1661 else 1705 else
1662 add_weight (this, (op->weight + op->carrying)); 1706 add_weight (this, (op->weight + op->carrying));
1663 1707
1664 otmp = this->in_player (); 1708 if (object *otmp = this->in_player ())
1665 if (otmp && otmp->contr)
1666 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1667 otmp->update_stats (); 1710 otmp->update_stats ();
1668 1711
1712 op->owner = 0; // its his/hers now. period.
1669 op->map = 0; 1713 op->map = 0;
1670 op->env = this; 1714 op->env = this;
1671 op->above = 0; 1715 op->above = 0;
1672 op->below = 0; 1716 op->below = 0;
1673 op->x = 0, op->y = 0; 1717 op->x = op->y = 0;
1674 1718
1675 /* reset the light list and los of the players on the map */ 1719 /* reset the light list and los of the players on the map */
1676 if ((op->glow_radius != 0) && map) 1720 if (op->glow_radius && map)
1677 { 1721 {
1678#ifdef DEBUG_LIGHTS 1722#ifdef DEBUG_LIGHTS
1679 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1723 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1680#endif /* DEBUG_LIGHTS */ 1724#endif /* DEBUG_LIGHTS */
1681 if (map->darkness) 1725 if (map->darkness)
… …
1915 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1916 */ 1960 */
1917void 1961void
1918flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1919{ 1963{
1920 if (op->inv)
1921 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1922 { 1965 {
1923 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
1924 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
1925 } 1968 }
1926} 1969}
1927 1970
1928/* 1971/*
1929 * deactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
1930 */ 1973 */
1931void 1974void
1932unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
1933{ 1976{
1934 if (op->inv)
1935 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1936 { 1978 {
1937 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
1938 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
1939 } 1981 }
1940}
1941
1942/*
1943 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1944 * all it's inventory (recursively).
1945 * If checksums are used, a player will get set_cheat called for
1946 * him/her-self and all object carried by a call to this function.
1947 */
1948void
1949set_cheat (object *op)
1950{
1951 SET_FLAG (op, FLAG_WAS_WIZ);
1952 flag_inv (op, FLAG_WAS_WIZ);
1953} 1982}
1954 1983
1955/* 1984/*
1956 * find_free_spot(object, map, x, y, start, stop) will search for 1985 * find_free_spot(object, map, x, y, start, stop) will search for
1957 * a spot at the given map and coordinates which will be able to contain 1986 * a spot at the given map and coordinates which will be able to contain
… …
1959 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
1960 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
1961 * start and stop are where to start relative to the free_arr array (1,9 1990 * start and stop are where to start relative to the free_arr array (1,9
1962 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
1963 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1992 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1964 * Note - this only checks to see if there is space for the head of the
1965 * object - if it is a multispace object, this should be called for all
1966 * pieces.
1967 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
1968 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
1969 * necessary, so the caller shouldn't need to do any special work. 1995 * necessary, so the caller shouldn't need to do any special work.
1970 * Note - updated to take an object instead of archetype - this is necessary 1996 * Note - updated to take an object instead of archetype - this is necessary
1971 * because arch_blocked (now ob_blocked) needs to know the movement type 1997 * because arch_blocked (now ob_blocked) needs to know the movement type
1972 * to know if the space in question will block the object. We can't use 1998 * to know if the space in question will block the object. We can't use
… …
1974 * customized, changed states, etc. 2000 * customized, changed states, etc.
1975 */ 2001 */
1976int 2002int
1977find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2003find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1978{ 2004{
2005 int altern[SIZEOFFREE];
1979 int index = 0, flag; 2006 int index = 0, flag;
1980 int altern[SIZEOFFREE];
1981 2007
1982 for (int i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
1983 { 2009 {
1984 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2010 mapxy pos (m, x, y); pos.move (i);
1985 if (!flag) 2011
2012 if (!pos.normalise ())
2013 continue;
2014
2015 mapspace &ms = *pos;
2016
2017 if (ms.flags () & P_IS_ALIVE)
2018 continue;
2019
2020 /* However, often
2021 * ob doesn't have any move type (when used to place exits)
2022 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2023 */
2024 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2025 {
1986 altern [index++] = i; 2026 altern [index++] = i;
2027 continue;
2028 }
1987 2029
1988 /* Basically, if we find a wall on a space, we cut down the search size. 2030 /* Basically, if we find a wall on a space, we cut down the search size.
1989 * In this way, we won't return spaces that are on another side of a wall. 2031 * In this way, we won't return spaces that are on another side of a wall.
1990 * This mostly work, but it cuts down the search size in all directions - 2032 * This mostly work, but it cuts down the search size in all directions -
1991 * if the space being examined only has a wall to the north and empty 2033 * if the space being examined only has a wall to the north and empty
1992 * spaces in all the other directions, this will reduce the search space 2034 * spaces in all the other directions, this will reduce the search space
1993 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
1994 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
1995 */ 2037 */
1996 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2038 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2039 {
1997 stop = maxfree[i]; 2040 stop = maxfree[i];
2041 continue;
2042 }
2043
2044 /* Note it is intentional that we check ob - the movement type of the
2045 * head of the object should correspond for the entire object.
2046 */
2047 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2048 continue;
2049
2050 if (ob->blocked (m, pos.x, pos.y))
2051 continue;
2052
2053 altern [index++] = i;
1998 } 2054 }
1999 2055
2000 if (!index) 2056 if (!index)
2001 return -1; 2057 return -1;
2002 2058
… …
2011 */ 2067 */
2012int 2068int
2013find_first_free_spot (const object *ob, maptile *m, int x, int y) 2069find_first_free_spot (const object *ob, maptile *m, int x, int y)
2014{ 2070{
2015 for (int i = 0; i < SIZEOFFREE; i++) 2071 for (int i = 0; i < SIZEOFFREE; i++)
2016 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2072 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2017 return i; 2073 return i;
2018 2074
2019 return -1; 2075 return -1;
2020} 2076}
2021 2077
… …
2075 object *tmp; 2131 object *tmp;
2076 maptile *mp; 2132 maptile *mp;
2077 2133
2078 MoveType blocked, move_type; 2134 MoveType blocked, move_type;
2079 2135
2080 if (exclude && exclude->head) 2136 if (exclude && exclude->head_ () != exclude)
2081 { 2137 {
2082 exclude = exclude->head; 2138 exclude = exclude->head;
2083 move_type = exclude->move_type; 2139 move_type = exclude->move_type;
2084 } 2140 }
2085 else 2141 else
… …
2108 max = maxfree[i]; 2164 max = maxfree[i];
2109 else if (mflags & P_IS_ALIVE) 2165 else if (mflags & P_IS_ALIVE)
2110 { 2166 {
2111 for (tmp = ms.bot; tmp; tmp = tmp->above) 2167 for (tmp = ms.bot; tmp; tmp = tmp->above)
2112 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2168 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2113 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2169 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2114 break; 2170 break;
2115 2171
2116 if (tmp) 2172 if (tmp)
2117 return freedir[i]; 2173 return freedir[i];
2118 } 2174 }
… …
2298 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2354 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2299 * core dumps if they do. 2355 * core dumps if they do.
2300 * 2356 *
2301 * Add a check so we can't pick up invisible objects (0.93.8) 2357 * Add a check so we can't pick up invisible objects (0.93.8)
2302 */ 2358 */
2303
2304int 2359int
2305can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2306{ 2361{
2307 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2308 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2313 * create clone from object to another 2368 * create clone from object to another
2314 */ 2369 */
2315object * 2370object *
2316object_create_clone (object *asrc) 2371object_create_clone (object *asrc)
2317{ 2372{
2318 object *dst = 0, *tmp, *src, *part, *prev, *item; 2373 object *dst = 0, *tmp, *src, *prev, *item;
2319 2374
2320 if (!asrc) 2375 if (!asrc)
2321 return 0; 2376 return 0;
2322 2377
2323 src = asrc;
2324 if (src->head)
2325 src = src->head; 2378 src = asrc->head_ ();
2326 2379
2327 prev = 0; 2380 prev = 0;
2328 for (part = src; part; part = part->more) 2381 for (object *part = src; part; part = part->more)
2329 { 2382 {
2330 tmp = part->clone (); 2383 tmp = part->clone ();
2331 tmp->x -= src->x; 2384 tmp->x -= src->x;
2332 tmp->y -= src->y; 2385 tmp->y -= src->y;
2333 2386
… …
2446 /* Basically, if the archetype has this key set, 2499 /* Basically, if the archetype has this key set,
2447 * we need to store the null value so when we save 2500 * we need to store the null value so when we save
2448 * it, we save the empty value so that when we load, 2501 * it, we save the empty value so that when we load,
2449 * we get this value back again. 2502 * we get this value back again.
2450 */ 2503 */
2451 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2504 if (get_ob_key_link (op->arch, canonical_key))
2452 field->value = 0; 2505 field->value = 0;
2453 else 2506 else
2454 { 2507 {
2455 if (last) 2508 if (last)
2456 last->next = field->next; 2509 last->next = field->next;
… …
2525 } 2578 }
2526 else 2579 else
2527 item = item->env; 2580 item = item->env;
2528} 2581}
2529 2582
2530
2531const char * 2583const char *
2532object::flag_desc (char *desc, int len) const 2584object::flag_desc (char *desc, int len) const
2533{ 2585{
2534 char *p = desc; 2586 char *p = desc;
2535 bool first = true; 2587 bool first = true;
… …
2569 &name, 2621 &name,
2570 title ? "\",title:\"" : "", 2622 title ? "\",title:\"" : "",
2571 title ? (const char *)title : "", 2623 title ? (const char *)title : "",
2572 flag_desc (flagdesc, 512), type); 2624 flag_desc (flagdesc, 512), type);
2573 2625
2574 if (env) 2626 if (!this->flag[FLAG_REMOVED] && env)
2575 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2627 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2576 2628
2577 if (map) 2629 if (map)
2578 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2630 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2579 2631
… …
2581} 2633}
2582 2634
2583const char * 2635const char *
2584object::debug_desc () const 2636object::debug_desc () const
2585{ 2637{
2586 static char info[256 * 4]; 2638 static char info[3][256 * 4];
2639 static int info_idx;
2640
2587 return debug_desc (info); 2641 return debug_desc (info [++info_idx % 3]);
2588}
2589
2590const char *
2591object::debug_desc2 () const
2592{
2593 static char info[256 * 4];
2594 return debug_desc (info);
2595} 2642}
2596 2643
2597struct region * 2644struct region *
2598object::region () const 2645object::region () const
2599{ 2646{
… …
2602} 2649}
2603 2650
2604const materialtype_t * 2651const materialtype_t *
2605object::dominant_material () const 2652object::dominant_material () const
2606{ 2653{
2607 if (materialtype_t *mat = name_to_material (materialname)) 2654 if (materialtype_t *mt = name_to_material (materialname))
2608 return mat; 2655 return mt;
2609 2656
2610 // omfg this is slow, this has to be temporary :)
2611 shstr unknown ("unknown");
2612
2613 return name_to_material (unknown); 2657 return name_to_material (shstr_unknown);
2614} 2658}
2615 2659
2616void 2660void
2617object::open_container (object *new_container) 2661object::open_container (object *new_container)
2618{ 2662{
… …
2634 old_container->flag [FLAG_APPLIED] = 0; 2678 old_container->flag [FLAG_APPLIED] = 0;
2635 container = 0; 2679 container = 0;
2636 2680
2637 esrv_update_item (UPD_FLAGS, this, old_container); 2681 esrv_update_item (UPD_FLAGS, this, old_container);
2638 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2682 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2683 play_sound (sound_find ("chest_close"));
2639 } 2684 }
2640 2685
2641 if (new_container) 2686 if (new_container)
2642 { 2687 {
2643 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2688 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2659 new_container->flag [FLAG_APPLIED] = 1; 2704 new_container->flag [FLAG_APPLIED] = 1;
2660 container = new_container; 2705 container = new_container;
2661 2706
2662 esrv_update_item (UPD_FLAGS, this, new_container); 2707 esrv_update_item (UPD_FLAGS, this, new_container);
2663 esrv_send_inventory (this, new_container); 2708 esrv_send_inventory (this, new_container);
2709 play_sound (sound_find ("chest_open"));
2710 }
2711}
2712
2713object *
2714object::force_find (const shstr name)
2715{
2716 /* cycle through his inventory to look for the MARK we want to
2717 * place
2718 */
2719 for (object *tmp = inv; tmp; tmp = tmp->below)
2720 if (tmp->type == FORCE && tmp->slaying == name)
2721 return splay (tmp);
2722
2723 return 0;
2724}
2725
2726void
2727object::force_add (const shstr name, int duration)
2728{
2729 if (object *force = force_find (name))
2730 force->destroy ();
2731
2732 object *force = get_archetype (FORCE_NAME);
2733
2734 force->slaying = name;
2735 force->stats.food = 1;
2736 force->speed_left = -1.f;
2737
2738 force->set_speed (duration ? 1.f / duration : 0.f);
2739 force->flag [FLAG_IS_USED_UP] = true;
2740 force->flag [FLAG_APPLIED] = true;
2741
2742 insert (force);
2743}
2744
2745void
2746object::play_sound (faceidx sound) const
2747{
2748 if (!sound)
2749 return;
2750
2751 if (flag [FLAG_REMOVED])
2752 return;
2753
2754 if (env)
2664 } 2755 {
2756 if (object *pl = in_player ())
2757 pl->contr->play_sound (sound);
2758 }
2759 else
2760 map->play_sound (sound, x, y);
2665} 2761}
2666 2762
2667

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines