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.57 by root, Sun Dec 3 02:46:33 2006 UTC vs.
Revision 1.109 by root, Sun Jan 7 21:54:59 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program 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
… …
30#include <sys/uio.h> 31#include <sys/uio.h>
31#include <object.h> 32#include <object.h>
32#include <funcpoint.h> 33#include <funcpoint.h>
33#include <loader.h> 34#include <loader.h>
34 35
36#include <bitset>
37
35int nrofallocobjects = 0; 38int nrofallocobjects = 0;
36static UUID uuid; 39static UUID uuid;
37const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
38 41
39object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
40 44
41short 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,
42 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
43}; 47};
44short 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,
… …
104 _exit (1); 108 _exit (1);
105 } 109 }
106 110
107 uuid.seq = uid; 111 uuid.seq = uid;
108 write_uuid (); 112 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 114 fclose (fp);
111} 115}
112 116
113UUID 117UUID
114gen_uuid () 118gen_uuid ()
… …
139 * 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
140 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
141 */ 145 */
142 146
143 /* For each field in wants, */ 147 /* For each field in wants, */
144 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)
145 { 149 {
146 key_value *has_field; 150 key_value *has_field;
147 151
148 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
149 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
… …
183 * 187 *
184 * Note that this function appears a lot longer than the macro it 188 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 189 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 190 * reduce this to the same efficiency.
187 * 191 *
188 * Check nrof variable *before* calling CAN_MERGE() 192 * Check nrof variable *before* calling can_merge()
189 * 193 *
190 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
191 * check weight 195 * check weight
192 */ 196 */
193
194bool object::can_merge (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
195{ 198{
196 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 200 if (ob1 == ob2
201 || ob1->type != ob2->type
202 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value
204 || ob1->name != ob2->name)
198 return 0; 205 return 0;
199 206
200 if (ob1->speed != ob2->speed) 207 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204 * value could not be stored in a sint32 (which unfortunately sometimes is 209 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 210 * used to store nrof).
206 */ 211 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 212 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 222 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 223
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 225 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 226
222 227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 228 || ob1->arch != ob2->arch
224 * being locked in inventory should prevent merging.
225 * 0x4 in flags3 is CLIENT_SENT
226 */
227 if ((ob1->arch != ob2->arch) ||
228 (ob1->flags[0] != ob2->flags[0]) ||
229 (ob1->flags[1] != ob2->flags[1]) ||
230 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232 (ob1->name != ob2->name) || 229 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 230 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 231 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 232 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 235 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 236 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 237 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 238 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 239 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 240 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 241 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 242 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 243 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 244 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 245 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 246 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 247 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 248 || ob1->move_on != ob2->move_on
252 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 249 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 252 return 0;
254 253
255 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 255 * check all objects in the inventory.
257 */ 256 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 259 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 261 return 0;
263 262
264 /* Now check to see if the two inventory objects could merge */ 263 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 265 return 0;
267 266
268 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 268 * if it is valid.
270 */ 269 */
… …
279 278
280 /* Note sure why the following is the case - either the object has to 279 /* Note sure why the following is the case - either the object has to
281 * be animated or have a very low speed. Is this an attempted monster 280 * be animated or have a very low speed. Is this an attempted monster
282 * check? 281 * check?
283 */ 282 */
284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
285 return 0; 284 return 0;
286 285
287 switch (ob1->type) 286 switch (ob1->type)
288 { 287 {
289 case SCROLL: 288 case SCROLL:
… …
354 op = op->env; 353 op = op->env;
355 return op; 354 return op;
356} 355}
357 356
358/* 357/*
359 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
360 * a better check. We basically keeping traversing up until we can't
361 * or find a player.
362 */
363
364object *
365is_player_inv (object *op)
366{
367 for (; op != NULL && op->type != PLAYER; op = op->env)
368 if (op->env == op)
369 op->env = NULL;
370 return op;
371}
372
373/*
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 359 * Some error messages.
376 * The result of the dump is stored in the static global errmsg array. 360 * The result of the dump is stored in the static global errmsg array.
377 */ 361 */
378 362
… …
381{ 365{
382 if (!op) 366 if (!op)
383 return strdup ("[NULLOBJ]"); 367 return strdup ("[NULLOBJ]");
384 368
385 object_freezer freezer; 369 object_freezer freezer;
386 save_object (freezer, op, 3); 370 save_object (freezer, op, 1);
387 return freezer.as_string (); 371 return freezer.as_string ();
388} 372}
389 373
390/* 374/*
391 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
… …
408} 392}
409 393
410/* 394/*
411 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
412 */ 396 */
413
414object * 397object *
415find_object (tag_t i) 398find_object (tag_t i)
416{ 399{
417 for (object *op = object::first; op; op = op->next) 400 return ((unsigned int)i) < objects.size ()
418 if (op->count == i) 401 ? objects [i]
419 return op; 402 : 0;
420
421 return 0;
422} 403}
423 404
424/* 405/*
425 * Returns the first object which has a name equal to the argument. 406 * Returns the first object which has a name equal to the argument.
426 * Used only by the patch command, but not all that useful. 407 * Used only by the patch command, but not all that useful.
427 * Enables features like "patch <name-of-other-player> food 999" 408 * Enables features like "patch <name-of-other-player> food 999"
428 */ 409 */
429
430object * 410object *
431find_object_name (const char *str) 411find_object_name (const char *str)
432{ 412{
433 shstr_cmp str_ (str); 413 shstr_cmp str_ (str);
434 object *op; 414 object *op;
435 415
436 for (op = object::first; op != NULL; op = op->next) 416 for_all_objects (op)
437 if (op->name == str_) 417 if (op->name == str_)
438 break; 418 break;
439 419
440 return op; 420 return op;
441} 421}
… …
484 } 464 }
485 465
486 op->key_values = 0; 466 op->key_values = 0;
487} 467}
488 468
489void object::clear ()
490{
491 attachable_base::clear ();
492
493 free_key_values (this);
494
495 owner = 0;
496 name = 0;
497 name_pl = 0;
498 title = 0;
499 race = 0;
500 slaying = 0;
501 skill = 0;
502 msg = 0;
503 lore = 0;
504 custom_name = 0;
505 materialname = 0;
506 contr = 0;
507 below = 0;
508 above = 0;
509 inv = 0;
510 container = 0;
511 env = 0;
512 more = 0;
513 head = 0;
514 map = 0;
515 active_next = 0;
516 active_prev = 0;
517
518 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520 SET_FLAG (this, FLAG_REMOVED);
521
522 /* What is not cleared is next, prev, and count */
523
524 expmul = 1.0;
525 face = blank_face;
526
527 if (settings.casting_time)
528 casting_time = -1;
529}
530
531void object::clone (object *destination)
532{
533 *(object_copy *)destination = *this;
534 *(object_pod *)destination = *this;
535
536 if (self || cb)
537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538}
539
540/* 469/*
541 * copy object first frees everything allocated by the second object, 470 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 471 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 472 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 473 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
545 * if the first object is freed, the pointers in the new object 474 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 475 * will point at garbage.
547 */ 476 */
548void 477void
549copy_object (object *op2, object *op) 478object::copy_to (object *dst)
550{ 479{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 482
554 op2->clone (op); 483 *(object_copy *)dst = *this;
555 484
556 if (is_freed) 485 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 486 SET_FLAG (dst, FLAG_FREED);
487
558 if (is_removed) 488 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 489 SET_FLAG (dst, FLAG_REMOVED);
560 490
561 if (op2->speed < 0) 491 if (speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563 493
564 /* Copy over key_values, if any. */ 494 /* Copy over key_values, if any. */
565 if (op2->key_values) 495 if (key_values)
566 { 496 {
567 key_value *tail = 0; 497 key_value *tail = 0;
568 key_value *i; 498 key_value *i;
569 499
570 op->key_values = 0; 500 dst->key_values = 0;
571 501
572 for (i = op2->key_values; i; i = i->next) 502 for (i = key_values; i; i = i->next)
573 { 503 {
574 key_value *new_link = new key_value; 504 key_value *new_link = new key_value;
575 505
576 new_link->next = 0; 506 new_link->next = 0;
577 new_link->key = i->key; 507 new_link->key = i->key;
578 new_link->value = i->value; 508 new_link->value = i->value;
579 509
580 /* Try and be clever here, too. */ 510 /* Try and be clever here, too. */
581 if (!op->key_values) 511 if (!dst->key_values)
582 { 512 {
583 op->key_values = new_link; 513 dst->key_values = new_link;
584 tail = new_link; 514 tail = new_link;
585 } 515 }
586 else 516 else
587 { 517 {
588 tail->next = new_link; 518 tail->next = new_link;
589 tail = new_link; 519 tail = new_link;
590 } 520 }
591 } 521 }
592 } 522 }
593 523
594 update_ob_speed (op); 524 dst->set_speed (dst->speed);
525}
526
527object *
528object::clone ()
529{
530 object *neu = create ();
531 copy_to (neu);
532 return neu;
595} 533}
596 534
597/* 535/*
598 * If an object with the IS_TURNABLE() flag needs to be turned due 536 * If an object with the IS_TURNABLE() flag needs to be turned due
599 * to the closest player being on the other side, this function can 537 * to the closest player being on the other side, this function can
600 * be called to update the face variable, _and_ how it looks on the map. 538 * be called to update the face variable, _and_ how it looks on the map.
601 */ 539 */
602
603void 540void
604update_turn_face (object *op) 541update_turn_face (object *op)
605{ 542{
606 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 543 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
607 return; 544 return;
545
608 SET_ANIMATION (op, op->direction); 546 SET_ANIMATION (op, op->direction);
609 update_object (op, UP_OBJ_FACE); 547 update_object (op, UP_OBJ_FACE);
610} 548}
611 549
612/* 550/*
613 * Updates the speed of an object. If the speed changes from 0 to another 551 * Updates the speed of an object. If the speed changes from 0 to another
614 * value, or vice versa, then add/remove the object from the active list. 552 * value, or vice versa, then add/remove the object from the active list.
615 * This function needs to be called whenever the speed of an object changes. 553 * This function needs to be called whenever the speed of an object changes.
616 */ 554 */
617void 555void
618update_ob_speed (object *op) 556object::set_speed (float speed)
619{ 557{
620 extern int arch_init; 558 if (flag [FLAG_FREED] && speed)
621
622 /* No reason putting the archetypes objects on the speed list,
623 * since they never really need to be updated.
624 */
625
626 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
627 { 559 {
628 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 560 LOG (llevError, "Object %s is freed but has speed.\n", &name);
629#ifdef MANY_CORES
630 abort ();
631#else
632 op->speed = 0; 561 speed = 0;
633#endif
634 }
635
636 if (arch_init)
637 return;
638
639 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
640 { 562 }
641 /* If already on active list, don't do anything */
642 if (op->active_next || op->active_prev || op == active_objects)
643 return;
644 563
645 /* process_events() expects us to insert the object at the beginning 564 this->speed = speed;
646 * of the list. */
647 op->active_next = active_objects;
648 565
649 if (op->active_next != NULL) 566 if (has_active_speed ())
650 op->active_next->active_prev = op; 567 activate ();
651
652 active_objects = op;
653 }
654 else 568 else
655 { 569 deactivate ();
656 /* If not on the active list, nothing needs to be done */
657 if (!op->active_next && !op->active_prev && op != active_objects)
658 return;
659
660 if (op->active_prev == NULL)
661 {
662 active_objects = op->active_next;
663
664 if (op->active_next != NULL)
665 op->active_next->active_prev = NULL;
666 }
667 else
668 {
669 op->active_prev->active_next = op->active_next;
670
671 if (op->active_next)
672 op->active_next->active_prev = op->active_prev;
673 }
674
675 op->active_next = NULL;
676 op->active_prev = NULL;
677 }
678} 570}
679 571
680/* This function removes object 'op' from the list of active
681 * objects.
682 * This should only be used for style maps or other such
683 * reference maps where you don't want an object that isn't
684 * in play chewing up cpu time getting processed.
685 * The reverse of this is to call update_ob_speed, which
686 * will do the right thing based on the speed of the object.
687 */
688void
689remove_from_active_list (object *op)
690{
691 /* If not on the active list, nothing needs to be done */
692 if (!op->active_next && !op->active_prev && op != active_objects)
693 return;
694
695 if (op->active_prev == NULL)
696 {
697 active_objects = op->active_next;
698 if (op->active_next != NULL)
699 op->active_next->active_prev = NULL;
700 }
701 else
702 {
703 op->active_prev->active_next = op->active_next;
704 if (op->active_next)
705 op->active_next->active_prev = op->active_prev;
706 }
707 op->active_next = NULL;
708 op->active_prev = NULL;
709}
710
711/* 572/*
712 * update_object() updates the array which represents the map. 573 * update_object() updates the the map.
713 * It takes into account invisible objects (and represent squares covered 574 * It takes into account invisible objects (and represent squares covered
714 * by invisible objects by whatever is below them (unless it's another 575 * by invisible objects by whatever is below them (unless it's another
715 * invisible object, etc...) 576 * invisible object, etc...)
716 * If the object being updated is beneath a player, the look-window 577 * If the object being updated is beneath a player, the look-window
717 * of that player is updated (this might be a suboptimal way of 578 * of that player is updated (this might be a suboptimal way of
718 * updating that window, though, since update_object() is called _often_) 579 * updating that window, though, since update_object() is called _often_)
719 * 580 *
720 * action is a hint of what the caller believes need to be done. 581 * action is a hint of what the caller believes need to be done.
721 * For example, if the only thing that has changed is the face (due to
722 * an animation), we don't need to call update_position until that actually
723 * comes into view of a player. OTOH, many other things, like addition/removal
724 * of walls or living creatures may need us to update the flags now.
725 * current action are: 582 * current action are:
726 * UP_OBJ_INSERT: op was inserted 583 * UP_OBJ_INSERT: op was inserted
727 * UP_OBJ_REMOVE: op was removed 584 * UP_OBJ_REMOVE: op was removed
728 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 585 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
729 * as that is easier than trying to look at what may have changed. 586 * as that is easier than trying to look at what may have changed.
730 * UP_OBJ_FACE: only the objects face has changed. 587 * UP_OBJ_FACE: only the objects face has changed.
731 */ 588 */
732
733void 589void
734update_object (object *op, int action) 590update_object (object *op, int action)
735{ 591{
736 int update_now = 0, flags;
737 MoveType move_on, move_off, move_block, move_slow; 592 MoveType move_on, move_off, move_block, move_slow;
738 593
739 if (op == NULL) 594 if (op == NULL)
740 { 595 {
741 /* this should never happen */ 596 /* this should never happen */
742 LOG (llevDebug, "update_object() called for NULL object.\n"); 597 LOG (llevDebug, "update_object() called for NULL object.\n");
743 return; 598 return;
744 } 599 }
745 600
746 if (op->env != NULL) 601 if (op->env)
747 { 602 {
748 /* Animation is currently handled by client, so nothing 603 /* Animation is currently handled by client, so nothing
749 * to do in this case. 604 * to do in this case.
750 */ 605 */
751 return; 606 return;
… …
756 */ 611 */
757 if (!op->map || op->map->in_memory == MAP_SAVING) 612 if (!op->map || op->map->in_memory == MAP_SAVING)
758 return; 613 return;
759 614
760 /* make sure the object is within map boundaries */ 615 /* make sure the object is within map boundaries */
761 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 616 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
762 { 617 {
763 LOG (llevError, "update_object() called for object out of map!\n"); 618 LOG (llevError, "update_object() called for object out of map!\n");
764#ifdef MANY_CORES 619#ifdef MANY_CORES
765 abort (); 620 abort ();
766#endif 621#endif
767 return; 622 return;
768 } 623 }
769 624
770 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 625 mapspace &m = op->ms ();
771 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
772 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
773 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
774 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
775 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
776 626
627 if (!(m.flags_ & P_UPTODATE))
628 /* nop */;
777 if (action == UP_OBJ_INSERT) 629 else if (action == UP_OBJ_INSERT)
778 { 630 {
631 // this is likely overkill, TODO: revisit (schmorp)
779 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 632 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
780 update_now = 1;
781
782 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 633 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783 update_now = 1; 634 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
784 635 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
636 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
785 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 637 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
786 update_now = 1;
787
788 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
789 update_now = 1;
790
791 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
792 update_now = 1;
793
794 if ((move_on | op->move_on) != move_on) 638 || (m.move_on | op->move_on ) != m.move_on
795 update_now = 1;
796
797 if ((move_off | op->move_off) != move_off) 639 || (m.move_off | op->move_off ) != m.move_off
798 update_now = 1; 640 || (m.move_slow | op->move_slow) != m.move_slow
799
800 /* This isn't perfect, but I don't expect a lot of objects to 641 /* This isn't perfect, but I don't expect a lot of objects to
801 * to have move_allow right now. 642 * to have move_allow right now.
802 */ 643 */
803 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 644 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
804 update_now = 1; 645 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
805 646 m.flags_ = 0;
806 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1;
808 } 647 }
809 /* if the object is being removed, we can't make intelligent 648 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 649 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 650 * that is being removed.
812 */ 651 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 652 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
814 update_now = 1; 653 m.flags_ = 0;
815 else if (action == UP_OBJ_FACE) 654 else if (action == UP_OBJ_FACE)
816 /* Nothing to do for that case */ ; 655 /* Nothing to do for that case */ ;
817 else 656 else
818 LOG (llevError, "update_object called with invalid action: %d\n", action); 657 LOG (llevError, "update_object called with invalid action: %d\n", action);
819 658
820 if (update_now)
821 {
822 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
823 update_position (op->map, op->x, op->y);
824 }
825
826 if (op->more != NULL) 659 if (op->more)
827 update_object (op->more, action); 660 update_object (op->more, action);
828} 661}
829 662
830object::vector object::mortals;
831object::vector object::objects; // not yet used
832object *object::first; 663object *object::first;
833
834void object::free_mortals ()
835{
836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
837 if ((*i)->refcnt)
838 ++i; // further delay freeing
839 else
840 {
841 delete *i;
842 mortals.erase (i);
843 }
844
845 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
852}
853 664
854object::object () 665object::object ()
855{ 666{
856 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
857 668
… …
864 free_key_values (this); 675 free_key_values (this);
865} 676}
866 677
867void object::link () 678void object::link ()
868{ 679{
869 count = ++ob_count;
870 uuid = gen_uuid (); 680 uuid = gen_uuid ();
871 681
872 prev = 0; 682 refcnt_inc ();
873 next = object::first; 683 objects.insert (this);
874
875 if (object::first)
876 object::first->prev = this;
877
878 object::first = this;
879} 684}
880 685
881void object::unlink () 686void object::unlink ()
882{ 687{
883 if (this == object::first) 688 objects.erase (this);
884 object::first = next; 689 refcnt_dec ();
690}
885 691
886 /* Remove this object from the list of used objects */ 692void
887 if (prev) prev->next = next; 693object::activate ()
888 if (next) next->prev = prev; 694{
695 /* If already on active list, don't do anything */
696 if (active)
697 return;
889 698
890 prev = 0; 699 if (has_active_speed ())
891 next = 0; 700 actives.insert (this);
701}
702
703void
704object::activate_recursive ()
705{
706 activate ();
707
708 for (object *op = inv; op; op = op->below)
709 op->activate_recursive ();
710}
711
712/* This function removes object 'op' from the list of active
713 * objects.
714 * This should only be used for style maps or other such
715 * reference maps where you don't want an object that isn't
716 * in play chewing up cpu time getting processed.
717 * The reverse of this is to call update_ob_speed, which
718 * will do the right thing based on the speed of the object.
719 */
720void
721object::deactivate ()
722{
723 /* If not on the active list, nothing needs to be done */
724 if (!active)
725 return;
726
727 actives.erase (this);
728}
729
730void
731object::deactivate_recursive ()
732{
733 for (object *op = inv; op; op = op->below)
734 op->deactivate_recursive ();
735
736 deactivate ();
737}
738
739void
740object::set_flag_inv (int flag, int value)
741{
742 for (object *op = inv; op; op = op->below)
743 {
744 op->flag [flag] = value;
745 op->set_flag_inv (flag, value);
746 }
747}
748
749/*
750 * Remove and free all objects in the inventory of the given object.
751 * object.c ?
752 */
753void
754object::destroy_inv (bool drop_to_ground)
755{
756 // need to check first, because the checks below might segfault
757 // as we might be on an invalid mapspace and crossfire code
758 // is too buggy to ensure that the inventory is empty.
759 // corollary: if you create arrows etc. with stuff in tis inventory,
760 // cf will crash below with off-map x and y
761 if (!inv)
762 return;
763
764 /* Only if the space blocks everything do we not process -
765 * if some form of movement is allowed, let objects
766 * drop on that space.
767 */
768 if (!drop_to_ground
769 || !map
770 || map->in_memory != MAP_IN_MEMORY
771 || ms ().move_block == MOVE_ALL)
772 {
773 while (inv)
774 {
775 inv->destroy_inv (drop_to_ground);
776 inv->destroy ();
777 }
778 }
779 else
780 { /* Put objects in inventory onto this space */
781 while (inv)
782 {
783 object *op = inv;
784
785 if (op->flag [FLAG_STARTEQUIP]
786 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE
788 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE])
790 op->destroy ();
791 else
792 map->insert (op, x, y);
793 }
794 }
892} 795}
893 796
894object *object::create () 797object *object::create ()
895{ 798{
896 object *op = new object; 799 object *op = new object;
897 op->link (); 800 op->link ();
898 return op; 801 return op;
899} 802}
900 803
901/* 804void
902 * free_object() frees everything allocated by an object, removes 805object::do_destroy ()
903 * it from the list of used objects, and puts it on the list of
904 * free objects. The IS_FREED() flag is set in the object.
905 * The object must have been removed by remove_ob() first for
906 * this function to succeed.
907 *
908 * If destroy_inventory is set, free inventory as well. Else drop items in
909 * inventory to the ground.
910 */
911void object::destroy (bool destroy_inventory)
912{ 806{
913 if (QUERY_FLAG (this, FLAG_FREED)) 807 if (flag [FLAG_IS_LINKED])
808 remove_button_link (this);
809
810 if (flag [FLAG_FRIENDLY])
811 remove_friendly_object (this);
812
813 if (!flag [FLAG_REMOVED])
814 remove ();
815
816 if (flag [FLAG_FREED])
914 return; 817 return;
915 818
916 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 819 set_speed (0);
917 remove_friendly_object (this);
918 820
919 if (!QUERY_FLAG (this, FLAG_REMOVED)) 821 flag [FLAG_FREED] = 1;
920 remove_ob (this);
921 822
922 SET_FLAG (this, FLAG_FREED); 823 attachable::do_destroy ();
923 824
924 if (more) 825 destroy_inv (true);
925 { 826 unlink ();
926 more->destroy (destroy_inventory);
927 more = 0;
928 }
929
930 if (inv)
931 {
932 /* Only if the space blocks everything do we not process -
933 * if some form of movement is allowed, let objects
934 * drop on that space.
935 */
936 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
937 {
938 object *op = inv;
939
940 while (op)
941 {
942 object *tmp = op->below;
943 op->destroy (destroy_inventory);
944 op = tmp;
945 }
946 }
947 else
948 { /* Put objects in inventory onto this space */
949 object *op = inv;
950
951 while (op)
952 {
953 object *tmp = op->below;
954
955 remove_ob (op);
956
957 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
958 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
959 free_object (op);
960 else
961 {
962 op->x = x;
963 op->y = y;
964 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
965 }
966
967 op = tmp;
968 }
969 }
970 }
971 827
972 // hack to ensure that freed objects still have a valid map 828 // hack to ensure that freed objects still have a valid map
973 { 829 {
974 static maptile *freed_map; // freed objects are moved here to avoid crashes 830 static maptile *freed_map; // freed objects are moved here to avoid crashes
975 831
… …
979 835
980 freed_map->name = "/internal/freed_objects_map"; 836 freed_map->name = "/internal/freed_objects_map";
981 freed_map->width = 3; 837 freed_map->width = 3;
982 freed_map->height = 3; 838 freed_map->height = 3;
983 839
984 freed_map->allocate (); 840 freed_map->alloc ();
841 freed_map->in_memory = MAP_IN_MEMORY;
985 } 842 }
986 843
987 map = freed_map; 844 map = freed_map;
988 x = 1; 845 x = 1;
989 y = 1; 846 y = 1;
990 } 847 }
991 848
849 head = 0;
850
851 if (more)
852 {
853 more->destroy ();
854 more = 0;
855 }
856
992 // clear those pointers that likely might have circular references to us 857 // clear those pointers that likely might have circular references to us
993 owner = 0; 858 owner = 0;
994 enemy = 0; 859 enemy = 0;
995 attacked_by = 0; 860 attacked_by = 0;
861}
996 862
997 // only relevant for players(?), but make sure of it anyways 863void
998 contr = 0; 864object::destroy (bool destroy_inventory)
865{
866 if (destroyed ())
867 return;
999 868
1000 /* Remove object from the active list */ 869 if (destroy_inventory)
1001 speed = 0; 870 destroy_inv (false);
1002 update_ob_speed (this);
1003 871
1004 unlink (); 872 attachable::destroy ();
1005
1006 mortals.push_back (this);
1007} 873}
1008 874
1009/* 875/*
1010 * sub_weight() recursively (outwards) subtracts a number from the 876 * sub_weight() recursively (outwards) subtracts a number from the
1011 * weight of an object (and what is carried by it's environment(s)). 877 * weight of an object (and what is carried by it's environment(s)).
1012 */ 878 */
1013
1014void 879void
1015sub_weight (object *op, signed long weight) 880sub_weight (object *op, signed long weight)
1016{ 881{
1017 while (op != NULL) 882 while (op != NULL)
1018 { 883 {
… …
1022 op->carrying -= weight; 887 op->carrying -= weight;
1023 op = op->env; 888 op = op->env;
1024 } 889 }
1025} 890}
1026 891
1027/* remove_ob(op): 892/* op->remove ():
1028 * This function removes the object op from the linked list of objects 893 * This function removes the object op from the linked list of objects
1029 * which it is currently tied to. When this function is done, the 894 * which it is currently tied to. When this function is done, the
1030 * object will have no environment. If the object previously had an 895 * object will have no environment. If the object previously had an
1031 * environment, the x and y coordinates will be updated to 896 * environment, the x and y coordinates will be updated to
1032 * the previous environment. 897 * the previous environment.
1033 * Beware: This function is called from the editor as well! 898 * Beware: This function is called from the editor as well!
1034 */ 899 */
1035
1036void 900void
1037remove_ob (object *op) 901object::remove ()
1038{ 902{
1039 object *tmp, *last = 0; 903 object *tmp, *last = 0;
1040 object *otmp; 904 object *otmp;
1041 905
1042 int check_walk_off;
1043 maptile *m;
1044
1045 sint16 x, y;
1046
1047 if (QUERY_FLAG (op, FLAG_REMOVED)) 906 if (QUERY_FLAG (this, FLAG_REMOVED))
1048 return; 907 return;
1049 908
1050 SET_FLAG (op, FLAG_REMOVED); 909 SET_FLAG (this, FLAG_REMOVED);
910 INVOKE_OBJECT (REMOVE, this);
1051 911
1052 if (op->more != NULL) 912 if (more)
1053 remove_ob (op->more); 913 more->remove ();
1054 914
1055 /* 915 /*
1056 * In this case, the object to be removed is in someones 916 * In this case, the object to be removed is in someones
1057 * inventory. 917 * inventory.
1058 */ 918 */
1059 if (op->env != NULL) 919 if (env)
1060 { 920 {
1061 if (op->nrof) 921 if (nrof)
1062 sub_weight (op->env, op->weight * op->nrof); 922 sub_weight (env, weight * nrof);
1063 else 923 else
1064 sub_weight (op->env, op->weight + op->carrying); 924 sub_weight (env, weight + carrying);
1065 925
1066 /* NO_FIX_PLAYER is set when a great many changes are being 926 /* NO_FIX_PLAYER is set when a great many changes are being
1067 * made to players inventory. If set, avoiding the call 927 * made to players inventory. If set, avoiding the call
1068 * to save cpu time. 928 * to save cpu time.
1069 */ 929 */
1070 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 930 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1071 fix_player (otmp); 931 otmp->update_stats ();
1072 932
1073 if (op->above != NULL) 933 if (above)
1074 op->above->below = op->below; 934 above->below = below;
1075 else 935 else
1076 op->env->inv = op->below; 936 env->inv = below;
1077 937
1078 if (op->below != NULL) 938 if (below)
1079 op->below->above = op->above; 939 below->above = above;
1080 940
1081 /* we set up values so that it could be inserted into 941 /* we set up values so that it could be inserted into
1082 * the map, but we don't actually do that - it is up 942 * the map, but we don't actually do that - it is up
1083 * to the caller to decide what we want to do. 943 * to the caller to decide what we want to do.
1084 */ 944 */
1085 op->x = op->env->x, op->y = op->env->y; 945 x = env->x, y = env->y;
1086 op->map = op->env->map; 946 map = env->map;
1087 op->above = NULL, op->below = NULL; 947 above = 0, below = 0;
1088 op->env = NULL; 948 env = 0;
1089 } 949 }
1090 else if (op->map) 950 else if (map)
1091 { 951 {
1092 x = op->x; 952 if (type == PLAYER)
1093 y = op->y;
1094 m = get_map_from_coord (op->map, &x, &y);
1095
1096 if (!m)
1097 {
1098 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1099 op->map->path, op->x, op->y);
1100 /* in old days, we used to set x and y to 0 and continue.
1101 * it seems if we get into this case, something is probablye
1102 * screwed up and should be fixed.
1103 */
1104 abort ();
1105 } 953 {
1106 954 --map->players;
1107 if (op->map != m) 955 map->touch ();
1108 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1109 op->map->path, m->path, op->x, op->y, x, y);
1110
1111 /* Re did the following section of code - it looks like it had
1112 * lots of logic for things we no longer care about
1113 */ 956 }
957
958 map->dirty = true;
1114 959
1115 /* link the object above us */ 960 /* link the object above us */
1116 if (op->above) 961 if (above)
1117 op->above->below = op->below; 962 above->below = below;
1118 else 963 else
1119 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 964 map->at (x, y).top = below; /* we were top, set new top */
1120 965
1121 /* Relink the object below us, if there is one */ 966 /* Relink the object below us, if there is one */
1122 if (op->below) 967 if (below)
1123 op->below->above = op->above; 968 below->above = above;
1124 else 969 else
1125 { 970 {
1126 /* Nothing below, which means we need to relink map object for this space 971 /* Nothing below, which means we need to relink map object for this space
1127 * use translated coordinates in case some oddness with map tiling is 972 * use translated coordinates in case some oddness with map tiling is
1128 * evident 973 * evident
1129 */ 974 */
1130 if (GET_MAP_OB (m, x, y) != op) 975 if (GET_MAP_OB (map, x, y) != this)
1131 { 976 {
1132 char *dump = dump_object (op); 977 char *dump = dump_object (this);
1133 LOG (llevError, 978 LOG (llevError,
1134 "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); 979 "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);
1135 free (dump); 980 free (dump);
1136 dump = dump_object (GET_MAP_OB (m, x, y)); 981 dump = dump_object (GET_MAP_OB (map, x, y));
1137 LOG (llevError, "%s\n", dump); 982 LOG (llevError, "%s\n", dump);
1138 free (dump); 983 free (dump);
1139 } 984 }
1140 985
1141 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 986 map->at (x, y).bot = above; /* goes on above it. */
1142 } 987 }
1143 988
1144 op->above = 0; 989 above = 0;
1145 op->below = 0; 990 below = 0;
1146 991
1147 if (op->map->in_memory == MAP_SAVING) 992 if (map->in_memory == MAP_SAVING)
1148 return; 993 return;
1149 994
1150 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 995 int check_walk_off = !flag [FLAG_NO_APPLY];
1151 996
1152 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 997 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1153 { 998 {
1154 /* No point updating the players look faces if he is the object 999 /* No point updating the players look faces if he is the object
1155 * being removed. 1000 * being removed.
1156 */ 1001 */
1157 1002
1158 if (tmp->type == PLAYER && tmp != op) 1003 if (tmp->type == PLAYER && tmp != this)
1159 { 1004 {
1160 /* If a container that the player is currently using somehow gets 1005 /* If a container that the player is currently using somehow gets
1161 * removed (most likely destroyed), update the player view 1006 * removed (most likely destroyed), update the player view
1162 * appropriately. 1007 * appropriately.
1163 */ 1008 */
1164 if (tmp->container == op) 1009 if (tmp->container == this)
1165 { 1010 {
1166 CLEAR_FLAG (op, FLAG_APPLIED); 1011 flag [FLAG_APPLIED] = 0;
1167 tmp->container = NULL; 1012 tmp->container = 0;
1168 } 1013 }
1169 1014
1170 tmp->contr->socket.update_look = 1; 1015 if (tmp->contr->ns)
1016 tmp->contr->ns->floorbox_update ();
1171 } 1017 }
1172 1018
1173 /* See if player moving off should effect something */ 1019 /* See if object moving off should effect something */
1174 if (check_walk_off 1020 if (check_walk_off
1175 && ((op->move_type & tmp->move_off) 1021 && ((move_type & tmp->move_off)
1176 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1022 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1177 { 1023 {
1178 move_apply (tmp, op, NULL); 1024 move_apply (tmp, this, 0);
1179 1025
1180 if (op->destroyed ()) 1026 if (destroyed ())
1181 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1027 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1182 } 1028 }
1183 1029
1184 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1030 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1185 1031 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1186 if (tmp->above == tmp) 1032 if (tmp->above == tmp)
1187 tmp->above = NULL; 1033 tmp->above = 0;
1188 1034
1189 last = tmp; 1035 last = tmp;
1190 } 1036 }
1191 1037
1192 /* last == NULL of there are no objects on this space */ 1038 /* last == NULL if there are no objects on this space */
1039 //TODO: this makes little sense, why only update the topmost object?
1193 if (last == NULL) 1040 if (!last)
1194 { 1041 map->at (x, y).flags_ = 0;
1195 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1196 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1197 * those out anyways, and if there are any flags set right now, they won't
1198 * be correct anyways.
1199 */
1200 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1201 update_position (op->map, op->x, op->y);
1202 }
1203 else 1042 else
1204 update_object (last, UP_OBJ_REMOVE); 1043 update_object (last, UP_OBJ_REMOVE);
1205 1044
1206 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1045 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1207 update_all_los (op->map, op->x, op->y); 1046 update_all_los (map, x, y);
1208 } 1047 }
1209} 1048}
1210 1049
1211/* 1050/*
1212 * merge_ob(op,top): 1051 * merge_ob(op,top):
… …
1220merge_ob (object *op, object *top) 1059merge_ob (object *op, object *top)
1221{ 1060{
1222 if (!op->nrof) 1061 if (!op->nrof)
1223 return 0; 1062 return 0;
1224 1063
1225 if (top == NULL) 1064 if (top)
1226 for (top = op; top != NULL && top->above != NULL; top = top->above); 1065 for (top = op; top && top->above; top = top->above)
1066 ;
1227 1067
1228 for (; top != NULL; top = top->below) 1068 for (; top; top = top->below)
1229 { 1069 {
1230 if (top == op) 1070 if (top == op)
1231 continue; 1071 continue;
1232 if (CAN_MERGE (op, top)) 1072
1073 if (object::can_merge (op, top))
1233 { 1074 {
1234 top->nrof += op->nrof; 1075 top->nrof += op->nrof;
1235 1076
1236/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1077/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1237 op->weight = 0; /* Don't want any adjustements now */ 1078 op->weight = 0; /* Don't want any adjustements now */
1238 remove_ob (op); 1079 op->destroy ();
1239 free_object (op);
1240 return top; 1080 return top;
1241 } 1081 }
1242 } 1082 }
1243 1083
1244 return 0; 1084 return 0;
… …
1249 * job preparing multi-part monsters 1089 * job preparing multi-part monsters
1250 */ 1090 */
1251object * 1091object *
1252insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1253{ 1093{
1254 object *tmp;
1255
1256 if (op->head)
1257 op = op->head;
1258
1259 for (tmp = op; tmp; tmp = tmp->more) 1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1260 { 1095 {
1261 tmp->x = x + tmp->arch->clone.x; 1096 tmp->x = x + tmp->arch->clone.x;
1262 tmp->y = y + tmp->arch->clone.y; 1097 tmp->y = y + tmp->arch->clone.y;
1263 } 1098 }
1264 1099
… …
1283 * Return value: 1118 * Return value:
1284 * new object if 'op' was merged with other object 1119 * new object if 'op' was merged with other object
1285 * NULL if 'op' was destroyed 1120 * NULL if 'op' was destroyed
1286 * just 'op' otherwise 1121 * just 'op' otherwise
1287 */ 1122 */
1288
1289object * 1123object *
1290insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1291{ 1125{
1292 object *tmp, *top, *floor = NULL; 1126 object *tmp, *top, *floor = NULL;
1293 sint16 x, y; 1127 sint16 x, y;
… …
1296 { 1130 {
1297 LOG (llevError, "Trying to insert freed object!\n"); 1131 LOG (llevError, "Trying to insert freed object!\n");
1298 return NULL; 1132 return NULL;
1299 } 1133 }
1300 1134
1301 if (m == NULL) 1135 if (!m)
1302 { 1136 {
1303 char *dump = dump_object (op); 1137 char *dump = dump_object (op);
1304 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1305 free (dump); 1139 free (dump);
1306 return op; 1140 return op;
… …
1327 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1161 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1328 free (dump); 1162 free (dump);
1329 return op; 1163 return op;
1330 } 1164 }
1331 1165
1332 if (op->more != NULL) 1166 if (op->more)
1333 { 1167 {
1334 /* The part may be on a different map. */ 1168 /* The part may be on a different map. */
1335 1169
1336 object *more = op->more; 1170 object *more = op->more;
1337 1171
1338 /* We really need the caller to normalize coordinates - if 1172 /* We really need the caller to normalise coordinates - if
1339 * we set the map, that doesn't work if the location is within 1173 * we set the map, that doesn't work if the location is within
1340 * a map and this is straddling an edge. So only if coordinate 1174 * a map and this is straddling an edge. So only if coordinate
1341 * is clear wrong do we normalize it. 1175 * is clear wrong do we normalise it.
1342 */ 1176 */
1343 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1177 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1344 more->map = get_map_from_coord (m, &more->x, &more->y); 1178 more->map = get_map_from_coord (m, &more->x, &more->y);
1345 else if (!more->map) 1179 else if (!more->map)
1346 { 1180 {
… …
1353 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1187 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1354 { 1188 {
1355 if (!op->head) 1189 if (!op->head)
1356 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1190 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1357 1191
1358 return NULL; 1192 return 0;
1359 } 1193 }
1360 } 1194 }
1361 1195
1362 CLEAR_FLAG (op, FLAG_REMOVED); 1196 CLEAR_FLAG (op, FLAG_REMOVED);
1363 1197
… …
1370 y = op->y; 1204 y = op->y;
1371 1205
1372 /* this has to be done after we translate the coordinates. 1206 /* this has to be done after we translate the coordinates.
1373 */ 1207 */
1374 if (op->nrof && !(flag & INS_NO_MERGE)) 1208 if (op->nrof && !(flag & INS_NO_MERGE))
1375 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1209 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1376 if (CAN_MERGE (op, tmp)) 1210 if (object::can_merge (op, tmp))
1377 { 1211 {
1378 op->nrof += tmp->nrof; 1212 op->nrof += tmp->nrof;
1379 remove_ob (tmp); 1213 tmp->destroy ();
1380 free_object (tmp);
1381 } 1214 }
1382 1215
1383 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1216 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1384 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1217 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1385 1218
… …
1398 op->below = originator->below; 1231 op->below = originator->below;
1399 1232
1400 if (op->below) 1233 if (op->below)
1401 op->below->above = op; 1234 op->below->above = op;
1402 else 1235 else
1403 SET_MAP_OB (op->map, op->x, op->y, op); 1236 op->ms ().bot = op;
1404 1237
1405 /* since *below* originator, no need to update top */ 1238 /* since *below* originator, no need to update top */
1406 originator->below = op; 1239 originator->below = op;
1407 } 1240 }
1408 else 1241 else
1409 { 1242 {
1410 /* If there are other objects, then */ 1243 /* If there are other objects, then */
1411 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1244 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1412 { 1245 {
1413 object *last = NULL; 1246 object *last = 0;
1414 1247
1415 /* 1248 /*
1416 * If there are multiple objects on this space, we do some trickier handling. 1249 * If there are multiple objects on this space, we do some trickier handling.
1417 * We've already dealt with merging if appropriate. 1250 * We've already dealt with merging if appropriate.
1418 * Generally, we want to put the new object on top. But if 1251 * Generally, we want to put the new object on top. But if
… …
1422 * once we get to them. This reduces the need to traverse over all of 1255 * once we get to them. This reduces the need to traverse over all of
1423 * them when adding another one - this saves quite a bit of cpu time 1256 * them when adding another one - this saves quite a bit of cpu time
1424 * when lots of spells are cast in one area. Currently, it is presumed 1257 * when lots of spells are cast in one area. Currently, it is presumed
1425 * that flying non pickable objects are spell objects. 1258 * that flying non pickable objects are spell objects.
1426 */ 1259 */
1427
1428 while (top != NULL) 1260 while (top)
1429 { 1261 {
1430 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1262 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1431 floor = top; 1263 floor = top;
1432 1264
1433 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1265 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1454 * If INS_ON_TOP is used, don't do this processing 1286 * If INS_ON_TOP is used, don't do this processing
1455 * Need to find the object that in fact blocks view, otherwise 1287 * Need to find the object that in fact blocks view, otherwise
1456 * stacking is a bit odd. 1288 * stacking is a bit odd.
1457 */ 1289 */
1458 if (!(flag & INS_ON_TOP) && 1290 if (!(flag & INS_ON_TOP) &&
1459 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1291 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1460 { 1292 {
1461 for (last = top; last != floor; last = last->below) 1293 for (last = top; last != floor; last = last->below)
1462 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1294 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1463 break; 1295 break;
1464 /* Check to see if we found the object that blocks view, 1296 /* Check to see if we found the object that blocks view,
… …
1486 op->above = GET_MAP_OB (op->map, op->x, op->y); 1318 op->above = GET_MAP_OB (op->map, op->x, op->y);
1487 1319
1488 if (op->above) 1320 if (op->above)
1489 op->above->below = op; 1321 op->above->below = op;
1490 1322
1491 op->below = NULL; 1323 op->below = 0;
1492 SET_MAP_OB (op->map, op->x, op->y, op); 1324 op->ms ().bot = op;
1493 } 1325 }
1494 else 1326 else
1495 { /* get inserted into the stack above top */ 1327 { /* get inserted into the stack above top */
1496 op->above = top->above; 1328 op->above = top->above;
1497 1329
… …
1500 1332
1501 op->below = top; 1333 op->below = top;
1502 top->above = op; 1334 top->above = op;
1503 } 1335 }
1504 1336
1505 if (op->above == NULL) 1337 if (!op->above)
1506 SET_MAP_TOP (op->map, op->x, op->y, op); 1338 op->ms ().top = op;
1507 } /* else not INS_BELOW_ORIGINATOR */ 1339 } /* else not INS_BELOW_ORIGINATOR */
1508 1340
1509 if (op->type == PLAYER) 1341 if (op->type == PLAYER)
1342 {
1510 op->contr->do_los = 1; 1343 op->contr->do_los = 1;
1344 ++op->map->players;
1345 op->map->touch ();
1346 }
1347
1348 op->map->dirty = true;
1511 1349
1512 /* If we have a floor, we know the player, if any, will be above 1350 /* If we have a floor, we know the player, if any, will be above
1513 * it, so save a few ticks and start from there. 1351 * it, so save a few ticks and start from there.
1514 */ 1352 */
1515 if (!(flag & INS_MAP_LOAD)) 1353 if (!(flag & INS_MAP_LOAD))
1516 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1354 if (object *pl = op->ms ().player ())
1517 if (tmp->type == PLAYER) 1355 if (pl->contr->ns)
1518 tmp->contr->socket.update_look = 1; 1356 pl->contr->ns->floorbox_update ();
1519 1357
1520 /* If this object glows, it may affect lighting conditions that are 1358 /* If this object glows, it may affect lighting conditions that are
1521 * visible to others on this map. But update_all_los is really 1359 * visible to others on this map. But update_all_los is really
1522 * an inefficient way to do this, as it means los for all players 1360 * an inefficient way to do this, as it means los for all players
1523 * on the map will get recalculated. The players could very well 1361 * on the map will get recalculated. The players could very well
1524 * be far away from this change and not affected in any way - 1362 * be far away from this change and not affected in any way -
1525 * this should get redone to only look for players within range, 1363 * this should get redone to only look for players within range,
1526 * or just updating the P_NEED_UPDATE for spaces within this area 1364 * or just updating the P_UPTODATE for spaces within this area
1527 * of effect may be sufficient. 1365 * of effect may be sufficient.
1528 */ 1366 */
1529 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1367 if (op->map->darkness && (op->glow_radius != 0))
1530 update_all_los (op->map, op->x, op->y); 1368 update_all_los (op->map, op->x, op->y);
1531 1369
1532 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1370 /* updates flags (blocked, alive, no magic, etc) for this map space */
1533 update_object (op, UP_OBJ_INSERT); 1371 update_object (op, UP_OBJ_INSERT);
1534 1372
1373 INVOKE_OBJECT (INSERT, op);
1374
1535 /* Don't know if moving this to the end will break anything. However, 1375 /* Don't know if moving this to the end will break anything. However,
1536 * we want to have update_look set above before calling this. 1376 * we want to have floorbox_update called before calling this.
1537 * 1377 *
1538 * check_move_on() must be after this because code called from 1378 * check_move_on() must be after this because code called from
1539 * check_move_on() depends on correct map flags (so functions like 1379 * check_move_on() depends on correct map flags (so functions like
1540 * blocked() and wall() work properly), and these flags are updated by 1380 * blocked() and wall() work properly), and these flags are updated by
1541 * update_object(). 1381 * update_object().
… …
1543 1383
1544 /* if this is not the head or flag has been passed, don't check walk on status */ 1384 /* if this is not the head or flag has been passed, don't check walk on status */
1545 if (!(flag & INS_NO_WALK_ON) && !op->head) 1385 if (!(flag & INS_NO_WALK_ON) && !op->head)
1546 { 1386 {
1547 if (check_move_on (op, originator)) 1387 if (check_move_on (op, originator))
1548 return NULL; 1388 return 0;
1549 1389
1550 /* If we are a multi part object, lets work our way through the check 1390 /* If we are a multi part object, lets work our way through the check
1551 * walk on's. 1391 * walk on's.
1552 */ 1392 */
1553 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1393 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1554 if (check_move_on (tmp, originator)) 1394 if (check_move_on (tmp, originator))
1555 return NULL; 1395 return 0;
1556 } 1396 }
1557 1397
1558 return op; 1398 return op;
1559} 1399}
1560 1400
1561/* this function inserts an object in the map, but if it 1401/* this function inserts an object in the map, but if it
1562 * finds an object of its own type, it'll remove that one first. 1402 * finds an object of its own type, it'll remove that one first.
1563 * op is the object to insert it under: supplies x and the map. 1403 * op is the object to insert it under: supplies x and the map.
1564 */ 1404 */
1565void 1405void
1566replace_insert_ob_in_map (const char *arch_string, object *op) 1406replace_insert_ob_in_map (const char *arch_string, object *op)
1567{ 1407{
1568 object * 1408 object *tmp, *tmp1;
1569 tmp;
1570 object *
1571 tmp1;
1572 1409
1573 /* first search for itself and remove any old instances */ 1410 /* first search for itself and remove any old instances */
1574 1411
1575 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1412 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1576 {
1577 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1413 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1578 { 1414 tmp->destroy ();
1579 remove_ob (tmp);
1580 free_object (tmp);
1581 }
1582 }
1583 1415
1584 tmp1 = arch_to_object (archetype::find (arch_string)); 1416 tmp1 = arch_to_object (archetype::find (arch_string));
1585 1417
1586 tmp1->x = op->x; 1418 tmp1->x = op->x;
1587 tmp1->y = op->y; 1419 tmp1->y = op->y;
1588 insert_ob_in_map (tmp1, op->map, op, 0); 1420 insert_ob_in_map (tmp1, op->map, op, 0);
1421}
1422
1423object *
1424object::insert_at (object *where, object *originator, int flags)
1425{
1426 where->map->insert (this, where->x, where->y, originator, flags);
1589} 1427}
1590 1428
1591/* 1429/*
1592 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1430 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1593 * is returned contains nr objects, and the remaining parts contains 1431 * is returned contains nr objects, and the remaining parts contains
1594 * the rest (or is removed and freed if that number is 0). 1432 * the rest (or is removed and freed if that number is 0).
1595 * On failure, NULL is returned, and the reason put into the 1433 * On failure, NULL is returned, and the reason put into the
1596 * global static errmsg array. 1434 * global static errmsg array.
1597 */ 1435 */
1598
1599object * 1436object *
1600get_split_ob (object *orig_ob, uint32 nr) 1437get_split_ob (object *orig_ob, uint32 nr)
1601{ 1438{
1602 object * 1439 object *newob;
1603 newob;
1604 int
1605 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1440 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1606 1441
1607 if (orig_ob->nrof < nr) 1442 if (orig_ob->nrof < nr)
1608 { 1443 {
1609 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1444 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1610 return NULL; 1445 return NULL;
1611 } 1446 }
1612 1447
1613 newob = object_create_clone (orig_ob); 1448 newob = object_create_clone (orig_ob);
1614 1449
1615 if ((orig_ob->nrof -= nr) < 1) 1450 if ((orig_ob->nrof -= nr) < 1)
1616 { 1451 orig_ob->destroy (1);
1617 if (!is_removed)
1618 remove_ob (orig_ob);
1619 free_object2 (orig_ob, 1);
1620 }
1621 else if (!is_removed) 1452 else if (!is_removed)
1622 { 1453 {
1623 if (orig_ob->env != NULL) 1454 if (orig_ob->env != NULL)
1624 sub_weight (orig_ob->env, orig_ob->weight * nr); 1455 sub_weight (orig_ob->env, orig_ob->weight * nr);
1625 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1456 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1645 1476
1646object * 1477object *
1647decrease_ob_nr (object *op, uint32 i) 1478decrease_ob_nr (object *op, uint32 i)
1648{ 1479{
1649 object *tmp; 1480 object *tmp;
1650 player *pl;
1651 1481
1652 if (i == 0) /* objects with op->nrof require this check */ 1482 if (i == 0) /* objects with op->nrof require this check */
1653 return op; 1483 return op;
1654 1484
1655 if (i > op->nrof) 1485 if (i > op->nrof)
1656 i = op->nrof; 1486 i = op->nrof;
1657 1487
1658 if (QUERY_FLAG (op, FLAG_REMOVED)) 1488 if (QUERY_FLAG (op, FLAG_REMOVED))
1659 op->nrof -= i; 1489 op->nrof -= i;
1660 else if (op->env != NULL) 1490 else if (op->env)
1661 { 1491 {
1662 /* is this object in the players inventory, or sub container 1492 /* is this object in the players inventory, or sub container
1663 * therein? 1493 * therein?
1664 */ 1494 */
1665 tmp = is_player_inv (op->env); 1495 tmp = op->in_player ();
1666 /* nope. Is this a container the player has opened? 1496 /* nope. Is this a container the player has opened?
1667 * If so, set tmp to that player. 1497 * If so, set tmp to that player.
1668 * IMO, searching through all the players will mostly 1498 * IMO, searching through all the players will mostly
1669 * likely be quicker than following op->env to the map, 1499 * likely be quicker than following op->env to the map,
1670 * and then searching the map for a player. 1500 * and then searching the map for a player.
1671 */ 1501 */
1672 if (!tmp) 1502 if (!tmp)
1673 { 1503 for_all_players (pl)
1674 for (pl = first_player; pl; pl = pl->next)
1675 if (pl->ob->container == op->env) 1504 if (pl->ob->container == op->env)
1505 {
1506 tmp = pl->ob;
1676 break; 1507 break;
1677 if (pl)
1678 tmp = pl->ob;
1679 else
1680 tmp = NULL;
1681 } 1508 }
1682 1509
1683 if (i < op->nrof) 1510 if (i < op->nrof)
1684 { 1511 {
1685 sub_weight (op->env, op->weight * i); 1512 sub_weight (op->env, op->weight * i);
1686 op->nrof -= i; 1513 op->nrof -= i;
1687 if (tmp) 1514 if (tmp)
1688 {
1689 esrv_send_item (tmp, op); 1515 esrv_send_item (tmp, op);
1690 }
1691 } 1516 }
1692 else 1517 else
1693 { 1518 {
1694 remove_ob (op); 1519 op->remove ();
1695 op->nrof = 0; 1520 op->nrof = 0;
1696 if (tmp) 1521 if (tmp)
1697 {
1698 esrv_del_item (tmp->contr, op->count); 1522 esrv_del_item (tmp->contr, op->count);
1699 }
1700 } 1523 }
1701 } 1524 }
1702 else 1525 else
1703 { 1526 {
1704 object *above = op->above; 1527 object *above = op->above;
1705 1528
1706 if (i < op->nrof) 1529 if (i < op->nrof)
1707 op->nrof -= i; 1530 op->nrof -= i;
1708 else 1531 else
1709 { 1532 {
1710 remove_ob (op); 1533 op->remove ();
1711 op->nrof = 0; 1534 op->nrof = 0;
1712 } 1535 }
1713 1536
1714 /* Since we just removed op, op->above is null */ 1537 /* Since we just removed op, op->above is null */
1715 for (tmp = above; tmp != NULL; tmp = tmp->above) 1538 for (tmp = above; tmp; tmp = tmp->above)
1716 if (tmp->type == PLAYER) 1539 if (tmp->type == PLAYER)
1717 { 1540 {
1718 if (op->nrof) 1541 if (op->nrof)
1719 esrv_send_item (tmp, op); 1542 esrv_send_item (tmp, op);
1720 else 1543 else
… …
1724 1547
1725 if (op->nrof) 1548 if (op->nrof)
1726 return op; 1549 return op;
1727 else 1550 else
1728 { 1551 {
1729 free_object (op); 1552 op->destroy ();
1730 return NULL; 1553 return 0;
1731 } 1554 }
1732} 1555}
1733 1556
1734/* 1557/*
1735 * add_weight(object, weight) adds the specified weight to an object, 1558 * add_weight(object, weight) adds the specified weight to an object,
… …
1747 op->carrying += weight; 1570 op->carrying += weight;
1748 op = op->env; 1571 op = op->env;
1749 } 1572 }
1750} 1573}
1751 1574
1752/*
1753 * insert_ob_in_ob(op,environment):
1754 * This function inserts the object op in the linked list
1755 * inside the object environment.
1756 *
1757 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1758 * the inventory at the last position or next to other objects of the same
1759 * type.
1760 * Frank: Now sorted by type, archetype and magic!
1761 *
1762 * The function returns now pointer to inserted item, and return value can
1763 * be != op, if items are merged. -Tero
1764 */
1765
1766object * 1575object *
1767insert_ob_in_ob (object *op, object *where) 1576insert_ob_in_ob (object *op, object *where)
1768{ 1577{
1769 object * 1578 if (!where)
1770 tmp, *
1771 otmp;
1772
1773 if (!QUERY_FLAG (op, FLAG_REMOVED))
1774 {
1775 char *dump = dump_object (op);
1776 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1777 free (dump);
1778 return op;
1779 }
1780
1781 if (where == NULL)
1782 { 1579 {
1783 char *dump = dump_object (op); 1580 char *dump = dump_object (op);
1784 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1581 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1785 free (dump); 1582 free (dump);
1786 return op; 1583 return op;
1787 } 1584 }
1788 1585
1789 if (where->head) 1586 if (where->head)
1790 { 1587 {
1791 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1588 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1792 where = where->head; 1589 where = where->head;
1793 } 1590 }
1591
1592 return where->insert (op);
1593}
1594
1595/*
1596 * env->insert (op)
1597 * This function inserts the object op in the linked list
1598 * inside the object environment.
1599 *
1600 * The function returns now pointer to inserted item, and return value can
1601 * be != op, if items are merged. -Tero
1602 */
1603
1604object *
1605object::insert (object *op)
1606{
1607 object *tmp, *otmp;
1608
1609 if (!QUERY_FLAG (op, FLAG_REMOVED))
1610 op->remove ();
1794 1611
1795 if (op->more) 1612 if (op->more)
1796 { 1613 {
1797 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1614 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1798 return op; 1615 return op;
… …
1800 1617
1801 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1618 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1802 CLEAR_FLAG (op, FLAG_REMOVED); 1619 CLEAR_FLAG (op, FLAG_REMOVED);
1803 if (op->nrof) 1620 if (op->nrof)
1804 { 1621 {
1805 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1622 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1806 if (CAN_MERGE (tmp, op)) 1623 if (object::can_merge (tmp, op))
1807 { 1624 {
1808 /* return the original object and remove inserted object 1625 /* return the original object and remove inserted object
1809 (client needs the original object) */ 1626 (client needs the original object) */
1810 tmp->nrof += op->nrof; 1627 tmp->nrof += op->nrof;
1811 /* Weight handling gets pretty funky. Since we are adding to 1628 /* Weight handling gets pretty funky. Since we are adding to
1812 * tmp->nrof, we need to increase the weight. 1629 * tmp->nrof, we need to increase the weight.
1813 */ 1630 */
1814 add_weight (where, op->weight * op->nrof); 1631 add_weight (this, op->weight * op->nrof);
1815 SET_FLAG (op, FLAG_REMOVED); 1632 SET_FLAG (op, FLAG_REMOVED);
1816 free_object (op); /* free the inserted object */ 1633 op->destroy (); /* free the inserted object */
1817 op = tmp; 1634 op = tmp;
1818 remove_ob (op); /* and fix old object's links */ 1635 op->remove (); /* and fix old object's links */
1819 CLEAR_FLAG (op, FLAG_REMOVED); 1636 CLEAR_FLAG (op, FLAG_REMOVED);
1820 break; 1637 break;
1821 } 1638 }
1822 1639
1823 /* I assume combined objects have no inventory 1640 /* I assume combined objects have no inventory
1824 * We add the weight - this object could have just been removed 1641 * We add the weight - this object could have just been removed
1825 * (if it was possible to merge). calling remove_ob will subtract 1642 * (if it was possible to merge). calling remove_ob will subtract
1826 * the weight, so we need to add it in again, since we actually do 1643 * the weight, so we need to add it in again, since we actually do
1827 * the linking below 1644 * the linking below
1828 */ 1645 */
1829 add_weight (where, op->weight * op->nrof); 1646 add_weight (this, op->weight * op->nrof);
1830 } 1647 }
1831 else 1648 else
1832 add_weight (where, (op->weight + op->carrying)); 1649 add_weight (this, (op->weight + op->carrying));
1833 1650
1834 otmp = is_player_inv (where); 1651 otmp = this->in_player ();
1835 if (otmp && otmp->contr != NULL) 1652 if (otmp && otmp->contr)
1836 {
1837 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1653 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1838 fix_player (otmp); 1654 otmp->update_stats ();
1839 }
1840 1655
1841 op->map = NULL; 1656 op->map = 0;
1842 op->env = where; 1657 op->env = this;
1843 op->above = NULL; 1658 op->above = 0;
1844 op->below = NULL; 1659 op->below = 0;
1845 op->x = 0, op->y = 0; 1660 op->x = 0, op->y = 0;
1846 1661
1847 /* reset the light list and los of the players on the map */ 1662 /* reset the light list and los of the players on the map */
1848 if ((op->glow_radius != 0) && where->map) 1663 if ((op->glow_radius != 0) && map)
1849 { 1664 {
1850#ifdef DEBUG_LIGHTS 1665#ifdef DEBUG_LIGHTS
1851 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1666 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1852#endif /* DEBUG_LIGHTS */ 1667#endif /* DEBUG_LIGHTS */
1853 if (MAP_DARKNESS (where->map)) 1668 if (map->darkness)
1854 update_all_los (where->map, where->x, where->y); 1669 update_all_los (map, x, y);
1855 } 1670 }
1856 1671
1857 /* Client has no idea of ordering so lets not bother ordering it here. 1672 /* Client has no idea of ordering so lets not bother ordering it here.
1858 * It sure simplifies this function... 1673 * It sure simplifies this function...
1859 */ 1674 */
1860 if (where->inv == NULL) 1675 if (!inv)
1861 where->inv = op; 1676 inv = op;
1862 else 1677 else
1863 { 1678 {
1864 op->below = where->inv; 1679 op->below = inv;
1865 op->below->above = op; 1680 op->below->above = op;
1866 where->inv = op; 1681 inv = op;
1867 } 1682 }
1683
1684 INVOKE_OBJECT (INSERT, this);
1685
1868 return op; 1686 return op;
1869} 1687}
1870 1688
1871/* 1689/*
1872 * Checks if any objects has a move_type that matches objects 1690 * Checks if any objects has a move_type that matches objects
… …
1886 * 1704 *
1887 * MSW 2001-07-08: Check all objects on space, not just those below 1705 * MSW 2001-07-08: Check all objects on space, not just those below
1888 * object being inserted. insert_ob_in_map may not put new objects 1706 * object being inserted. insert_ob_in_map may not put new objects
1889 * on top. 1707 * on top.
1890 */ 1708 */
1891
1892int 1709int
1893check_move_on (object *op, object *originator) 1710check_move_on (object *op, object *originator)
1894{ 1711{
1895 object *tmp; 1712 object *tmp;
1896 maptile *m = op->map; 1713 maptile *m = op->map;
… …
1923 1740
1924 /* The objects have to be checked from top to bottom. 1741 /* The objects have to be checked from top to bottom.
1925 * Hence, we first go to the top: 1742 * Hence, we first go to the top:
1926 */ 1743 */
1927 1744
1928 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1745 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1929 { 1746 {
1930 /* Trim the search when we find the first other spell effect 1747 /* Trim the search when we find the first other spell effect
1931 * this helps performance so that if a space has 50 spell objects, 1748 * this helps performance so that if a space has 50 spell objects,
1932 * we don't need to check all of them. 1749 * we don't need to check all of them.
1933 */ 1750 */
… …
1988/* 1805/*
1989 * present_arch(arch, map, x, y) searches for any objects with 1806 * present_arch(arch, map, x, y) searches for any objects with
1990 * a matching archetype at the given map and coordinates. 1807 * a matching archetype at the given map and coordinates.
1991 * The first matching object is returned, or NULL if none. 1808 * The first matching object is returned, or NULL if none.
1992 */ 1809 */
1993
1994object * 1810object *
1995present_arch (const archetype *at, maptile *m, int x, int y) 1811present_arch (const archetype *at, maptile *m, int x, int y)
1996{ 1812{
1997 object *
1998 tmp;
1999
2000 if (m == NULL || out_of_map (m, x, y)) 1813 if (!m || out_of_map (m, x, y))
2001 { 1814 {
2002 LOG (llevError, "Present_arch called outside map.\n"); 1815 LOG (llevError, "Present_arch called outside map.\n");
2003 return NULL; 1816 return NULL;
2004 } 1817 }
2005 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1818
1819 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2006 if (tmp->arch == at) 1820 if (tmp->arch == at)
2007 return tmp; 1821 return tmp;
1822
2008 return NULL; 1823 return NULL;
2009} 1824}
2010 1825
2011/* 1826/*
2012 * present(type, map, x, y) searches for any objects with 1827 * present(type, map, x, y) searches for any objects with
2013 * a matching type variable at the given map and coordinates. 1828 * a matching type variable at the given map and coordinates.
2014 * The first matching object is returned, or NULL if none. 1829 * The first matching object is returned, or NULL if none.
2015 */ 1830 */
2016
2017object * 1831object *
2018present (unsigned char type, maptile *m, int x, int y) 1832present (unsigned char type, maptile *m, int x, int y)
2019{ 1833{
2020 object *
2021 tmp;
2022
2023 if (out_of_map (m, x, y)) 1834 if (out_of_map (m, x, y))
2024 { 1835 {
2025 LOG (llevError, "Present called outside map.\n"); 1836 LOG (llevError, "Present called outside map.\n");
2026 return NULL; 1837 return NULL;
2027 } 1838 }
2028 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1839
1840 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2029 if (tmp->type == type) 1841 if (tmp->type == type)
2030 return tmp; 1842 return tmp;
1843
2031 return NULL; 1844 return NULL;
2032} 1845}
2033 1846
2034/* 1847/*
2035 * present_in_ob(type, object) searches for any objects with 1848 * present_in_ob(type, object) searches for any objects with
2036 * a matching type variable in the inventory of the given object. 1849 * a matching type variable in the inventory of the given object.
2037 * The first matching object is returned, or NULL if none. 1850 * The first matching object is returned, or NULL if none.
2038 */ 1851 */
2039
2040object * 1852object *
2041present_in_ob (unsigned char type, const object *op) 1853present_in_ob (unsigned char type, const object *op)
2042{ 1854{
2043 object *
2044 tmp;
2045
2046 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1855 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047 if (tmp->type == type) 1856 if (tmp->type == type)
2048 return tmp; 1857 return tmp;
1858
2049 return NULL; 1859 return NULL;
2050} 1860}
2051 1861
2052/* 1862/*
2053 * present_in_ob (type, str, object) searches for any objects with 1863 * present_in_ob (type, str, object) searches for any objects with
… …
2061 * str is the string to match against. Note that we match against 1871 * str is the string to match against. Note that we match against
2062 * the object name, not the archetype name. this is so that the 1872 * the object name, not the archetype name. this is so that the
2063 * spell code can use one object type (force), but change it's name 1873 * spell code can use one object type (force), but change it's name
2064 * to be unique. 1874 * to be unique.
2065 */ 1875 */
2066
2067object * 1876object *
2068present_in_ob_by_name (int type, const char *str, const object *op) 1877present_in_ob_by_name (int type, const char *str, const object *op)
2069{ 1878{
2070 object *
2071 tmp;
2072
2073 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1879 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2074 {
2075 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1880 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2076 return tmp; 1881 return tmp;
2077 } 1882
2078 return NULL; 1883 return 0;
2079} 1884}
2080 1885
2081/* 1886/*
2082 * present_arch_in_ob(archetype, object) searches for any objects with 1887 * present_arch_in_ob(archetype, object) searches for any objects with
2083 * a matching archetype in the inventory of the given object. 1888 * a matching archetype in the inventory of the given object.
2084 * The first matching object is returned, or NULL if none. 1889 * The first matching object is returned, or NULL if none.
2085 */ 1890 */
2086
2087object * 1891object *
2088present_arch_in_ob (const archetype *at, const object *op) 1892present_arch_in_ob (const archetype *at, const object *op)
2089{ 1893{
2090 object *
2091 tmp;
2092
2093 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1894 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2094 if (tmp->arch == at) 1895 if (tmp->arch == at)
2095 return tmp; 1896 return tmp;
1897
2096 return NULL; 1898 return NULL;
2097} 1899}
2098 1900
2099/* 1901/*
2100 * activate recursively a flag on an object inventory 1902 * activate recursively a flag on an object inventory
2101 */ 1903 */
2102void 1904void
2103flag_inv (object *op, int flag) 1905flag_inv (object *op, int flag)
2104{ 1906{
2105 object *
2106 tmp;
2107
2108 if (op->inv) 1907 if (op->inv)
2109 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1908 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2110 { 1909 {
2111 SET_FLAG (tmp, flag); 1910 SET_FLAG (tmp, flag);
2112 flag_inv (tmp, flag); 1911 flag_inv (tmp, flag);
2113 } 1912 }
2114} /* 1913}
1914
1915/*
2115 * desactivate recursively a flag on an object inventory 1916 * deactivate recursively a flag on an object inventory
2116 */ 1917 */
2117void 1918void
2118unflag_inv (object *op, int flag) 1919unflag_inv (object *op, int flag)
2119{ 1920{
2120 object *
2121 tmp;
2122
2123 if (op->inv) 1921 if (op->inv)
2124 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1922 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2125 { 1923 {
2126 CLEAR_FLAG (tmp, flag); 1924 CLEAR_FLAG (tmp, flag);
2127 unflag_inv (tmp, flag); 1925 unflag_inv (tmp, flag);
2128 } 1926 }
2129} 1927}
… …
2132 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1930 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2133 * all it's inventory (recursively). 1931 * all it's inventory (recursively).
2134 * If checksums are used, a player will get set_cheat called for 1932 * If checksums are used, a player will get set_cheat called for
2135 * him/her-self and all object carried by a call to this function. 1933 * him/her-self and all object carried by a call to this function.
2136 */ 1934 */
2137
2138void 1935void
2139set_cheat (object *op) 1936set_cheat (object *op)
2140{ 1937{
2141 SET_FLAG (op, FLAG_WAS_WIZ); 1938 SET_FLAG (op, FLAG_WAS_WIZ);
2142 flag_inv (op, FLAG_WAS_WIZ); 1939 flag_inv (op, FLAG_WAS_WIZ);
… …
2161 * because arch_blocked (now ob_blocked) needs to know the movement type 1958 * because arch_blocked (now ob_blocked) needs to know the movement type
2162 * to know if the space in question will block the object. We can't use 1959 * to know if the space in question will block the object. We can't use
2163 * the archetype because that isn't correct if the monster has been 1960 * the archetype because that isn't correct if the monster has been
2164 * customized, changed states, etc. 1961 * customized, changed states, etc.
2165 */ 1962 */
2166
2167int 1963int
2168find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1964find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2169{ 1965{
2170 int
2171 i,
2172 index = 0, flag; 1966 int index = 0, flag;
2173 static int
2174 altern[SIZEOFFREE]; 1967 int altern[SIZEOFFREE];
2175 1968
2176 for (i = start; i < stop; i++) 1969 for (int i = start; i < stop; i++)
2177 { 1970 {
2178 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1971 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2179 if (!flag) 1972 if (!flag)
2180 altern[index++] = i; 1973 altern [index++] = i;
2181 1974
2182 /* Basically, if we find a wall on a space, we cut down the search size. 1975 /* Basically, if we find a wall on a space, we cut down the search size.
2183 * In this way, we won't return spaces that are on another side of a wall. 1976 * In this way, we won't return spaces that are on another side of a wall.
2184 * This mostly work, but it cuts down the search size in all directions - 1977 * This mostly work, but it cuts down the search size in all directions -
2185 * if the space being examined only has a wall to the north and empty 1978 * if the space being examined only has a wall to the north and empty
2186 * spaces in all the other directions, this will reduce the search space 1979 * spaces in all the other directions, this will reduce the search space
2187 * to only the spaces immediately surrounding the target area, and 1980 * to only the spaces immediately surrounding the target area, and
2188 * won't look 2 spaces south of the target space. 1981 * won't look 2 spaces south of the target space.
2189 */ 1982 */
2190 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 1983 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2191 stop = maxfree[i]; 1984 stop = maxfree[i];
2192 } 1985 }
1986
2193 if (!index) 1987 if (!index)
2194 return -1; 1988 return -1;
1989
2195 return altern[RANDOM () % index]; 1990 return altern[RANDOM () % index];
2196} 1991}
2197 1992
2198/* 1993/*
2199 * find_first_free_spot(archetype, maptile, x, y) works like 1994 * find_first_free_spot(archetype, maptile, x, y) works like
2200 * find_free_spot(), but it will search max number of squares. 1995 * find_free_spot(), but it will search max number of squares.
2201 * But it will return the first available spot, not a random choice. 1996 * But it will return the first available spot, not a random choice.
2202 * Changed 0.93.2: Have it return -1 if there is no free spot available. 1997 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2203 */ 1998 */
2204
2205int 1999int
2206find_first_free_spot (const object *ob, maptile *m, int x, int y) 2000find_first_free_spot (const object *ob, maptile *m, int x, int y)
2207{ 2001{
2208 int
2209 i;
2210
2211 for (i = 0; i < SIZEOFFREE; i++) 2002 for (int i = 0; i < SIZEOFFREE; i++)
2212 {
2213 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2003 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2214 return i; 2004 return i;
2215 } 2005
2216 return -1; 2006 return -1;
2217} 2007}
2218 2008
2219/* 2009/*
2220 * The function permute(arr, begin, end) randomly reorders the array 2010 * The function permute(arr, begin, end) randomly reorders the array
2221 * arr[begin..end-1]. 2011 * arr[begin..end-1].
2012 * now uses a fisher-yates shuffle, old permute was broken
2222 */ 2013 */
2223static void 2014static void
2224permute (int *arr, int begin, int end) 2015permute (int *arr, int begin, int end)
2225{ 2016{
2226 int 2017 arr += begin;
2227 i,
2228 j,
2229 tmp,
2230 len;
2231
2232 len = end - begin; 2018 end -= begin;
2233 for (i = begin; i < end; i++)
2234 {
2235 j = begin + RANDOM () % len;
2236 2019
2237 tmp = arr[i]; 2020 while (--end)
2238 arr[i] = arr[j]; 2021 swap (arr [end], arr [RANDOM () % (end + 1)]);
2239 arr[j] = tmp;
2240 }
2241} 2022}
2242 2023
2243/* new function to make monster searching more efficient, and effective! 2024/* new function to make monster searching more efficient, and effective!
2244 * This basically returns a randomized array (in the passed pointer) of 2025 * This basically returns a randomized array (in the passed pointer) of
2245 * the spaces to find monsters. In this way, it won't always look for 2026 * the spaces to find monsters. In this way, it won't always look for
… …
2248 * the 3x3 area will be searched, just not in a predictable order. 2029 * the 3x3 area will be searched, just not in a predictable order.
2249 */ 2030 */
2250void 2031void
2251get_search_arr (int *search_arr) 2032get_search_arr (int *search_arr)
2252{ 2033{
2253 int 2034 int i;
2254 i;
2255 2035
2256 for (i = 0; i < SIZEOFFREE; i++) 2036 for (i = 0; i < SIZEOFFREE; i++)
2257 {
2258 search_arr[i] = i; 2037 search_arr[i] = i;
2259 }
2260 2038
2261 permute (search_arr, 1, SIZEOFFREE1 + 1); 2039 permute (search_arr, 1, SIZEOFFREE1 + 1);
2262 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2040 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2263 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2041 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2264} 2042}
… …
2273 * Perhaps incorrectly, but I'm making the assumption that exclude 2051 * Perhaps incorrectly, but I'm making the assumption that exclude
2274 * is actually want is going to try and move there. We need this info 2052 * is actually want is going to try and move there. We need this info
2275 * because we have to know what movement the thing looking to move 2053 * because we have to know what movement the thing looking to move
2276 * there is capable of. 2054 * there is capable of.
2277 */ 2055 */
2278
2279int 2056int
2280find_dir (maptile *m, int x, int y, object *exclude) 2057find_dir (maptile *m, int x, int y, object *exclude)
2281{ 2058{
2282 int
2283 i,
2284 max = SIZEOFFREE, mflags; 2059 int i, max = SIZEOFFREE, mflags;
2285 2060
2286 sint16 nx, ny; 2061 sint16 nx, ny;
2287 object * 2062 object *tmp;
2288 tmp;
2289 maptile * 2063 maptile *mp;
2290 mp;
2291 2064
2292 MoveType blocked, move_type; 2065 MoveType blocked, move_type;
2293 2066
2294 if (exclude && exclude->head) 2067 if (exclude && exclude->head)
2295 { 2068 {
… …
2307 mp = m; 2080 mp = m;
2308 nx = x + freearr_x[i]; 2081 nx = x + freearr_x[i];
2309 ny = y + freearr_y[i]; 2082 ny = y + freearr_y[i];
2310 2083
2311 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2084 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2085
2312 if (mflags & P_OUT_OF_MAP) 2086 if (mflags & P_OUT_OF_MAP)
2313 {
2314 max = maxfree[i]; 2087 max = maxfree[i];
2315 }
2316 else 2088 else
2317 { 2089 {
2318 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2090 mapspace &ms = mp->at (nx, ny);
2091
2092 blocked = ms.move_block;
2319 2093
2320 if ((move_type & blocked) == move_type) 2094 if ((move_type & blocked) == move_type)
2321 {
2322 max = maxfree[i]; 2095 max = maxfree[i];
2323 }
2324 else if (mflags & P_IS_ALIVE) 2096 else if (mflags & P_IS_ALIVE)
2325 { 2097 {
2326 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2098 for (tmp = ms.bot; tmp; tmp = tmp->above)
2327 { 2099 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2328 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2100 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2329 {
2330 break; 2101 break;
2331 } 2102
2332 }
2333 if (tmp) 2103 if (tmp)
2334 {
2335 return freedir[i]; 2104 return freedir[i];
2336 }
2337 } 2105 }
2338 } 2106 }
2339 } 2107 }
2108
2340 return 0; 2109 return 0;
2341} 2110}
2342 2111
2343/* 2112/*
2344 * distance(object 1, object 2) will return the square of the 2113 * distance(object 1, object 2) will return the square of the
2345 * distance between the two given objects. 2114 * distance between the two given objects.
2346 */ 2115 */
2347
2348int 2116int
2349distance (const object *ob1, const object *ob2) 2117distance (const object *ob1, const object *ob2)
2350{ 2118{
2351 int
2352 i;
2353
2354 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2119 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2355 return i;
2356} 2120}
2357 2121
2358/* 2122/*
2359 * find_dir_2(delta-x,delta-y) will return a direction in which 2123 * find_dir_2(delta-x,delta-y) will return a direction in which
2360 * an object which has subtracted the x and y coordinates of another 2124 * an object which has subtracted the x and y coordinates of another
2361 * object, needs to travel toward it. 2125 * object, needs to travel toward it.
2362 */ 2126 */
2363
2364int 2127int
2365find_dir_2 (int x, int y) 2128find_dir_2 (int x, int y)
2366{ 2129{
2367 int 2130 int q;
2368 q;
2369 2131
2370 if (y) 2132 if (y)
2371 q = x * 100 / y; 2133 q = x * 100 / y;
2372 else if (x) 2134 else if (x)
2373 q = -300 * x; 2135 q = -300 * x;
… …
2408int 2170int
2409absdir (int d) 2171absdir (int d)
2410{ 2172{
2411 while (d < 1) 2173 while (d < 1)
2412 d += 8; 2174 d += 8;
2175
2413 while (d > 8) 2176 while (d > 8)
2414 d -= 8; 2177 d -= 8;
2178
2415 return d; 2179 return d;
2416} 2180}
2417 2181
2418/* 2182/*
2419 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2183 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2421 */ 2185 */
2422 2186
2423int 2187int
2424dirdiff (int dir1, int dir2) 2188dirdiff (int dir1, int dir2)
2425{ 2189{
2426 int 2190 int d;
2427 d;
2428 2191
2429 d = abs (dir1 - dir2); 2192 d = abs (dir1 - dir2);
2430 if (d > 4) 2193 if (d > 4)
2431 d = 8 - d; 2194 d = 8 - d;
2195
2432 return d; 2196 return d;
2433} 2197}
2434 2198
2435/* peterm: 2199/* peterm:
2436 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2200 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2439 * This basically means that if direction is 15, then it could either go 2203 * This basically means that if direction is 15, then it could either go
2440 * direction 4, 14, or 16 to get back to where we are. 2204 * direction 4, 14, or 16 to get back to where we are.
2441 * Moved from spell_util.c to object.c with the other related direction 2205 * Moved from spell_util.c to object.c with the other related direction
2442 * functions. 2206 * functions.
2443 */ 2207 */
2444
2445int
2446 reduction_dir[SIZEOFFREE][3] = { 2208int reduction_dir[SIZEOFFREE][3] = {
2447 {0, 0, 0}, /* 0 */ 2209 {0, 0, 0}, /* 0 */
2448 {0, 0, 0}, /* 1 */ 2210 {0, 0, 0}, /* 1 */
2449 {0, 0, 0}, /* 2 */ 2211 {0, 0, 0}, /* 2 */
2450 {0, 0, 0}, /* 3 */ 2212 {0, 0, 0}, /* 3 */
2451 {0, 0, 0}, /* 4 */ 2213 {0, 0, 0}, /* 4 */
… …
2499 * find a path to that monster that we found. If not, 2261 * find a path to that monster that we found. If not,
2500 * we don't bother going toward it. Returns 1 if we 2262 * we don't bother going toward it. Returns 1 if we
2501 * can see a direct way to get it 2263 * can see a direct way to get it
2502 * Modified to be map tile aware -.MSW 2264 * Modified to be map tile aware -.MSW
2503 */ 2265 */
2504
2505
2506int 2266int
2507can_see_monsterP (maptile *m, int x, int y, int dir) 2267can_see_monsterP (maptile *m, int x, int y, int dir)
2508{ 2268{
2509 sint16 dx, dy; 2269 sint16 dx, dy;
2510 int
2511 mflags; 2270 int mflags;
2512 2271
2513 if (dir < 0) 2272 if (dir < 0)
2514 return 0; /* exit condition: invalid direction */ 2273 return 0; /* exit condition: invalid direction */
2515 2274
2516 dx = x + freearr_x[dir]; 2275 dx = x + freearr_x[dir];
… …
2529 return 0; 2288 return 0;
2530 2289
2531 /* yes, can see. */ 2290 /* yes, can see. */
2532 if (dir < 9) 2291 if (dir < 9)
2533 return 1; 2292 return 1;
2293
2534 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2294 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2535 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2295 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2296 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2536} 2297}
2537
2538
2539 2298
2540/* 2299/*
2541 * can_pick(picker, item): finds out if an object is possible to be 2300 * can_pick(picker, item): finds out if an object is possible to be
2542 * picked up by the picker. Returnes 1 if it can be 2301 * picked up by the picker. Returnes 1 if it can be
2543 * picked up, otherwise 0. 2302 * picked up, otherwise 0.
… …
2554 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2313 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2555 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2314 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2556 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2315 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2557} 2316}
2558 2317
2559
2560/* 2318/*
2561 * create clone from object to another 2319 * create clone from object to another
2562 */ 2320 */
2563object * 2321object *
2564object_create_clone (object *asrc) 2322object_create_clone (object *asrc)
2565{ 2323{
2566 object *
2567 dst = NULL, *tmp, *src, *part, *prev, *item; 2324 object *dst = 0, *tmp, *src, *part, *prev, *item;
2568 2325
2569 if (!asrc) 2326 if (!asrc)
2570 return NULL; 2327 return 0;
2328
2571 src = asrc; 2329 src = asrc;
2572 if (src->head) 2330 if (src->head)
2573 src = src->head; 2331 src = src->head;
2574 2332
2575 prev = NULL; 2333 prev = 0;
2576 for (part = src; part; part = part->more) 2334 for (part = src; part; part = part->more)
2577 { 2335 {
2578 tmp = get_object (); 2336 tmp = part->clone ();
2579 copy_object (part, tmp);
2580 tmp->x -= src->x; 2337 tmp->x -= src->x;
2581 tmp->y -= src->y; 2338 tmp->y -= src->y;
2339
2582 if (!part->head) 2340 if (!part->head)
2583 { 2341 {
2584 dst = tmp; 2342 dst = tmp;
2585 tmp->head = NULL; 2343 tmp->head = 0;
2586 } 2344 }
2587 else 2345 else
2588 {
2589 tmp->head = dst; 2346 tmp->head = dst;
2590 } 2347
2591 tmp->more = NULL; 2348 tmp->more = 0;
2349
2592 if (prev) 2350 if (prev)
2593 prev->more = tmp; 2351 prev->more = tmp;
2352
2594 prev = tmp; 2353 prev = tmp;
2595 } 2354 }
2596 2355
2597 for (item = src->inv; item; item = item->below) 2356 for (item = src->inv; item; item = item->below)
2598 insert_ob_in_ob (object_create_clone (item), dst); 2357 insert_ob_in_ob (object_create_clone (item), dst);
… …
2604/* Basically, we save the content of the string to a temp file, then call */ 2363/* Basically, we save the content of the string to a temp file, then call */
2605/* load_object on it. I admit it is a highly inefficient way to make things, */ 2364/* load_object on it. I admit it is a highly inefficient way to make things, */
2606/* but it was simple to make and allows reusing the load_object function. */ 2365/* but it was simple to make and allows reusing the load_object function. */
2607/* Remember not to use load_object_str in a time-critical situation. */ 2366/* Remember not to use load_object_str in a time-critical situation. */
2608/* Also remember that multiparts objects are not supported for now. */ 2367/* Also remember that multiparts objects are not supported for now. */
2609
2610object * 2368object *
2611load_object_str (const char *obstr) 2369load_object_str (const char *obstr)
2612{ 2370{
2613 object *op; 2371 object *op;
2614 char filename[MAX_BUF]; 2372 char filename[MAX_BUF];
… …
2624 } 2382 }
2625 2383
2626 fprintf (tempfile, obstr); 2384 fprintf (tempfile, obstr);
2627 fclose (tempfile); 2385 fclose (tempfile);
2628 2386
2629 op = get_object (); 2387 op = object::create ();
2630 2388
2631 object_thawer thawer (filename); 2389 object_thawer thawer (filename);
2632 2390
2633 if (thawer) 2391 if (thawer)
2634 load_object (thawer, op, 0); 2392 load_object (thawer, op, 0);
… …
2644 * returns NULL if no match. 2402 * returns NULL if no match.
2645 */ 2403 */
2646object * 2404object *
2647find_obj_by_type_subtype (const object *who, int type, int subtype) 2405find_obj_by_type_subtype (const object *who, int type, int subtype)
2648{ 2406{
2649 object *tmp;
2650
2651 for (tmp = who->inv; tmp; tmp = tmp->below) 2407 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2652 if (tmp->type == type && tmp->subtype == subtype) 2408 if (tmp->type == type && tmp->subtype == subtype)
2653 return tmp; 2409 return tmp;
2654 2410
2655 return NULL; 2411 return 0;
2656} 2412}
2657 2413
2658/* If ob has a field named key, return the link from the list, 2414/* If ob has a field named key, return the link from the list,
2659 * otherwise return NULL. 2415 * otherwise return NULL.
2660 * 2416 *
… …
2662 * do the desired thing. 2418 * do the desired thing.
2663 */ 2419 */
2664key_value * 2420key_value *
2665get_ob_key_link (const object *ob, const char *key) 2421get_ob_key_link (const object *ob, const char *key)
2666{ 2422{
2667 key_value *link;
2668
2669 for (link = ob->key_values; link != NULL; link = link->next) 2423 for (key_value *link = ob->key_values; link; link = link->next)
2670 if (link->key == key) 2424 if (link->key == key)
2671 return link; 2425 return link;
2672 2426
2673 return NULL; 2427 return 0;
2674} 2428}
2675 2429
2676/* 2430/*
2677 * Returns the value of op has an extra_field for key, or NULL. 2431 * Returns the value of op has an extra_field for key, or NULL.
2678 * 2432 *
… …
2718 * Returns TRUE on success. 2472 * Returns TRUE on success.
2719 */ 2473 */
2720int 2474int
2721set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2475set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2722{ 2476{
2723 key_value *
2724 field = NULL, *last = NULL; 2477 key_value *field = NULL, *last = NULL;
2725 2478
2726 for (field = op->key_values; field != NULL; field = field->next) 2479 for (field = op->key_values; field != NULL; field = field->next)
2727 { 2480 {
2728 if (field->key != canonical_key) 2481 if (field->key != canonical_key)
2729 { 2482 {
… …
2757 /* IF we get here, key doesn't exist */ 2510 /* IF we get here, key doesn't exist */
2758 2511
2759 /* No field, we'll have to add it. */ 2512 /* No field, we'll have to add it. */
2760 2513
2761 if (!add_key) 2514 if (!add_key)
2762 {
2763 return FALSE; 2515 return FALSE;
2764 } 2516
2765 /* There isn't any good reason to store a null 2517 /* There isn't any good reason to store a null
2766 * value in the key/value list. If the archetype has 2518 * value in the key/value list. If the archetype has
2767 * this key, then we should also have it, so shouldn't 2519 * this key, then we should also have it, so shouldn't
2768 * be here. If user wants to store empty strings, 2520 * be here. If user wants to store empty strings,
2769 * should pass in "" 2521 * should pass in ""
… …
2818 } 2570 }
2819 else 2571 else
2820 item = item->env; 2572 item = item->env;
2821} 2573}
2822 2574
2575
2576const char *
2577object::flag_desc (char *desc, int len) const
2578{
2579 char *p = desc;
2580 bool first = true;
2581
2582 *p = 0;
2583
2584 for (int i = 0; i < NUM_FLAGS; i++)
2585 {
2586 if (len <= 10) // magic constant!
2587 {
2588 snprintf (p, len, ",...");
2589 break;
2590 }
2591
2592 if (flag [i])
2593 {
2594 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2595 len -= cnt;
2596 p += cnt;
2597 first = false;
2598 }
2599 }
2600
2601 return desc;
2602}
2603
2823// return a suitable string describing an objetc in enough detail to find it 2604// return a suitable string describing an object in enough detail to find it
2824const char * 2605const char *
2825object::debug_desc (char *info) const 2606object::debug_desc (char *info) const
2826{ 2607{
2608 char flagdesc[512];
2827 char info2[256 * 3]; 2609 char info2[256 * 4];
2828 char *p = info; 2610 char *p = info;
2829 2611
2830 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2612 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2831 count, 2613 count, uuid.seq,
2832 &name, 2614 &name,
2833 title ? " " : "", 2615 title ? "\",title:" : "",
2834 title ? (const char *)title : ""); 2616 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type);
2835 2618
2836 if (env) 2619 if (env)
2837 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2838 2621
2839 if (map) 2622 if (map)
2840 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2623 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2841 2624
2842 return info; 2625 return info;
2843} 2626}
2844 2627
2845const char * 2628const char *
2846object::debug_desc () const 2629object::debug_desc () const
2847{ 2630{
2848 static char info[256 * 3]; 2631 static char info[256 * 4];
2849 return debug_desc (info); 2632 return debug_desc (info);
2850} 2633}
2851 2634

Diff Legend

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