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.44 by root, Thu Sep 14 17:29:27 2006 UTC vs.
Revision 1.112 by root, Mon Jan 8 14:11:04 2007 UTC

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

Diff Legend

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