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

Diff Legend

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