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

Diff Legend

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