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.39 by root, Wed Sep 13 02:05:19 2006 UTC vs.
Revision 1.131 by root, Sat Feb 10 15:20:23 2007 UTC

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

Diff Legend

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