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.41 by root, Thu Sep 14 01:12:28 2006 UTC vs.
Revision 1.147 by root, Sat May 12 16:06:42 2007 UTC

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

Diff Legend

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