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

Diff Legend

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