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.144 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.206 by root, Tue Apr 15 14:21:04 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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; 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. */
137static int 145static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 146compare_ob_value_lists_one (const object *wants, const object *has)
139{ 147{
140 key_value *wants_field; 148 key_value *wants_field;
141 149
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 150 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
150 key_value *has_field; 158 key_value *has_field;
151 159
152 /* Look for a field in has with the same key. */ 160 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key); 161 has_field = get_ob_key_link (has, wants_field->key);
154 162
155 if (has_field == NULL) 163 if (!has_field)
156 {
157 /* No field with that name. */ 164 return 0; /* No field with that name. */
158 return FALSE;
159 }
160 165
161 /* Found the matching field. */ 166 /* Found the matching field. */
162 if (has_field->value != wants_field->value) 167 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */ 168 return 0; /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167 169
168 /* If we get here, we found a match. Now for the next field in wants. */ 170 /* If we get here, we found a match. Now for the next field in wants. */
169 } 171 }
170 172
171 /* If we get here, every field in wants has a matching field in has. */ 173 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 174 return 1;
173} 175}
174 176
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 177/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 178static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 179compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 180{
179 /* However, there may be fields in has which aren't partnered in wants, 181 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 182 * so we need to run the comparison *twice*. :(
181 */ 183 */
202 || ob1->speed != ob2->speed 204 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 205 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 206 || ob1->name != ob2->name)
205 return 0; 207 return 0;
206 208
207 //TODO: this ain't working well, use nicer and correct overflow check 209 /* Do not merge objects if nrof would overflow. First part checks
208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 210 * for unsigned overflow (2c), second part checks wether the result
209 * value could not be stored in a sint32 (which unfortunately sometimes is 211 * would fit into a 32 bit signed int, which is often used to hold
210 * used to store nrof). 212 * nrof values.
211 */ 213 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 214 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 215 return 0;
214 216
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 217 /* If the objects have been identified, set the BEEN_APPLIED flag.
216 * This is to the comparison of the flags below will be OK. We 218 * This is to the comparison of the flags below will be OK. We
217 * just can't ignore the been applied or identified flags, as they 219 * just can't ignore the been applied or identified flags, as they
218 * are not equal - just if it has been identified, the been_applied 220 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 221 * flags lose any meaning.
220 */ 222 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
249 || ob1->move_off != ob2->move_off 251 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 252 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 253 || ob1->move_slow_penalty != ob2->move_slow_penalty)
252 return 0; 254 return 0;
253 255
254 /* This is really a spellbook check - really, we should 256 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 257 * not merge objects with real inventories, as splitting them
258 * is hard.
256 */ 259 */
257 if (ob1->inv || ob2->inv) 260 if (ob1->inv || ob2->inv)
258 { 261 {
259 /* if one object has inventory but the other doesn't, not equiv */ 262 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 263 return 0; /* inventories differ in length */
261 return 0;
262 264
263 /* Now check to see if the two inventory objects could merge */ 265 if (ob1->inv->below || ob2->inv->below)
266 return 0; /* more than one object in inv */
267
264 if (!object::can_merge (ob1->inv, ob2->inv)) 268 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 269 return 0; /* inventory objects differ */
266 270
267 /* inventory ok - still need to check rest of this object to see 271 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 272 * if it is valid.
269 */ 273 */
270 } 274 }
289 if (ob1->level != ob2->level) 293 if (ob1->level != ob2->level)
290 return 0; 294 return 0;
291 break; 295 break;
292 } 296 }
293 297
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 298 if (ob1->key_values || ob2->key_values)
295 { 299 {
296 /* At least one of these has key_values. */ 300 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 301 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 302 /* One has fields, but the other one doesn't. */
299 return 0; 303 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 304 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 305 return 0;
302 } 306 }
303 307
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 308 if (ob1->self || ob2->self)
306 { 309 {
307 ob1->optimise (); 310 ob1->optimise ();
308 ob2->optimise (); 311 ob2->optimise ();
309 312
310 if (ob1->self || ob2->self) 313 if (ob1->self || ob2->self)
314 {
315 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
316 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
317
318 if (k1 != k2)
311 return 0; 319 return 0;
320 else if (k1 == 0)
321 return 1;
322 else if (!cfperl_can_merge (ob1, ob2))
323 return 0;
324 }
312 } 325 }
313 326
314 /* Everything passes, must be OK. */ 327 /* Everything passes, must be OK. */
315 return 1; 328 return 1;
316} 329}
374/* 387/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 388 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 389 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 390 * If it's not a multi-object, it is returned.
378 */ 391 */
379
380object * 392object *
381get_nearest_part (object *op, const object *pl) 393get_nearest_part (object *op, const object *pl)
382{ 394{
383 object *tmp, *closest; 395 object *tmp, *closest;
384 int last_dist, i; 396 int last_dist, i;
420 break; 432 break;
421 433
422 return op; 434 return op;
423} 435}
424 436
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 437/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 438 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 439 * skill and experience objects.
440 * ACTUALLY NO! investigate! TODO
434 */ 441 */
435void 442void
436object::set_owner (object *owner) 443object::set_owner (object *owner)
437{ 444{
445 // allow objects which own objects
438 if (!owner) 446 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) 447 while (owner->owner)
449 owner = owner->owner; 448 owner = owner->owner;
449
450 if (flag [FLAG_FREED])
451 {
452 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
453 return;
454 }
450 455
451 this->owner = owner; 456 this->owner = owner;
452} 457}
453 458
454void 459int
460object::slottype () const
461{
462 if (type == SKILL)
463 {
464 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
465 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
466 }
467 else
468 {
469 if (slot [body_combat].info) return slot_combat;
470 if (slot [body_range ].info) return slot_ranged;
471 }
472
473 return slot_none;
474}
475
476bool
455object::set_weapon (object *ob) 477object::change_weapon (object *ob)
456{ 478{
457 if (current_weapon == ob) 479 if (current_weapon == ob)
458 return; 480 return true;
481
482 if (chosen_skill)
483 chosen_skill->flag [FLAG_APPLIED] = false;
459 484
460 current_weapon = ob; 485 current_weapon = ob;
461 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 486 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
487
488 if (chosen_skill)
489 chosen_skill->flag [FLAG_APPLIED] = true;
490
462 update_stats (); 491 update_stats ();
492
493 if (ob)
494 {
495 // now check wether any body locations became invalid, in which case
496 // we cannot apply the weapon at the moment.
497 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
498 if (slot[i].used < 0)
499 {
500 current_weapon = chosen_skill = 0;
501 update_stats ();
502
503 new_draw_info_format (NDI_UNIQUE, 0, this,
504 "You try to balance all your items at once, "
505 "but the %s is just too much for your body. "
506 "[You need to unapply some items first.]", &ob->name);
507 return false;
508 }
509
510 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
511 }
512 else
513 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
514
515 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
516 {
517 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
518 &name, ob->debug_desc ());
519 return false;
520 }
521
522 return true;
463} 523}
464 524
465/* Zero the key_values on op, decrementing the shared-string 525/* Zero the key_values on op, decrementing the shared-string
466 * refcounts and freeing the links. 526 * refcounts and freeing the links.
467 */ 527 */
531object::copy_to (object *dst) 591object::copy_to (object *dst)
532{ 592{
533 *dst = *this; 593 *dst = *this;
534 594
535 if (speed < 0) 595 if (speed < 0)
536 dst->speed_left = speed_left - rndm (); 596 dst->speed_left -= rndm ();
537 597
538 dst->set_speed (dst->speed); 598 dst->set_speed (dst->speed);
539} 599}
540 600
541void 601void
542object::instantiate () 602object::instantiate ()
543{ 603{
544 if (!uuid.seq) // HACK 604 if (!uuid.seq) // HACK
545 uuid = gen_uuid (); 605 uuid = UUID::gen ();
546 606
547 speed_left = -0.1f; 607 speed_left = -0.1f;
548 /* copy the body_info to the body_used - this is only really 608 /* copy the body_info to the body_used - this is only really
549 * need for monsters, but doesn't hurt to do it for everything. 609 * need for monsters, but doesn't hurt to do it for everything.
550 * by doing so, when a monster is created, it has good starting 610 * by doing so, when a monster is created, it has good starting
551 * values for the body_used info, so when items are created 611 * values for the body_used info, so when items are created
552 * for it, they can be properly equipped. 612 * for it, they can be properly equipped.
553 */ 613 */
554 memcpy (body_used, body_info, sizeof (body_used)); 614 for (int i = NUM_BODY_LOCATIONS; i--; )
615 slot[i].used = slot[i].info;
555 616
556 attachable::instantiate (); 617 attachable::instantiate ();
557} 618}
558 619
559object * 620object *
708static int object_count; 769static int object_count;
709 770
710void object::link () 771void object::link ()
711{ 772{
712 assert (!index);//D 773 assert (!index);//D
713 uuid = gen_uuid (); 774 uuid = UUID::gen ();
714 count = ++object_count; 775 count = ++object_count;
715 776
716 refcnt_inc (); 777 refcnt_inc ();
717 objects.insert (this); 778 objects.insert (this);
718} 779}
802 * if some form of movement is allowed, let objects 863 * if some form of movement is allowed, let objects
803 * drop on that space. 864 * drop on that space.
804 */ 865 */
805 if (!drop_to_ground 866 if (!drop_to_ground
806 || !map 867 || !map
807 || map->in_memory != MAP_IN_MEMORY 868 || map->in_memory != MAP_ACTIVE
808 || map->nodrop 869 || map->nodrop
809 || ms ().move_block == MOVE_ALL) 870 || ms ().move_block == MOVE_ALL)
810 { 871 {
811 while (inv) 872 while (inv)
812 { 873 {
867 928
868 if (!freed_map) 929 if (!freed_map)
869 { 930 {
870 freed_map = new maptile; 931 freed_map = new maptile;
871 932
933 freed_map->path = "<freed objects map>";
872 freed_map->name = "/internal/freed_objects_map"; 934 freed_map->name = "/internal/freed_objects_map";
873 freed_map->width = 3; 935 freed_map->width = 3;
874 freed_map->height = 3; 936 freed_map->height = 3;
937 freed_map->nodrop = 1;
875 938
876 freed_map->alloc (); 939 freed_map->alloc ();
877 freed_map->in_memory = MAP_IN_MEMORY; 940 freed_map->in_memory = MAP_ACTIVE;
878 } 941 }
879 942
880 map = freed_map; 943 map = freed_map;
881 x = 1; 944 x = 1;
882 y = 1; 945 y = 1;
883 } 946 }
884 947
885 head = 0;
886
887 if (more) 948 if (more)
888 { 949 {
889 more->destroy (); 950 more->destroy ();
890 more = 0; 951 more = 0;
891 } 952 }
892 953
954 head = 0;
955
893 // clear those pointers that likely might have circular references to us 956 // clear those pointers that likely might cause circular references
894 owner = 0; 957 owner = 0;
895 enemy = 0; 958 enemy = 0;
896 attacked_by = 0; 959 attacked_by = 0;
960 current_weapon = 0;
897} 961}
898 962
899void 963void
900object::destroy (bool destroy_inventory) 964object::destroy (bool destroy_inventory)
901{ 965{
902 if (destroyed ()) 966 if (destroyed ())
903 return; 967 return;
904 968
905 if (destroy_inventory) 969 if (destroy_inventory)
906 destroy_inv (false); 970 destroy_inv (false);
971
972 if (is_head ())
973 if (sound_destroy)
974 play_sound (sound_destroy);
975 else if (flag [FLAG_MONSTER])
976 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
907 977
908 attachable::destroy (); 978 attachable::destroy ();
909} 979}
910 980
911/* 981/*
1026 if (map->in_memory == MAP_SAVING) 1096 if (map->in_memory == MAP_SAVING)
1027 return; 1097 return;
1028 1098
1029 int check_walk_off = !flag [FLAG_NO_APPLY]; 1099 int check_walk_off = !flag [FLAG_NO_APPLY];
1030 1100
1101 if (object *pl = ms.player ())
1102 {
1103 if (pl->container == this)
1104 /* If a container that the player is currently using somehow gets
1105 * removed (most likely destroyed), update the player view
1106 * appropriately.
1107 */
1108 pl->close_container ();
1109
1110 pl->contr->ns->floorbox_update ();
1111 }
1112
1031 for (tmp = ms.bot; tmp; tmp = tmp->above) 1113 for (tmp = ms.bot; tmp; tmp = tmp->above)
1032 { 1114 {
1033 /* No point updating the players look faces if he is the object 1115 /* No point updating the players look faces if he is the object
1034 * being removed. 1116 * being removed.
1035 */ 1117 */
1036
1037 if (tmp->type == PLAYER && tmp != this)
1038 {
1039 /* If a container that the player is currently using somehow gets
1040 * removed (most likely destroyed), update the player view
1041 * appropriately.
1042 */
1043 if (tmp->container == this)
1044 {
1045 flag [FLAG_APPLIED] = 0;
1046 tmp->container = 0;
1047 }
1048
1049 if (tmp->contr->ns)
1050 tmp->contr->ns->floorbox_update ();
1051 }
1052 1118
1053 /* See if object moving off should effect something */ 1119 /* See if object moving off should effect something */
1054 if (check_walk_off 1120 if (check_walk_off
1055 && ((move_type & tmp->move_off) 1121 && ((move_type & tmp->move_off)
1056 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1122 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1059 1125
1060 if (destroyed ()) 1126 if (destroyed ())
1061 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1127 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1062 } 1128 }
1063 1129
1064 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1065 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1066 if (tmp->above == tmp)
1067 tmp->above = 0;
1068
1069 last = tmp; 1130 last = tmp;
1070 } 1131 }
1071 1132
1072 /* last == NULL if there are no objects on this space */ 1133 /* last == NULL if there are no objects on this space */
1073 //TODO: this makes little sense, why only update the topmost object? 1134 //TODO: this makes little sense, why only update the topmost object?
1093merge_ob (object *op, object *top) 1154merge_ob (object *op, object *top)
1094{ 1155{
1095 if (!op->nrof) 1156 if (!op->nrof)
1096 return 0; 1157 return 0;
1097 1158
1098 if (top) 1159 if (!top)
1099 for (top = op; top && top->above; top = top->above) 1160 for (top = op; top && top->above; top = top->above)
1100 ; 1161 ;
1101 1162
1102 for (; top; top = top->below) 1163 for (; top; top = top->below)
1103 { 1164 {
1124 if (more) 1185 if (more)
1125 return; 1186 return;
1126 1187
1127 object *prev = this; 1188 object *prev = this;
1128 1189
1129 for (archetype *at = arch->more; at; at = at->more) 1190 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1130 { 1191 {
1131 object *op = arch_to_object (at); 1192 object *op = arch_to_object (at);
1132 1193
1133 op->name = name; 1194 op->name = name;
1134 op->name_pl = name_pl; 1195 op->name_pl = name_pl;
1148object * 1209object *
1149insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1210insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1150{ 1211{
1151 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1212 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1152 { 1213 {
1153 tmp->x = x + tmp->arch->clone.x; 1214 tmp->x = x + tmp->arch->x;
1154 tmp->y = y + tmp->arch->clone.y; 1215 tmp->y = y + tmp->arch->y;
1155 } 1216 }
1156 1217
1157 return insert_ob_in_map (op, m, originator, flag); 1218 return insert_ob_in_map (op, m, originator, flag);
1158} 1219}
1159 1220
1180object * 1241object *
1181insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1242insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1182{ 1243{
1183 assert (!op->flag [FLAG_FREED]); 1244 assert (!op->flag [FLAG_FREED]);
1184 1245
1185 object *tmp, *top, *floor = NULL; 1246 object *top, *floor = NULL;
1186 1247
1187 op->remove (); 1248 op->remove ();
1188
1189#if 0
1190 if (!m->active != !op->active)
1191 if (m->active)
1192 op->activate_recursive ();
1193 else
1194 op->deactivate_recursive ();
1195#endif
1196
1197 if (out_of_map (m, op->x, op->y))
1198 {
1199 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1200#ifdef MANY_CORES
1201 /* Better to catch this here, as otherwise the next use of this object
1202 * is likely to cause a crash. Better to find out where it is getting
1203 * improperly inserted.
1204 */
1205 abort ();
1206#endif
1207 return op;
1208 }
1209
1210 if (object *more = op->more)
1211 {
1212 if (!insert_ob_in_map (more, m, originator, flag))
1213 {
1214 if (!op->head)
1215 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1216
1217 return 0;
1218 }
1219 }
1220
1221 CLEAR_FLAG (op, FLAG_REMOVED);
1222 1249
1223 /* Ideally, the caller figures this out. However, it complicates a lot 1250 /* Ideally, the caller figures this out. However, it complicates a lot
1224 * of areas of callers (eg, anything that uses find_free_spot would now 1251 * of areas of callers (eg, anything that uses find_free_spot would now
1225 * need extra work 1252 * need extra work
1226 */ 1253 */
1227 if (!xy_normalise (m, op->x, op->y)) 1254 if (!xy_normalise (m, op->x, op->y))
1255 {
1256 op->destroy ();
1228 return 0; 1257 return 0;
1258 }
1259
1260 if (object *more = op->more)
1261 if (!insert_ob_in_map (more, m, originator, flag))
1262 return 0;
1263
1264 CLEAR_FLAG (op, FLAG_REMOVED);
1229 1265
1230 op->map = m; 1266 op->map = m;
1231 mapspace &ms = op->ms (); 1267 mapspace &ms = op->ms ();
1232 1268
1233 /* this has to be done after we translate the coordinates. 1269 /* this has to be done after we translate the coordinates.
1234 */ 1270 */
1235 if (op->nrof && !(flag & INS_NO_MERGE)) 1271 if (op->nrof && !(flag & INS_NO_MERGE))
1236 for (tmp = ms.bot; tmp; tmp = tmp->above) 1272 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1237 if (object::can_merge (op, tmp)) 1273 if (object::can_merge (op, tmp))
1238 { 1274 {
1239 op->nrof += tmp->nrof; 1275 op->nrof += tmp->nrof;
1240 tmp->destroy (); 1276 tmp->destroy ();
1241 } 1277 }
1268 else 1304 else
1269 { 1305 {
1270 top = ms.bot; 1306 top = ms.bot;
1271 1307
1272 /* If there are other objects, then */ 1308 /* If there are other objects, then */
1273 if ((!(flag & INS_MAP_LOAD)) && top) 1309 if (top)
1274 { 1310 {
1275 object *last = 0; 1311 object *last = 0;
1276 1312
1277 /* 1313 /*
1278 * If there are multiple objects on this space, we do some trickier handling. 1314 * If there are multiple objects on this space, we do some trickier handling.
1331 if (last && last->below && last != floor) 1367 if (last && last->below && last != floor)
1332 top = last->below; 1368 top = last->below;
1333 } 1369 }
1334 } /* If objects on this space */ 1370 } /* If objects on this space */
1335 1371
1336 if (flag & INS_MAP_LOAD)
1337 top = ms.top;
1338
1339 if (flag & INS_ABOVE_FLOOR_ONLY) 1372 if (flag & INS_ABOVE_FLOOR_ONLY)
1340 top = floor; 1373 top = floor;
1341 1374
1342 /* Top is the object that our object (op) is going to get inserted above. 1375 /* Top is the object that our object (op) is going to get inserted above.
1343 */ 1376 */
1375 op->map->touch (); 1408 op->map->touch ();
1376 } 1409 }
1377 1410
1378 op->map->dirty = true; 1411 op->map->dirty = true;
1379 1412
1380 /* If we have a floor, we know the player, if any, will be above
1381 * it, so save a few ticks and start from there.
1382 */
1383 if (!(flag & INS_MAP_LOAD))
1384 if (object *pl = ms.player ()) 1413 if (object *pl = ms.player ())
1385 if (pl->contr->ns)
1386 pl->contr->ns->floorbox_update (); 1414 pl->contr->ns->floorbox_update ();
1387 1415
1388 /* If this object glows, it may affect lighting conditions that are 1416 /* If this object glows, it may affect lighting conditions that are
1389 * visible to others on this map. But update_all_los is really 1417 * visible to others on this map. But update_all_los is really
1390 * an inefficient way to do this, as it means los for all players 1418 * an inefficient way to do this, as it means los for all players
1391 * on the map will get recalculated. The players could very well 1419 * on the map will get recalculated. The players could very well
1410 * blocked() and wall() work properly), and these flags are updated by 1438 * blocked() and wall() work properly), and these flags are updated by
1411 * update_object(). 1439 * update_object().
1412 */ 1440 */
1413 1441
1414 /* if this is not the head or flag has been passed, don't check walk on status */ 1442 /* if this is not the head or flag has been passed, don't check walk on status */
1415 if (!(flag & INS_NO_WALK_ON) && !op->head) 1443 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1416 { 1444 {
1417 if (check_move_on (op, originator)) 1445 if (check_move_on (op, originator))
1418 return 0; 1446 return 0;
1419 1447
1420 /* If we are a multi part object, lets work our way through the check 1448 /* If we are a multi part object, lets work our way through the check
1421 * walk on's. 1449 * walk on's.
1422 */ 1450 */
1423 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1451 for (object *tmp = op->more; tmp; tmp = tmp->more)
1424 if (check_move_on (tmp, originator)) 1452 if (check_move_on (tmp, originator))
1425 return 0; 1453 return 0;
1426 } 1454 }
1427 1455
1428 return op; 1456 return op;
1438 object *tmp, *tmp1; 1466 object *tmp, *tmp1;
1439 1467
1440 /* first search for itself and remove any old instances */ 1468 /* first search for itself and remove any old instances */
1441 1469
1442 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1470 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1443 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1471 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1444 tmp->destroy (); 1472 tmp->destroy ();
1445 1473
1446 tmp1 = arch_to_object (archetype::find (arch_string)); 1474 tmp1 = arch_to_object (archetype::find (arch_string));
1447 1475
1448 tmp1->x = op->x; 1476 tmp1->x = op->x;
1451} 1479}
1452 1480
1453object * 1481object *
1454object::insert_at (object *where, object *originator, int flags) 1482object::insert_at (object *where, object *originator, int flags)
1455{ 1483{
1484 if (where->env)
1485 return where->env->insert (this);
1486 else
1456 return where->map->insert (this, where->x, where->y, originator, flags); 1487 return where->map->insert (this, where->x, where->y, originator, flags);
1457} 1488}
1458 1489
1459/* 1490/*
1460 * 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
1461 * is returned contains nr objects, and the remaining parts contains 1492 * is returned contains nr objects, and the remaining parts contains
1481 orig_ob->destroy (1); 1512 orig_ob->destroy (1);
1482 else if (!is_removed) 1513 else if (!is_removed)
1483 { 1514 {
1484 if (orig_ob->env != NULL) 1515 if (orig_ob->env != NULL)
1485 sub_weight (orig_ob->env, orig_ob->weight * nr); 1516 sub_weight (orig_ob->env, orig_ob->weight * nr);
1486 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1517 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1487 { 1518 {
1488 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1519 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1489 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); 1520 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1490 return NULL; 1521 return NULL;
1491 } 1522 }
1609 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);
1610 free (dump); 1641 free (dump);
1611 return op; 1642 return op;
1612 } 1643 }
1613 1644
1614 if (where->head) 1645 if (where->head_ () != where)
1615 { 1646 {
1616 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");
1617 where = where->head; 1648 where = where->head;
1618 } 1649 }
1619 1650
1620 return where->insert (op); 1651 return where->insert (op);
1621} 1652}
1629 * be != op, if items are merged. -Tero 1660 * be != op, if items are merged. -Tero
1630 */ 1661 */
1631object * 1662object *
1632object::insert (object *op) 1663object::insert (object *op)
1633{ 1664{
1634 object *tmp, *otmp;
1635
1636 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1637 op->remove (); 1666 op->remove ();
1638 1667
1639 if (op->more) 1668 if (op->more)
1640 { 1669 {
1642 return op; 1671 return op;
1643 } 1672 }
1644 1673
1645 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1646 CLEAR_FLAG (op, FLAG_REMOVED); 1675 CLEAR_FLAG (op, FLAG_REMOVED);
1676
1647 if (op->nrof) 1677 if (op->nrof)
1648 { 1678 {
1649 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1679 for (object *tmp = inv; tmp; tmp = tmp->below)
1650 if (object::can_merge (tmp, op)) 1680 if (object::can_merge (tmp, op))
1651 { 1681 {
1652 /* return the original object and remove inserted object 1682 /* return the original object and remove inserted object
1653 (client needs the original object) */ 1683 (client needs the original object) */
1654 tmp->nrof += op->nrof; 1684 tmp->nrof += op->nrof;
1673 add_weight (this, op->weight * op->nrof); 1703 add_weight (this, op->weight * op->nrof);
1674 } 1704 }
1675 else 1705 else
1676 add_weight (this, (op->weight + op->carrying)); 1706 add_weight (this, (op->weight + op->carrying));
1677 1707
1678 otmp = this->in_player (); 1708 if (object *otmp = this->in_player ())
1679 if (otmp && otmp->contr)
1680 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1681 otmp->update_stats (); 1710 otmp->update_stats ();
1682 1711
1712 op->owner = 0; // its his/hers now. period.
1683 op->map = 0; 1713 op->map = 0;
1684 op->env = this; 1714 op->env = this;
1685 op->above = 0; 1715 op->above = 0;
1686 op->below = 0; 1716 op->below = 0;
1687 op->x = 0, op->y = 0; 1717 op->x = op->y = 0;
1688 1718
1689 /* 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 */
1690 if ((op->glow_radius != 0) && map) 1720 if (op->glow_radius && map)
1691 { 1721 {
1692#ifdef DEBUG_LIGHTS 1722#ifdef DEBUG_LIGHTS
1693 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);
1694#endif /* DEBUG_LIGHTS */ 1724#endif /* DEBUG_LIGHTS */
1695 if (map->darkness) 1725 if (map->darkness)
1929 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1930 */ 1960 */
1931void 1961void
1932flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1933{ 1963{
1934 if (op->inv)
1935 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1936 { 1965 {
1937 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
1938 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
1939 } 1968 }
1940} 1969}
1941 1970
1942/* 1971/*
1943 * deactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
1944 */ 1973 */
1945void 1974void
1946unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
1947{ 1976{
1948 if (op->inv)
1949 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1950 { 1978 {
1951 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
1952 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
1953 } 1981 }
1954}
1955
1956/*
1957 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1958 * all it's inventory (recursively).
1959 * If checksums are used, a player will get set_cheat called for
1960 * him/her-self and all object carried by a call to this function.
1961 */
1962void
1963set_cheat (object *op)
1964{
1965 SET_FLAG (op, FLAG_WAS_WIZ);
1966 flag_inv (op, FLAG_WAS_WIZ);
1967} 1982}
1968 1983
1969/* 1984/*
1970 * 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
1971 * 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
1973 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
1974 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
1975 * 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
1976 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
1977 * 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)
1978 * Note - this only checks to see if there is space for the head of the
1979 * object - if it is a multispace object, this should be called for all
1980 * pieces.
1981 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
1982 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
1983 * 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.
1984 * 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
1985 * 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
1986 * 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
1988 * customized, changed states, etc. 2000 * customized, changed states, etc.
1989 */ 2001 */
1990int 2002int
1991find_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)
1992{ 2004{
2005 int altern[SIZEOFFREE];
1993 int index = 0, flag; 2006 int index = 0, flag;
1994 int altern[SIZEOFFREE];
1995 2007
1996 for (int i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
1997 { 2009 {
1998 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2010 mapxy pos (m, x, y); pos.move (i);
1999 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 {
2000 altern [index++] = i; 2026 altern [index++] = i;
2027 continue;
2028 }
2001 2029
2002 /* 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.
2003 * 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.
2004 * 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 -
2005 * 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
2006 * 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
2007 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
2008 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
2009 */ 2037 */
2010 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2038 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2039 {
2011 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;
2012 } 2054 }
2013 2055
2014 if (!index) 2056 if (!index)
2015 return -1; 2057 return -1;
2016 2058
2025 */ 2067 */
2026int 2068int
2027find_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)
2028{ 2070{
2029 for (int i = 0; i < SIZEOFFREE; i++) 2071 for (int i = 0; i < SIZEOFFREE; i++)
2030 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]))
2031 return i; 2073 return i;
2032 2074
2033 return -1; 2075 return -1;
2034} 2076}
2035 2077
2089 object *tmp; 2131 object *tmp;
2090 maptile *mp; 2132 maptile *mp;
2091 2133
2092 MoveType blocked, move_type; 2134 MoveType blocked, move_type;
2093 2135
2094 if (exclude && exclude->head) 2136 if (exclude && exclude->head_ () != exclude)
2095 { 2137 {
2096 exclude = exclude->head; 2138 exclude = exclude->head;
2097 move_type = exclude->move_type; 2139 move_type = exclude->move_type;
2098 } 2140 }
2099 else 2141 else
2122 max = maxfree[i]; 2164 max = maxfree[i];
2123 else if (mflags & P_IS_ALIVE) 2165 else if (mflags & P_IS_ALIVE)
2124 { 2166 {
2125 for (tmp = ms.bot; tmp; tmp = tmp->above) 2167 for (tmp = ms.bot; tmp; tmp = tmp->above)
2126 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2168 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2127 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2169 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2128 break; 2170 break;
2129 2171
2130 if (tmp) 2172 if (tmp)
2131 return freedir[i]; 2173 return freedir[i];
2132 } 2174 }
2312 * 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
2313 * core dumps if they do. 2355 * core dumps if they do.
2314 * 2356 *
2315 * 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)
2316 */ 2358 */
2317
2318int 2359int
2319can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2320{ 2361{
2321 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2322 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2327 * create clone from object to another 2368 * create clone from object to another
2328 */ 2369 */
2329object * 2370object *
2330object_create_clone (object *asrc) 2371object_create_clone (object *asrc)
2331{ 2372{
2332 object *dst = 0, *tmp, *src, *part, *prev, *item; 2373 object *dst = 0, *tmp, *src, *prev, *item;
2333 2374
2334 if (!asrc) 2375 if (!asrc)
2335 return 0; 2376 return 0;
2336 2377
2337 src = asrc;
2338 if (src->head)
2339 src = src->head; 2378 src = asrc->head_ ();
2340 2379
2341 prev = 0; 2380 prev = 0;
2342 for (part = src; part; part = part->more) 2381 for (object *part = src; part; part = part->more)
2343 { 2382 {
2344 tmp = part->clone (); 2383 tmp = part->clone ();
2345 tmp->x -= src->x; 2384 tmp->x -= src->x;
2346 tmp->y -= src->y; 2385 tmp->y -= src->y;
2347 2386
2460 /* Basically, if the archetype has this key set, 2499 /* Basically, if the archetype has this key set,
2461 * we need to store the null value so when we save 2500 * we need to store the null value so when we save
2462 * it, we save the empty value so that when we load, 2501 * it, we save the empty value so that when we load,
2463 * we get this value back again. 2502 * we get this value back again.
2464 */ 2503 */
2465 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2504 if (get_ob_key_link (op->arch, canonical_key))
2466 field->value = 0; 2505 field->value = 0;
2467 else 2506 else
2468 { 2507 {
2469 if (last) 2508 if (last)
2470 last->next = field->next; 2509 last->next = field->next;
2539 } 2578 }
2540 else 2579 else
2541 item = item->env; 2580 item = item->env;
2542} 2581}
2543 2582
2544
2545const char * 2583const char *
2546object::flag_desc (char *desc, int len) const 2584object::flag_desc (char *desc, int len) const
2547{ 2585{
2548 char *p = desc; 2586 char *p = desc;
2549 bool first = true; 2587 bool first = true;
2576{ 2614{
2577 char flagdesc[512]; 2615 char flagdesc[512];
2578 char info2[256 * 4]; 2616 char info2[256 * 4];
2579 char *p = info; 2617 char *p = info;
2580 2618
2581 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2619 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2582 count, uuid.seq, 2620 count,
2621 uuid.c_str (),
2583 &name, 2622 &name,
2584 title ? "\",title:\"" : "", 2623 title ? "\",title:\"" : "",
2585 title ? (const char *)title : "", 2624 title ? (const char *)title : "",
2586 flag_desc (flagdesc, 512), type); 2625 flag_desc (flagdesc, 512), type);
2587 2626
2588 if (env) 2627 if (!this->flag[FLAG_REMOVED] && env)
2589 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2628 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2590 2629
2591 if (map) 2630 if (map)
2592 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2631 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2593 2632
2611} 2650}
2612 2651
2613const materialtype_t * 2652const materialtype_t *
2614object::dominant_material () const 2653object::dominant_material () const
2615{ 2654{
2616 if (materialtype_t *mat = name_to_material (materialname)) 2655 if (materialtype_t *mt = name_to_material (materialname))
2617 return mat; 2656 return mt;
2618 2657
2619 // omfg this is slow, this has to be temporary :)
2620 shstr unknown ("unknown");
2621
2622 return name_to_material (unknown); 2658 return name_to_material (shstr_unknown);
2623} 2659}
2624 2660
2625void 2661void
2626object::open_container (object *new_container) 2662object::open_container (object *new_container)
2627{ 2663{
2643 old_container->flag [FLAG_APPLIED] = 0; 2679 old_container->flag [FLAG_APPLIED] = 0;
2644 container = 0; 2680 container = 0;
2645 2681
2646 esrv_update_item (UPD_FLAGS, this, old_container); 2682 esrv_update_item (UPD_FLAGS, this, old_container);
2647 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2683 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2684 play_sound (sound_find ("chest_close"));
2648 } 2685 }
2649 2686
2650 if (new_container) 2687 if (new_container)
2651 { 2688 {
2652 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2689 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2668 new_container->flag [FLAG_APPLIED] = 1; 2705 new_container->flag [FLAG_APPLIED] = 1;
2669 container = new_container; 2706 container = new_container;
2670 2707
2671 esrv_update_item (UPD_FLAGS, this, new_container); 2708 esrv_update_item (UPD_FLAGS, this, new_container);
2672 esrv_send_inventory (this, new_container); 2709 esrv_send_inventory (this, new_container);
2710 play_sound (sound_find ("chest_open"));
2711 }
2712}
2713
2714object *
2715object::force_find (const shstr name)
2716{
2717 /* cycle through his inventory to look for the MARK we want to
2718 * place
2719 */
2720 for (object *tmp = inv; tmp; tmp = tmp->below)
2721 if (tmp->type == FORCE && tmp->slaying == name)
2722 return splay (tmp);
2723
2724 return 0;
2725}
2726
2727void
2728object::force_add (const shstr name, int duration)
2729{
2730 if (object *force = force_find (name))
2731 force->destroy ();
2732
2733 object *force = get_archetype (FORCE_NAME);
2734
2735 force->slaying = name;
2736 force->stats.food = 1;
2737 force->speed_left = -1.f;
2738
2739 force->set_speed (duration ? 1.f / duration : 0.f);
2740 force->flag [FLAG_IS_USED_UP] = true;
2741 force->flag [FLAG_APPLIED] = true;
2742
2743 insert (force);
2744}
2745
2746void
2747object::play_sound (faceidx sound) const
2748{
2749 if (!sound)
2750 return;
2751
2752 if (flag [FLAG_REMOVED])
2753 return;
2754
2755 if (env)
2673 } 2756 {
2757 if (object *pl = in_player ())
2758 pl->contr->play_sound (sound);
2759 }
2760 else
2761 map->play_sound (sound, x, y);
2674} 2762}
2675 2763
2676

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines