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.43 by root, Thu Sep 14 17:10:24 2006 UTC vs.
Revision 1.123 by root, Fri Jan 26 20:59:56 2007 UTC

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

Diff Legend

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