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

Diff Legend

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