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.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.203 by root, Fri Apr 11 13:59:05 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
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. */
27#include <global.h> 27#include <global.h>
28#include <stdio.h> 28#include <stdio.h>
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
33#include <loader.h> 34#include <loader.h>
34 35
35#include <bitset> 36#include <bitset>
36 37
37int nrofallocobjects = 0; 38UUID UUID::cur;
38static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 39static const uint64 UUID_SKIP = 1<<19;
40 40
41object *active_objects; /* List of active objects that need to be processed */ 41objectvec objects;
42activevec actives;
42 43
43short 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, 44short freearr_x[SIZEOFFREE] = {
45 0,
46 0, 1, 1, 1, 0, -1, -1, -1,
47 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 48 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 49};
46short 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, 50short freearr_y[SIZEOFFREE] = {
51 0,
52 -1, -1, 0, 1, 1, 1, 0, -1,
53 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
47 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 54 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
48}; 55};
49int 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, 56int maxfree[SIZEOFFREE] = {
57 0,
58 9, 10, 13, 14, 17, 18, 21, 22,
59 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
50 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 60 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
51}; 61};
52int freedir[SIZEOFFREE] = { 62int freedir[SIZEOFFREE] = {
53 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, 63 0,
64 1, 2, 3, 4, 5, 6, 7, 8,
65 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
54 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 66 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
55}; 67};
56 68
57static void 69static void
58write_uuid (void) 70write_uuid (uval64 skip, bool sync)
59{ 71{
60 char filename1[MAX_BUF], filename2[MAX_BUF]; 72 CALL_BEGIN (2);
61 73 CALL_ARG_SV (newSVval64 (skip));
62 sprintf (filename1, "%s/uuid", settings.localdir); 74 CALL_ARG_SV (boolSV (sync));
63 sprintf (filename2, "%s/uuid~", settings.localdir); 75 CALL_CALL ("cf::write_uuid", G_DISCARD);
64 76 CALL_END;
65 FILE *fp;
66
67 if (!(fp = fopen (filename2, "w")))
68 {
69 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70 return;
71 }
72
73 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74 fclose (fp);
75 rename (filename2, filename1);
76} 77}
77 78
78static void 79static void
79read_uuid (void) 80read_uuid (void)
80{ 81{
87 if (!(fp = fopen (filename, "r"))) 88 if (!(fp = fopen (filename, "r")))
88 { 89 {
89 if (errno == ENOENT) 90 if (errno == ENOENT)
90 { 91 {
91 LOG (llevInfo, "RESET uid to 1\n"); 92 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0; 93 UUID::cur.seq = 0;
93 write_uuid (); 94 write_uuid (UUID_SKIP, true);
94 return; 95 return;
95 } 96 }
96 97
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 99 _exit (1);
99 } 100 }
100 101
101 int version; 102 UUID::BUF buf;
102 unsigned long long uid; 103 buf[0] = 0;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 104 fgets (buf, sizeof (buf), fp);
105
106 if (!UUID::cur.parse (buf))
104 { 107 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 108 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106 _exit (1); 109 _exit (1);
107 } 110 }
108 111
109 uuid.seq = uid; 112 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110 write_uuid (); 113
111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 114 write_uuid (UUID_SKIP, true);
112 fclose (fp); 115 fclose (fp);
113} 116}
114 117
115UUID 118UUID
116gen_uuid () 119UUID::gen ()
117{ 120{
118 UUID uid; 121 UUID uid;
119 122
120 uid.seq = ++uuid.seq; 123 uid.seq = ++cur.seq;
121 124
122 if (!(uuid.seq & (UUID_SKIP - 1))) 125 if (expect_false (!(cur.seq & (UUID_SKIP - 1))))
123 write_uuid (); 126 write_uuid (UUID_SKIP, false);
124 127
125 return uid; 128 return uid;
126} 129}
127 130
128void 131void
129init_uuid () 132UUID::init ()
130{ 133{
131 read_uuid (); 134 read_uuid ();
132} 135}
133 136
134/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 137/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
252 /* This is really a spellbook check - really, we should 255 /* This is really a spellbook check - really, we should
253 * check all objects in the inventory. 256 * check all objects in the inventory.
254 */ 257 */
255 if (ob1->inv || ob2->inv) 258 if (ob1->inv || ob2->inv)
256 { 259 {
257 /* if one object has inventory but the other doesn't, not equiv */ 260 if (!(ob1->inv && ob2->inv))
258 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 261 return 0; /* inventories differ in length */
259 return 0;
260 262
261 /* Now check to see if the two inventory objects could merge */ 263 if (ob1->inv->below || ob2->inv->below)
264 return 0; /* more than one object in inv */
265
262 if (!object::can_merge (ob1->inv, ob2->inv)) 266 if (!object::can_merge (ob1->inv, ob2->inv))
263 return 0; 267 return 0; /* inventory objexts differ */
264 268
265 /* inventory ok - still need to check rest of this object to see 269 /* inventory ok - still need to check rest of this object to see
266 * if it is valid. 270 * if it is valid.
267 */ 271 */
268 } 272 }
297 return 0; 301 return 0;
298 else if (!compare_ob_value_lists (ob1, ob2)) 302 else if (!compare_ob_value_lists (ob1, ob2))
299 return 0; 303 return 0;
300 } 304 }
301 305
302 //TODO: generate an event or call into perl for additional checks
303 if (ob1->self || ob2->self) 306 if (ob1->self || ob2->self)
304 { 307 {
305 ob1->optimise (); 308 ob1->optimise ();
306 ob2->optimise (); 309 ob2->optimise ();
307 310
308 if (ob1->self || ob2->self) 311 if (ob1->self || ob2->self)
312 {
313 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
314 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
315
316 if (k1 != k2)
309 return 0; 317 return 0;
318 else if (k1 == 0)
319 return 1;
320 else if (!cfperl_can_merge (ob1, ob2))
321 return 0;
322 }
310 } 323 }
311 324
312 /* Everything passes, must be OK. */ 325 /* Everything passes, must be OK. */
313 return 1; 326 return 1;
314} 327}
322sum_weight (object *op) 335sum_weight (object *op)
323{ 336{
324 long sum; 337 long sum;
325 object *inv; 338 object *inv;
326 339
327 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 340 for (sum = 0, inv = op->inv; inv; inv = inv->below)
328 { 341 {
329 if (inv->inv) 342 if (inv->inv)
330 sum_weight (inv); 343 sum_weight (inv);
344
331 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 345 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332 } 346 }
333 347
334 if (op->type == CONTAINER && op->stats.Str) 348 if (op->type == CONTAINER && op->stats.Str)
335 sum = (sum * (100 - op->stats.Str)) / 100; 349 sum = (sum * (100 - op->stats.Str)) / 100;
355/* 369/*
356 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 370 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357 * Some error messages. 371 * Some error messages.
358 * The result of the dump is stored in the static global errmsg array. 372 * The result of the dump is stored in the static global errmsg array.
359 */ 373 */
360
361char * 374char *
362dump_object (object *op) 375dump_object (object *op)
363{ 376{
364 if (!op) 377 if (!op)
365 return strdup ("[NULLOBJ]"); 378 return strdup ("[NULLOBJ]");
366 379
367 object_freezer freezer; 380 object_freezer freezer;
368 save_object (freezer, op, 1); 381 op->write (freezer);
369 return freezer.as_string (); 382 return freezer.as_string ();
370} 383}
371 384
372/* 385/*
373 * get_nearest_part(multi-object, object 2) returns the part of the 386 * get_nearest_part(multi-object, object 2) returns the part of the
374 * multi-object 1 which is closest to the second object. 387 * multi-object 1 which is closest to the second object.
375 * If it's not a multi-object, it is returned. 388 * If it's not a multi-object, it is returned.
376 */ 389 */
377
378object * 390object *
379get_nearest_part (object *op, const object *pl) 391get_nearest_part (object *op, const object *pl)
380{ 392{
381 object *tmp, *closest; 393 object *tmp, *closest;
382 int last_dist, i; 394 int last_dist, i;
390} 402}
391 403
392/* 404/*
393 * Returns the object which has the count-variable equal to the argument. 405 * Returns the object which has the count-variable equal to the argument.
394 */ 406 */
395
396object * 407object *
397find_object (tag_t i) 408find_object (tag_t i)
398{ 409{
399 for (object *op = object::first; op; op = op->next) 410 for_all_objects (op)
400 if (op->count == i) 411 if (op->count == i)
401 return op; 412 return op;
402 413
403 return 0; 414 return 0;
404} 415}
405 416
406/* 417/*
407 * Returns the first object which has a name equal to the argument. 418 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 419 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 420 * Enables features like "patch <name-of-other-player> food 999"
410 */ 421 */
411
412object * 422object *
413find_object_name (const char *str) 423find_object_name (const char *str)
414{ 424{
415 shstr_cmp str_ (str); 425 shstr_cmp str_ (str);
416 object *op; 426 object *op;
417 427
418 for (op = object::first; op != NULL; op = op->next) 428 for_all_objects (op)
419 if (op->name == str_) 429 if (op->name == str_)
420 break; 430 break;
421 431
422 return op; 432 return op;
423} 433}
424 434
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 435/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 436 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 437 * skill and experience objects.
438 * ACTUALLY NO! investigate! TODO
434 */ 439 */
435void 440void
436object::set_owner (object *owner) 441object::set_owner (object *owner)
437{ 442{
443 // allow objects which own objects
438 if (!owner) 444 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) 445 while (owner->owner)
449 owner = owner->owner; 446 owner = owner->owner;
447
448 if (flag [FLAG_FREED])
449 {
450 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
451 return;
452 }
450 453
451 this->owner = owner; 454 this->owner = owner;
455}
456
457int
458object::slottype () const
459{
460 if (type == SKILL)
461 {
462 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
463 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
464 }
465 else
466 {
467 if (slot [body_combat].info) return slot_combat;
468 if (slot [body_range ].info) return slot_ranged;
469 }
470
471 return slot_none;
472}
473
474bool
475object::change_weapon (object *ob)
476{
477 if (current_weapon == ob)
478 return true;
479
480 if (chosen_skill)
481 chosen_skill->flag [FLAG_APPLIED] = false;
482
483 current_weapon = ob;
484 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
485
486 if (chosen_skill)
487 chosen_skill->flag [FLAG_APPLIED] = true;
488
489 update_stats ();
490
491 if (ob)
492 {
493 // now check wether any body locations became invalid, in which case
494 // we cannot apply the weapon at the moment.
495 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
496 if (slot[i].used < 0)
497 {
498 current_weapon = chosen_skill = 0;
499 update_stats ();
500
501 new_draw_info_format (NDI_UNIQUE, 0, this,
502 "You try to balance all your items at once, "
503 "but the %s is just too much for your body. "
504 "[You need to unapply some items first.]", &ob->name);
505 return false;
506 }
507
508 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
509 }
510 else
511 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
512
513 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
514 {
515 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
516 &name, ob->debug_desc ());
517 return false;
518 }
519
520 return true;
452} 521}
453 522
454/* Zero the key_values on op, decrementing the shared-string 523/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 524 * refcounts and freeing the links.
456 */ 525 */
457static void 526static void
458free_key_values (object *op) 527free_key_values (object *op)
459{ 528{
460 for (key_value *i = op->key_values; i != 0;) 529 for (key_value *i = op->key_values; i; )
461 { 530 {
462 key_value *next = i->next; 531 key_value *next = i->next;
463 delete i; 532 delete i;
464 533
465 i = next; 534 i = next;
466 } 535 }
467 536
468 op->key_values = 0; 537 op->key_values = 0;
469} 538}
470 539
471/* 540object &
472 * copy_to first frees everything allocated by the dst object, 541object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 542{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 543 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 544 bool is_removed = flag [FLAG_REMOVED];
484 545
485 *(object_copy *)dst = *this; 546 *(object_copy *)this = src;
486 547
487 if (is_freed) 548 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 549 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495 550
496 /* Copy over key_values, if any. */ 551 /* Copy over key_values, if any. */
497 if (key_values) 552 if (src.key_values)
498 { 553 {
499 key_value *tail = 0; 554 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 555 key_values = 0;
503 556
504 for (i = key_values; i; i = i->next) 557 for (key_value *i = src.key_values; i; i = i->next)
505 { 558 {
506 key_value *new_link = new key_value; 559 key_value *new_link = new key_value;
507 560
508 new_link->next = 0; 561 new_link->next = 0;
509 new_link->key = i->key; 562 new_link->key = i->key;
510 new_link->value = i->value; 563 new_link->value = i->value;
511 564
512 /* Try and be clever here, too. */ 565 /* Try and be clever here, too. */
513 if (!dst->key_values) 566 if (!key_values)
514 { 567 {
515 dst->key_values = new_link; 568 key_values = new_link;
516 tail = new_link; 569 tail = new_link;
517 } 570 }
518 else 571 else
519 { 572 {
520 tail->next = new_link; 573 tail->next = new_link;
521 tail = new_link; 574 tail = new_link;
522 } 575 }
523 } 576 }
524 } 577 }
578}
579
580/*
581 * copy_to first frees everything allocated by the dst object,
582 * and then copies the contents of itself into the second
583 * object, allocating what needs to be allocated. Basically, any
584 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
585 * if the first object is freed, the pointers in the new object
586 * will point at garbage.
587 */
588void
589object::copy_to (object *dst)
590{
591 *dst = *this;
592
593 if (speed < 0)
594 dst->speed_left -= rndm ();
525 595
526 dst->set_speed (dst->speed); 596 dst->set_speed (dst->speed);
597}
598
599void
600object::instantiate ()
601{
602 if (!uuid.seq) // HACK
603 uuid = UUID::gen ();
604
605 speed_left = -0.1f;
606 /* copy the body_info to the body_used - this is only really
607 * need for monsters, but doesn't hurt to do it for everything.
608 * by doing so, when a monster is created, it has good starting
609 * values for the body_used info, so when items are created
610 * for it, they can be properly equipped.
611 */
612 for (int i = NUM_BODY_LOCATIONS; i--; )
613 slot[i].used = slot[i].info;
614
615 attachable::instantiate ();
527} 616}
528 617
529object * 618object *
530object::clone () 619object::clone ()
531{ 620{
564 } 653 }
565 654
566 this->speed = speed; 655 this->speed = speed;
567 656
568 if (has_active_speed ()) 657 if (has_active_speed ())
569 activate (false); 658 activate ();
570 else 659 else
571 deactivate (false); 660 deactivate ();
572} 661}
573 662
574/* 663/*
575 * update_object() updates the the map. 664 * update_object() updates the the map.
576 * It takes into account invisible objects (and represent squares covered 665 * It takes into account invisible objects (and represent squares covered
589 * UP_OBJ_FACE: only the objects face has changed. 678 * UP_OBJ_FACE: only the objects face has changed.
590 */ 679 */
591void 680void
592update_object (object *op, int action) 681update_object (object *op, int action)
593{ 682{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 683 if (op == NULL)
597 { 684 {
598 /* this should never happen */ 685 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 686 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 687 return;
624 return; 711 return;
625 } 712 }
626 713
627 mapspace &m = op->ms (); 714 mapspace &m = op->ms ();
628 715
629 if (m.flags_ & P_NEED_UPDATE) 716 if (!(m.flags_ & P_UPTODATE))
630 /* nop */; 717 /* nop */;
631 else if (action == UP_OBJ_INSERT) 718 else if (action == UP_OBJ_INSERT)
632 { 719 {
633 // this is likely overkill, TODO: revisit (schmorp) 720 // this is likely overkill, TODO: revisit (schmorp)
634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 721 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
643 /* This isn't perfect, but I don't expect a lot of objects to 730 /* This isn't perfect, but I don't expect a lot of objects to
644 * to have move_allow right now. 731 * to have move_allow right now.
645 */ 732 */
646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 733 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 734 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648 m.flags_ = P_NEED_UPDATE; 735 m.flags_ = 0;
649 } 736 }
650 /* if the object is being removed, we can't make intelligent 737 /* if the object is being removed, we can't make intelligent
651 * decisions, because remove_ob can't really pass the object 738 * decisions, because remove_ob can't really pass the object
652 * that is being removed. 739 * that is being removed.
653 */ 740 */
654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 741 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655 m.flags_ = P_NEED_UPDATE; 742 m.flags_ = 0;
656 else if (action == UP_OBJ_FACE) 743 else if (action == UP_OBJ_FACE)
657 /* Nothing to do for that case */ ; 744 /* Nothing to do for that case */ ;
658 else 745 else
659 LOG (llevError, "update_object called with invalid action: %d\n", action); 746 LOG (llevError, "update_object called with invalid action: %d\n", action);
660 747
661 if (op->more) 748 if (op->more)
662 update_object (op->more, action); 749 update_object (op->more, action);
663} 750}
664 751
665object::vector object::objects; // not yet used
666object *object::first;
667
668object::object () 752object::object ()
669{ 753{
670 SET_FLAG (this, FLAG_REMOVED); 754 SET_FLAG (this, FLAG_REMOVED);
671 755
672 expmul = 1.0; 756 expmul = 1.0;
673 face = blank_face; 757 face = blank_face;
674} 758}
675 759
676object::~object () 760object::~object ()
677{ 761{
762 unlink ();
763
678 free_key_values (this); 764 free_key_values (this);
679} 765}
680 766
767static int object_count;
768
681void object::link () 769void object::link ()
682{ 770{
771 assert (!index);//D
772 uuid = UUID::gen ();
683 count = ++ob_count; 773 count = ++object_count;
684 uuid = gen_uuid ();
685 774
686 prev = 0; 775 refcnt_inc ();
687 next = object::first; 776 objects.insert (this);
688
689 if (object::first)
690 object::first->prev = this;
691
692 object::first = this;
693} 777}
694 778
695void object::unlink () 779void object::unlink ()
696{ 780{
697 if (this == object::first) 781 if (!index)
698 object::first = next; 782 return;
699 783
700 /* Remove this object from the list of used objects */ 784 objects.erase (this);
701 if (prev) prev->next = next; 785 refcnt_dec ();
702 if (next) next->prev = prev;
703
704 prev = 0;
705 next = 0;
706} 786}
707 787
708void 788void
709object::activate (bool recursive) 789object::activate ()
710{ 790{
791 /* If already on active list, don't do anything */
792 if (active)
793 return;
794
711 if (has_active_speed ()) 795 if (has_active_speed ())
712 { 796 actives.insert (this);
713 /* If already on active list, don't do anything */ 797}
714 if (active_next || active_prev || this == active_objects)
715 return;
716 798
717 /* process_events() expects us to insert the object at the beginning 799void
718 * of the list. */ 800object::activate_recursive ()
719 active_next = active_objects; 801{
802 activate ();
720 803
721 if (active_next)
722 active_next->active_prev = this;
723
724 active_objects = this;
725 }
726
727 if (recursive)
728 for (object *op = inv; op; op = op->above) 804 for (object *op = inv; op; op = op->below)
729 op->activate (1); 805 op->activate_recursive ();
730} 806}
731 807
732/* This function removes object 'op' from the list of active 808/* This function removes object 'op' from the list of active
733 * objects. 809 * objects.
734 * This should only be used for style maps or other such 810 * This should only be used for style maps or other such
736 * in play chewing up cpu time getting processed. 812 * in play chewing up cpu time getting processed.
737 * The reverse of this is to call update_ob_speed, which 813 * The reverse of this is to call update_ob_speed, which
738 * will do the right thing based on the speed of the object. 814 * will do the right thing based on the speed of the object.
739 */ 815 */
740void 816void
741object::deactivate (bool recursive) 817object::deactivate ()
742{ 818{
743 /* If not on the active list, nothing needs to be done */ 819 /* If not on the active list, nothing needs to be done */
744 if (!active_next && !active_prev && this != active_objects) 820 if (!active)
745 return; 821 return;
746 822
747 if (active_prev == 0) 823 actives.erase (this);
748 { 824}
749 active_objects = active_next;
750 if (active_next)
751 active_next->active_prev = 0;
752 }
753 else
754 {
755 active_prev->active_next = active_next;
756 if (active_next)
757 active_next->active_prev = active_prev;
758 }
759 825
760 active_next = 0; 826void
761 active_prev = 0; 827object::deactivate_recursive ()
762 828{
763 if (recursive)
764 for (object *op = inv; op; op = op->above) 829 for (object *op = inv; op; op = op->below)
830 op->deactivate_recursive ();
831
765 op->deactivate (1); 832 deactivate ();
833}
834
835void
836object::set_flag_inv (int flag, int value)
837{
838 for (object *op = inv; op; op = op->below)
839 {
840 op->flag [flag] = value;
841 op->set_flag_inv (flag, value);
842 }
766} 843}
767 844
768/* 845/*
769 * Remove and free all objects in the inventory of the given object. 846 * Remove and free all objects in the inventory of the given object.
770 * object.c ? 847 * object.c ?
785 * drop on that space. 862 * drop on that space.
786 */ 863 */
787 if (!drop_to_ground 864 if (!drop_to_ground
788 || !map 865 || !map
789 || map->in_memory != MAP_IN_MEMORY 866 || map->in_memory != MAP_IN_MEMORY
867 || map->nodrop
790 || ms ().move_block == MOVE_ALL) 868 || ms ().move_block == MOVE_ALL)
791 { 869 {
792 while (inv) 870 while (inv)
793 { 871 {
794 inv->destroy_inv (drop_to_ground); 872 inv->destroy_inv (drop_to_ground);
803 881
804 if (op->flag [FLAG_STARTEQUIP] 882 if (op->flag [FLAG_STARTEQUIP]
805 || op->flag [FLAG_NO_DROP] 883 || op->flag [FLAG_NO_DROP]
806 || op->type == RUNE 884 || op->type == RUNE
807 || op->type == TRAP 885 || op->type == TRAP
808 || op->flag [FLAG_IS_A_TEMPLATE]) 886 || op->flag [FLAG_IS_A_TEMPLATE]
887 || op->flag [FLAG_DESTROY_ON_DEATH])
809 op->destroy (); 888 op->destroy ();
810 else 889 else
811 map->insert (op, x, y); 890 map->insert (op, x, y);
812 } 891 }
813 } 892 }
821} 900}
822 901
823void 902void
824object::do_destroy () 903object::do_destroy ()
825{ 904{
905 attachable::do_destroy ();
906
826 if (flag [FLAG_IS_LINKED]) 907 if (flag [FLAG_IS_LINKED])
827 remove_button_link (this); 908 remove_button_link (this);
828 909
829 if (flag [FLAG_FRIENDLY]) 910 if (flag [FLAG_FRIENDLY])
830 remove_friendly_object (this); 911 remove_friendly_object (this);
831 912
832 if (!flag [FLAG_REMOVED]) 913 if (!flag [FLAG_REMOVED])
833 remove (); 914 remove ();
834 915
835 if (flag [FLAG_FREED]) 916 destroy_inv (true);
836 return;
837 917
838 set_speed (0); 918 deactivate ();
919 unlink ();
839 920
840 flag [FLAG_FREED] = 1; 921 flag [FLAG_FREED] = 1;
841
842 attachable::do_destroy ();
843
844 destroy_inv (true);
845 unlink ();
846 922
847 // hack to ensure that freed objects still have a valid map 923 // hack to ensure that freed objects still have a valid map
848 { 924 {
849 static maptile *freed_map; // freed objects are moved here to avoid crashes 925 static maptile *freed_map; // freed objects are moved here to avoid crashes
850 926
851 if (!freed_map) 927 if (!freed_map)
852 { 928 {
853 freed_map = new maptile; 929 freed_map = new maptile;
854 930
931 freed_map->path = "<freed objects map>";
855 freed_map->name = "/internal/freed_objects_map"; 932 freed_map->name = "/internal/freed_objects_map";
856 freed_map->width = 3; 933 freed_map->width = 3;
857 freed_map->height = 3; 934 freed_map->height = 3;
935 freed_map->nodrop = 1;
858 936
859 freed_map->alloc (); 937 freed_map->alloc ();
938 freed_map->in_memory = MAP_IN_MEMORY;
860 } 939 }
861 940
862 map = freed_map; 941 map = freed_map;
863 x = 1; 942 x = 1;
864 y = 1; 943 y = 1;
865 } 944 }
866 945
867 head = 0;
868
869 if (more) 946 if (more)
870 { 947 {
871 more->destroy (); 948 more->destroy ();
872 more = 0; 949 more = 0;
873 } 950 }
874 951
952 head = 0;
953
875 // clear those pointers that likely might have circular references to us 954 // clear those pointers that likely might cause circular references
876 owner = 0; 955 owner = 0;
877 enemy = 0; 956 enemy = 0;
878 attacked_by = 0; 957 attacked_by = 0;
879 958 current_weapon = 0;
880 // only relevant for players(?), but make sure of it anyways
881 contr = 0;
882} 959}
883 960
884void 961void
885object::destroy (bool destroy_inventory) 962object::destroy (bool destroy_inventory)
886{ 963{
887 if (destroyed ()) 964 if (destroyed ())
888 return; 965 return;
889 966
890 if (destroy_inventory) 967 if (destroy_inventory)
891 destroy_inv (false); 968 destroy_inv (false);
969
970 if (is_head ())
971 if (sound_destroy)
972 play_sound (sound_destroy);
973 else if (flag [FLAG_MONSTER])
974 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
892 975
893 attachable::destroy (); 976 attachable::destroy ();
894} 977}
895 978
896/* 979/*
914 * This function removes the object op from the linked list of objects 997 * This function removes the object op from the linked list of objects
915 * which it is currently tied to. When this function is done, the 998 * which it is currently tied to. When this function is done, the
916 * object will have no environment. If the object previously had an 999 * object will have no environment. If the object previously had an
917 * environment, the x and y coordinates will be updated to 1000 * environment, the x and y coordinates will be updated to
918 * the previous environment. 1001 * the previous environment.
919 * Beware: This function is called from the editor as well!
920 */ 1002 */
921void 1003void
922object::remove () 1004object::do_remove ()
923{ 1005{
924 object *tmp, *last = 0; 1006 object *tmp, *last = 0;
925 object *otmp; 1007 object *otmp;
926 1008
927 if (QUERY_FLAG (this, FLAG_REMOVED)) 1009 if (QUERY_FLAG (this, FLAG_REMOVED))
970 } 1052 }
971 else if (map) 1053 else if (map)
972 { 1054 {
973 if (type == PLAYER) 1055 if (type == PLAYER)
974 { 1056 {
1057 // leaving a spot always closes any open container on the ground
1058 if (container && !container->env)
1059 // this causes spurious floorbox updates, but it ensures
1060 // that the CLOSE event is being sent.
1061 close_container ();
1062
975 --map->players; 1063 --map->players;
976 map->last_access = runtime; 1064 map->touch ();
977 } 1065 }
978 1066
1067 map->dirty = true;
1068 mapspace &ms = this->ms ();
979 1069
980 /* link the object above us */ 1070 /* link the object above us */
981 if (above) 1071 if (above)
982 above->below = below; 1072 above->below = below;
983 else 1073 else
984 map->at (x, y).top = below; /* we were top, set new top */ 1074 ms.top = below; /* we were top, set new top */
985 1075
986 /* Relink the object below us, if there is one */ 1076 /* Relink the object below us, if there is one */
987 if (below) 1077 if (below)
988 below->above = above; 1078 below->above = above;
989 else 1079 else
991 /* Nothing below, which means we need to relink map object for this space 1081 /* Nothing below, which means we need to relink map object for this space
992 * use translated coordinates in case some oddness with map tiling is 1082 * use translated coordinates in case some oddness with map tiling is
993 * evident 1083 * evident
994 */ 1084 */
995 if (GET_MAP_OB (map, x, y) != this) 1085 if (GET_MAP_OB (map, x, y) != this)
996 {
997 char *dump = dump_object (this);
998 LOG (llevError,
999 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1086 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1000 free (dump);
1001 dump = dump_object (GET_MAP_OB (map, x, y));
1002 LOG (llevError, "%s\n", dump);
1003 free (dump);
1004 }
1005 1087
1006 map->at (x, y).bot = above; /* goes on above it. */ 1088 ms.bot = above; /* goes on above it. */
1007 } 1089 }
1008 1090
1009 above = 0; 1091 above = 0;
1010 below = 0; 1092 below = 0;
1011 1093
1012 if (map->in_memory == MAP_SAVING) 1094 if (map->in_memory == MAP_SAVING)
1013 return; 1095 return;
1014 1096
1015 int check_walk_off = !flag [FLAG_NO_APPLY]; 1097 int check_walk_off = !flag [FLAG_NO_APPLY];
1016 1098
1099 if (object *pl = ms.player ())
1100 {
1101 if (pl->container == this)
1102 /* If a container that the player is currently using somehow gets
1103 * removed (most likely destroyed), update the player view
1104 * appropriately.
1105 */
1106 pl->close_container ();
1107
1108 pl->contr->ns->floorbox_update ();
1109 }
1110
1017 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1111 for (tmp = ms.bot; tmp; tmp = tmp->above)
1018 { 1112 {
1019 /* No point updating the players look faces if he is the object 1113 /* No point updating the players look faces if he is the object
1020 * being removed. 1114 * being removed.
1021 */ 1115 */
1022
1023 if (tmp->type == PLAYER && tmp != this)
1024 {
1025 /* If a container that the player is currently using somehow gets
1026 * removed (most likely destroyed), update the player view
1027 * appropriately.
1028 */
1029 if (tmp->container == this)
1030 {
1031 flag [FLAG_APPLIED] = 0;
1032 tmp->container = 0;
1033 }
1034
1035 if (tmp->contr->ns)
1036 tmp->contr->ns->floorbox_update ();
1037 }
1038 1116
1039 /* See if object moving off should effect something */ 1117 /* See if object moving off should effect something */
1040 if (check_walk_off 1118 if (check_walk_off
1041 && ((move_type & tmp->move_off) 1119 && ((move_type & tmp->move_off)
1042 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1120 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1045 1123
1046 if (destroyed ()) 1124 if (destroyed ())
1047 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1125 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1048 } 1126 }
1049 1127
1050 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1051 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1052 if (tmp->above == tmp)
1053 tmp->above = 0;
1054
1055 last = tmp; 1128 last = tmp;
1056 } 1129 }
1057 1130
1058 /* last == NULL if there are no objects on this space */ 1131 /* last == NULL if there are no objects on this space */
1059 //TODO: this makes little sense, why only update the topmost object? 1132 //TODO: this makes little sense, why only update the topmost object?
1060 if (!last) 1133 if (!last)
1061 map->at (x, y).flags_ = P_NEED_UPDATE; 1134 map->at (x, y).flags_ = 0;
1062 else 1135 else
1063 update_object (last, UP_OBJ_REMOVE); 1136 update_object (last, UP_OBJ_REMOVE);
1064 1137
1065 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1138 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1066 update_all_los (map, x, y); 1139 update_all_los (map, x, y);
1079merge_ob (object *op, object *top) 1152merge_ob (object *op, object *top)
1080{ 1153{
1081 if (!op->nrof) 1154 if (!op->nrof)
1082 return 0; 1155 return 0;
1083 1156
1084 if (top) 1157 if (!top)
1085 for (top = op; top && top->above; top = top->above) 1158 for (top = op; top && top->above; top = top->above)
1086 ; 1159 ;
1087 1160
1088 for (; top; top = top->below) 1161 for (; top; top = top->below)
1089 { 1162 {
1102 } 1175 }
1103 1176
1104 return 0; 1177 return 0;
1105} 1178}
1106 1179
1180void
1181object::expand_tail ()
1182{
1183 if (more)
1184 return;
1185
1186 object *prev = this;
1187
1188 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1189 {
1190 object *op = arch_to_object (at);
1191
1192 op->name = name;
1193 op->name_pl = name_pl;
1194 op->title = title;
1195
1196 op->head = this;
1197 prev->more = op;
1198
1199 prev = op;
1200 }
1201}
1202
1107/* 1203/*
1108 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1204 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1109 * job preparing multi-part monsters 1205 * job preparing multi-part monsters.
1110 */ 1206 */
1111object * 1207object *
1112insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1208insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1113{ 1209{
1114 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1210 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1115 { 1211 {
1116 tmp->x = x + tmp->arch->clone.x; 1212 tmp->x = x + tmp->arch->x;
1117 tmp->y = y + tmp->arch->clone.y; 1213 tmp->y = y + tmp->arch->y;
1118 } 1214 }
1119 1215
1120 return insert_ob_in_map (op, m, originator, flag); 1216 return insert_ob_in_map (op, m, originator, flag);
1121} 1217}
1122 1218
1141 * just 'op' otherwise 1237 * just 'op' otherwise
1142 */ 1238 */
1143object * 1239object *
1144insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1240insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1145{ 1241{
1242 assert (!op->flag [FLAG_FREED]);
1243
1146 object *tmp, *top, *floor = NULL; 1244 object *top, *floor = NULL;
1147 sint16 x, y;
1148 1245
1149 if (QUERY_FLAG (op, FLAG_FREED)) 1246 op->remove ();
1150 {
1151 LOG (llevError, "Trying to insert freed object!\n");
1152 return NULL;
1153 }
1154
1155 if (!m)
1156 {
1157 char *dump = dump_object (op);
1158 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1159 free (dump);
1160 return op;
1161 }
1162
1163 if (out_of_map (m, op->x, op->y))
1164 {
1165 char *dump = dump_object (op);
1166 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1167#ifdef MANY_CORES
1168 /* Better to catch this here, as otherwise the next use of this object
1169 * is likely to cause a crash. Better to find out where it is getting
1170 * improperly inserted.
1171 */
1172 abort ();
1173#endif
1174 free (dump);
1175 return op;
1176 }
1177
1178 if (!QUERY_FLAG (op, FLAG_REMOVED))
1179 {
1180 char *dump = dump_object (op);
1181 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1182 free (dump);
1183 return op;
1184 }
1185
1186 if (op->more)
1187 {
1188 /* The part may be on a different map. */
1189
1190 object *more = op->more;
1191
1192 /* We really need the caller to normalize coordinates - if
1193 * we set the map, that doesn't work if the location is within
1194 * a map and this is straddling an edge. So only if coordinate
1195 * is clear wrong do we normalize it.
1196 */
1197 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1198 more->map = get_map_from_coord (m, &more->x, &more->y);
1199 else if (!more->map)
1200 {
1201 /* For backwards compatibility - when not dealing with tiled maps,
1202 * more->map should always point to the parent.
1203 */
1204 more->map = m;
1205 }
1206
1207 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1208 {
1209 if (!op->head)
1210 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1211
1212 return 0;
1213 }
1214 }
1215
1216 CLEAR_FLAG (op, FLAG_REMOVED);
1217 1247
1218 /* Ideally, the caller figures this out. However, it complicates a lot 1248 /* Ideally, the caller figures this out. However, it complicates a lot
1219 * of areas of callers (eg, anything that uses find_free_spot would now 1249 * of areas of callers (eg, anything that uses find_free_spot would now
1220 * need extra work 1250 * need extra work
1221 */ 1251 */
1222 op->map = get_map_from_coord (m, &op->x, &op->y); 1252 if (!xy_normalise (m, op->x, op->y))
1223 x = op->x; 1253 {
1224 y = op->y; 1254 op->destroy ();
1255 return 0;
1256 }
1257
1258 if (object *more = op->more)
1259 if (!insert_ob_in_map (more, m, originator, flag))
1260 return 0;
1261
1262 CLEAR_FLAG (op, FLAG_REMOVED);
1263
1264 op->map = m;
1265 mapspace &ms = op->ms ();
1225 1266
1226 /* this has to be done after we translate the coordinates. 1267 /* this has to be done after we translate the coordinates.
1227 */ 1268 */
1228 if (op->nrof && !(flag & INS_NO_MERGE)) 1269 if (op->nrof && !(flag & INS_NO_MERGE))
1229 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1270 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1230 if (object::can_merge (op, tmp)) 1271 if (object::can_merge (op, tmp))
1231 { 1272 {
1232 op->nrof += tmp->nrof; 1273 op->nrof += tmp->nrof;
1233 tmp->destroy (); 1274 tmp->destroy ();
1234 } 1275 }
1251 op->below = originator->below; 1292 op->below = originator->below;
1252 1293
1253 if (op->below) 1294 if (op->below)
1254 op->below->above = op; 1295 op->below->above = op;
1255 else 1296 else
1256 op->ms ().bot = op; 1297 ms.bot = op;
1257 1298
1258 /* since *below* originator, no need to update top */ 1299 /* since *below* originator, no need to update top */
1259 originator->below = op; 1300 originator->below = op;
1260 } 1301 }
1261 else 1302 else
1262 { 1303 {
1304 top = ms.bot;
1305
1263 /* If there are other objects, then */ 1306 /* If there are other objects, then */
1264 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1307 if (top)
1265 { 1308 {
1266 object *last = 0; 1309 object *last = 0;
1267 1310
1268 /* 1311 /*
1269 * If there are multiple objects on this space, we do some trickier handling. 1312 * If there are multiple objects on this space, we do some trickier handling.
1275 * once we get to them. This reduces the need to traverse over all of 1318 * once we get to them. This reduces the need to traverse over all of
1276 * them when adding another one - this saves quite a bit of cpu time 1319 * them when adding another one - this saves quite a bit of cpu time
1277 * when lots of spells are cast in one area. Currently, it is presumed 1320 * when lots of spells are cast in one area. Currently, it is presumed
1278 * that flying non pickable objects are spell objects. 1321 * that flying non pickable objects are spell objects.
1279 */ 1322 */
1280 while (top) 1323 for (top = ms.bot; top; top = top->above)
1281 { 1324 {
1282 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1325 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1283 floor = top; 1326 floor = top;
1284 1327
1285 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1328 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1288 top = top->below; 1331 top = top->below;
1289 break; 1332 break;
1290 } 1333 }
1291 1334
1292 last = top; 1335 last = top;
1293 top = top->above;
1294 } 1336 }
1295 1337
1296 /* Don't want top to be NULL, so set it to the last valid object */ 1338 /* Don't want top to be NULL, so set it to the last valid object */
1297 top = last; 1339 top = last;
1298 1340
1300 * looks like instead of lots of conditions here. 1342 * looks like instead of lots of conditions here.
1301 * makes things faster, and effectively the same result. 1343 * makes things faster, and effectively the same result.
1302 */ 1344 */
1303 1345
1304 /* Have object 'fall below' other objects that block view. 1346 /* Have object 'fall below' other objects that block view.
1305 * Unless those objects are exits, type 66 1347 * Unless those objects are exits.
1306 * If INS_ON_TOP is used, don't do this processing 1348 * If INS_ON_TOP is used, don't do this processing
1307 * Need to find the object that in fact blocks view, otherwise 1349 * Need to find the object that in fact blocks view, otherwise
1308 * stacking is a bit odd. 1350 * stacking is a bit odd.
1309 */ 1351 */
1310 if (!(flag & INS_ON_TOP) && 1352 if (!(flag & INS_ON_TOP)
1311 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1353 && ms.flags () & P_BLOCKSVIEW
1354 && (op->face && !faces [op->face].visibility))
1312 { 1355 {
1313 for (last = top; last != floor; last = last->below) 1356 for (last = top; last != floor; last = last->below)
1314 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1357 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315 break; 1358 break;
1359
1316 /* Check to see if we found the object that blocks view, 1360 /* Check to see if we found the object that blocks view,
1317 * and make sure we have a below pointer for it so that 1361 * and make sure we have a below pointer for it so that
1318 * we can get inserted below this one, which requires we 1362 * we can get inserted below this one, which requires we
1319 * set top to the object below us. 1363 * set top to the object below us.
1320 */ 1364 */
1321 if (last && last->below && last != floor) 1365 if (last && last->below && last != floor)
1322 top = last->below; 1366 top = last->below;
1323 } 1367 }
1324 } /* If objects on this space */ 1368 } /* If objects on this space */
1325 1369
1326 if (flag & INS_MAP_LOAD)
1327 top = GET_MAP_TOP (op->map, op->x, op->y);
1328
1329 if (flag & INS_ABOVE_FLOOR_ONLY) 1370 if (flag & INS_ABOVE_FLOOR_ONLY)
1330 top = floor; 1371 top = floor;
1331 1372
1332 /* Top is the object that our object (op) is going to get inserted above. 1373 /* Top is the object that our object (op) is going to get inserted above.
1333 */ 1374 */
1334 1375
1335 /* First object on this space */ 1376 /* First object on this space */
1336 if (!top) 1377 if (!top)
1337 { 1378 {
1338 op->above = GET_MAP_OB (op->map, op->x, op->y); 1379 op->above = ms.bot;
1339 1380
1340 if (op->above) 1381 if (op->above)
1341 op->above->below = op; 1382 op->above->below = op;
1342 1383
1343 op->below = 0; 1384 op->below = 0;
1344 op->ms ().bot = op; 1385 ms.bot = op;
1345 } 1386 }
1346 else 1387 else
1347 { /* get inserted into the stack above top */ 1388 { /* get inserted into the stack above top */
1348 op->above = top->above; 1389 op->above = top->above;
1349 1390
1353 op->below = top; 1394 op->below = top;
1354 top->above = op; 1395 top->above = op;
1355 } 1396 }
1356 1397
1357 if (!op->above) 1398 if (!op->above)
1358 op->ms ().top = op; 1399 ms.top = op;
1359 } /* else not INS_BELOW_ORIGINATOR */ 1400 } /* else not INS_BELOW_ORIGINATOR */
1360 1401
1361 if (op->type == PLAYER) 1402 if (op->type == PLAYER)
1362 { 1403 {
1363 op->contr->do_los = 1; 1404 op->contr->do_los = 1;
1364 ++op->map->players; 1405 ++op->map->players;
1365 op->map->last_access = runtime; 1406 op->map->touch ();
1366 } 1407 }
1367 1408
1368 /* If we have a floor, we know the player, if any, will be above 1409 op->map->dirty = true;
1369 * it, so save a few ticks and start from there. 1410
1370 */
1371 if (!(flag & INS_MAP_LOAD))
1372 if (object *pl = op->ms ().player ()) 1411 if (object *pl = ms.player ())
1373 if (pl->contr->ns)
1374 pl->contr->ns->floorbox_update (); 1412 pl->contr->ns->floorbox_update ();
1375 1413
1376 /* If this object glows, it may affect lighting conditions that are 1414 /* If this object glows, it may affect lighting conditions that are
1377 * visible to others on this map. But update_all_los is really 1415 * visible to others on this map. But update_all_los is really
1378 * an inefficient way to do this, as it means los for all players 1416 * an inefficient way to do this, as it means los for all players
1379 * on the map will get recalculated. The players could very well 1417 * on the map will get recalculated. The players could very well
1380 * be far away from this change and not affected in any way - 1418 * be far away from this change and not affected in any way -
1381 * this should get redone to only look for players within range, 1419 * this should get redone to only look for players within range,
1382 * or just updating the P_NEED_UPDATE for spaces within this area 1420 * or just updating the P_UPTODATE for spaces within this area
1383 * of effect may be sufficient. 1421 * of effect may be sufficient.
1384 */ 1422 */
1385 if (op->map->darkness && (op->glow_radius != 0)) 1423 if (op->map->darkness && (op->glow_radius != 0))
1386 update_all_los (op->map, op->x, op->y); 1424 update_all_los (op->map, op->x, op->y);
1387 1425
1398 * blocked() and wall() work properly), and these flags are updated by 1436 * blocked() and wall() work properly), and these flags are updated by
1399 * update_object(). 1437 * update_object().
1400 */ 1438 */
1401 1439
1402 /* if this is not the head or flag has been passed, don't check walk on status */ 1440 /* if this is not the head or flag has been passed, don't check walk on status */
1403 if (!(flag & INS_NO_WALK_ON) && !op->head) 1441 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404 { 1442 {
1405 if (check_move_on (op, originator)) 1443 if (check_move_on (op, originator))
1406 return 0; 1444 return 0;
1407 1445
1408 /* If we are a multi part object, lets work our way through the check 1446 /* If we are a multi part object, lets work our way through the check
1409 * walk on's. 1447 * walk on's.
1410 */ 1448 */
1411 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1449 for (object *tmp = op->more; tmp; tmp = tmp->more)
1412 if (check_move_on (tmp, originator)) 1450 if (check_move_on (tmp, originator))
1413 return 0; 1451 return 0;
1414 } 1452 }
1415 1453
1416 return op; 1454 return op;
1425{ 1463{
1426 object *tmp, *tmp1; 1464 object *tmp, *tmp1;
1427 1465
1428 /* first search for itself and remove any old instances */ 1466 /* first search for itself and remove any old instances */
1429 1467
1430 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1468 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1469 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432 tmp->destroy (); 1470 tmp->destroy ();
1433 1471
1434 tmp1 = arch_to_object (archetype::find (arch_string)); 1472 tmp1 = arch_to_object (archetype::find (arch_string));
1435 1473
1436 tmp1->x = op->x; 1474 tmp1->x = op->x;
1439} 1477}
1440 1478
1441object * 1479object *
1442object::insert_at (object *where, object *originator, int flags) 1480object::insert_at (object *where, object *originator, int flags)
1443{ 1481{
1444 where->map->insert (this, where->x, where->y, originator, flags); 1482 return where->map->insert (this, where->x, where->y, originator, flags);
1445} 1483}
1446 1484
1447/* 1485/*
1448 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1486 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1449 * is returned contains nr objects, and the remaining parts contains 1487 * is returned contains nr objects, and the remaining parts contains
1489 * the amount of an object. If the amount reaches 0, the object 1527 * the amount of an object. If the amount reaches 0, the object
1490 * is subsequently removed and freed. 1528 * is subsequently removed and freed.
1491 * 1529 *
1492 * Return value: 'op' if something is left, NULL if the amount reached 0 1530 * Return value: 'op' if something is left, NULL if the amount reached 0
1493 */ 1531 */
1494
1495object * 1532object *
1496decrease_ob_nr (object *op, uint32 i) 1533decrease_ob_nr (object *op, uint32 i)
1497{ 1534{
1498 object *tmp; 1535 object *tmp;
1499 1536
1574 1611
1575/* 1612/*
1576 * add_weight(object, weight) adds the specified weight to an object, 1613 * add_weight(object, weight) adds the specified weight to an object,
1577 * and also updates how much the environment(s) is/are carrying. 1614 * and also updates how much the environment(s) is/are carrying.
1578 */ 1615 */
1579
1580void 1616void
1581add_weight (object *op, signed long weight) 1617add_weight (object *op, signed long weight)
1582{ 1618{
1583 while (op != NULL) 1619 while (op != NULL)
1584 { 1620 {
1599 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1635 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1600 free (dump); 1636 free (dump);
1601 return op; 1637 return op;
1602 } 1638 }
1603 1639
1604 if (where->head) 1640 if (where->head_ () != where)
1605 { 1641 {
1606 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1642 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1607 where = where->head; 1643 where = where->head;
1608 } 1644 }
1609 1645
1610 return where->insert (op); 1646 return where->insert (op);
1611} 1647}
1616 * inside the object environment. 1652 * inside the object environment.
1617 * 1653 *
1618 * The function returns now pointer to inserted item, and return value can 1654 * The function returns now pointer to inserted item, and return value can
1619 * be != op, if items are merged. -Tero 1655 * be != op, if items are merged. -Tero
1620 */ 1656 */
1621
1622object * 1657object *
1623object::insert (object *op) 1658object::insert (object *op)
1624{ 1659{
1625 object *tmp, *otmp;
1626
1627 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1660 if (!QUERY_FLAG (op, FLAG_REMOVED))
1628 op->remove (); 1661 op->remove ();
1629 1662
1630 if (op->more) 1663 if (op->more)
1631 { 1664 {
1633 return op; 1666 return op;
1634 } 1667 }
1635 1668
1636 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1669 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1637 CLEAR_FLAG (op, FLAG_REMOVED); 1670 CLEAR_FLAG (op, FLAG_REMOVED);
1671
1638 if (op->nrof) 1672 if (op->nrof)
1639 { 1673 {
1640 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1674 for (object *tmp = inv; tmp; tmp = tmp->below)
1641 if (object::can_merge (tmp, op)) 1675 if (object::can_merge (tmp, op))
1642 { 1676 {
1643 /* return the original object and remove inserted object 1677 /* return the original object and remove inserted object
1644 (client needs the original object) */ 1678 (client needs the original object) */
1645 tmp->nrof += op->nrof; 1679 tmp->nrof += op->nrof;
1664 add_weight (this, op->weight * op->nrof); 1698 add_weight (this, op->weight * op->nrof);
1665 } 1699 }
1666 else 1700 else
1667 add_weight (this, (op->weight + op->carrying)); 1701 add_weight (this, (op->weight + op->carrying));
1668 1702
1669 otmp = this->in_player (); 1703 if (object *otmp = this->in_player ())
1670 if (otmp && otmp->contr)
1671 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1704 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1672 otmp->update_stats (); 1705 otmp->update_stats ();
1673 1706
1707 op->owner = 0; // its his/hers now. period.
1674 op->map = 0; 1708 op->map = 0;
1675 op->env = this; 1709 op->env = this;
1676 op->above = 0; 1710 op->above = 0;
1677 op->below = 0; 1711 op->below = 0;
1678 op->x = 0, op->y = 0; 1712 op->x = op->y = 0;
1679 1713
1680 /* reset the light list and los of the players on the map */ 1714 /* reset the light list and los of the players on the map */
1681 if ((op->glow_radius != 0) && map) 1715 if (op->glow_radius && map)
1682 { 1716 {
1683#ifdef DEBUG_LIGHTS 1717#ifdef DEBUG_LIGHTS
1684 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1718 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1685#endif /* DEBUG_LIGHTS */ 1719#endif /* DEBUG_LIGHTS */
1686 if (map->darkness) 1720 if (map->darkness)
1758 1792
1759 /* The objects have to be checked from top to bottom. 1793 /* The objects have to be checked from top to bottom.
1760 * Hence, we first go to the top: 1794 * Hence, we first go to the top:
1761 */ 1795 */
1762 1796
1763 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1797 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764 { 1798 {
1765 /* Trim the search when we find the first other spell effect 1799 /* Trim the search when we find the first other spell effect
1766 * this helps performance so that if a space has 50 spell objects, 1800 * this helps performance so that if a space has 50 spell objects,
1767 * we don't need to check all of them. 1801 * we don't need to check all of them.
1768 */ 1802 */
1786 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1820 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1787 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1821 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788 { 1822 {
1789 1823
1790 float 1824 float
1791 diff = tmp->move_slow_penalty * FABS (op->speed); 1825 diff = tmp->move_slow_penalty * fabs (op->speed);
1792 1826
1793 if (op->type == PLAYER) 1827 if (op->type == PLAYER)
1794 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1828 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1795 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1829 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796 diff /= 4.0; 1830 diff /= 4.0;
1826 * The first matching object is returned, or NULL if none. 1860 * The first matching object is returned, or NULL if none.
1827 */ 1861 */
1828object * 1862object *
1829present_arch (const archetype *at, maptile *m, int x, int y) 1863present_arch (const archetype *at, maptile *m, int x, int y)
1830{ 1864{
1831 if (m == NULL || out_of_map (m, x, y)) 1865 if (!m || out_of_map (m, x, y))
1832 { 1866 {
1833 LOG (llevError, "Present_arch called outside map.\n"); 1867 LOG (llevError, "Present_arch called outside map.\n");
1834 return NULL; 1868 return NULL;
1835 } 1869 }
1836 1870
1837 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1871 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838 if (tmp->arch == at) 1872 if (tmp->arch == at)
1839 return tmp; 1873 return tmp;
1840 1874
1841 return NULL; 1875 return NULL;
1842} 1876}
1853 { 1887 {
1854 LOG (llevError, "Present called outside map.\n"); 1888 LOG (llevError, "Present called outside map.\n");
1855 return NULL; 1889 return NULL;
1856 } 1890 }
1857 1891
1858 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1892 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859 if (tmp->type == type) 1893 if (tmp->type == type)
1860 return tmp; 1894 return tmp;
1861 1895
1862 return NULL; 1896 return NULL;
1863} 1897}
1920 * activate recursively a flag on an object inventory 1954 * activate recursively a flag on an object inventory
1921 */ 1955 */
1922void 1956void
1923flag_inv (object *op, int flag) 1957flag_inv (object *op, int flag)
1924{ 1958{
1925 if (op->inv)
1926 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1959 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1927 { 1960 {
1928 SET_FLAG (tmp, flag); 1961 SET_FLAG (tmp, flag);
1929 flag_inv (tmp, flag); 1962 flag_inv (tmp, flag);
1930 } 1963 }
1931} 1964}
1932 1965
1933/* 1966/*
1934 * deactivate recursively a flag on an object inventory 1967 * deactivate recursively a flag on an object inventory
1935 */ 1968 */
1936void 1969void
1937unflag_inv (object *op, int flag) 1970unflag_inv (object *op, int flag)
1938{ 1971{
1939 if (op->inv)
1940 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1972 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1941 { 1973 {
1942 CLEAR_FLAG (tmp, flag); 1974 CLEAR_FLAG (tmp, flag);
1943 unflag_inv (tmp, flag); 1975 unflag_inv (tmp, flag);
1944 } 1976 }
1945}
1946
1947/*
1948 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1949 * all it's inventory (recursively).
1950 * If checksums are used, a player will get set_cheat called for
1951 * him/her-self and all object carried by a call to this function.
1952 */
1953void
1954set_cheat (object *op)
1955{
1956 SET_FLAG (op, FLAG_WAS_WIZ);
1957 flag_inv (op, FLAG_WAS_WIZ);
1958} 1977}
1959 1978
1960/* 1979/*
1961 * find_free_spot(object, map, x, y, start, stop) will search for 1980 * find_free_spot(object, map, x, y, start, stop) will search for
1962 * a spot at the given map and coordinates which will be able to contain 1981 * a spot at the given map and coordinates which will be able to contain
1964 * to search (see the freearr_x/y[] definition). 1983 * to search (see the freearr_x/y[] definition).
1965 * It returns a random choice among the alternatives found. 1984 * It returns a random choice among the alternatives found.
1966 * start and stop are where to start relative to the free_arr array (1,9 1985 * start and stop are where to start relative to the free_arr array (1,9
1967 * does all 4 immediate directions). This returns the index into the 1986 * does all 4 immediate directions). This returns the index into the
1968 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1987 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1969 * Note - this only checks to see if there is space for the head of the
1970 * object - if it is a multispace object, this should be called for all
1971 * pieces.
1972 * Note2: This function does correctly handle tiled maps, but does not 1988 * Note: This function does correctly handle tiled maps, but does not
1973 * inform the caller. However, insert_ob_in_map will update as 1989 * inform the caller. However, insert_ob_in_map will update as
1974 * necessary, so the caller shouldn't need to do any special work. 1990 * necessary, so the caller shouldn't need to do any special work.
1975 * Note - updated to take an object instead of archetype - this is necessary 1991 * Note - updated to take an object instead of archetype - this is necessary
1976 * because arch_blocked (now ob_blocked) needs to know the movement type 1992 * because arch_blocked (now ob_blocked) needs to know the movement type
1977 * to know if the space in question will block the object. We can't use 1993 * to know if the space in question will block the object. We can't use
1979 * customized, changed states, etc. 1995 * customized, changed states, etc.
1980 */ 1996 */
1981int 1997int
1982find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1998find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1983{ 1999{
2000 int altern[SIZEOFFREE];
1984 int index = 0, flag; 2001 int index = 0, flag;
1985 int altern[SIZEOFFREE];
1986 2002
1987 for (int i = start; i < stop; i++) 2003 for (int i = start; i < stop; i++)
1988 { 2004 {
1989 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2005 mapxy pos (m, x, y); pos.move (i);
1990 if (!flag) 2006
2007 if (!pos.normalise ())
2008 continue;
2009
2010 mapspace &ms = *pos;
2011
2012 if (ms.flags () & P_IS_ALIVE)
2013 continue;
2014
2015 /* However, often
2016 * ob doesn't have any move type (when used to place exits)
2017 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2018 */
2019 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2020 {
1991 altern [index++] = i; 2021 altern [index++] = i;
2022 continue;
2023 }
1992 2024
1993 /* Basically, if we find a wall on a space, we cut down the search size. 2025 /* Basically, if we find a wall on a space, we cut down the search size.
1994 * In this way, we won't return spaces that are on another side of a wall. 2026 * In this way, we won't return spaces that are on another side of a wall.
1995 * This mostly work, but it cuts down the search size in all directions - 2027 * This mostly work, but it cuts down the search size in all directions -
1996 * if the space being examined only has a wall to the north and empty 2028 * if the space being examined only has a wall to the north and empty
1997 * spaces in all the other directions, this will reduce the search space 2029 * spaces in all the other directions, this will reduce the search space
1998 * to only the spaces immediately surrounding the target area, and 2030 * to only the spaces immediately surrounding the target area, and
1999 * won't look 2 spaces south of the target space. 2031 * won't look 2 spaces south of the target space.
2000 */ 2032 */
2001 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2033 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2034 {
2002 stop = maxfree[i]; 2035 stop = maxfree[i];
2036 continue;
2037 }
2038
2039 /* Note it is intentional that we check ob - the movement type of the
2040 * head of the object should correspond for the entire object.
2041 */
2042 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2043 continue;
2044
2045 if (ob->blocked (m, pos.x, pos.y))
2046 continue;
2047
2048 altern [index++] = i;
2003 } 2049 }
2004 2050
2005 if (!index) 2051 if (!index)
2006 return -1; 2052 return -1;
2007 2053
2008 return altern[RANDOM () % index]; 2054 return altern [rndm (index)];
2009} 2055}
2010 2056
2011/* 2057/*
2012 * find_first_free_spot(archetype, maptile, x, y) works like 2058 * find_first_free_spot(archetype, maptile, x, y) works like
2013 * find_free_spot(), but it will search max number of squares. 2059 * find_free_spot(), but it will search max number of squares.
2016 */ 2062 */
2017int 2063int
2018find_first_free_spot (const object *ob, maptile *m, int x, int y) 2064find_first_free_spot (const object *ob, maptile *m, int x, int y)
2019{ 2065{
2020 for (int i = 0; i < SIZEOFFREE; i++) 2066 for (int i = 0; i < SIZEOFFREE; i++)
2021 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2067 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2022 return i; 2068 return i;
2023 2069
2024 return -1; 2070 return -1;
2025} 2071}
2026 2072
2034{ 2080{
2035 arr += begin; 2081 arr += begin;
2036 end -= begin; 2082 end -= begin;
2037 2083
2038 while (--end) 2084 while (--end)
2039 swap (arr [end], arr [RANDOM () % (end + 1)]); 2085 swap (arr [end], arr [rndm (end + 1)]);
2040} 2086}
2041 2087
2042/* new function to make monster searching more efficient, and effective! 2088/* new function to make monster searching more efficient, and effective!
2043 * This basically returns a randomized array (in the passed pointer) of 2089 * This basically returns a randomized array (in the passed pointer) of
2044 * the spaces to find monsters. In this way, it won't always look for 2090 * the spaces to find monsters. In this way, it won't always look for
2080 object *tmp; 2126 object *tmp;
2081 maptile *mp; 2127 maptile *mp;
2082 2128
2083 MoveType blocked, move_type; 2129 MoveType blocked, move_type;
2084 2130
2085 if (exclude && exclude->head) 2131 if (exclude && exclude->head_ () != exclude)
2086 { 2132 {
2087 exclude = exclude->head; 2133 exclude = exclude->head;
2088 move_type = exclude->move_type; 2134 move_type = exclude->move_type;
2089 } 2135 }
2090 else 2136 else
2113 max = maxfree[i]; 2159 max = maxfree[i];
2114 else if (mflags & P_IS_ALIVE) 2160 else if (mflags & P_IS_ALIVE)
2115 { 2161 {
2116 for (tmp = ms.bot; tmp; tmp = tmp->above) 2162 for (tmp = ms.bot; tmp; tmp = tmp->above)
2117 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2163 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2164 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119 break; 2165 break;
2120 2166
2121 if (tmp) 2167 if (tmp)
2122 return freedir[i]; 2168 return freedir[i];
2123 } 2169 }
2178 2224
2179 return 3; 2225 return 3;
2180} 2226}
2181 2227
2182/* 2228/*
2183 * absdir(int): Returns a number between 1 and 8, which represent
2184 * the "absolute" direction of a number (it actually takes care of
2185 * "overflow" in previous calculations of a direction).
2186 */
2187
2188int
2189absdir (int d)
2190{
2191 while (d < 1)
2192 d += 8;
2193
2194 while (d > 8)
2195 d -= 8;
2196
2197 return d;
2198}
2199
2200/*
2201 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2229 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202 * between two directions (which are expected to be absolute (see absdir()) 2230 * between two directions (which are expected to be absolute (see absdir())
2203 */ 2231 */
2204
2205int 2232int
2206dirdiff (int dir1, int dir2) 2233dirdiff (int dir1, int dir2)
2207{ 2234{
2208 int d; 2235 int d;
2209 2236
2322 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2349 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2323 * core dumps if they do. 2350 * core dumps if they do.
2324 * 2351 *
2325 * Add a check so we can't pick up invisible objects (0.93.8) 2352 * Add a check so we can't pick up invisible objects (0.93.8)
2326 */ 2353 */
2327
2328int 2354int
2329can_pick (const object *who, const object *item) 2355can_pick (const object *who, const object *item)
2330{ 2356{
2331 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2357 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2332 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2358 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2337 * create clone from object to another 2363 * create clone from object to another
2338 */ 2364 */
2339object * 2365object *
2340object_create_clone (object *asrc) 2366object_create_clone (object *asrc)
2341{ 2367{
2342 object *dst = 0, *tmp, *src, *part, *prev, *item; 2368 object *dst = 0, *tmp, *src, *prev, *item;
2343 2369
2344 if (!asrc) 2370 if (!asrc)
2345 return 0; 2371 return 0;
2346 2372
2347 src = asrc;
2348 if (src->head)
2349 src = src->head; 2373 src = asrc->head_ ();
2350 2374
2351 prev = 0; 2375 prev = 0;
2352 for (part = src; part; part = part->more) 2376 for (object *part = src; part; part = part->more)
2353 { 2377 {
2354 tmp = part->clone (); 2378 tmp = part->clone ();
2355 tmp->x -= src->x; 2379 tmp->x -= src->x;
2356 tmp->y -= src->y; 2380 tmp->y -= src->y;
2357 2381
2373 2397
2374 for (item = src->inv; item; item = item->below) 2398 for (item = src->inv; item; item = item->below)
2375 insert_ob_in_ob (object_create_clone (item), dst); 2399 insert_ob_in_ob (object_create_clone (item), dst);
2376 2400
2377 return dst; 2401 return dst;
2378}
2379
2380/* GROS - Creates an object using a string representing its content. */
2381/* Basically, we save the content of the string to a temp file, then call */
2382/* load_object on it. I admit it is a highly inefficient way to make things, */
2383/* but it was simple to make and allows reusing the load_object function. */
2384/* Remember not to use load_object_str in a time-critical situation. */
2385/* Also remember that multiparts objects are not supported for now. */
2386object *
2387load_object_str (const char *obstr)
2388{
2389 object *op;
2390 char filename[MAX_BUF];
2391
2392 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394 FILE *tempfile = fopen (filename, "w");
2395
2396 if (tempfile == NULL)
2397 {
2398 LOG (llevError, "Error - Unable to access load object temp file\n");
2399 return NULL;
2400 }
2401
2402 fprintf (tempfile, obstr);
2403 fclose (tempfile);
2404
2405 op = object::create ();
2406
2407 object_thawer thawer (filename);
2408
2409 if (thawer)
2410 load_object (thawer, op, 0);
2411
2412 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413 CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415 return op;
2416} 2402}
2417 2403
2418/* This returns the first object in who's inventory that 2404/* This returns the first object in who's inventory that
2419 * has the same type and subtype match. 2405 * has the same type and subtype match.
2420 * returns NULL if no match. 2406 * returns NULL if no match.
2475 if (link->key == canonical_key) 2461 if (link->key == canonical_key)
2476 return link->value; 2462 return link->value;
2477 2463
2478 return 0; 2464 return 0;
2479} 2465}
2480
2481 2466
2482/* 2467/*
2483 * Updates the canonical_key in op to value. 2468 * Updates the canonical_key in op to value.
2484 * 2469 *
2485 * canonical_key is a shared string (value doesn't have to be). 2470 * canonical_key is a shared string (value doesn't have to be).
2509 /* Basically, if the archetype has this key set, 2494 /* Basically, if the archetype has this key set,
2510 * we need to store the null value so when we save 2495 * we need to store the null value so when we save
2511 * it, we save the empty value so that when we load, 2496 * it, we save the empty value so that when we load,
2512 * we get this value back again. 2497 * we get this value back again.
2513 */ 2498 */
2514 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2499 if (get_ob_key_link (op->arch, canonical_key))
2515 field->value = 0; 2500 field->value = 0;
2516 else 2501 else
2517 { 2502 {
2518 if (last) 2503 if (last)
2519 last->next = field->next; 2504 last->next = field->next;
2588 } 2573 }
2589 else 2574 else
2590 item = item->env; 2575 item = item->env;
2591} 2576}
2592 2577
2593
2594const char * 2578const char *
2595object::flag_desc (char *desc, int len) const 2579object::flag_desc (char *desc, int len) const
2596{ 2580{
2597 char *p = desc; 2581 char *p = desc;
2598 bool first = true; 2582 bool first = true;
2599 2583
2584 *p = 0;
2585
2600 for (int i = 0; i < NUM_FLAGS; i++) 2586 for (int i = 0; i < NUM_FLAGS; i++)
2601 { 2587 {
2602 if (len <= 10) // magic constant! 2588 if (len <= 10) // magic constant!
2603 { 2589 {
2604 snprintf (p, len, ",..."); 2590 snprintf (p, len, ",...");
2605 break; 2591 break;
2606 } 2592 }
2607 2593
2608 if (flag[i]) 2594 if (flag [i])
2609 { 2595 {
2610 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); 2596 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611 len -= cnt; 2597 len -= cnt;
2612 p += cnt; 2598 p += cnt;
2613 first = false; 2599 first = false;
2615 } 2601 }
2616 2602
2617 return desc; 2603 return desc;
2618} 2604}
2619 2605
2620// return a suitable string describing an objetc in enough detail to find it 2606// return a suitable string describing an object in enough detail to find it
2621const char * 2607const char *
2622object::debug_desc (char *info) const 2608object::debug_desc (char *info) const
2623{ 2609{
2624 char flagdesc[512]; 2610 char flagdesc[512];
2625 char info2[256 * 4]; 2611 char info2[256 * 4];
2626 char *p = info; 2612 char *p = info;
2627 2613
2628 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2614 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2629 count, uuid.seq, 2615 count,
2616 uuid.c_str (),
2630 &name, 2617 &name,
2631 title ? "\",title:" : "", 2618 title ? "\",title:\"" : "",
2632 title ? (const char *)title : "", 2619 title ? (const char *)title : "",
2633 flag_desc (flagdesc, 512), type); 2620 flag_desc (flagdesc, 512), type);
2634 2621
2635 if (env) 2622 if (!this->flag[FLAG_REMOVED] && env)
2636 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2623 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2637 2624
2638 if (map) 2625 if (map)
2639 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2626 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2640 2627
2642} 2629}
2643 2630
2644const char * 2631const char *
2645object::debug_desc () const 2632object::debug_desc () const
2646{ 2633{
2647 static char info[256 * 3]; 2634 static char info[3][256 * 4];
2635 static int info_idx;
2636
2648 return debug_desc (info); 2637 return debug_desc (info [++info_idx % 3]);
2649} 2638}
2650 2639
2640struct region *
2641object::region () const
2642{
2643 return map ? map->region (x, y)
2644 : region::default_region ();
2645}
2646
2647const materialtype_t *
2648object::dominant_material () const
2649{
2650 if (materialtype_t *mt = name_to_material (materialname))
2651 return mt;
2652
2653 return name_to_material (shstr_unknown);
2654}
2655
2656void
2657object::open_container (object *new_container)
2658{
2659 if (container == new_container)
2660 return;
2661
2662 if (object *old_container = container)
2663 {
2664 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2665 return;
2666
2667#if 0
2668 // remove the "Close old_container" object.
2669 if (object *closer = old_container->inv)
2670 if (closer->type == CLOSE_CON)
2671 closer->destroy ();
2672#endif
2673
2674 old_container->flag [FLAG_APPLIED] = 0;
2675 container = 0;
2676
2677 esrv_update_item (UPD_FLAGS, this, old_container);
2678 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2679 play_sound (sound_find ("chest_close"));
2680 }
2681
2682 if (new_container)
2683 {
2684 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2685 return;
2686
2687 // TODO: this does not seem to serve any purpose anymore?
2688#if 0
2689 // insert the "Close Container" object.
2690 if (archetype *closer = new_container->other_arch)
2691 {
2692 object *closer = arch_to_object (new_container->other_arch);
2693 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2694 new_container->insert (closer);
2695 }
2696#endif
2697
2698 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2699
2700 new_container->flag [FLAG_APPLIED] = 1;
2701 container = new_container;
2702
2703 esrv_update_item (UPD_FLAGS, this, new_container);
2704 esrv_send_inventory (this, new_container);
2705 play_sound (sound_find ("chest_open"));
2706 }
2707}
2708
2709object *
2710object::force_find (const shstr name)
2711{
2712 /* cycle through his inventory to look for the MARK we want to
2713 * place
2714 */
2715 for (object *tmp = inv; tmp; tmp = tmp->below)
2716 if (tmp->type == FORCE && tmp->slaying == name)
2717 return splay (tmp);
2718
2719 return 0;
2720}
2721
2722void
2723object::force_add (const shstr name, int duration)
2724{
2725 if (object *force = force_find (name))
2726 force->destroy ();
2727
2728 object *force = get_archetype (FORCE_NAME);
2729
2730 force->slaying = name;
2731 force->stats.food = 1;
2732 force->speed_left = -1.f;
2733
2734 force->set_speed (duration ? 1.f / duration : 0.f);
2735 force->flag [FLAG_IS_USED_UP] = true;
2736 force->flag [FLAG_APPLIED] = true;
2737
2738 insert (force);
2739}
2740
2741void
2742object::play_sound (faceidx sound) const
2743{
2744 if (!sound)
2745 return;
2746
2747 if (flag [FLAG_REMOVED])
2748 return;
2749
2750 if (env)
2751 {
2752 if (object *pl = in_player ())
2753 pl->contr->play_sound (sound);
2754 }
2755 else
2756 map->play_sound (sound, x, y);
2757}
2758

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines