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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines