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.53 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.160 by root, Tue Jun 5 13:05:02 2007 UTC

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

Diff Legend

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