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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.55 by root, Sun Dec 3 00:41:33 2006 UTC vs.
Revision 1.163 by root, Sun Jul 1 05:00:17 2007 UTC

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

Diff Legend

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