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

Diff Legend

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