ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.44 by root, Thu Sep 14 17:29:27 2006 UTC vs.
Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC

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