ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.55 by root, Sun Dec 3 00:41:33 2006 UTC vs.
Revision 1.142 by root, Mon Apr 30 04:25:29 2007 UTC

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

Diff Legend

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