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.71 by elmex, Tue Dec 19 13:41:45 2006 UTC vs.
Revision 1.199 by root, Thu Nov 8 19:43:23 2007 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; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 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] = { 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,
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 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 47};
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, 48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
141 * objects with lists are rare, and lists stay short. If not, use a 143 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
143 */ 145 */
144 146
145 /* For each field in wants, */ 147 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 149 {
148 key_value *has_field; 150 key_value *has_field;
149 151
150 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
190 * Check nrof variable *before* calling can_merge() 192 * Check nrof variable *before* calling can_merge()
191 * 193 *
192 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
193 * check weight 195 * check weight
194 */ 196 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
197{ 198{
198 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
199 if (ob1 == ob2 200 if (ob1 == ob2
200 || ob1->type != ob2->type 201 || ob1->type != ob2->type
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 222 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 223
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 225 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 226
226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227 || ob1->arch != ob2->arch 228 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 229 || ob1->name != ob2->name
229 || ob1->title != ob2->title 230 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 231 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 232 || ob1->weight != ob2->weight
253 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
254 * check all objects in the inventory. 255 * check all objects in the inventory.
255 */ 256 */
256 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
257 { 258 {
258 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
260 return 0;
261 261
262 /* Now check to see if the two inventory objects could merge */ 262 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */
264
263 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
264 return 0; 266 return 0; /* inventory objexts differ */
265 267
266 /* inventory ok - still need to check rest of this object to see 268 /* inventory ok - still need to check rest of this object to see
267 * if it is valid. 269 * if it is valid.
268 */ 270 */
269 } 271 }
277 279
278 /* Note sure why the following is the case - either the object has to 280 /* Note sure why the following is the case - either the object has to
279 * be animated or have a very low speed. Is this an attempted monster 281 * be animated or have a very low speed. Is this an attempted monster
280 * check? 282 * check?
281 */ 283 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 285 return 0;
284 286
285 switch (ob1->type) 287 switch (ob1->type)
286 { 288 {
287 case SCROLL: 289 case SCROLL:
298 return 0; 300 return 0;
299 else if (!compare_ob_value_lists (ob1, ob2)) 301 else if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 302 return 0;
301 } 303 }
302 304
303 //TODO: generate an event or call into perl for additional checks
304 if (ob1->self || ob2->self) 305 if (ob1->self || ob2->self)
305 { 306 {
306 ob1->optimise (); 307 ob1->optimise ();
307 ob2->optimise (); 308 ob2->optimise ();
308 309
309 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
311 {
312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314
315 if (k1 != k2)
310 return 0; 316 return 0;
317 else if (k1 == 0)
318 return 1;
319 else if (!cfperl_can_merge (ob1, ob2))
320 return 0;
321 }
311 } 322 }
312 323
313 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
314 return 1; 325 return 1;
315} 326}
323sum_weight (object *op) 334sum_weight (object *op)
324{ 335{
325 long sum; 336 long sum;
326 object *inv; 337 object *inv;
327 338
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 339 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 340 {
330 if (inv->inv) 341 if (inv->inv)
331 sum_weight (inv); 342 sum_weight (inv);
343
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 344 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 345 }
334 346
335 if (op->type == CONTAINER && op->stats.Str) 347 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 348 sum = (sum * (100 - op->stats.Str)) / 100;
352 op = op->env; 364 op = op->env;
353 return op; 365 return op;
354} 366}
355 367
356/* 368/*
357 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
358 * a better check. We basically keeping traversing up until we can't
359 * or find a player.
360 */
361
362object *
363is_player_inv (object *op)
364{
365 for (; op != NULL && op->type != PLAYER; op = op->env)
366 if (op->env == op)
367 op->env = NULL;
368 return op;
369}
370
371/*
372 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 369 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
373 * Some error messages. 370 * Some error messages.
374 * The result of the dump is stored in the static global errmsg array. 371 * The result of the dump is stored in the static global errmsg array.
375 */ 372 */
376
377char * 373char *
378dump_object (object *op) 374dump_object (object *op)
379{ 375{
380 if (!op) 376 if (!op)
381 return strdup ("[NULLOBJ]"); 377 return strdup ("[NULLOBJ]");
382 378
383 object_freezer freezer; 379 object_freezer freezer;
384 save_object (freezer, op, 3); 380 op->write (freezer);
385 return freezer.as_string (); 381 return freezer.as_string ();
386} 382}
387 383
388/* 384/*
389 * get_nearest_part(multi-object, object 2) returns the part of the 385 * get_nearest_part(multi-object, object 2) returns the part of the
390 * multi-object 1 which is closest to the second object. 386 * multi-object 1 which is closest to the second object.
391 * If it's not a multi-object, it is returned. 387 * If it's not a multi-object, it is returned.
392 */ 388 */
393
394object * 389object *
395get_nearest_part (object *op, const object *pl) 390get_nearest_part (object *op, const object *pl)
396{ 391{
397 object *tmp, *closest; 392 object *tmp, *closest;
398 int last_dist, i; 393 int last_dist, i;
406} 401}
407 402
408/* 403/*
409 * Returns the object which has the count-variable equal to the argument. 404 * Returns the object which has the count-variable equal to the argument.
410 */ 405 */
411
412object * 406object *
413find_object (tag_t i) 407find_object (tag_t i)
414{ 408{
415 for (object *op = object::first; op; op = op->next) 409 for_all_objects (op)
416 if (op->count == i) 410 if (op->count == i)
417 return op; 411 return op;
418 412
419 return 0; 413 return 0;
420} 414}
421 415
422/* 416/*
423 * Returns the first object which has a name equal to the argument. 417 * Returns the first object which has a name equal to the argument.
424 * Used only by the patch command, but not all that useful. 418 * Used only by the patch command, but not all that useful.
425 * Enables features like "patch <name-of-other-player> food 999" 419 * Enables features like "patch <name-of-other-player> food 999"
426 */ 420 */
427
428object * 421object *
429find_object_name (const char *str) 422find_object_name (const char *str)
430{ 423{
431 shstr_cmp str_ (str); 424 shstr_cmp str_ (str);
432 object *op; 425 object *op;
433 426
434 for (op = object::first; op != NULL; op = op->next) 427 for_all_objects (op)
435 if (op->name == str_) 428 if (op->name == str_)
436 break; 429 break;
437 430
438 return op; 431 return op;
439} 432}
445} 438}
446 439
447/* 440/*
448 * Sets the owner and sets the skill and exp pointers to owner's current 441 * Sets the owner and sets the skill and exp pointers to owner's current
449 * skill and experience objects. 442 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO
450 */ 444 */
451void 445void
452object::set_owner (object *owner) 446object::set_owner (object *owner)
453{ 447{
448 // allow objects which own objects
454 if (!owner) 449 if (owner)
455 return;
456
457 /* next line added to allow objects which own objects */
458 /* Add a check for ownercounts in here, as I got into an endless loop
459 * with the fireball owning a poison cloud which then owned the
460 * fireball. I believe that was caused by one of the objects getting
461 * freed and then another object replacing it. Since the ownercounts
462 * didn't match, this check is valid and I believe that cause is valid.
463 */
464 while (owner->owner) 450 while (owner->owner)
465 owner = owner->owner; 451 owner = owner->owner;
452
453 if (flag [FLAG_FREED])
454 {
455 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
456 return;
457 }
466 458
467 this->owner = owner; 459 this->owner = owner;
460}
461
462int
463object::slottype () const
464{
465 if (type == SKILL)
466 {
467 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
468 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
469 }
470 else
471 {
472 if (slot [body_combat].info) return slot_combat;
473 if (slot [body_range ].info) return slot_ranged;
474 }
475
476 return slot_none;
477}
478
479bool
480object::change_weapon (object *ob)
481{
482 if (current_weapon == ob)
483 return true;
484
485 if (chosen_skill)
486 chosen_skill->flag [FLAG_APPLIED] = false;
487
488 current_weapon = ob;
489 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
490
491 if (chosen_skill)
492 chosen_skill->flag [FLAG_APPLIED] = true;
493
494 update_stats ();
495
496 if (ob)
497 {
498 // now check wether any body locations became invalid, in which case
499 // we cannot apply the weapon at the moment.
500 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
501 if (slot[i].used < 0)
502 {
503 current_weapon = chosen_skill = 0;
504 update_stats ();
505
506 new_draw_info_format (NDI_UNIQUE, 0, this,
507 "You try to balance all your items at once, "
508 "but the %s is just too much for your body. "
509 "[You need to unapply some items first.]", &ob->name);
510 return false;
511 }
512
513 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
514 }
515 else
516 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
517
518 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
519 {
520 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
521 &name, ob->debug_desc ());
522 return false;
523 }
524
525 return true;
468} 526}
469 527
470/* Zero the key_values on op, decrementing the shared-string 528/* Zero the key_values on op, decrementing the shared-string
471 * refcounts and freeing the links. 529 * refcounts and freeing the links.
472 */ 530 */
473static void 531static void
474free_key_values (object *op) 532free_key_values (object *op)
475{ 533{
476 for (key_value *i = op->key_values; i != 0;) 534 for (key_value *i = op->key_values; i; )
477 { 535 {
478 key_value *next = i->next; 536 key_value *next = i->next;
479 delete i; 537 delete i;
480 538
481 i = next; 539 i = next;
482 } 540 }
483 541
484 op->key_values = 0; 542 op->key_values = 0;
485} 543}
486 544
487void object::clear () 545object &
546object::operator =(const object &src)
488{ 547{
489 attachable_base::clear (); 548 bool is_freed = flag [FLAG_FREED];
549 bool is_removed = flag [FLAG_REMOVED];
490 550
491 free_key_values (this);
492
493 owner = 0;
494 name = 0;
495 name_pl = 0;
496 title = 0;
497 race = 0;
498 slaying = 0;
499 skill = 0;
500 msg = 0;
501 lore = 0;
502 custom_name = 0;
503 materialname = 0;
504 contr = 0;
505 below = 0;
506 above = 0;
507 inv = 0;
508 container = 0;
509 env = 0;
510 more = 0;
511 head = 0;
512 map = 0;
513 active_next = 0;
514 active_prev = 0;
515
516 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
517
518 SET_FLAG (this, FLAG_REMOVED);
519
520 /* What is not cleared is next, prev, and count */
521
522 expmul = 1.0;
523 face = blank_face;
524
525 if (settings.casting_time)
526 casting_time = -1;
527}
528
529/*
530 * copy_to first frees everything allocated by the dst object,
531 * and then copies the contents of itself into the second
532 * object, allocating what needs to be allocated. Basically, any
533 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
534 * if the first object is freed, the pointers in the new object
535 * will point at garbage.
536 */
537void
538object::copy_to (object *dst)
539{
540 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
541 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
542
543 *(object_copy *)dst = *this; 551 *(object_copy *)this = src;
544 *(object_pod *)dst = *this;
545 552
546 if (self || cb) 553 flag [FLAG_FREED] = is_freed;
547 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 554 flag [FLAG_REMOVED] = is_removed;
548
549 if (is_freed)
550 SET_FLAG (dst, FLAG_FREED);
551
552 if (is_removed)
553 SET_FLAG (dst, FLAG_REMOVED);
554
555 if (speed < 0)
556 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
557 555
558 /* Copy over key_values, if any. */ 556 /* Copy over key_values, if any. */
559 if (key_values) 557 if (src.key_values)
560 { 558 {
561 key_value *tail = 0; 559 key_value *tail = 0;
562 key_value *i;
563
564 dst->key_values = 0; 560 key_values = 0;
565 561
566 for (i = key_values; i; i = i->next) 562 for (key_value *i = src.key_values; i; i = i->next)
567 { 563 {
568 key_value *new_link = new key_value; 564 key_value *new_link = new key_value;
569 565
570 new_link->next = 0; 566 new_link->next = 0;
571 new_link->key = i->key; 567 new_link->key = i->key;
572 new_link->value = i->value; 568 new_link->value = i->value;
573 569
574 /* Try and be clever here, too. */ 570 /* Try and be clever here, too. */
575 if (!dst->key_values) 571 if (!key_values)
576 { 572 {
577 dst->key_values = new_link; 573 key_values = new_link;
578 tail = new_link; 574 tail = new_link;
579 } 575 }
580 else 576 else
581 { 577 {
582 tail->next = new_link; 578 tail->next = new_link;
583 tail = new_link; 579 tail = new_link;
584 } 580 }
585 } 581 }
586 } 582 }
583}
587 584
588 update_ob_speed (dst); 585/*
586 * copy_to first frees everything allocated by the dst object,
587 * and then copies the contents of itself into the second
588 * object, allocating what needs to be allocated. Basically, any
589 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
590 * if the first object is freed, the pointers in the new object
591 * will point at garbage.
592 */
593void
594object::copy_to (object *dst)
595{
596 *dst = *this;
597
598 if (speed < 0)
599 dst->speed_left -= rndm ();
600
601 dst->set_speed (dst->speed);
602}
603
604void
605object::instantiate ()
606{
607 if (!uuid.seq) // HACK
608 uuid = gen_uuid ();
609
610 speed_left = -0.1f;
611 /* copy the body_info to the body_used - this is only really
612 * need for monsters, but doesn't hurt to do it for everything.
613 * by doing so, when a monster is created, it has good starting
614 * values for the body_used info, so when items are created
615 * for it, they can be properly equipped.
616 */
617 for (int i = NUM_BODY_LOCATIONS; i--; )
618 slot[i].used = slot[i].info;
619
620 attachable::instantiate ();
589} 621}
590 622
591object * 623object *
592object::clone () 624object::clone ()
593{ 625{
599/* 631/*
600 * If an object with the IS_TURNABLE() flag needs to be turned due 632 * If an object with the IS_TURNABLE() flag needs to be turned due
601 * to the closest player being on the other side, this function can 633 * to the closest player being on the other side, this function can
602 * be called to update the face variable, _and_ how it looks on the map. 634 * be called to update the face variable, _and_ how it looks on the map.
603 */ 635 */
604
605void 636void
606update_turn_face (object *op) 637update_turn_face (object *op)
607{ 638{
608 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 639 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
609 return; 640 return;
641
610 SET_ANIMATION (op, op->direction); 642 SET_ANIMATION (op, op->direction);
611 update_object (op, UP_OBJ_FACE); 643 update_object (op, UP_OBJ_FACE);
612} 644}
613 645
614/* 646/*
615 * Updates the speed of an object. If the speed changes from 0 to another 647 * Updates the speed of an object. If the speed changes from 0 to another
616 * value, or vice versa, then add/remove the object from the active list. 648 * value, or vice versa, then add/remove the object from the active list.
617 * This function needs to be called whenever the speed of an object changes. 649 * This function needs to be called whenever the speed of an object changes.
618 */ 650 */
619void 651void
620update_ob_speed (object *op) 652object::set_speed (float speed)
621{ 653{
622 extern int arch_init; 654 if (flag [FLAG_FREED] && speed)
623
624 /* No reason putting the archetypes objects on the speed list,
625 * since they never really need to be updated.
626 */
627
628 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
629 { 655 {
630 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 656 LOG (llevError, "Object %s is freed but has speed.\n", &name);
631#ifdef MANY_CORES
632 abort ();
633#else
634 op->speed = 0; 657 speed = 0;
635#endif
636 }
637
638 if (arch_init)
639 return;
640
641 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
642 { 658 }
643 /* If already on active list, don't do anything */
644 if (op->active_next || op->active_prev || op == active_objects)
645 return;
646 659
647 /* process_events() expects us to insert the object at the beginning 660 this->speed = speed;
648 * of the list. */
649 op->active_next = active_objects;
650 661
651 if (op->active_next != NULL) 662 if (has_active_speed ())
652 op->active_next->active_prev = op; 663 activate ();
653
654 active_objects = op;
655 }
656 else 664 else
657 { 665 deactivate ();
658 /* If not on the active list, nothing needs to be done */
659 if (!op->active_next && !op->active_prev && op != active_objects)
660 return;
661
662 if (op->active_prev == NULL)
663 {
664 active_objects = op->active_next;
665
666 if (op->active_next != NULL)
667 op->active_next->active_prev = NULL;
668 }
669 else
670 {
671 op->active_prev->active_next = op->active_next;
672
673 if (op->active_next)
674 op->active_next->active_prev = op->active_prev;
675 }
676
677 op->active_next = NULL;
678 op->active_prev = NULL;
679 }
680} 666}
681 667
682/* This function removes object 'op' from the list of active
683 * objects.
684 * This should only be used for style maps or other such
685 * reference maps where you don't want an object that isn't
686 * in play chewing up cpu time getting processed.
687 * The reverse of this is to call update_ob_speed, which
688 * will do the right thing based on the speed of the object.
689 */
690void
691remove_from_active_list (object *op)
692{
693 /* If not on the active list, nothing needs to be done */
694 if (!op->active_next && !op->active_prev && op != active_objects)
695 return;
696
697 if (op->active_prev == NULL)
698 {
699 active_objects = op->active_next;
700 if (op->active_next != NULL)
701 op->active_next->active_prev = NULL;
702 }
703 else
704 {
705 op->active_prev->active_next = op->active_next;
706 if (op->active_next)
707 op->active_next->active_prev = op->active_prev;
708 }
709 op->active_next = NULL;
710 op->active_prev = NULL;
711}
712
713/* 668/*
714 * update_object() updates the array which represents the map. 669 * update_object() updates the the map.
715 * It takes into account invisible objects (and represent squares covered 670 * It takes into account invisible objects (and represent squares covered
716 * by invisible objects by whatever is below them (unless it's another 671 * by invisible objects by whatever is below them (unless it's another
717 * invisible object, etc...) 672 * invisible object, etc...)
718 * If the object being updated is beneath a player, the look-window 673 * If the object being updated is beneath a player, the look-window
719 * of that player is updated (this might be a suboptimal way of 674 * of that player is updated (this might be a suboptimal way of
720 * updating that window, though, since update_object() is called _often_) 675 * updating that window, though, since update_object() is called _often_)
721 * 676 *
722 * action is a hint of what the caller believes need to be done. 677 * action is a hint of what the caller believes need to be done.
723 * For example, if the only thing that has changed is the face (due to
724 * an animation), we don't need to call update_position until that actually
725 * comes into view of a player. OTOH, many other things, like addition/removal
726 * of walls or living creatures may need us to update the flags now.
727 * current action are: 678 * current action are:
728 * UP_OBJ_INSERT: op was inserted 679 * UP_OBJ_INSERT: op was inserted
729 * UP_OBJ_REMOVE: op was removed 680 * UP_OBJ_REMOVE: op was removed
730 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 681 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
731 * as that is easier than trying to look at what may have changed. 682 * as that is easier than trying to look at what may have changed.
732 * UP_OBJ_FACE: only the objects face has changed. 683 * UP_OBJ_FACE: only the objects face has changed.
733 */ 684 */
734
735void 685void
736update_object (object *op, int action) 686update_object (object *op, int action)
737{ 687{
738 int update_now = 0, flags;
739 MoveType move_on, move_off, move_block, move_slow;
740
741 if (op == NULL) 688 if (op == NULL)
742 { 689 {
743 /* this should never happen */ 690 /* this should never happen */
744 LOG (llevDebug, "update_object() called for NULL object.\n"); 691 LOG (llevDebug, "update_object() called for NULL object.\n");
745 return; 692 return;
746 } 693 }
747 694
748 if (op->env != NULL) 695 if (op->env)
749 { 696 {
750 /* Animation is currently handled by client, so nothing 697 /* Animation is currently handled by client, so nothing
751 * to do in this case. 698 * to do in this case.
752 */ 699 */
753 return; 700 return;
758 */ 705 */
759 if (!op->map || op->map->in_memory == MAP_SAVING) 706 if (!op->map || op->map->in_memory == MAP_SAVING)
760 return; 707 return;
761 708
762 /* make sure the object is within map boundaries */ 709 /* make sure the object is within map boundaries */
763 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 710 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
764 { 711 {
765 LOG (llevError, "update_object() called for object out of map!\n"); 712 LOG (llevError, "update_object() called for object out of map!\n");
766#ifdef MANY_CORES 713#ifdef MANY_CORES
767 abort (); 714 abort ();
768#endif 715#endif
769 return; 716 return;
770 } 717 }
771 718
772 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 719 mapspace &m = op->ms ();
773 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778 720
721 if (!(m.flags_ & P_UPTODATE))
722 /* nop */;
779 if (action == UP_OBJ_INSERT) 723 else if (action == UP_OBJ_INSERT)
780 { 724 {
725 // this is likely overkill, TODO: revisit (schmorp)
781 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 726 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782 update_now = 1;
783
784 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 727 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785 update_now = 1; 728 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786 729 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
730 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 731 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788 update_now = 1;
789
790 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791 update_now = 1;
792
793 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794 update_now = 1;
795
796 if ((move_on | op->move_on) != move_on) 732 || (m.move_on | op->move_on ) != m.move_on
797 update_now = 1;
798
799 if ((move_off | op->move_off) != move_off) 733 || (m.move_off | op->move_off ) != m.move_off
800 update_now = 1; 734 || (m.move_slow | op->move_slow) != m.move_slow
801
802 /* This isn't perfect, but I don't expect a lot of objects to 735 /* This isn't perfect, but I don't expect a lot of objects to
803 * to have move_allow right now. 736 * to have move_allow right now.
804 */ 737 */
805 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 738 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806 update_now = 1; 739 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807 740 m.flags_ = 0;
808 if ((move_slow | op->move_slow) != move_slow)
809 update_now = 1;
810 } 741 }
811
812 /* if the object is being removed, we can't make intelligent 742 /* if the object is being removed, we can't make intelligent
813 * decisions, because remove_ob can't really pass the object 743 * decisions, because remove_ob can't really pass the object
814 * that is being removed. 744 * that is being removed.
815 */ 745 */
816 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 746 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
817 update_now = 1; 747 m.flags_ = 0;
818 else if (action == UP_OBJ_FACE) 748 else if (action == UP_OBJ_FACE)
819 /* Nothing to do for that case */ ; 749 /* Nothing to do for that case */ ;
820 else 750 else
821 LOG (llevError, "update_object called with invalid action: %d\n", action); 751 LOG (llevError, "update_object called with invalid action: %d\n", action);
822 752
823 if (update_now)
824 {
825 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
826 update_position (op->map, op->x, op->y);
827 }
828
829 if (op->more != NULL) 753 if (op->more)
830 update_object (op->more, action); 754 update_object (op->more, action);
831}
832
833object::vector object::mortals;
834object::vector object::objects; // not yet used
835object *object::first;
836
837void object::free_mortals ()
838{
839 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
840 if ((*i)->refcnt)
841 ++i; // further delay freeing
842 else
843 {
844 delete *i;
845 mortals.erase (i);
846 }
847} 755}
848 756
849object::object () 757object::object ()
850{ 758{
851 SET_FLAG (this, FLAG_REMOVED); 759 SET_FLAG (this, FLAG_REMOVED);
854 face = blank_face; 762 face = blank_face;
855} 763}
856 764
857object::~object () 765object::~object ()
858{ 766{
767 unlink ();
768
859 free_key_values (this); 769 free_key_values (this);
860} 770}
861 771
772static int object_count;
773
862void object::link () 774void object::link ()
863{ 775{
864 count = ++ob_count; 776 assert (!index);//D
865 uuid = gen_uuid (); 777 uuid = gen_uuid ();
778 count = ++object_count;
866 779
867 prev = 0; 780 refcnt_inc ();
868 next = object::first; 781 objects.insert (this);
869
870 if (object::first)
871 object::first->prev = this;
872
873 object::first = this;
874} 782}
875 783
876void object::unlink () 784void object::unlink ()
877{ 785{
878 if (this == object::first) 786 if (!index)
879 object::first = next; 787 return;
880 788
881 /* Remove this object from the list of used objects */ 789 objects.erase (this);
882 if (prev) prev->next = next; 790 refcnt_dec ();
883 if (next) next->prev = prev; 791}
884 792
885 prev = 0; 793void
886 next = 0; 794object::activate ()
795{
796 /* If already on active list, don't do anything */
797 if (active)
798 return;
799
800 if (has_active_speed ())
801 actives.insert (this);
802}
803
804void
805object::activate_recursive ()
806{
807 activate ();
808
809 for (object *op = inv; op; op = op->below)
810 op->activate_recursive ();
811}
812
813/* This function removes object 'op' from the list of active
814 * objects.
815 * This should only be used for style maps or other such
816 * reference maps where you don't want an object that isn't
817 * in play chewing up cpu time getting processed.
818 * The reverse of this is to call update_ob_speed, which
819 * will do the right thing based on the speed of the object.
820 */
821void
822object::deactivate ()
823{
824 /* If not on the active list, nothing needs to be done */
825 if (!active)
826 return;
827
828 actives.erase (this);
829}
830
831void
832object::deactivate_recursive ()
833{
834 for (object *op = inv; op; op = op->below)
835 op->deactivate_recursive ();
836
837 deactivate ();
838}
839
840void
841object::set_flag_inv (int flag, int value)
842{
843 for (object *op = inv; op; op = op->below)
844 {
845 op->flag [flag] = value;
846 op->set_flag_inv (flag, value);
847 }
848}
849
850/*
851 * Remove and free all objects in the inventory of the given object.
852 * object.c ?
853 */
854void
855object::destroy_inv (bool drop_to_ground)
856{
857 // need to check first, because the checks below might segfault
858 // as we might be on an invalid mapspace and crossfire code
859 // is too buggy to ensure that the inventory is empty.
860 // corollary: if you create arrows etc. with stuff in tis inventory,
861 // cf will crash below with off-map x and y
862 if (!inv)
863 return;
864
865 /* Only if the space blocks everything do we not process -
866 * if some form of movement is allowed, let objects
867 * drop on that space.
868 */
869 if (!drop_to_ground
870 || !map
871 || map->in_memory != MAP_IN_MEMORY
872 || map->nodrop
873 || ms ().move_block == MOVE_ALL)
874 {
875 while (inv)
876 {
877 inv->destroy_inv (drop_to_ground);
878 inv->destroy ();
879 }
880 }
881 else
882 { /* Put objects in inventory onto this space */
883 while (inv)
884 {
885 object *op = inv;
886
887 if (op->flag [FLAG_STARTEQUIP]
888 || op->flag [FLAG_NO_DROP]
889 || op->type == RUNE
890 || op->type == TRAP
891 || op->flag [FLAG_IS_A_TEMPLATE]
892 || op->flag [FLAG_DESTROY_ON_DEATH])
893 op->destroy ();
894 else
895 map->insert (op, x, y);
896 }
897 }
887} 898}
888 899
889object *object::create () 900object *object::create ()
890{ 901{
891 object *op = new object; 902 object *op = new object;
892 op->link (); 903 op->link ();
893 return op; 904 return op;
894} 905}
895 906
896/* 907void
897 * free_object() frees everything allocated by an object, removes 908object::do_destroy ()
898 * it from the list of used objects, and puts it on the list of
899 * free objects. The IS_FREED() flag is set in the object.
900 * The object must have been removed by remove_ob() first for
901 * this function to succeed.
902 *
903 * If destroy_inventory is set, free inventory as well. Else drop items in
904 * inventory to the ground.
905 */
906void object::destroy (bool destroy_inventory)
907{ 909{
908 if (QUERY_FLAG (this, FLAG_FREED)) 910 attachable::do_destroy ();
909 return;
910 911
911 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 912 if (flag [FLAG_IS_LINKED])
913 remove_button_link (this);
914
915 if (flag [FLAG_FRIENDLY])
912 remove_friendly_object (this); 916 remove_friendly_object (this);
913 917
914 if (!QUERY_FLAG (this, FLAG_REMOVED)) 918 if (!flag [FLAG_REMOVED])
915 remove (); 919 remove ();
916 920
917 SET_FLAG (this, FLAG_FREED); 921 destroy_inv (true);
918 922
919 if (more) 923 deactivate ();
920 { 924 unlink ();
921 more->destroy (destroy_inventory);
922 more = 0;
923 }
924 925
925 if (inv) 926 flag [FLAG_FREED] = 1;
926 {
927 /* Only if the space blocks everything do we not process -
928 * if some form of movement is allowed, let objects
929 * drop on that space.
930 */
931 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
932 {
933 object *op = inv;
934
935 while (op)
936 {
937 object *tmp = op->below;
938 op->destroy (destroy_inventory);
939 op = tmp;
940 }
941 }
942 else
943 { /* Put objects in inventory onto this space */
944 object *op = inv;
945
946 while (op)
947 {
948 object *tmp = op->below;
949
950 op->remove ();
951
952 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
953 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
954 op->destroy ();
955 else
956 {
957 op->x = x;
958 op->y = y;
959 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
960 }
961
962 op = tmp;
963 }
964 }
965 }
966 927
967 // hack to ensure that freed objects still have a valid map 928 // hack to ensure that freed objects still have a valid map
968 { 929 {
969 static maptile *freed_map; // freed objects are moved here to avoid crashes 930 static maptile *freed_map; // freed objects are moved here to avoid crashes
970 931
971 if (!freed_map) 932 if (!freed_map)
972 { 933 {
973 freed_map = new maptile; 934 freed_map = new maptile;
974 935
936 freed_map->path = "<freed objects map>";
975 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
976 freed_map->width = 3; 938 freed_map->width = 3;
977 freed_map->height = 3; 939 freed_map->height = 3;
978 940
979 freed_map->allocate (); 941 freed_map->alloc ();
942 freed_map->in_memory = MAP_IN_MEMORY;
980 } 943 }
981 944
982 map = freed_map; 945 map = freed_map;
983 x = 1; 946 x = 1;
984 y = 1; 947 y = 1;
985 } 948 }
986 949
950 if (more)
951 {
952 more->destroy ();
953 more = 0;
954 }
955
956 head = 0;
957
987 // clear those pointers that likely might have circular references to us 958 // clear those pointers that likely might cause circular references
988 owner = 0; 959 owner = 0;
989 enemy = 0; 960 enemy = 0;
990 attacked_by = 0; 961 attacked_by = 0;
962 current_weapon = 0;
963}
991 964
992 // only relevant for players(?), but make sure of it anyways 965void
993 contr = 0; 966object::destroy (bool destroy_inventory)
967{
968 if (destroyed ())
969 return;
994 970
995 /* Remove object from the active list */ 971 if (destroy_inventory)
996 speed = 0; 972 destroy_inv (false);
997 update_ob_speed (this);
998 973
999 unlink (); 974 if (is_head ())
975 if (sound_destroy)
976 play_sound (sound_destroy);
977 else if (flag [FLAG_MONSTER])
978 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
1000 979
1001 mortals.push_back (this); 980 attachable::destroy ();
1002} 981}
1003 982
1004/* 983/*
1005 * sub_weight() recursively (outwards) subtracts a number from the 984 * sub_weight() recursively (outwards) subtracts a number from the
1006 * weight of an object (and what is carried by it's environment(s)). 985 * weight of an object (and what is carried by it's environment(s)).
1022 * This function removes the object op from the linked list of objects 1001 * This function removes the object op from the linked list of objects
1023 * which it is currently tied to. When this function is done, the 1002 * which it is currently tied to. When this function is done, the
1024 * object will have no environment. If the object previously had an 1003 * object will have no environment. If the object previously had an
1025 * environment, the x and y coordinates will be updated to 1004 * environment, the x and y coordinates will be updated to
1026 * the previous environment. 1005 * the previous environment.
1027 * Beware: This function is called from the editor as well!
1028 */ 1006 */
1029void 1007void
1030object::remove () 1008object::do_remove ()
1031{ 1009{
1032 object *tmp, *last = 0; 1010 object *tmp, *last = 0;
1033 object *otmp; 1011 object *otmp;
1034 1012
1035 int check_walk_off;
1036
1037 if (QUERY_FLAG (this, FLAG_REMOVED)) 1013 if (QUERY_FLAG (this, FLAG_REMOVED))
1038 return; 1014 return;
1039 1015
1040 SET_FLAG (this, FLAG_REMOVED); 1016 SET_FLAG (this, FLAG_REMOVED);
1017 INVOKE_OBJECT (REMOVE, this);
1041 1018
1042 if (more) 1019 if (more)
1043 more->remove (); 1020 more->remove ();
1044 1021
1045 /* 1022 /*
1055 1032
1056 /* NO_FIX_PLAYER is set when a great many changes are being 1033 /* NO_FIX_PLAYER is set when a great many changes are being
1057 * made to players inventory. If set, avoiding the call 1034 * made to players inventory. If set, avoiding the call
1058 * to save cpu time. 1035 * to save cpu time.
1059 */ 1036 */
1060 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1037 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1061 fix_player (otmp); 1038 otmp->update_stats ();
1062 1039
1063 if (above != NULL) 1040 if (above)
1064 above->below = below; 1041 above->below = below;
1065 else 1042 else
1066 env->inv = below; 1043 env->inv = below;
1067 1044
1068 if (below != NULL) 1045 if (below)
1069 below->above = above; 1046 below->above = above;
1070 1047
1071 /* we set up values so that it could be inserted into 1048 /* we set up values so that it could be inserted into
1072 * the map, but we don't actually do that - it is up 1049 * the map, but we don't actually do that - it is up
1073 * to the caller to decide what we want to do. 1050 * to the caller to decide what we want to do.
1077 above = 0, below = 0; 1054 above = 0, below = 0;
1078 env = 0; 1055 env = 0;
1079 } 1056 }
1080 else if (map) 1057 else if (map)
1081 { 1058 {
1082 /* Re did the following section of code - it looks like it had 1059 if (type == PLAYER)
1083 * lots of logic for things we no longer care about
1084 */ 1060 {
1061 // leaving a spot always closes any open container on the ground
1062 if (container && !container->env)
1063 // this causes spurious floorbox updates, but it ensures
1064 // that the CLOSE event is being sent.
1065 close_container ();
1066
1067 --map->players;
1068 map->touch ();
1069 }
1070
1071 map->dirty = true;
1072 mapspace &ms = this->ms ();
1085 1073
1086 /* link the object above us */ 1074 /* link the object above us */
1087 if (above) 1075 if (above)
1088 above->below = below; 1076 above->below = below;
1089 else 1077 else
1090 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ 1078 ms.top = below; /* we were top, set new top */
1091 1079
1092 /* Relink the object below us, if there is one */ 1080 /* Relink the object below us, if there is one */
1093 if (below) 1081 if (below)
1094 below->above = above; 1082 below->above = above;
1095 else 1083 else
1097 /* Nothing below, which means we need to relink map object for this space 1085 /* Nothing below, which means we need to relink map object for this space
1098 * use translated coordinates in case some oddness with map tiling is 1086 * use translated coordinates in case some oddness with map tiling is
1099 * evident 1087 * evident
1100 */ 1088 */
1101 if (GET_MAP_OB (map, x, y) != this) 1089 if (GET_MAP_OB (map, x, y) != this)
1102 {
1103 char *dump = dump_object (this);
1104 LOG (llevError,
1105 "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); 1090 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 ());
1106 free (dump);
1107 dump = dump_object (GET_MAP_OB (map, x, y));
1108 LOG (llevError, "%s\n", dump);
1109 free (dump);
1110 }
1111 1091
1112 SET_MAP_OB (map, x, y, above); /* goes on above it. */ 1092 ms.bot = above; /* goes on above it. */
1113 } 1093 }
1114 1094
1115 above = 0; 1095 above = 0;
1116 below = 0; 1096 below = 0;
1117 1097
1118 if (map->in_memory == MAP_SAVING) 1098 if (map->in_memory == MAP_SAVING)
1119 return; 1099 return;
1120 1100
1121 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1101 int check_walk_off = !flag [FLAG_NO_APPLY];
1122 1102
1103 if (object *pl = ms.player ())
1104 {
1105 if (pl->container == this)
1106 /* If a container that the player is currently using somehow gets
1107 * removed (most likely destroyed), update the player view
1108 * appropriately.
1109 */
1110 pl->close_container ();
1111
1112 pl->contr->ns->floorbox_update ();
1113 }
1114
1123 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1115 for (tmp = ms.bot; tmp; tmp = tmp->above)
1124 { 1116 {
1125 /* No point updating the players look faces if he is the object 1117 /* No point updating the players look faces if he is the object
1126 * being removed. 1118 * being removed.
1127 */ 1119 */
1128 1120
1129 if (tmp->type == PLAYER && tmp != this)
1130 {
1131 /* If a container that the player is currently using somehow gets
1132 * removed (most likely destroyed), update the player view
1133 * appropriately.
1134 */
1135 if (tmp->container == this)
1136 {
1137 CLEAR_FLAG (this, FLAG_APPLIED);
1138 tmp->container = 0;
1139 }
1140
1141 tmp->contr->socket->floorbox_update ();
1142 }
1143
1144 /* See if player moving off should effect something */ 1121 /* See if object moving off should effect something */
1145 if (check_walk_off 1122 if (check_walk_off
1146 && ((move_type & tmp->move_off) 1123 && ((move_type & tmp->move_off)
1147 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1124 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1148 { 1125 {
1149 move_apply (tmp, this, 0, false); 1126 move_apply (tmp, this, 0);
1150 1127
1151 if (destroyed ()) 1128 if (destroyed ())
1152 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1129 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1153 } 1130 }
1154 1131
1155 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1156
1157 if (tmp->above == tmp)
1158 tmp->above = 0;
1159
1160 last = tmp; 1132 last = tmp;
1161 } 1133 }
1162 1134
1163 /* last == NULL of there are no objects on this space */ 1135 /* last == NULL if there are no objects on this space */
1136 //TODO: this makes little sense, why only update the topmost object?
1164 if (!last) 1137 if (!last)
1165 { 1138 map->at (x, y).flags_ = 0;
1166 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1167 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1168 * those out anyways, and if there are any flags set right now, they won't
1169 * be correct anyways.
1170 */
1171 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1172 update_position (map, x, y);
1173 }
1174 else 1139 else
1175 update_object (last, UP_OBJ_REMOVE); 1140 update_object (last, UP_OBJ_REMOVE);
1176 1141
1177 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1142 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1178 update_all_los (map, x, y); 1143 update_all_los (map, x, y);
1179 } 1144 }
1180} 1145}
1181 1146
1182/* 1147/*
1191merge_ob (object *op, object *top) 1156merge_ob (object *op, object *top)
1192{ 1157{
1193 if (!op->nrof) 1158 if (!op->nrof)
1194 return 0; 1159 return 0;
1195 1160
1196 if (top == NULL) 1161 if (!top)
1197 for (top = op; top != NULL && top->above != NULL; top = top->above); 1162 for (top = op; top && top->above; top = top->above)
1163 ;
1198 1164
1199 for (; top != NULL; top = top->below) 1165 for (; top; top = top->below)
1200 { 1166 {
1201 if (top == op) 1167 if (top == op)
1202 continue; 1168 continue;
1203 1169
1204 if (object::can_merge (op, top)) 1170 if (object::can_merge (op, top))
1213 } 1179 }
1214 1180
1215 return 0; 1181 return 0;
1216} 1182}
1217 1183
1184void
1185object::expand_tail ()
1186{
1187 if (more)
1188 return;
1189
1190 object *prev = this;
1191
1192 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1193 {
1194 object *op = arch_to_object (at);
1195
1196 op->name = name;
1197 op->name_pl = name_pl;
1198 op->title = title;
1199
1200 op->head = this;
1201 prev->more = op;
1202
1203 prev = op;
1204 }
1205}
1206
1218/* 1207/*
1219 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1208 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1220 * job preparing multi-part monsters 1209 * job preparing multi-part monsters.
1221 */ 1210 */
1222object * 1211object *
1223insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1212insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1224{ 1213{
1225 object *tmp;
1226
1227 if (op->head)
1228 op = op->head;
1229
1230 for (tmp = op; tmp; tmp = tmp->more) 1214 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1231 { 1215 {
1232 tmp->x = x + tmp->arch->clone.x; 1216 tmp->x = x + tmp->arch->x;
1233 tmp->y = y + tmp->arch->clone.y; 1217 tmp->y = y + tmp->arch->y;
1234 } 1218 }
1235 1219
1236 return insert_ob_in_map (op, m, originator, flag); 1220 return insert_ob_in_map (op, m, originator, flag);
1237} 1221}
1238 1222
1254 * Return value: 1238 * Return value:
1255 * new object if 'op' was merged with other object 1239 * new object if 'op' was merged with other object
1256 * NULL if 'op' was destroyed 1240 * NULL if 'op' was destroyed
1257 * just 'op' otherwise 1241 * just 'op' otherwise
1258 */ 1242 */
1259
1260object * 1243object *
1261insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1244insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1262{ 1245{
1246 assert (!op->flag [FLAG_FREED]);
1247
1263 object *tmp, *top, *floor = NULL; 1248 object *top, *floor = NULL;
1264 sint16 x, y;
1265 1249
1266 if (QUERY_FLAG (op, FLAG_FREED)) 1250 op->remove ();
1267 {
1268 LOG (llevError, "Trying to insert freed object!\n");
1269 return NULL;
1270 }
1271
1272 if (m == NULL)
1273 {
1274 char *dump = dump_object (op);
1275 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1276 free (dump);
1277 return op;
1278 }
1279
1280 if (out_of_map (m, op->x, op->y))
1281 {
1282 char *dump = dump_object (op);
1283 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1284#ifdef MANY_CORES
1285 /* Better to catch this here, as otherwise the next use of this object
1286 * is likely to cause a crash. Better to find out where it is getting
1287 * improperly inserted.
1288 */
1289 abort ();
1290#endif
1291 free (dump);
1292 return op;
1293 }
1294
1295 if (!QUERY_FLAG (op, FLAG_REMOVED))
1296 {
1297 char *dump = dump_object (op);
1298 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1299 free (dump);
1300 return op;
1301 }
1302
1303 if (op->more != NULL)
1304 {
1305 /* The part may be on a different map. */
1306
1307 object *more = op->more;
1308
1309 /* We really need the caller to normalize coordinates - if
1310 * we set the map, that doesn't work if the location is within
1311 * a map and this is straddling an edge. So only if coordinate
1312 * is clear wrong do we normalize it.
1313 */
1314 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1315 more->map = get_map_from_coord (m, &more->x, &more->y);
1316 else if (!more->map)
1317 {
1318 /* For backwards compatibility - when not dealing with tiled maps,
1319 * more->map should always point to the parent.
1320 */
1321 more->map = m;
1322 }
1323
1324 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1325 {
1326 if (!op->head)
1327 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1328
1329 return NULL;
1330 }
1331 }
1332
1333 CLEAR_FLAG (op, FLAG_REMOVED);
1334 1251
1335 /* Ideally, the caller figures this out. However, it complicates a lot 1252 /* Ideally, the caller figures this out. However, it complicates a lot
1336 * of areas of callers (eg, anything that uses find_free_spot would now 1253 * of areas of callers (eg, anything that uses find_free_spot would now
1337 * need extra work 1254 * need extra work
1338 */ 1255 */
1339 op->map = get_map_from_coord (m, &op->x, &op->y); 1256 if (!xy_normalise (m, op->x, op->y))
1340 x = op->x; 1257 {
1341 y = op->y; 1258 op->destroy ();
1259 return 0;
1260 }
1261
1262 if (object *more = op->more)
1263 if (!insert_ob_in_map (more, m, originator, flag))
1264 return 0;
1265
1266 CLEAR_FLAG (op, FLAG_REMOVED);
1267
1268 op->map = m;
1269 mapspace &ms = op->ms ();
1342 1270
1343 /* this has to be done after we translate the coordinates. 1271 /* this has to be done after we translate the coordinates.
1344 */ 1272 */
1345 if (op->nrof && !(flag & INS_NO_MERGE)) 1273 if (op->nrof && !(flag & INS_NO_MERGE))
1346 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1274 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1347 if (object::can_merge (op, tmp)) 1275 if (object::can_merge (op, tmp))
1348 { 1276 {
1349 op->nrof += tmp->nrof; 1277 op->nrof += tmp->nrof;
1350 tmp->destroy (); 1278 tmp->destroy ();
1351 } 1279 }
1368 op->below = originator->below; 1296 op->below = originator->below;
1369 1297
1370 if (op->below) 1298 if (op->below)
1371 op->below->above = op; 1299 op->below->above = op;
1372 else 1300 else
1373 SET_MAP_OB (op->map, op->x, op->y, op); 1301 ms.bot = op;
1374 1302
1375 /* since *below* originator, no need to update top */ 1303 /* since *below* originator, no need to update top */
1376 originator->below = op; 1304 originator->below = op;
1377 } 1305 }
1378 else 1306 else
1379 { 1307 {
1308 top = ms.bot;
1309
1380 /* If there are other objects, then */ 1310 /* If there are other objects, then */
1381 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1311 if (top)
1382 { 1312 {
1383 object *last = NULL; 1313 object *last = 0;
1384 1314
1385 /* 1315 /*
1386 * If there are multiple objects on this space, we do some trickier handling. 1316 * If there are multiple objects on this space, we do some trickier handling.
1387 * We've already dealt with merging if appropriate. 1317 * We've already dealt with merging if appropriate.
1388 * Generally, we want to put the new object on top. But if 1318 * Generally, we want to put the new object on top. But if
1392 * once we get to them. This reduces the need to traverse over all of 1322 * once we get to them. This reduces the need to traverse over all of
1393 * them when adding another one - this saves quite a bit of cpu time 1323 * them when adding another one - this saves quite a bit of cpu time
1394 * when lots of spells are cast in one area. Currently, it is presumed 1324 * when lots of spells are cast in one area. Currently, it is presumed
1395 * that flying non pickable objects are spell objects. 1325 * that flying non pickable objects are spell objects.
1396 */ 1326 */
1397 1327 for (top = ms.bot; top; top = top->above)
1398 while (top != NULL)
1399 { 1328 {
1400 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1329 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1401 floor = top; 1330 floor = top;
1402 1331
1403 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1332 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1406 top = top->below; 1335 top = top->below;
1407 break; 1336 break;
1408 } 1337 }
1409 1338
1410 last = top; 1339 last = top;
1411 top = top->above;
1412 } 1340 }
1413 1341
1414 /* Don't want top to be NULL, so set it to the last valid object */ 1342 /* Don't want top to be NULL, so set it to the last valid object */
1415 top = last; 1343 top = last;
1416 1344
1418 * looks like instead of lots of conditions here. 1346 * looks like instead of lots of conditions here.
1419 * makes things faster, and effectively the same result. 1347 * makes things faster, and effectively the same result.
1420 */ 1348 */
1421 1349
1422 /* Have object 'fall below' other objects that block view. 1350 /* Have object 'fall below' other objects that block view.
1423 * Unless those objects are exits, type 66 1351 * Unless those objects are exits.
1424 * If INS_ON_TOP is used, don't do this processing 1352 * If INS_ON_TOP is used, don't do this processing
1425 * Need to find the object that in fact blocks view, otherwise 1353 * Need to find the object that in fact blocks view, otherwise
1426 * stacking is a bit odd. 1354 * stacking is a bit odd.
1427 */ 1355 */
1428 if (!(flag & INS_ON_TOP) && 1356 if (!(flag & INS_ON_TOP)
1429 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1357 && ms.flags () & P_BLOCKSVIEW
1358 && (op->face && !faces [op->face].visibility))
1430 { 1359 {
1431 for (last = top; last != floor; last = last->below) 1360 for (last = top; last != floor; last = last->below)
1432 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1361 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1433 break; 1362 break;
1363
1434 /* Check to see if we found the object that blocks view, 1364 /* Check to see if we found the object that blocks view,
1435 * and make sure we have a below pointer for it so that 1365 * and make sure we have a below pointer for it so that
1436 * we can get inserted below this one, which requires we 1366 * we can get inserted below this one, which requires we
1437 * set top to the object below us. 1367 * set top to the object below us.
1438 */ 1368 */
1439 if (last && last->below && last != floor) 1369 if (last && last->below && last != floor)
1440 top = last->below; 1370 top = last->below;
1441 } 1371 }
1442 } /* If objects on this space */ 1372 } /* If objects on this space */
1443 1373
1444 if (flag & INS_MAP_LOAD)
1445 top = GET_MAP_TOP (op->map, op->x, op->y);
1446
1447 if (flag & INS_ABOVE_FLOOR_ONLY) 1374 if (flag & INS_ABOVE_FLOOR_ONLY)
1448 top = floor; 1375 top = floor;
1449 1376
1450 /* Top is the object that our object (op) is going to get inserted above. 1377 /* Top is the object that our object (op) is going to get inserted above.
1451 */ 1378 */
1452 1379
1453 /* First object on this space */ 1380 /* First object on this space */
1454 if (!top) 1381 if (!top)
1455 { 1382 {
1456 op->above = GET_MAP_OB (op->map, op->x, op->y); 1383 op->above = ms.bot;
1457 1384
1458 if (op->above) 1385 if (op->above)
1459 op->above->below = op; 1386 op->above->below = op;
1460 1387
1461 op->below = NULL; 1388 op->below = 0;
1462 SET_MAP_OB (op->map, op->x, op->y, op); 1389 ms.bot = op;
1463 } 1390 }
1464 else 1391 else
1465 { /* get inserted into the stack above top */ 1392 { /* get inserted into the stack above top */
1466 op->above = top->above; 1393 op->above = top->above;
1467 1394
1470 1397
1471 op->below = top; 1398 op->below = top;
1472 top->above = op; 1399 top->above = op;
1473 } 1400 }
1474 1401
1475 if (op->above == NULL) 1402 if (!op->above)
1476 SET_MAP_TOP (op->map, op->x, op->y, op); 1403 ms.top = op;
1477 } /* else not INS_BELOW_ORIGINATOR */ 1404 } /* else not INS_BELOW_ORIGINATOR */
1478 1405
1479 if (op->type == PLAYER) 1406 if (op->type == PLAYER)
1407 {
1480 op->contr->do_los = 1; 1408 op->contr->do_los = 1;
1409 ++op->map->players;
1410 op->map->touch ();
1411 }
1481 1412
1482 /* If we have a floor, we know the player, if any, will be above 1413 op->map->dirty = true;
1483 * it, so save a few ticks and start from there. 1414
1484 */ 1415 if (object *pl = ms.player ())
1485 if (!(flag & INS_MAP_LOAD))
1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1487 if (tmp->type == PLAYER)
1488 tmp->contr->socket->floorbox_update (); 1416 pl->contr->ns->floorbox_update ();
1489 1417
1490 /* If this object glows, it may affect lighting conditions that are 1418 /* If this object glows, it may affect lighting conditions that are
1491 * visible to others on this map. But update_all_los is really 1419 * visible to others on this map. But update_all_los is really
1492 * an inefficient way to do this, as it means los for all players 1420 * an inefficient way to do this, as it means los for all players
1493 * on the map will get recalculated. The players could very well 1421 * on the map will get recalculated. The players could very well
1494 * be far away from this change and not affected in any way - 1422 * be far away from this change and not affected in any way -
1495 * this should get redone to only look for players within range, 1423 * this should get redone to only look for players within range,
1496 * or just updating the P_NEED_UPDATE for spaces within this area 1424 * or just updating the P_UPTODATE for spaces within this area
1497 * of effect may be sufficient. 1425 * of effect may be sufficient.
1498 */ 1426 */
1499 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1427 if (op->map->darkness && (op->glow_radius != 0))
1500 update_all_los (op->map, op->x, op->y); 1428 update_all_los (op->map, op->x, op->y);
1501 1429
1502 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1430 /* updates flags (blocked, alive, no magic, etc) for this map space */
1503 update_object (op, UP_OBJ_INSERT); 1431 update_object (op, UP_OBJ_INSERT);
1432
1433 INVOKE_OBJECT (INSERT, op);
1504 1434
1505 /* Don't know if moving this to the end will break anything. However, 1435 /* Don't know if moving this to the end will break anything. However,
1506 * we want to have floorbox_update called before calling this. 1436 * we want to have floorbox_update called before calling this.
1507 * 1437 *
1508 * check_move_on() must be after this because code called from 1438 * check_move_on() must be after this because code called from
1510 * blocked() and wall() work properly), and these flags are updated by 1440 * blocked() and wall() work properly), and these flags are updated by
1511 * update_object(). 1441 * update_object().
1512 */ 1442 */
1513 1443
1514 /* if this is not the head or flag has been passed, don't check walk on status */ 1444 /* if this is not the head or flag has been passed, don't check walk on status */
1515 if (!(flag & INS_NO_WALK_ON) && !op->head) 1445 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1516 { 1446 {
1517 if (check_move_on (op, originator)) 1447 if (check_move_on (op, originator))
1518 return NULL; 1448 return 0;
1519 1449
1520 /* If we are a multi part object, lets work our way through the check 1450 /* If we are a multi part object, lets work our way through the check
1521 * walk on's. 1451 * walk on's.
1522 */ 1452 */
1523 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1453 for (object *tmp = op->more; tmp; tmp = tmp->more)
1524 if (check_move_on (tmp, originator)) 1454 if (check_move_on (tmp, originator))
1525 return NULL; 1455 return 0;
1526 } 1456 }
1527 1457
1528 return op; 1458 return op;
1529} 1459}
1530 1460
1531/* this function inserts an object in the map, but if it 1461/* this function inserts an object in the map, but if it
1532 * finds an object of its own type, it'll remove that one first. 1462 * finds an object of its own type, it'll remove that one first.
1533 * op is the object to insert it under: supplies x and the map. 1463 * op is the object to insert it under: supplies x and the map.
1534 */ 1464 */
1535void 1465void
1536replace_insert_ob_in_map (const char *arch_string, object *op) 1466replace_insert_ob_in_map (const char *arch_string, object *op)
1537{ 1467{
1538 object * 1468 object *tmp, *tmp1;
1539 tmp;
1540 object *
1541 tmp1;
1542 1469
1543 /* first search for itself and remove any old instances */ 1470 /* first search for itself and remove any old instances */
1544 1471
1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1472 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1473 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1547 tmp->destroy (); 1474 tmp->destroy ();
1548 1475
1549 tmp1 = arch_to_object (archetype::find (arch_string)); 1476 tmp1 = arch_to_object (archetype::find (arch_string));
1550 1477
1551 tmp1->x = op->x; 1478 tmp1->x = op->x;
1552 tmp1->y = op->y; 1479 tmp1->y = op->y;
1553 insert_ob_in_map (tmp1, op->map, op, 0); 1480 insert_ob_in_map (tmp1, op->map, op, 0);
1481}
1482
1483object *
1484object::insert_at (object *where, object *originator, int flags)
1485{
1486 return where->map->insert (this, where->x, where->y, originator, flags);
1554} 1487}
1555 1488
1556/* 1489/*
1557 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1490 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1558 * is returned contains nr objects, and the remaining parts contains 1491 * is returned contains nr objects, and the remaining parts contains
1559 * the rest (or is removed and freed if that number is 0). 1492 * the rest (or is removed and freed if that number is 0).
1560 * On failure, NULL is returned, and the reason put into the 1493 * On failure, NULL is returned, and the reason put into the
1561 * global static errmsg array. 1494 * global static errmsg array.
1562 */ 1495 */
1563
1564object * 1496object *
1565get_split_ob (object *orig_ob, uint32 nr) 1497get_split_ob (object *orig_ob, uint32 nr)
1566{ 1498{
1567 object *newob; 1499 object *newob;
1568 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1500 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1599 * the amount of an object. If the amount reaches 0, the object 1531 * the amount of an object. If the amount reaches 0, the object
1600 * is subsequently removed and freed. 1532 * is subsequently removed and freed.
1601 * 1533 *
1602 * Return value: 'op' if something is left, NULL if the amount reached 0 1534 * Return value: 'op' if something is left, NULL if the amount reached 0
1603 */ 1535 */
1604
1605object * 1536object *
1606decrease_ob_nr (object *op, uint32 i) 1537decrease_ob_nr (object *op, uint32 i)
1607{ 1538{
1608 object *tmp; 1539 object *tmp;
1609 player *pl;
1610 1540
1611 if (i == 0) /* objects with op->nrof require this check */ 1541 if (i == 0) /* objects with op->nrof require this check */
1612 return op; 1542 return op;
1613 1543
1614 if (i > op->nrof) 1544 if (i > op->nrof)
1615 i = op->nrof; 1545 i = op->nrof;
1616 1546
1617 if (QUERY_FLAG (op, FLAG_REMOVED)) 1547 if (QUERY_FLAG (op, FLAG_REMOVED))
1618 op->nrof -= i; 1548 op->nrof -= i;
1619 else if (op->env != NULL) 1549 else if (op->env)
1620 { 1550 {
1621 /* is this object in the players inventory, or sub container 1551 /* is this object in the players inventory, or sub container
1622 * therein? 1552 * therein?
1623 */ 1553 */
1624 tmp = is_player_inv (op->env); 1554 tmp = op->in_player ();
1625 /* nope. Is this a container the player has opened? 1555 /* nope. Is this a container the player has opened?
1626 * If so, set tmp to that player. 1556 * If so, set tmp to that player.
1627 * IMO, searching through all the players will mostly 1557 * IMO, searching through all the players will mostly
1628 * likely be quicker than following op->env to the map, 1558 * likely be quicker than following op->env to the map,
1629 * and then searching the map for a player. 1559 * and then searching the map for a player.
1630 */ 1560 */
1631 if (!tmp) 1561 if (!tmp)
1632 { 1562 for_all_players (pl)
1633 for (pl = first_player; pl; pl = pl->next)
1634 if (pl->ob->container == op->env) 1563 if (pl->ob->container == op->env)
1564 {
1565 tmp = pl->ob;
1635 break; 1566 break;
1636 if (pl)
1637 tmp = pl->ob;
1638 else
1639 tmp = NULL;
1640 } 1567 }
1641 1568
1642 if (i < op->nrof) 1569 if (i < op->nrof)
1643 { 1570 {
1644 sub_weight (op->env, op->weight * i); 1571 sub_weight (op->env, op->weight * i);
1645 op->nrof -= i; 1572 op->nrof -= i;
1646 if (tmp) 1573 if (tmp)
1647 {
1648 esrv_send_item (tmp, op); 1574 esrv_send_item (tmp, op);
1649 }
1650 } 1575 }
1651 else 1576 else
1652 { 1577 {
1653 op->remove (); 1578 op->remove ();
1654 op->nrof = 0; 1579 op->nrof = 0;
1655 if (tmp) 1580 if (tmp)
1656 {
1657 esrv_del_item (tmp->contr, op->count); 1581 esrv_del_item (tmp->contr, op->count);
1658 }
1659 } 1582 }
1660 } 1583 }
1661 else 1584 else
1662 { 1585 {
1663 object *above = op->above; 1586 object *above = op->above;
1669 op->remove (); 1592 op->remove ();
1670 op->nrof = 0; 1593 op->nrof = 0;
1671 } 1594 }
1672 1595
1673 /* Since we just removed op, op->above is null */ 1596 /* Since we just removed op, op->above is null */
1674 for (tmp = above; tmp != NULL; tmp = tmp->above) 1597 for (tmp = above; tmp; tmp = tmp->above)
1675 if (tmp->type == PLAYER) 1598 if (tmp->type == PLAYER)
1676 { 1599 {
1677 if (op->nrof) 1600 if (op->nrof)
1678 esrv_send_item (tmp, op); 1601 esrv_send_item (tmp, op);
1679 else 1602 else
1684 if (op->nrof) 1607 if (op->nrof)
1685 return op; 1608 return op;
1686 else 1609 else
1687 { 1610 {
1688 op->destroy (); 1611 op->destroy ();
1689 return NULL; 1612 return 0;
1690 } 1613 }
1691} 1614}
1692 1615
1693/* 1616/*
1694 * add_weight(object, weight) adds the specified weight to an object, 1617 * add_weight(object, weight) adds the specified weight to an object,
1695 * and also updates how much the environment(s) is/are carrying. 1618 * and also updates how much the environment(s) is/are carrying.
1696 */ 1619 */
1697
1698void 1620void
1699add_weight (object *op, signed long weight) 1621add_weight (object *op, signed long weight)
1700{ 1622{
1701 while (op != NULL) 1623 while (op != NULL)
1702 { 1624 {
1717 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1639 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1718 free (dump); 1640 free (dump);
1719 return op; 1641 return op;
1720 } 1642 }
1721 1643
1722 if (where->head) 1644 if (where->head_ () != where)
1723 { 1645 {
1724 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1646 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1725 where = where->head; 1647 where = where->head;
1726 } 1648 }
1727 1649
1728 return where->insert (op); 1650 return where->insert (op);
1729} 1651}
1734 * inside the object environment. 1656 * inside the object environment.
1735 * 1657 *
1736 * The function returns now pointer to inserted item, and return value can 1658 * The function returns now pointer to inserted item, and return value can
1737 * be != op, if items are merged. -Tero 1659 * be != op, if items are merged. -Tero
1738 */ 1660 */
1739
1740object * 1661object *
1741object::insert (object *op) 1662object::insert (object *op)
1742{ 1663{
1743 object *tmp, *otmp;
1744
1745 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1664 if (!QUERY_FLAG (op, FLAG_REMOVED))
1746 op->remove (); 1665 op->remove ();
1747 1666
1748 if (op->more) 1667 if (op->more)
1749 { 1668 {
1751 return op; 1670 return op;
1752 } 1671 }
1753 1672
1754 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1673 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1755 CLEAR_FLAG (op, FLAG_REMOVED); 1674 CLEAR_FLAG (op, FLAG_REMOVED);
1675
1756 if (op->nrof) 1676 if (op->nrof)
1757 { 1677 {
1758 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1678 for (object *tmp = inv; tmp; tmp = tmp->below)
1759 if (object::can_merge (tmp, op)) 1679 if (object::can_merge (tmp, op))
1760 { 1680 {
1761 /* return the original object and remove inserted object 1681 /* return the original object and remove inserted object
1762 (client needs the original object) */ 1682 (client needs the original object) */
1763 tmp->nrof += op->nrof; 1683 tmp->nrof += op->nrof;
1782 add_weight (this, op->weight * op->nrof); 1702 add_weight (this, op->weight * op->nrof);
1783 } 1703 }
1784 else 1704 else
1785 add_weight (this, (op->weight + op->carrying)); 1705 add_weight (this, (op->weight + op->carrying));
1786 1706
1787 otmp = is_player_inv (this); 1707 if (object *otmp = this->in_player ())
1788 if (otmp && otmp->contr)
1789 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1708 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1790 fix_player (otmp); 1709 otmp->update_stats ();
1791 1710
1711 op->owner = 0; // its his/hers now. period.
1792 op->map = NULL; 1712 op->map = 0;
1793 op->env = this; 1713 op->env = this;
1794 op->above = NULL; 1714 op->above = 0;
1795 op->below = NULL; 1715 op->below = 0;
1796 op->x = 0, op->y = 0; 1716 op->x = op->y = 0;
1797 1717
1798 /* reset the light list and los of the players on the map */ 1718 /* reset the light list and los of the players on the map */
1799 if ((op->glow_radius != 0) && map) 1719 if (op->glow_radius && map)
1800 { 1720 {
1801#ifdef DEBUG_LIGHTS 1721#ifdef DEBUG_LIGHTS
1802 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1722 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1803#endif /* DEBUG_LIGHTS */ 1723#endif /* DEBUG_LIGHTS */
1804 if (MAP_DARKNESS (map)) 1724 if (map->darkness)
1805 update_all_los (map, x, y); 1725 update_all_los (map, x, y);
1806 } 1726 }
1807 1727
1808 /* Client has no idea of ordering so lets not bother ordering it here. 1728 /* Client has no idea of ordering so lets not bother ordering it here.
1809 * It sure simplifies this function... 1729 * It sure simplifies this function...
1814 { 1734 {
1815 op->below = inv; 1735 op->below = inv;
1816 op->below->above = op; 1736 op->below->above = op;
1817 inv = op; 1737 inv = op;
1818 } 1738 }
1739
1740 INVOKE_OBJECT (INSERT, this);
1819 1741
1820 return op; 1742 return op;
1821} 1743}
1822 1744
1823/* 1745/*
1838 * 1760 *
1839 * MSW 2001-07-08: Check all objects on space, not just those below 1761 * MSW 2001-07-08: Check all objects on space, not just those below
1840 * object being inserted. insert_ob_in_map may not put new objects 1762 * object being inserted. insert_ob_in_map may not put new objects
1841 * on top. 1763 * on top.
1842 */ 1764 */
1843
1844int 1765int
1845check_move_on (object *op, object *originator) 1766check_move_on (object *op, object *originator)
1846{ 1767{
1847 object *tmp; 1768 object *tmp;
1848 maptile *m = op->map; 1769 maptile *m = op->map;
1875 1796
1876 /* The objects have to be checked from top to bottom. 1797 /* The objects have to be checked from top to bottom.
1877 * Hence, we first go to the top: 1798 * Hence, we first go to the top:
1878 */ 1799 */
1879 1800
1880 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1801 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1881 { 1802 {
1882 /* Trim the search when we find the first other spell effect 1803 /* Trim the search when we find the first other spell effect
1883 * this helps performance so that if a space has 50 spell objects, 1804 * this helps performance so that if a space has 50 spell objects,
1884 * we don't need to check all of them. 1805 * we don't need to check all of them.
1885 */ 1806 */
1903 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1824 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1904 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1825 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1905 { 1826 {
1906 1827
1907 float 1828 float
1908 diff = tmp->move_slow_penalty * FABS (op->speed); 1829 diff = tmp->move_slow_penalty * fabs (op->speed);
1909 1830
1910 if (op->type == PLAYER) 1831 if (op->type == PLAYER)
1911 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1832 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1912 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1833 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1913 diff /= 4.0; 1834 diff /= 4.0;
1918 1839
1919 /* Basically same logic as above, except now for actual apply. */ 1840 /* Basically same logic as above, except now for actual apply. */
1920 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1841 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1921 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1842 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1922 { 1843 {
1923 move_apply (tmp, op, originator, true); 1844 move_apply (tmp, op, originator);
1924 1845
1925 if (op->destroyed ()) 1846 if (op->destroyed ())
1926 return 1; 1847 return 1;
1927 1848
1928 /* what the person/creature stepped onto has moved the object 1849 /* what the person/creature stepped onto has moved the object
1940/* 1861/*
1941 * present_arch(arch, map, x, y) searches for any objects with 1862 * present_arch(arch, map, x, y) searches for any objects with
1942 * a matching archetype at the given map and coordinates. 1863 * a matching archetype at the given map and coordinates.
1943 * The first matching object is returned, or NULL if none. 1864 * The first matching object is returned, or NULL if none.
1944 */ 1865 */
1945
1946object * 1866object *
1947present_arch (const archetype *at, maptile *m, int x, int y) 1867present_arch (const archetype *at, maptile *m, int x, int y)
1948{ 1868{
1949 object *
1950 tmp;
1951
1952 if (m == NULL || out_of_map (m, x, y)) 1869 if (!m || out_of_map (m, x, y))
1953 { 1870 {
1954 LOG (llevError, "Present_arch called outside map.\n"); 1871 LOG (llevError, "Present_arch called outside map.\n");
1955 return NULL; 1872 return NULL;
1956 } 1873 }
1957 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1874
1875 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1958 if (tmp->arch == at) 1876 if (tmp->arch == at)
1959 return tmp; 1877 return tmp;
1878
1960 return NULL; 1879 return NULL;
1961} 1880}
1962 1881
1963/* 1882/*
1964 * present(type, map, x, y) searches for any objects with 1883 * present(type, map, x, y) searches for any objects with
1965 * a matching type variable at the given map and coordinates. 1884 * a matching type variable at the given map and coordinates.
1966 * The first matching object is returned, or NULL if none. 1885 * The first matching object is returned, or NULL if none.
1967 */ 1886 */
1968
1969object * 1887object *
1970present (unsigned char type, maptile *m, int x, int y) 1888present (unsigned char type, maptile *m, int x, int y)
1971{ 1889{
1972 object *
1973 tmp;
1974
1975 if (out_of_map (m, x, y)) 1890 if (out_of_map (m, x, y))
1976 { 1891 {
1977 LOG (llevError, "Present called outside map.\n"); 1892 LOG (llevError, "Present called outside map.\n");
1978 return NULL; 1893 return NULL;
1979 } 1894 }
1980 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1895
1896 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1981 if (tmp->type == type) 1897 if (tmp->type == type)
1982 return tmp; 1898 return tmp;
1899
1983 return NULL; 1900 return NULL;
1984} 1901}
1985 1902
1986/* 1903/*
1987 * present_in_ob(type, object) searches for any objects with 1904 * present_in_ob(type, object) searches for any objects with
1988 * a matching type variable in the inventory of the given object. 1905 * a matching type variable in the inventory of the given object.
1989 * The first matching object is returned, or NULL if none. 1906 * The first matching object is returned, or NULL if none.
1990 */ 1907 */
1991
1992object * 1908object *
1993present_in_ob (unsigned char type, const object *op) 1909present_in_ob (unsigned char type, const object *op)
1994{ 1910{
1995 object *
1996 tmp;
1997
1998 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1911 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1999 if (tmp->type == type) 1912 if (tmp->type == type)
2000 return tmp; 1913 return tmp;
1914
2001 return NULL; 1915 return NULL;
2002} 1916}
2003 1917
2004/* 1918/*
2005 * present_in_ob (type, str, object) searches for any objects with 1919 * present_in_ob (type, str, object) searches for any objects with
2013 * str is the string to match against. Note that we match against 1927 * str is the string to match against. Note that we match against
2014 * the object name, not the archetype name. this is so that the 1928 * the object name, not the archetype name. this is so that the
2015 * spell code can use one object type (force), but change it's name 1929 * spell code can use one object type (force), but change it's name
2016 * to be unique. 1930 * to be unique.
2017 */ 1931 */
2018
2019object * 1932object *
2020present_in_ob_by_name (int type, const char *str, const object *op) 1933present_in_ob_by_name (int type, const char *str, const object *op)
2021{ 1934{
2022 object *
2023 tmp;
2024
2025 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1935 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2026 {
2027 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1936 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2028 return tmp; 1937 return tmp;
2029 } 1938
2030 return NULL; 1939 return 0;
2031} 1940}
2032 1941
2033/* 1942/*
2034 * present_arch_in_ob(archetype, object) searches for any objects with 1943 * present_arch_in_ob(archetype, object) searches for any objects with
2035 * a matching archetype in the inventory of the given object. 1944 * a matching archetype in the inventory of the given object.
2036 * The first matching object is returned, or NULL if none. 1945 * The first matching object is returned, or NULL if none.
2037 */ 1946 */
2038
2039object * 1947object *
2040present_arch_in_ob (const archetype *at, const object *op) 1948present_arch_in_ob (const archetype *at, const object *op)
2041{ 1949{
2042 object *
2043 tmp;
2044
2045 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1950 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2046 if (tmp->arch == at) 1951 if (tmp->arch == at)
2047 return tmp; 1952 return tmp;
1953
2048 return NULL; 1954 return NULL;
2049} 1955}
2050 1956
2051/* 1957/*
2052 * activate recursively a flag on an object inventory 1958 * activate recursively a flag on an object inventory
2053 */ 1959 */
2054void 1960void
2055flag_inv (object *op, int flag) 1961flag_inv (object *op, int flag)
2056{ 1962{
2057 object *
2058 tmp;
2059
2060 if (op->inv)
2061 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1963 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2062 { 1964 {
2063 SET_FLAG (tmp, flag); 1965 SET_FLAG (tmp, flag);
2064 flag_inv (tmp, flag); 1966 flag_inv (tmp, flag);
2065 } 1967 }
2066} /* 1968}
1969
1970/*
2067 * desactivate recursively a flag on an object inventory 1971 * deactivate recursively a flag on an object inventory
2068 */ 1972 */
2069void 1973void
2070unflag_inv (object *op, int flag) 1974unflag_inv (object *op, int flag)
2071{ 1975{
2072 object *
2073 tmp;
2074
2075 if (op->inv)
2076 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1976 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2077 { 1977 {
2078 CLEAR_FLAG (tmp, flag); 1978 CLEAR_FLAG (tmp, flag);
2079 unflag_inv (tmp, flag); 1979 unflag_inv (tmp, flag);
2080 } 1980 }
2081}
2082
2083/*
2084 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2085 * all it's inventory (recursively).
2086 * If checksums are used, a player will get set_cheat called for
2087 * him/her-self and all object carried by a call to this function.
2088 */
2089
2090void
2091set_cheat (object *op)
2092{
2093 SET_FLAG (op, FLAG_WAS_WIZ);
2094 flag_inv (op, FLAG_WAS_WIZ);
2095} 1981}
2096 1982
2097/* 1983/*
2098 * find_free_spot(object, map, x, y, start, stop) will search for 1984 * find_free_spot(object, map, x, y, start, stop) will search for
2099 * a spot at the given map and coordinates which will be able to contain 1985 * a spot at the given map and coordinates which will be able to contain
2101 * to search (see the freearr_x/y[] definition). 1987 * to search (see the freearr_x/y[] definition).
2102 * It returns a random choice among the alternatives found. 1988 * It returns a random choice among the alternatives found.
2103 * start and stop are where to start relative to the free_arr array (1,9 1989 * start and stop are where to start relative to the free_arr array (1,9
2104 * does all 4 immediate directions). This returns the index into the 1990 * does all 4 immediate directions). This returns the index into the
2105 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1991 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2106 * Note - this only checks to see if there is space for the head of the
2107 * object - if it is a multispace object, this should be called for all
2108 * pieces.
2109 * Note2: This function does correctly handle tiled maps, but does not 1992 * Note: This function does correctly handle tiled maps, but does not
2110 * inform the caller. However, insert_ob_in_map will update as 1993 * inform the caller. However, insert_ob_in_map will update as
2111 * necessary, so the caller shouldn't need to do any special work. 1994 * necessary, so the caller shouldn't need to do any special work.
2112 * Note - updated to take an object instead of archetype - this is necessary 1995 * Note - updated to take an object instead of archetype - this is necessary
2113 * because arch_blocked (now ob_blocked) needs to know the movement type 1996 * because arch_blocked (now ob_blocked) needs to know the movement type
2114 * to know if the space in question will block the object. We can't use 1997 * to know if the space in question will block the object. We can't use
2115 * the archetype because that isn't correct if the monster has been 1998 * the archetype because that isn't correct if the monster has been
2116 * customized, changed states, etc. 1999 * customized, changed states, etc.
2117 */ 2000 */
2118
2119int 2001int
2120find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2002find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2121{ 2003{
2122 int
2123 i,
2124 index = 0, flag;
2125 static int
2126 altern[SIZEOFFREE]; 2004 int altern[SIZEOFFREE];
2005 int index = 0, flag;
2127 2006
2128 for (i = start; i < stop; i++) 2007 for (int i = start; i < stop; i++)
2129 { 2008 {
2130 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2009 mapxy pos (m, x, y); pos.move (i);
2131 if (!flag) 2010
2011 if (!pos.normalise ())
2012 continue;
2013
2014 mapspace &ms = *pos;
2015
2016 if (ms.flags () & P_IS_ALIVE)
2017 continue;
2018
2019 /* However, often
2020 * ob doesn't have any move type (when used to place exits)
2021 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2022 */
2023 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2024 {
2132 altern[index++] = i; 2025 altern [index++] = i;
2026 continue;
2027 }
2133 2028
2134 /* Basically, if we find a wall on a space, we cut down the search size. 2029 /* Basically, if we find a wall on a space, we cut down the search size.
2135 * In this way, we won't return spaces that are on another side of a wall. 2030 * In this way, we won't return spaces that are on another side of a wall.
2136 * This mostly work, but it cuts down the search size in all directions - 2031 * This mostly work, but it cuts down the search size in all directions -
2137 * if the space being examined only has a wall to the north and empty 2032 * if the space being examined only has a wall to the north and empty
2138 * spaces in all the other directions, this will reduce the search space 2033 * spaces in all the other directions, this will reduce the search space
2139 * to only the spaces immediately surrounding the target area, and 2034 * to only the spaces immediately surrounding the target area, and
2140 * won't look 2 spaces south of the target space. 2035 * won't look 2 spaces south of the target space.
2141 */ 2036 */
2142 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2037 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2038 {
2143 stop = maxfree[i]; 2039 stop = maxfree[i];
2040 continue;
2041 }
2042
2043 /* Note it is intentional that we check ob - the movement type of the
2044 * head of the object should correspond for the entire object.
2045 */
2046 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2047 continue;
2048
2049 if (ob->blocked (m, pos.x, pos.y))
2050 continue;
2051
2052 altern [index++] = i;
2144 } 2053 }
2054
2145 if (!index) 2055 if (!index)
2146 return -1; 2056 return -1;
2057
2147 return altern[RANDOM () % index]; 2058 return altern [rndm (index)];
2148} 2059}
2149 2060
2150/* 2061/*
2151 * find_first_free_spot(archetype, maptile, x, y) works like 2062 * find_first_free_spot(archetype, maptile, x, y) works like
2152 * find_free_spot(), but it will search max number of squares. 2063 * find_free_spot(), but it will search max number of squares.
2153 * But it will return the first available spot, not a random choice. 2064 * But it will return the first available spot, not a random choice.
2154 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2065 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2155 */ 2066 */
2156
2157int 2067int
2158find_first_free_spot (const object *ob, maptile *m, int x, int y) 2068find_first_free_spot (const object *ob, maptile *m, int x, int y)
2159{ 2069{
2160 int
2161 i;
2162
2163 for (i = 0; i < SIZEOFFREE; i++) 2070 for (int i = 0; i < SIZEOFFREE; i++)
2164 {
2165 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2071 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2166 return i; 2072 return i;
2167 } 2073
2168 return -1; 2074 return -1;
2169} 2075}
2170 2076
2171/* 2077/*
2172 * The function permute(arr, begin, end) randomly reorders the array 2078 * The function permute(arr, begin, end) randomly reorders the array
2173 * arr[begin..end-1]. 2079 * arr[begin..end-1].
2080 * now uses a fisher-yates shuffle, old permute was broken
2174 */ 2081 */
2175static void 2082static void
2176permute (int *arr, int begin, int end) 2083permute (int *arr, int begin, int end)
2177{ 2084{
2178 int 2085 arr += begin;
2179 i,
2180 j,
2181 tmp,
2182 len;
2183
2184 len = end - begin; 2086 end -= begin;
2185 for (i = begin; i < end; i++)
2186 {
2187 j = begin + RANDOM () % len;
2188 2087
2189 tmp = arr[i]; 2088 while (--end)
2190 arr[i] = arr[j]; 2089 swap (arr [end], arr [rndm (end + 1)]);
2191 arr[j] = tmp;
2192 }
2193} 2090}
2194 2091
2195/* new function to make monster searching more efficient, and effective! 2092/* new function to make monster searching more efficient, and effective!
2196 * This basically returns a randomized array (in the passed pointer) of 2093 * This basically returns a randomized array (in the passed pointer) of
2197 * the spaces to find monsters. In this way, it won't always look for 2094 * the spaces to find monsters. In this way, it won't always look for
2200 * the 3x3 area will be searched, just not in a predictable order. 2097 * the 3x3 area will be searched, just not in a predictable order.
2201 */ 2098 */
2202void 2099void
2203get_search_arr (int *search_arr) 2100get_search_arr (int *search_arr)
2204{ 2101{
2205 int 2102 int i;
2206 i;
2207 2103
2208 for (i = 0; i < SIZEOFFREE; i++) 2104 for (i = 0; i < SIZEOFFREE; i++)
2209 {
2210 search_arr[i] = i; 2105 search_arr[i] = i;
2211 }
2212 2106
2213 permute (search_arr, 1, SIZEOFFREE1 + 1); 2107 permute (search_arr, 1, SIZEOFFREE1 + 1);
2214 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2108 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2215 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2109 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2216} 2110}
2225 * Perhaps incorrectly, but I'm making the assumption that exclude 2119 * Perhaps incorrectly, but I'm making the assumption that exclude
2226 * is actually want is going to try and move there. We need this info 2120 * is actually want is going to try and move there. We need this info
2227 * because we have to know what movement the thing looking to move 2121 * because we have to know what movement the thing looking to move
2228 * there is capable of. 2122 * there is capable of.
2229 */ 2123 */
2230
2231int 2124int
2232find_dir (maptile *m, int x, int y, object *exclude) 2125find_dir (maptile *m, int x, int y, object *exclude)
2233{ 2126{
2234 int
2235 i,
2236 max = SIZEOFFREE, mflags; 2127 int i, max = SIZEOFFREE, mflags;
2237 2128
2238 sint16 nx, ny; 2129 sint16 nx, ny;
2239 object * 2130 object *tmp;
2240 tmp;
2241 maptile * 2131 maptile *mp;
2242 mp;
2243 2132
2244 MoveType blocked, move_type; 2133 MoveType blocked, move_type;
2245 2134
2246 if (exclude && exclude->head) 2135 if (exclude && exclude->head_ () != exclude)
2247 { 2136 {
2248 exclude = exclude->head; 2137 exclude = exclude->head;
2249 move_type = exclude->move_type; 2138 move_type = exclude->move_type;
2250 } 2139 }
2251 else 2140 else
2259 mp = m; 2148 mp = m;
2260 nx = x + freearr_x[i]; 2149 nx = x + freearr_x[i];
2261 ny = y + freearr_y[i]; 2150 ny = y + freearr_y[i];
2262 2151
2263 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2152 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2153
2264 if (mflags & P_OUT_OF_MAP) 2154 if (mflags & P_OUT_OF_MAP)
2265 {
2266 max = maxfree[i]; 2155 max = maxfree[i];
2267 }
2268 else 2156 else
2269 { 2157 {
2270 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2158 mapspace &ms = mp->at (nx, ny);
2159
2160 blocked = ms.move_block;
2271 2161
2272 if ((move_type & blocked) == move_type) 2162 if ((move_type & blocked) == move_type)
2273 {
2274 max = maxfree[i]; 2163 max = maxfree[i];
2275 }
2276 else if (mflags & P_IS_ALIVE) 2164 else if (mflags & P_IS_ALIVE)
2277 { 2165 {
2278 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2166 for (tmp = ms.bot; tmp; tmp = tmp->above)
2279 { 2167 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2280 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2168 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2281 {
2282 break; 2169 break;
2283 } 2170
2284 }
2285 if (tmp) 2171 if (tmp)
2286 {
2287 return freedir[i]; 2172 return freedir[i];
2288 }
2289 } 2173 }
2290 } 2174 }
2291 } 2175 }
2176
2292 return 0; 2177 return 0;
2293} 2178}
2294 2179
2295/* 2180/*
2296 * distance(object 1, object 2) will return the square of the 2181 * distance(object 1, object 2) will return the square of the
2297 * distance between the two given objects. 2182 * distance between the two given objects.
2298 */ 2183 */
2299
2300int 2184int
2301distance (const object *ob1, const object *ob2) 2185distance (const object *ob1, const object *ob2)
2302{ 2186{
2303 int
2304 i;
2305
2306 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2187 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2307 return i;
2308} 2188}
2309 2189
2310/* 2190/*
2311 * find_dir_2(delta-x,delta-y) will return a direction in which 2191 * find_dir_2(delta-x,delta-y) will return a direction in which
2312 * an object which has subtracted the x and y coordinates of another 2192 * an object which has subtracted the x and y coordinates of another
2313 * object, needs to travel toward it. 2193 * object, needs to travel toward it.
2314 */ 2194 */
2315
2316int 2195int
2317find_dir_2 (int x, int y) 2196find_dir_2 (int x, int y)
2318{ 2197{
2319 int 2198 int q;
2320 q;
2321 2199
2322 if (y) 2200 if (y)
2323 q = x * 100 / y; 2201 q = x * 100 / y;
2324 else if (x) 2202 else if (x)
2325 q = -300 * x; 2203 q = -300 * x;
2350 2228
2351 return 3; 2229 return 3;
2352} 2230}
2353 2231
2354/* 2232/*
2355 * absdir(int): Returns a number between 1 and 8, which represent
2356 * the "absolute" direction of a number (it actually takes care of
2357 * "overflow" in previous calculations of a direction).
2358 */
2359
2360int
2361absdir (int d)
2362{
2363 while (d < 1)
2364 d += 8;
2365 while (d > 8)
2366 d -= 8;
2367 return d;
2368}
2369
2370/*
2371 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2233 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2372 * between two directions (which are expected to be absolute (see absdir()) 2234 * between two directions (which are expected to be absolute (see absdir())
2373 */ 2235 */
2374
2375int 2236int
2376dirdiff (int dir1, int dir2) 2237dirdiff (int dir1, int dir2)
2377{ 2238{
2378 int 2239 int d;
2379 d;
2380 2240
2381 d = abs (dir1 - dir2); 2241 d = abs (dir1 - dir2);
2382 if (d > 4) 2242 if (d > 4)
2383 d = 8 - d; 2243 d = 8 - d;
2244
2384 return d; 2245 return d;
2385} 2246}
2386 2247
2387/* peterm: 2248/* peterm:
2388 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2249 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2391 * This basically means that if direction is 15, then it could either go 2252 * This basically means that if direction is 15, then it could either go
2392 * direction 4, 14, or 16 to get back to where we are. 2253 * direction 4, 14, or 16 to get back to where we are.
2393 * Moved from spell_util.c to object.c with the other related direction 2254 * Moved from spell_util.c to object.c with the other related direction
2394 * functions. 2255 * functions.
2395 */ 2256 */
2396
2397int
2398 reduction_dir[SIZEOFFREE][3] = { 2257int reduction_dir[SIZEOFFREE][3] = {
2399 {0, 0, 0}, /* 0 */ 2258 {0, 0, 0}, /* 0 */
2400 {0, 0, 0}, /* 1 */ 2259 {0, 0, 0}, /* 1 */
2401 {0, 0, 0}, /* 2 */ 2260 {0, 0, 0}, /* 2 */
2402 {0, 0, 0}, /* 3 */ 2261 {0, 0, 0}, /* 3 */
2403 {0, 0, 0}, /* 4 */ 2262 {0, 0, 0}, /* 4 */
2451 * find a path to that monster that we found. If not, 2310 * find a path to that monster that we found. If not,
2452 * we don't bother going toward it. Returns 1 if we 2311 * we don't bother going toward it. Returns 1 if we
2453 * can see a direct way to get it 2312 * can see a direct way to get it
2454 * Modified to be map tile aware -.MSW 2313 * Modified to be map tile aware -.MSW
2455 */ 2314 */
2456
2457
2458int 2315int
2459can_see_monsterP (maptile *m, int x, int y, int dir) 2316can_see_monsterP (maptile *m, int x, int y, int dir)
2460{ 2317{
2461 sint16 dx, dy; 2318 sint16 dx, dy;
2462 int
2463 mflags; 2319 int mflags;
2464 2320
2465 if (dir < 0) 2321 if (dir < 0)
2466 return 0; /* exit condition: invalid direction */ 2322 return 0; /* exit condition: invalid direction */
2467 2323
2468 dx = x + freearr_x[dir]; 2324 dx = x + freearr_x[dir];
2481 return 0; 2337 return 0;
2482 2338
2483 /* yes, can see. */ 2339 /* yes, can see. */
2484 if (dir < 9) 2340 if (dir < 9)
2485 return 1; 2341 return 1;
2342
2486 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2343 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2487 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2344 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2345 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2488} 2346}
2489
2490
2491 2347
2492/* 2348/*
2493 * can_pick(picker, item): finds out if an object is possible to be 2349 * can_pick(picker, item): finds out if an object is possible to be
2494 * picked up by the picker. Returnes 1 if it can be 2350 * picked up by the picker. Returnes 1 if it can be
2495 * picked up, otherwise 0. 2351 * picked up, otherwise 0.
2497 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2353 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2498 * core dumps if they do. 2354 * core dumps if they do.
2499 * 2355 *
2500 * Add a check so we can't pick up invisible objects (0.93.8) 2356 * Add a check so we can't pick up invisible objects (0.93.8)
2501 */ 2357 */
2502
2503int 2358int
2504can_pick (const object *who, const object *item) 2359can_pick (const object *who, const object *item)
2505{ 2360{
2506 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2361 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2507 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2362 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2508 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2363 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2509} 2364}
2510 2365
2511
2512/* 2366/*
2513 * create clone from object to another 2367 * create clone from object to another
2514 */ 2368 */
2515object * 2369object *
2516object_create_clone (object *asrc) 2370object_create_clone (object *asrc)
2517{ 2371{
2518 object *dst = 0, *tmp, *src, *part, *prev, *item; 2372 object *dst = 0, *tmp, *src, *prev, *item;
2519 2373
2520 if (!asrc) 2374 if (!asrc)
2521 return 0; 2375 return 0;
2522 2376
2523 src = asrc;
2524 if (src->head)
2525 src = src->head; 2377 src = asrc->head_ ();
2526 2378
2527 prev = 0; 2379 prev = 0;
2528 for (part = src; part; part = part->more) 2380 for (object *part = src; part; part = part->more)
2529 { 2381 {
2530 tmp = part->clone (); 2382 tmp = part->clone ();
2531 tmp->x -= src->x; 2383 tmp->x -= src->x;
2532 tmp->y -= src->y; 2384 tmp->y -= src->y;
2533 2385
2535 { 2387 {
2536 dst = tmp; 2388 dst = tmp;
2537 tmp->head = 0; 2389 tmp->head = 0;
2538 } 2390 }
2539 else 2391 else
2540 {
2541 tmp->head = dst; 2392 tmp->head = dst;
2542 }
2543 2393
2544 tmp->more = 0; 2394 tmp->more = 0;
2545 2395
2546 if (prev) 2396 if (prev)
2547 prev->more = tmp; 2397 prev->more = tmp;
2551 2401
2552 for (item = src->inv; item; item = item->below) 2402 for (item = src->inv; item; item = item->below)
2553 insert_ob_in_ob (object_create_clone (item), dst); 2403 insert_ob_in_ob (object_create_clone (item), dst);
2554 2404
2555 return dst; 2405 return dst;
2556}
2557
2558/* GROS - Creates an object using a string representing its content. */
2559/* Basically, we save the content of the string to a temp file, then call */
2560/* load_object on it. I admit it is a highly inefficient way to make things, */
2561/* but it was simple to make and allows reusing the load_object function. */
2562/* Remember not to use load_object_str in a time-critical situation. */
2563/* Also remember that multiparts objects are not supported for now. */
2564
2565object *
2566load_object_str (const char *obstr)
2567{
2568 object *op;
2569 char filename[MAX_BUF];
2570
2571 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2572
2573 FILE *tempfile = fopen (filename, "w");
2574
2575 if (tempfile == NULL)
2576 {
2577 LOG (llevError, "Error - Unable to access load object temp file\n");
2578 return NULL;
2579 }
2580
2581 fprintf (tempfile, obstr);
2582 fclose (tempfile);
2583
2584 op = object::create ();
2585
2586 object_thawer thawer (filename);
2587
2588 if (thawer)
2589 load_object (thawer, op, 0);
2590
2591 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2592 CLEAR_FLAG (op, FLAG_REMOVED);
2593
2594 return op;
2595} 2406}
2596 2407
2597/* This returns the first object in who's inventory that 2408/* This returns the first object in who's inventory that
2598 * has the same type and subtype match. 2409 * has the same type and subtype match.
2599 * returns NULL if no match. 2410 * returns NULL if no match.
2600 */ 2411 */
2601object * 2412object *
2602find_obj_by_type_subtype (const object *who, int type, int subtype) 2413find_obj_by_type_subtype (const object *who, int type, int subtype)
2603{ 2414{
2604 object *tmp;
2605
2606 for (tmp = who->inv; tmp; tmp = tmp->below) 2415 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2607 if (tmp->type == type && tmp->subtype == subtype) 2416 if (tmp->type == type && tmp->subtype == subtype)
2608 return tmp; 2417 return tmp;
2609 2418
2610 return NULL; 2419 return 0;
2611} 2420}
2612 2421
2613/* If ob has a field named key, return the link from the list, 2422/* If ob has a field named key, return the link from the list,
2614 * otherwise return NULL. 2423 * otherwise return NULL.
2615 * 2424 *
2617 * do the desired thing. 2426 * do the desired thing.
2618 */ 2427 */
2619key_value * 2428key_value *
2620get_ob_key_link (const object *ob, const char *key) 2429get_ob_key_link (const object *ob, const char *key)
2621{ 2430{
2622 key_value *link;
2623
2624 for (link = ob->key_values; link != NULL; link = link->next) 2431 for (key_value *link = ob->key_values; link; link = link->next)
2625 if (link->key == key) 2432 if (link->key == key)
2626 return link; 2433 return link;
2627 2434
2628 return NULL; 2435 return 0;
2629} 2436}
2630 2437
2631/* 2438/*
2632 * Returns the value of op has an extra_field for key, or NULL. 2439 * Returns the value of op has an extra_field for key, or NULL.
2633 * 2440 *
2658 if (link->key == canonical_key) 2465 if (link->key == canonical_key)
2659 return link->value; 2466 return link->value;
2660 2467
2661 return 0; 2468 return 0;
2662} 2469}
2663
2664 2470
2665/* 2471/*
2666 * Updates the canonical_key in op to value. 2472 * Updates the canonical_key in op to value.
2667 * 2473 *
2668 * canonical_key is a shared string (value doesn't have to be). 2474 * canonical_key is a shared string (value doesn't have to be).
2673 * Returns TRUE on success. 2479 * Returns TRUE on success.
2674 */ 2480 */
2675int 2481int
2676set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2482set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2677{ 2483{
2678 key_value *
2679 field = NULL, *last = NULL; 2484 key_value *field = NULL, *last = NULL;
2680 2485
2681 for (field = op->key_values; field != NULL; field = field->next) 2486 for (field = op->key_values; field != NULL; field = field->next)
2682 { 2487 {
2683 if (field->key != canonical_key) 2488 if (field->key != canonical_key)
2684 { 2489 {
2693 /* Basically, if the archetype has this key set, 2498 /* Basically, if the archetype has this key set,
2694 * we need to store the null value so when we save 2499 * we need to store the null value so when we save
2695 * it, we save the empty value so that when we load, 2500 * it, we save the empty value so that when we load,
2696 * we get this value back again. 2501 * we get this value back again.
2697 */ 2502 */
2698 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2503 if (get_ob_key_link (op->arch, canonical_key))
2699 field->value = 0; 2504 field->value = 0;
2700 else 2505 else
2701 { 2506 {
2702 if (last) 2507 if (last)
2703 last->next = field->next; 2508 last->next = field->next;
2712 /* IF we get here, key doesn't exist */ 2517 /* IF we get here, key doesn't exist */
2713 2518
2714 /* No field, we'll have to add it. */ 2519 /* No field, we'll have to add it. */
2715 2520
2716 if (!add_key) 2521 if (!add_key)
2717 {
2718 return FALSE; 2522 return FALSE;
2719 } 2523
2720 /* There isn't any good reason to store a null 2524 /* There isn't any good reason to store a null
2721 * value in the key/value list. If the archetype has 2525 * value in the key/value list. If the archetype has
2722 * this key, then we should also have it, so shouldn't 2526 * this key, then we should also have it, so shouldn't
2723 * be here. If user wants to store empty strings, 2527 * be here. If user wants to store empty strings,
2724 * should pass in "" 2528 * should pass in ""
2773 } 2577 }
2774 else 2578 else
2775 item = item->env; 2579 item = item->env;
2776} 2580}
2777 2581
2582const char *
2583object::flag_desc (char *desc, int len) const
2584{
2585 char *p = desc;
2586 bool first = true;
2587
2588 *p = 0;
2589
2590 for (int i = 0; i < NUM_FLAGS; i++)
2591 {
2592 if (len <= 10) // magic constant!
2593 {
2594 snprintf (p, len, ",...");
2595 break;
2596 }
2597
2598 if (flag [i])
2599 {
2600 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2601 len -= cnt;
2602 p += cnt;
2603 first = false;
2604 }
2605 }
2606
2607 return desc;
2608}
2609
2778// return a suitable string describing an objetc in enough detail to find it 2610// return a suitable string describing an object in enough detail to find it
2779const char * 2611const char *
2780object::debug_desc (char *info) const 2612object::debug_desc (char *info) const
2781{ 2613{
2614 char flagdesc[512];
2782 char info2[256 * 3]; 2615 char info2[256 * 4];
2783 char *p = info; 2616 char *p = info;
2784 2617
2785 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2618 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2786 count, 2619 count, uuid.seq,
2787 &name, 2620 &name,
2788 title ? " " : "", 2621 title ? "\",title:\"" : "",
2789 title ? (const char *)title : ""); 2622 title ? (const char *)title : "",
2623 flag_desc (flagdesc, 512), type);
2790 2624
2791 if (env) 2625 if (!this->flag[FLAG_REMOVED] && env)
2792 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2626 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2793 2627
2794 if (map) 2628 if (map)
2795 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2629 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2796 2630
2797 return info; 2631 return info;
2798} 2632}
2799 2633
2800const char * 2634const char *
2801object::debug_desc () const 2635object::debug_desc () const
2802{ 2636{
2803 static char info[256 * 3]; 2637 static char info[3][256 * 4];
2638 static int info_idx;
2639
2804 return debug_desc (info); 2640 return debug_desc (info [++info_idx % 3]);
2805} 2641}
2806 2642
2643struct region *
2644object::region () const
2645{
2646 return map ? map->region (x, y)
2647 : region::default_region ();
2648}
2649
2650const materialtype_t *
2651object::dominant_material () const
2652{
2653 if (materialtype_t *mt = name_to_material (materialname))
2654 return mt;
2655
2656 return name_to_material (shstr_unknown);
2657}
2658
2659void
2660object::open_container (object *new_container)
2661{
2662 if (container == new_container)
2663 return;
2664
2665 if (object *old_container = container)
2666 {
2667 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2668 return;
2669
2670#if 0
2671 // remove the "Close old_container" object.
2672 if (object *closer = old_container->inv)
2673 if (closer->type == CLOSE_CON)
2674 closer->destroy ();
2675#endif
2676
2677 old_container->flag [FLAG_APPLIED] = 0;
2678 container = 0;
2679
2680 esrv_update_item (UPD_FLAGS, this, old_container);
2681 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2682 play_sound (sound_find ("chest_close"));
2683 }
2684
2685 if (new_container)
2686 {
2687 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2688 return;
2689
2690 // TODO: this does not seem to serve any purpose anymore?
2691#if 0
2692 // insert the "Close Container" object.
2693 if (archetype *closer = new_container->other_arch)
2694 {
2695 object *closer = arch_to_object (new_container->other_arch);
2696 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2697 new_container->insert (closer);
2698 }
2699#endif
2700
2701 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2702
2703 new_container->flag [FLAG_APPLIED] = 1;
2704 container = new_container;
2705
2706 esrv_update_item (UPD_FLAGS, this, new_container);
2707 esrv_send_inventory (this, new_container);
2708 play_sound (sound_find ("chest_open"));
2709 }
2710}
2711
2712object *
2713object::force_find (const shstr name)
2714{
2715 /* cycle through his inventory to look for the MARK we want to
2716 * place
2717 */
2718 for (object *tmp = inv; tmp; tmp = tmp->below)
2719 if (tmp->type == FORCE && tmp->slaying == name)
2720 return splay (tmp);
2721
2722 return 0;
2723}
2724
2725void
2726object::force_add (const shstr name, int duration)
2727{
2728 if (object *force = force_find (name))
2729 force->destroy ();
2730
2731 object *force = get_archetype (FORCE_NAME);
2732
2733 force->slaying = name;
2734 force->stats.food = 1;
2735 force->speed_left = -1.f;
2736
2737 force->set_speed (duration ? 1.f / duration : 0.f);
2738 force->flag [FLAG_IS_USED_UP] = true;
2739 force->flag [FLAG_APPLIED] = true;
2740
2741 insert (force);
2742}
2743
2744void
2745object::play_sound (faceidx sound) const
2746{
2747 if (!sound)
2748 return;
2749
2750 if (flag [FLAG_REMOVED])
2751 return;
2752
2753 if (env)
2754 {
2755 if (object *pl = in_player ())
2756 pl->contr->play_sound (sound);
2757 }
2758 else
2759 map->play_sound (sound, x, y);
2760}
2761

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines