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.43 by root, Thu Sep 14 17:10:24 2006 UTC vs.
Revision 1.158 by root, Mon Jun 4 12:19:08 2007 UTC

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

Diff Legend

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