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.174 by root, Wed Aug 8 04:52:59 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 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 * Crossfire TRT 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 3 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,
… …
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, 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 <crossfire@schmorp.de> 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. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
… …
33#include <sproto.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; 38UUID UUID::cur;
39static UUID uuid; 39static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 40static const uint64 UUID_GAP = 1<<19;
41 41
42objectvec objects; 42objectvec objects;
43activevec actives; 43activevec actives;
44 44
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 45short freearr_x[SIZEOFFREE] = {
46 0,
47 0, 1, 1, 1, 0, -1, -1, -1,
48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 50};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 51short freearr_y[SIZEOFFREE] = {
52 0,
53 -1, -1, 0, 1, 1, 1, 0, -1,
54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50}; 56};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 57int maxfree[SIZEOFFREE] = {
58 0,
59 9, 10, 13, 14, 17, 18, 21, 22,
60 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 62};
54int freedir[SIZEOFFREE] = { 63int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 64 0,
65 1, 2, 3, 4, 5, 6, 7, 8,
66 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 67 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 68};
58 69
59static void 70static void
60write_uuid (void) 71write_uuid (uval64 skip, bool sync)
61{ 72{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 73 CALL_BEGIN (2);
63 74 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 75 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 77 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 78}
79 79
80static void 80static void
81read_uuid (void) 81read_uuid (void)
82{ 82{
83 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
84 84
85 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
86 86
87 seq_next_save = 0;
88
87 FILE *fp; 89 FILE *fp;
88 90
89 if (!(fp = fopen (filename, "r"))) 91 if (!(fp = fopen (filename, "r")))
90 { 92 {
91 if (errno == ENOENT) 93 if (errno == ENOENT)
92 { 94 {
93 LOG (llevInfo, "RESET uid to 1\n"); 95 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 96 UUID::cur.seq = 0;
95 write_uuid (); 97 write_uuid (UUID_GAP, true);
96 return; 98 return;
97 } 99 }
98 100
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 102 _exit (1);
101 } 103 }
102 104
103 int version; 105 UUID::BUF buf;
104 unsigned long long uid; 106 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
106 { 110 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 112 _exit (1);
109 } 113 }
110 114
111 uuid.seq = uid; 115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 116
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 117 write_uuid (UUID_GAP, true);
114 fclose (fp); 118 fclose (fp);
115} 119}
116 120
117UUID 121UUID
118gen_uuid () 122UUID::gen ()
119{ 123{
120 UUID uid; 124 UUID uid;
121 125
122 uid.seq = ++uuid.seq; 126 uid.seq = ++cur.seq;
123 127
124 if (!(uuid.seq & (UUID_SKIP - 1))) 128 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
126 134
127 return uid; 135 return uid;
128} 136}
129 137
130void 138void
131init_uuid () 139UUID::init ()
132{ 140{
133 read_uuid (); 141 read_uuid ();
134} 142}
135 143
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 144/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
… …
254 /* This is really a spellbook check - really, we should 262 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 263 * check all objects in the inventory.
256 */ 264 */
257 if (ob1->inv || ob2->inv) 265 if (ob1->inv || ob2->inv)
258 { 266 {
259 /* if one object has inventory but the other doesn't, not equiv */ 267 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 268 return 0; /* inventories differ in length */
261 return 0;
262 269
263 /* Now check to see if the two inventory objects could merge */ 270 if (ob1->inv->below || ob2->inv->below)
271 return 0; /* more than one object in inv */
272
264 if (!object::can_merge (ob1->inv, ob2->inv)) 273 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 274 return 0; /* inventory objexts differ */
266 275
267 /* inventory ok - still need to check rest of this object to see 276 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 277 * if it is valid.
269 */ 278 */
270 } 279 }
… …
305 { 314 {
306 ob1->optimise (); 315 ob1->optimise ();
307 ob2->optimise (); 316 ob2->optimise ();
308 317
309 if (ob1->self || ob2->self) 318 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2)) 319 {
320 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
321 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
322
323 if (k1 != k2)
311 return 0; 324 return 0;
325 else if (k1 == 0)
326 return 1;
327 else if (!cfperl_can_merge (ob1, ob2))
328 return 0;
329 }
312 } 330 }
313 331
314 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
315 return 1; 333 return 1;
316} 334}
… …
374/* 392/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 393 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 394 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 395 * If it's not a multi-object, it is returned.
378 */ 396 */
379
380object * 397object *
381get_nearest_part (object *op, const object *pl) 398get_nearest_part (object *op, const object *pl)
382{ 399{
383 object *tmp, *closest; 400 object *tmp, *closest;
384 int last_dist, i; 401 int last_dist, i;
… …
420 break; 437 break;
421 438
422 return op; 439 return op;
423} 440}
424 441
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 442/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 443 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 444 * skill and experience objects.
445 * ACTUALLY NO! investigate! TODO
434 */ 446 */
435void 447void
436object::set_owner (object *owner) 448object::set_owner (object *owner)
437{ 449{
450 // allow objects which own objects
438 if (!owner) 451 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 452 while (owner->owner)
449 owner = owner->owner; 453 owner = owner->owner;
454
455 if (flag [FLAG_FREED])
456 {
457 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
458 return;
459 }
450 460
451 this->owner = owner; 461 this->owner = owner;
452} 462}
453 463
454int 464int
… …
586object::copy_to (object *dst) 596object::copy_to (object *dst)
587{ 597{
588 *dst = *this; 598 *dst = *this;
589 599
590 if (speed < 0) 600 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 601 dst->speed_left -= rndm ();
592 602
593 dst->set_speed (dst->speed); 603 dst->set_speed (dst->speed);
594} 604}
595 605
596void 606void
597object::instantiate () 607object::instantiate ()
598{ 608{
599 if (!uuid.seq) // HACK 609 if (!uuid.seq) // HACK
600 uuid = gen_uuid (); 610 uuid = UUID::gen ();
601 611
602 speed_left = -0.1f; 612 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really 613 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything. 614 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting 615 * by doing so, when a monster is created, it has good starting
… …
764static int object_count; 774static int object_count;
765 775
766void object::link () 776void object::link ()
767{ 777{
768 assert (!index);//D 778 assert (!index);//D
769 uuid = gen_uuid (); 779 uuid = UUID::gen ();
770 count = ++object_count; 780 count = ++object_count;
771 781
772 refcnt_inc (); 782 refcnt_inc ();
773 objects.insert (this); 783 objects.insert (this);
774} 784}
… …
923 933
924 if (!freed_map) 934 if (!freed_map)
925 { 935 {
926 freed_map = new maptile; 936 freed_map = new maptile;
927 937
938 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 939 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 940 freed_map->width = 3;
930 freed_map->height = 3; 941 freed_map->height = 3;
942 freed_map->nodrop = 1;
931 943
932 freed_map->alloc (); 944 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY; 945 freed_map->in_memory = MAP_IN_MEMORY;
934 } 946 }
935 947
… …
1089 if (map->in_memory == MAP_SAVING) 1101 if (map->in_memory == MAP_SAVING)
1090 return; 1102 return;
1091 1103
1092 int check_walk_off = !flag [FLAG_NO_APPLY]; 1104 int check_walk_off = !flag [FLAG_NO_APPLY];
1093 1105
1094 for (tmp = ms.bot; tmp; tmp = tmp->above) 1106 if (object *pl = ms.player ())
1095 { 1107 {
1096 /* No point updating the players look faces if he is the object 1108 if (pl->container == this)
1097 * being removed.
1098 */
1099
1100 if (tmp->type == PLAYER && tmp->container == this)
1101 /* If a container that the player is currently using somehow gets 1109 /* If a container that the player is currently using somehow gets
1102 * removed (most likely destroyed), update the player view 1110 * removed (most likely destroyed), update the player view
1103 * appropriately. 1111 * appropriately.
1104 */ 1112 */
1105 tmp->close_container (); 1113 pl->close_container ();
1114
1115 pl->contr->ns->floorbox_update ();
1116 }
1117
1118 for (tmp = ms.bot; tmp; tmp = tmp->above)
1119 {
1120 /* No point updating the players look faces if he is the object
1121 * being removed.
1122 */
1106 1123
1107 /* See if object moving off should effect something */ 1124 /* See if object moving off should effect something */
1108 if (check_walk_off 1125 if (check_walk_off
1109 && ((move_type & tmp->move_off) 1126 && ((move_type & tmp->move_off)
1110 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1127 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1142merge_ob (object *op, object *top) 1159merge_ob (object *op, object *top)
1143{ 1160{
1144 if (!op->nrof) 1161 if (!op->nrof)
1145 return 0; 1162 return 0;
1146 1163
1147 if (top) 1164 if (!top)
1148 for (top = op; top && top->above; top = top->above) 1165 for (top = op; top && top->above; top = top->above)
1149 ; 1166 ;
1150 1167
1151 for (; top; top = top->below) 1168 for (; top; top = top->below)
1152 { 1169 {
… …
1233 1250
1234 object *top, *floor = NULL; 1251 object *top, *floor = NULL;
1235 1252
1236 op->remove (); 1253 op->remove ();
1237 1254
1238#if 0
1239 if (!m->active != !op->active)
1240 if (m->active)
1241 op->activate_recursive ();
1242 else
1243 op->deactivate_recursive ();
1244#endif
1245
1246 if (out_of_map (m, op->x, op->y))
1247 {
1248 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1249#ifdef MANY_CORES
1250 /* Better to catch this here, as otherwise the next use of this object
1251 * is likely to cause a crash. Better to find out where it is getting
1252 * improperly inserted.
1253 */
1254 abort ();
1255#endif
1256 return op;
1257 }
1258
1259 if (object *more = op->more)
1260 if (!insert_ob_in_map (more, m, originator, flag))
1261 return 0;
1262
1263 CLEAR_FLAG (op, FLAG_REMOVED);
1264
1265 /* Ideally, the caller figures this out. However, it complicates a lot 1255 /* Ideally, the caller figures this out. However, it complicates a lot
1266 * of areas of callers (eg, anything that uses find_free_spot would now 1256 * of areas of callers (eg, anything that uses find_free_spot would now
1267 * need extra work 1257 * need extra work
1268 */ 1258 */
1269 if (!xy_normalise (m, op->x, op->y)) 1259 if (!xy_normalise (m, op->x, op->y))
1260 {
1261 op->destroy ();
1270 return 0; 1262 return 0;
1263 }
1264
1265 if (object *more = op->more)
1266 if (!insert_ob_in_map (more, m, originator, flag))
1267 return 0;
1268
1269 CLEAR_FLAG (op, FLAG_REMOVED);
1271 1270
1272 op->map = m; 1271 op->map = m;
1273 mapspace &ms = op->ms (); 1272 mapspace &ms = op->ms ();
1274 1273
1275 /* this has to be done after we translate the coordinates. 1274 /* this has to be done after we translate the coordinates.
… …
1310 else 1309 else
1311 { 1310 {
1312 top = ms.bot; 1311 top = ms.bot;
1313 1312
1314 /* If there are other objects, then */ 1313 /* If there are other objects, then */
1315 if ((!(flag & INS_MAP_LOAD)) && top) 1314 if (top)
1316 { 1315 {
1317 object *last = 0; 1316 object *last = 0;
1318 1317
1319 /* 1318 /*
1320 * If there are multiple objects on this space, we do some trickier handling. 1319 * If there are multiple objects on this space, we do some trickier handling.
… …
1372 */ 1371 */
1373 if (last && last->below && last != floor) 1372 if (last && last->below && last != floor)
1374 top = last->below; 1373 top = last->below;
1375 } 1374 }
1376 } /* If objects on this space */ 1375 } /* If objects on this space */
1377 if (flag & INS_MAP_LOAD)
1378 top = ms.top;
1379 1376
1380 if (flag & INS_ABOVE_FLOOR_ONLY) 1377 if (flag & INS_ABOVE_FLOOR_ONLY)
1381 top = floor; 1378 top = floor;
1382 1379
1383 /* Top is the object that our object (op) is going to get inserted above. 1380 /* Top is the object that our object (op) is going to get inserted above.
… …
1416 op->map->touch (); 1413 op->map->touch ();
1417 } 1414 }
1418 1415
1419 op->map->dirty = true; 1416 op->map->dirty = true;
1420 1417
1421 /* If we have a floor, we know the player, if any, will be above
1422 * it, so save a few ticks and start from there.
1423 */
1424 if (!(flag & INS_MAP_LOAD))
1425 if (object *pl = ms.player ()) 1418 if (object *pl = ms.player ())
1426 if (pl->contr->ns)
1427 pl->contr->ns->floorbox_update (); 1419 pl->contr->ns->floorbox_update ();
1428 1420
1429 /* If this object glows, it may affect lighting conditions that are 1421 /* If this object glows, it may affect lighting conditions that are
1430 * visible to others on this map. But update_all_los is really 1422 * visible to others on this map. But update_all_los is really
1431 * an inefficient way to do this, as it means los for all players 1423 * an inefficient way to do this, as it means los for all players
1432 * on the map will get recalculated. The players could very well 1424 * on the map will get recalculated. The players could very well
… …
1670 * be != op, if items are merged. -Tero 1662 * be != op, if items are merged. -Tero
1671 */ 1663 */
1672object * 1664object *
1673object::insert (object *op) 1665object::insert (object *op)
1674{ 1666{
1675 object *tmp, *otmp;
1676
1677 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1667 if (!QUERY_FLAG (op, FLAG_REMOVED))
1678 op->remove (); 1668 op->remove ();
1679 1669
1680 if (op->more) 1670 if (op->more)
1681 { 1671 {
… …
1683 return op; 1673 return op;
1684 } 1674 }
1685 1675
1686 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1676 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1687 CLEAR_FLAG (op, FLAG_REMOVED); 1677 CLEAR_FLAG (op, FLAG_REMOVED);
1678
1688 if (op->nrof) 1679 if (op->nrof)
1689 { 1680 {
1690 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1681 for (object *tmp = inv; tmp; tmp = tmp->below)
1691 if (object::can_merge (tmp, op)) 1682 if (object::can_merge (tmp, op))
1692 { 1683 {
1693 /* return the original object and remove inserted object 1684 /* return the original object and remove inserted object
1694 (client needs the original object) */ 1685 (client needs the original object) */
1695 tmp->nrof += op->nrof; 1686 tmp->nrof += op->nrof;
… …
1714 add_weight (this, op->weight * op->nrof); 1705 add_weight (this, op->weight * op->nrof);
1715 } 1706 }
1716 else 1707 else
1717 add_weight (this, (op->weight + op->carrying)); 1708 add_weight (this, (op->weight + op->carrying));
1718 1709
1719 otmp = this->in_player (); 1710 if (object *otmp = this->in_player ())
1720 if (otmp && otmp->contr)
1721 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1711 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1722 otmp->update_stats (); 1712 otmp->update_stats ();
1723 1713
1714 op->owner = 0; // its his/hers now. period.
1724 op->map = 0; 1715 op->map = 0;
1725 op->env = this; 1716 op->env = this;
1726 op->above = 0; 1717 op->above = 0;
1727 op->below = 0; 1718 op->below = 0;
1728 op->x = 0, op->y = 0; 1719 op->x = op->y = 0;
1729 1720
1730 /* reset the light list and los of the players on the map */ 1721 /* reset the light list and los of the players on the map */
1731 if ((op->glow_radius != 0) && map) 1722 if (op->glow_radius && map)
1732 { 1723 {
1733#ifdef DEBUG_LIGHTS 1724#ifdef DEBUG_LIGHTS
1734 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1725 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1735#endif /* DEBUG_LIGHTS */ 1726#endif /* DEBUG_LIGHTS */
1736 if (map->darkness) 1727 if (map->darkness)
… …
1970 * activate recursively a flag on an object inventory 1961 * activate recursively a flag on an object inventory
1971 */ 1962 */
1972void 1963void
1973flag_inv (object *op, int flag) 1964flag_inv (object *op, int flag)
1974{ 1965{
1975 if (op->inv)
1976 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1966 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1977 { 1967 {
1978 SET_FLAG (tmp, flag); 1968 SET_FLAG (tmp, flag);
1979 flag_inv (tmp, flag); 1969 flag_inv (tmp, flag);
1980 } 1970 }
1981} 1971}
1982 1972
1983/* 1973/*
1984 * deactivate recursively a flag on an object inventory 1974 * deactivate recursively a flag on an object inventory
1985 */ 1975 */
1986void 1976void
1987unflag_inv (object *op, int flag) 1977unflag_inv (object *op, int flag)
1988{ 1978{
1989 if (op->inv)
1990 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1979 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1991 { 1980 {
1992 CLEAR_FLAG (tmp, flag); 1981 CLEAR_FLAG (tmp, flag);
1993 unflag_inv (tmp, flag); 1982 unflag_inv (tmp, flag);
1994 } 1983 }
1995} 1984}
1996 1985
1997/* 1986/*
1998 * find_free_spot(object, map, x, y, start, stop) will search for 1987 * find_free_spot(object, map, x, y, start, stop) will search for
1999 * a spot at the given map and coordinates which will be able to contain 1988 * a spot at the given map and coordinates which will be able to contain
… …
2001 * to search (see the freearr_x/y[] definition). 1990 * to search (see the freearr_x/y[] definition).
2002 * It returns a random choice among the alternatives found. 1991 * It returns a random choice among the alternatives found.
2003 * start and stop are where to start relative to the free_arr array (1,9 1992 * start and stop are where to start relative to the free_arr array (1,9
2004 * does all 4 immediate directions). This returns the index into the 1993 * does all 4 immediate directions). This returns the index into the
2005 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1994 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2006 * Note - this only checks to see if there is space for the head of the
2007 * object - if it is a multispace object, this should be called for all
2008 * pieces.
2009 * Note2: This function does correctly handle tiled maps, but does not 1995 * Note: This function does correctly handle tiled maps, but does not
2010 * inform the caller. However, insert_ob_in_map will update as 1996 * inform the caller. However, insert_ob_in_map will update as
2011 * necessary, so the caller shouldn't need to do any special work. 1997 * necessary, so the caller shouldn't need to do any special work.
2012 * Note - updated to take an object instead of archetype - this is necessary 1998 * Note - updated to take an object instead of archetype - this is necessary
2013 * because arch_blocked (now ob_blocked) needs to know the movement type 1999 * because arch_blocked (now ob_blocked) needs to know the movement type
2014 * to know if the space in question will block the object. We can't use 2000 * to know if the space in question will block the object. We can't use
… …
2016 * customized, changed states, etc. 2002 * customized, changed states, etc.
2017 */ 2003 */
2018int 2004int
2019find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2005find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2020{ 2006{
2007 int altern[SIZEOFFREE];
2021 int index = 0, flag; 2008 int index = 0, flag;
2022 int altern[SIZEOFFREE];
2023 2009
2024 for (int i = start; i < stop; i++) 2010 for (int i = start; i < stop; i++)
2025 { 2011 {
2026 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2012 mapxy pos (m, x, y); pos.move (i);
2027 if (!flag) 2013
2014 if (!pos.normalise ())
2015 continue;
2016
2017 mapspace &ms = *pos;
2018
2019 if (ms.flags () & P_IS_ALIVE)
2020 continue;
2021
2022 /* However, often
2023 * ob doesn't have any move type (when used to place exits)
2024 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2025 */
2026 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2027 {
2028 altern [index++] = i; 2028 altern [index++] = i;
2029 continue;
2030 }
2029 2031
2030 /* Basically, if we find a wall on a space, we cut down the search size. 2032 /* Basically, if we find a wall on a space, we cut down the search size.
2031 * In this way, we won't return spaces that are on another side of a wall. 2033 * In this way, we won't return spaces that are on another side of a wall.
2032 * This mostly work, but it cuts down the search size in all directions - 2034 * This mostly work, but it cuts down the search size in all directions -
2033 * if the space being examined only has a wall to the north and empty 2035 * if the space being examined only has a wall to the north and empty
2034 * spaces in all the other directions, this will reduce the search space 2036 * spaces in all the other directions, this will reduce the search space
2035 * to only the spaces immediately surrounding the target area, and 2037 * to only the spaces immediately surrounding the target area, and
2036 * won't look 2 spaces south of the target space. 2038 * won't look 2 spaces south of the target space.
2037 */ 2039 */
2038 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2040 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2041 {
2039 stop = maxfree[i]; 2042 stop = maxfree[i];
2043 continue;
2044 }
2045
2046 /* Note it is intentional that we check ob - the movement type of the
2047 * head of the object should correspond for the entire object.
2048 */
2049 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2050 continue;
2051
2052 if (ob->blocked (m, pos.x, pos.y))
2053 continue;
2054
2055 altern [index++] = i;
2040 } 2056 }
2041 2057
2042 if (!index) 2058 if (!index)
2043 return -1; 2059 return -1;
2044 2060
… …
2053 */ 2069 */
2054int 2070int
2055find_first_free_spot (const object *ob, maptile *m, int x, int y) 2071find_first_free_spot (const object *ob, maptile *m, int x, int y)
2056{ 2072{
2057 for (int i = 0; i < SIZEOFFREE; i++) 2073 for (int i = 0; i < SIZEOFFREE; i++)
2058 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2074 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2059 return i; 2075 return i;
2060 2076
2061 return -1; 2077 return -1;
2062} 2078}
2063 2079
… …
2340 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2356 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2341 * core dumps if they do. 2357 * core dumps if they do.
2342 * 2358 *
2343 * Add a check so we can't pick up invisible objects (0.93.8) 2359 * Add a check so we can't pick up invisible objects (0.93.8)
2344 */ 2360 */
2345
2346int 2361int
2347can_pick (const object *who, const object *item) 2362can_pick (const object *who, const object *item)
2348{ 2363{
2349 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2364 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2350 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2365 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2601{ 2616{
2602 char flagdesc[512]; 2617 char flagdesc[512];
2603 char info2[256 * 4]; 2618 char info2[256 * 4];
2604 char *p = info; 2619 char *p = info;
2605 2620
2606 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2621 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2607 count, uuid.seq, 2622 count,
2623 uuid.c_str (),
2608 &name, 2624 &name,
2609 title ? "\",title:\"" : "", 2625 title ? "\",title:\"" : "",
2610 title ? (const char *)title : "", 2626 title ? (const char *)title : "",
2611 flag_desc (flagdesc, 512), type); 2627 flag_desc (flagdesc, 512), type);
2612 2628
2613 if (env) 2629 if (!this->flag[FLAG_REMOVED] && env)
2614 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2630 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2615 2631
2616 if (map) 2632 if (map)
2617 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2633 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2618 2634
… …
2665 old_container->flag [FLAG_APPLIED] = 0; 2681 old_container->flag [FLAG_APPLIED] = 0;
2666 container = 0; 2682 container = 0;
2667 2683
2668 esrv_update_item (UPD_FLAGS, this, old_container); 2684 esrv_update_item (UPD_FLAGS, this, old_container);
2669 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2685 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2686 play_sound (sound_find ("chest_close"));
2670 } 2687 }
2671 2688
2672 if (new_container) 2689 if (new_container)
2673 { 2690 {
2674 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2691 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2690 new_container->flag [FLAG_APPLIED] = 1; 2707 new_container->flag [FLAG_APPLIED] = 1;
2691 container = new_container; 2708 container = new_container;
2692 2709
2693 esrv_update_item (UPD_FLAGS, this, new_container); 2710 esrv_update_item (UPD_FLAGS, this, new_container);
2694 esrv_send_inventory (this, new_container); 2711 esrv_send_inventory (this, new_container);
2712 play_sound (sound_find ("chest_open"));
2695 } 2713 }
2696} 2714}
2697 2715
2698object * 2716object *
2699object::force_find (const shstr name) 2717object::force_find (const shstr name)
… …
2725 force->flag [FLAG_APPLIED] = true; 2743 force->flag [FLAG_APPLIED] = true;
2726 2744
2727 insert (force); 2745 insert (force);
2728} 2746}
2729 2747
2748void
2749object::play_sound (faceidx sound) const
2750{
2751 if (!sound)
2752 return;
2753
2754 if (flag [FLAG_REMOVED])
2755 return;
2756
2757 if (env)
2758 {
2759 if (object *pl = in_player ())
2760 pl->contr->play_sound (sound);
2761 }
2762 else
2763 map->play_sound (sound, x, y);
2764}
2765

Diff Legend

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