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.55 by root, Sun Dec 3 00:41:33 2006 UTC vs.
Revision 1.139 by root, Sat Apr 21 17:34:22 2007 UTC

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

Diff Legend

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