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.46 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.145 by root, Mon May 7 03:05:58 2007 UTC

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

Diff Legend

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