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.52 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC

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

Diff Legend

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