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

Diff Legend

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