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.78 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
27#include <global.h> 27#include <global.h>
28#include <stdio.h> 28#include <stdio.h>
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
33#include <loader.h> 34#include <loader.h>
34 35
35#include <bitset> 36#include <bitset>
36 37
37int nrofallocobjects = 0; 38UUID UUID::cur;
38static UUID uuid; 39static uint64_t seq_next_save;
39const uint64 UUID_SKIP = 1<<19; 40static const uint64 UUID_GAP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
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, 45short freearr_x[SIZEOFFREE] = {
46 0,
47 0, 1, 1, 1, 0, -1, -1, -1,
48 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 49 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}; 50};
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, 51short freearr_y[SIZEOFFREE] = {
52 0,
53 -1, -1, 0, 1, 1, 1, 0, -1,
54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
47 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
48}; 56};
49int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 57int maxfree[SIZEOFFREE] = {
58 0,
59 9, 10, 13, 14, 17, 18, 21, 22,
60 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
50 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
51}; 62};
52int freedir[SIZEOFFREE] = { 63int freedir[SIZEOFFREE] = {
53 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 64 0,
65 1, 2, 3, 4, 5, 6, 7, 8,
66 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
54 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 67 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
55}; 68};
56 69
57static void 70static void
58write_uuid (void) 71write_uuid (uval64 skip, bool sync)
59{ 72{
60 char filename1[MAX_BUF], filename2[MAX_BUF]; 73 CALL_BEGIN (2);
61 74 CALL_ARG_SV (newSVval64 (skip));
62 sprintf (filename1, "%s/uuid", settings.localdir); 75 CALL_ARG_SV (boolSV (sync));
63 sprintf (filename2, "%s/uuid~", settings.localdir); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
64 77 CALL_END;
65 FILE *fp;
66
67 if (!(fp = fopen (filename2, "w")))
68 {
69 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70 return;
71 }
72
73 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74 fclose (fp);
75 rename (filename2, filename1);
76} 78}
77 79
78static void 80static void
79read_uuid (void) 81read_uuid (void)
80{ 82{
81 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
82 84
83 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
84 86
87 seq_next_save = 0;
88
85 FILE *fp; 89 FILE *fp;
86 90
87 if (!(fp = fopen (filename, "r"))) 91 if (!(fp = fopen (filename, "r")))
88 { 92 {
89 if (errno == ENOENT) 93 if (errno == ENOENT)
90 { 94 {
91 LOG (llevInfo, "RESET uid to 1\n"); 95 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0; 96 UUID::cur.seq = 0;
93 write_uuid (); 97 write_uuid (UUID_GAP, true);
94 return; 98 return;
95 } 99 }
96 100
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 102 _exit (1);
99 } 103 }
100 104
101 int version; 105 UUID::BUF buf;
102 unsigned long long uid; 106 buf[0] = 0;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
104 { 110 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106 _exit (1); 112 _exit (1);
107 } 113 }
108 114
109 uuid.seq = uid; 115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110 write_uuid (); 116
111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 117 write_uuid (UUID_GAP, true);
112 fclose (fp); 118 fclose (fp);
113} 119}
114 120
115UUID 121UUID
116gen_uuid () 122UUID::gen ()
117{ 123{
118 UUID uid; 124 UUID uid;
119 125
120 uid.seq = ++uuid.seq; 126 uid.seq = ++cur.seq;
121 127
122 if (!(uuid.seq & (UUID_SKIP - 1))) 128 if (expect_false (cur.seq >= seq_next_save))
123 write_uuid (); 129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
124 134
125 return uid; 135 return uid;
126} 136}
127 137
128void 138void
129init_uuid () 139UUID::init ()
130{ 140{
131 read_uuid (); 141 read_uuid ();
132} 142}
133 143
134/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 144/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141 * objects with lists are rare, and lists stay short. If not, use a 151 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 152 * different structure or at least keep the lists sorted...
143 */ 153 */
144 154
145 /* For each field in wants, */ 155 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 156 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 157 {
148 key_value *has_field; 158 key_value *has_field;
149 159
150 /* Look for a field in has with the same key. */ 160 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 161 has_field = get_ob_key_link (has, wants_field->key);
190 * Check nrof variable *before* calling can_merge() 200 * Check nrof variable *before* calling can_merge()
191 * 201 *
192 * Improvements made with merge: Better checking on potion, and also 202 * Improvements made with merge: Better checking on potion, and also
193 * check weight 203 * check weight
194 */ 204 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 205bool object::can_merge_slow (object *ob1, object *ob2)
197{ 206{
198 /* A couple quicksanity checks */ 207 /* A couple quicksanity checks */
199 if (ob1 == ob2 208 if (ob1 == ob2
200 || ob1->type != ob2->type 209 || ob1->type != ob2->type
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 230 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 231
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 232 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 233 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 234
226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 235 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227 || ob1->arch != ob2->arch 236 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 237 || ob1->name != ob2->name
229 || ob1->title != ob2->title 238 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 239 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 240 || ob1->weight != ob2->weight
253 /* This is really a spellbook check - really, we should 262 /* This is really a spellbook check - really, we should
254 * check all objects in the inventory. 263 * check all objects in the inventory.
255 */ 264 */
256 if (ob1->inv || ob2->inv) 265 if (ob1->inv || ob2->inv)
257 { 266 {
258 /* if one object has inventory but the other doesn't, not equiv */ 267 if (!(ob1->inv && ob2->inv))
259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 268 return 0; /* inventories differ in length */
260 return 0;
261 269
262 /* Now check to see if the two inventory objects could merge */ 270 if (ob1->inv->below || ob2->inv->below)
271 return 0; /* more than one object in inv */
272
263 if (!object::can_merge (ob1->inv, ob2->inv)) 273 if (!object::can_merge (ob1->inv, ob2->inv))
264 return 0; 274 return 0; /* inventory objexts differ */
265 275
266 /* inventory ok - still need to check rest of this object to see 276 /* inventory ok - still need to check rest of this object to see
267 * if it is valid. 277 * if it is valid.
268 */ 278 */
269 } 279 }
277 287
278 /* Note sure why the following is the case - either the object has to 288 /* Note sure why the following is the case - either the object has to
279 * be animated or have a very low speed. Is this an attempted monster 289 * be animated or have a very low speed. Is this an attempted monster
280 * check? 290 * check?
281 */ 291 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 292 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 293 return 0;
284 294
285 switch (ob1->type) 295 switch (ob1->type)
286 { 296 {
287 case SCROLL: 297 case SCROLL:
298 return 0; 308 return 0;
299 else if (!compare_ob_value_lists (ob1, ob2)) 309 else if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 310 return 0;
301 } 311 }
302 312
303 //TODO: generate an event or call into perl for additional checks
304 if (ob1->self || ob2->self) 313 if (ob1->self || ob2->self)
305 { 314 {
306 ob1->optimise (); 315 ob1->optimise ();
307 ob2->optimise (); 316 ob2->optimise ();
308 317
309 if (ob1->self || ob2->self) 318 if (ob1->self || ob2->self)
319 {
320 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
321 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
322
323 if (k1 != k2)
310 return 0; 324 return 0;
325 else if (k1 == 0)
326 return 1;
327 else if (!cfperl_can_merge (ob1, ob2))
328 return 0;
329 }
311 } 330 }
312 331
313 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
314 return 1; 333 return 1;
315} 334}
323sum_weight (object *op) 342sum_weight (object *op)
324{ 343{
325 long sum; 344 long sum;
326 object *inv; 345 object *inv;
327 346
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 347 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 348 {
330 if (inv->inv) 349 if (inv->inv)
331 sum_weight (inv); 350 sum_weight (inv);
351
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 352 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 353 }
334 354
335 if (op->type == CONTAINER && op->stats.Str) 355 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 356 sum = (sum * (100 - op->stats.Str)) / 100;
356/* 376/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 377 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 378 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array. 379 * The result of the dump is stored in the static global errmsg array.
360 */ 380 */
361
362char * 381char *
363dump_object (object *op) 382dump_object (object *op)
364{ 383{
365 if (!op) 384 if (!op)
366 return strdup ("[NULLOBJ]"); 385 return strdup ("[NULLOBJ]");
367 386
368 object_freezer freezer; 387 object_freezer freezer;
369 save_object (freezer, op, 3); 388 op->write (freezer);
370 return freezer.as_string (); 389 return freezer.as_string ();
371} 390}
372 391
373/* 392/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 393 * get_nearest_part(multi-object, object 2) returns the part of the
375 * multi-object 1 which is closest to the second object. 394 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 395 * If it's not a multi-object, it is returned.
377 */ 396 */
378
379object * 397object *
380get_nearest_part (object *op, const object *pl) 398get_nearest_part (object *op, const object *pl)
381{ 399{
382 object *tmp, *closest; 400 object *tmp, *closest;
383 int last_dist, i; 401 int last_dist, i;
391} 409}
392 410
393/* 411/*
394 * Returns the object which has the count-variable equal to the argument. 412 * Returns the object which has the count-variable equal to the argument.
395 */ 413 */
396
397object * 414object *
398find_object (tag_t i) 415find_object (tag_t i)
399{ 416{
400 for (object *op = object::first; op; op = op->next) 417 for_all_objects (op)
401 if (op->count == i) 418 if (op->count == i)
402 return op; 419 return op;
403 420
404 return 0; 421 return 0;
405} 422}
406 423
407/* 424/*
408 * Returns the first object which has a name equal to the argument. 425 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 427 * Enables features like "patch <name-of-other-player> food 999"
411 */ 428 */
412
413object * 429object *
414find_object_name (const char *str) 430find_object_name (const char *str)
415{ 431{
416 shstr_cmp str_ (str); 432 shstr_cmp str_ (str);
417 object *op; 433 object *op;
418 434
419 for (op = object::first; op != NULL; op = op->next) 435 for_all_objects (op)
420 if (op->name == str_) 436 if (op->name == str_)
421 break; 437 break;
422 438
423 return op; 439 return op;
424} 440}
425 441
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 442/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 443 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 444 * skill and experience objects.
445 * ACTUALLY NO! investigate! TODO
435 */ 446 */
436void 447void
437object::set_owner (object *owner) 448object::set_owner (object *owner)
438{ 449{
450 // allow objects which own objects
439 if (!owner) 451 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 452 while (owner->owner)
450 owner = owner->owner; 453 owner = owner->owner;
454
455 if (flag [FLAG_FREED])
456 {
457 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
458 return;
459 }
451 460
452 this->owner = owner; 461 this->owner = owner;
462}
463
464int
465object::slottype () const
466{
467 if (type == SKILL)
468 {
469 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
470 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
471 }
472 else
473 {
474 if (slot [body_combat].info) return slot_combat;
475 if (slot [body_range ].info) return slot_ranged;
476 }
477
478 return slot_none;
479}
480
481bool
482object::change_weapon (object *ob)
483{
484 if (current_weapon == ob)
485 return true;
486
487 if (chosen_skill)
488 chosen_skill->flag [FLAG_APPLIED] = false;
489
490 current_weapon = ob;
491 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
492
493 if (chosen_skill)
494 chosen_skill->flag [FLAG_APPLIED] = true;
495
496 update_stats ();
497
498 if (ob)
499 {
500 // now check wether any body locations became invalid, in which case
501 // we cannot apply the weapon at the moment.
502 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
503 if (slot[i].used < 0)
504 {
505 current_weapon = chosen_skill = 0;
506 update_stats ();
507
508 new_draw_info_format (NDI_UNIQUE, 0, this,
509 "You try to balance all your items at once, "
510 "but the %s is just too much for your body. "
511 "[You need to unapply some items first.]", &ob->name);
512 return false;
513 }
514
515 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
516 }
517 else
518 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
519
520 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
521 {
522 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
523 &name, ob->debug_desc ());
524 return false;
525 }
526
527 return true;
453} 528}
454 529
455/* Zero the key_values on op, decrementing the shared-string 530/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 531 * refcounts and freeing the links.
457 */ 532 */
458static void 533static void
459free_key_values (object *op) 534free_key_values (object *op)
460{ 535{
461 for (key_value *i = op->key_values; i != 0;) 536 for (key_value *i = op->key_values; i; )
462 { 537 {
463 key_value *next = i->next; 538 key_value *next = i->next;
464 delete i; 539 delete i;
465 540
466 i = next; 541 i = next;
467 } 542 }
468 543
469 op->key_values = 0; 544 op->key_values = 0;
470} 545}
471 546
472/* 547object &
473 * copy_to first frees everything allocated by the dst object, 548object::operator =(const object &src)
474 * and then copies the contents of itself into the second
475 * object, allocating what needs to be allocated. Basically, any
476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
477 * if the first object is freed, the pointers in the new object
478 * will point at garbage.
479 */
480void
481object::copy_to (object *dst)
482{ 549{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 550 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 551 bool is_removed = flag [FLAG_REMOVED];
485 552
486 *(object_copy *)dst = *this; 553 *(object_copy *)this = src;
487 *(object_pod *)dst = *this;
488 554
489 if (self || cb) 555 flag [FLAG_FREED] = is_freed;
490 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 556 flag [FLAG_REMOVED] = is_removed;
491
492 if (is_freed)
493 SET_FLAG (dst, FLAG_FREED);
494
495 if (is_removed)
496 SET_FLAG (dst, FLAG_REMOVED);
497
498 if (speed < 0)
499 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
500 557
501 /* Copy over key_values, if any. */ 558 /* Copy over key_values, if any. */
502 if (key_values) 559 if (src.key_values)
503 { 560 {
504 key_value *tail = 0; 561 key_value *tail = 0;
505 key_value *i;
506
507 dst->key_values = 0; 562 key_values = 0;
508 563
509 for (i = key_values; i; i = i->next) 564 for (key_value *i = src.key_values; i; i = i->next)
510 { 565 {
511 key_value *new_link = new key_value; 566 key_value *new_link = new key_value;
512 567
513 new_link->next = 0; 568 new_link->next = 0;
514 new_link->key = i->key; 569 new_link->key = i->key;
515 new_link->value = i->value; 570 new_link->value = i->value;
516 571
517 /* Try and be clever here, too. */ 572 /* Try and be clever here, too. */
518 if (!dst->key_values) 573 if (!key_values)
519 { 574 {
520 dst->key_values = new_link; 575 key_values = new_link;
521 tail = new_link; 576 tail = new_link;
522 } 577 }
523 else 578 else
524 { 579 {
525 tail->next = new_link; 580 tail->next = new_link;
526 tail = new_link; 581 tail = new_link;
527 } 582 }
528 } 583 }
529 } 584 }
585}
530 586
531 update_ob_speed (dst); 587/*
588 * copy_to first frees everything allocated by the dst object,
589 * and then copies the contents of itself into the second
590 * object, allocating what needs to be allocated. Basically, any
591 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
592 * if the first object is freed, the pointers in the new object
593 * will point at garbage.
594 */
595void
596object::copy_to (object *dst)
597{
598 *dst = *this;
599
600 if (speed < 0)
601 dst->speed_left -= rndm ();
602
603 dst->set_speed (dst->speed);
604}
605
606void
607object::instantiate ()
608{
609 if (!uuid.seq) // HACK
610 uuid = UUID::gen ();
611
612 speed_left = -0.1f;
613 /* copy the body_info to the body_used - this is only really
614 * need for monsters, but doesn't hurt to do it for everything.
615 * by doing so, when a monster is created, it has good starting
616 * values for the body_used info, so when items are created
617 * for it, they can be properly equipped.
618 */
619 for (int i = NUM_BODY_LOCATIONS; i--; )
620 slot[i].used = slot[i].info;
621
622 attachable::instantiate ();
532} 623}
533 624
534object * 625object *
535object::clone () 626object::clone ()
536{ 627{
542/* 633/*
543 * If an object with the IS_TURNABLE() flag needs to be turned due 634 * If an object with the IS_TURNABLE() flag needs to be turned due
544 * to the closest player being on the other side, this function can 635 * to the closest player being on the other side, this function can
545 * be called to update the face variable, _and_ how it looks on the map. 636 * be called to update the face variable, _and_ how it looks on the map.
546 */ 637 */
547
548void 638void
549update_turn_face (object *op) 639update_turn_face (object *op)
550{ 640{
551 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 641 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
552 return; 642 return;
643
553 SET_ANIMATION (op, op->direction); 644 SET_ANIMATION (op, op->direction);
554 update_object (op, UP_OBJ_FACE); 645 update_object (op, UP_OBJ_FACE);
555} 646}
556 647
557/* 648/*
558 * Updates the speed of an object. If the speed changes from 0 to another 649 * Updates the speed of an object. If the speed changes from 0 to another
559 * value, or vice versa, then add/remove the object from the active list. 650 * value, or vice versa, then add/remove the object from the active list.
560 * This function needs to be called whenever the speed of an object changes. 651 * This function needs to be called whenever the speed of an object changes.
561 */ 652 */
562void 653void
563update_ob_speed (object *op) 654object::set_speed (float speed)
564{ 655{
565 extern int arch_init; 656 if (flag [FLAG_FREED] && speed)
566
567 /* No reason putting the archetypes objects on the speed list,
568 * since they never really need to be updated.
569 */
570
571 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
572 { 657 {
573 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 658 LOG (llevError, "Object %s is freed but has speed.\n", &name);
574#ifdef MANY_CORES
575 abort ();
576#else
577 op->speed = 0; 659 speed = 0;
578#endif
579 }
580
581 if (arch_init)
582 return;
583
584 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
585 { 660 }
586 /* If already on active list, don't do anything */
587 if (op->active_next || op->active_prev || op == active_objects)
588 return;
589 661
590 /* process_events() expects us to insert the object at the beginning 662 this->speed = speed;
591 * of the list. */
592 op->active_next = active_objects;
593 663
594 if (op->active_next != NULL) 664 if (has_active_speed ())
595 op->active_next->active_prev = op; 665 activate ();
596
597 active_objects = op;
598 }
599 else 666 else
600 { 667 deactivate ();
601 /* If not on the active list, nothing needs to be done */
602 if (!op->active_next && !op->active_prev && op != active_objects)
603 return;
604
605 if (op->active_prev == NULL)
606 {
607 active_objects = op->active_next;
608
609 if (op->active_next != NULL)
610 op->active_next->active_prev = NULL;
611 }
612 else
613 {
614 op->active_prev->active_next = op->active_next;
615
616 if (op->active_next)
617 op->active_next->active_prev = op->active_prev;
618 }
619
620 op->active_next = NULL;
621 op->active_prev = NULL;
622 }
623}
624
625/* This function removes object 'op' from the list of active
626 * objects.
627 * This should only be used for style maps or other such
628 * reference maps where you don't want an object that isn't
629 * in play chewing up cpu time getting processed.
630 * The reverse of this is to call update_ob_speed, which
631 * will do the right thing based on the speed of the object.
632 */
633void
634remove_from_active_list (object *op)
635{
636 /* If not on the active list, nothing needs to be done */
637 if (!op->active_next && !op->active_prev && op != active_objects)
638 return;
639
640 if (op->active_prev == NULL)
641 {
642 active_objects = op->active_next;
643 if (op->active_next != NULL)
644 op->active_next->active_prev = NULL;
645 }
646 else
647 {
648 op->active_prev->active_next = op->active_next;
649 if (op->active_next)
650 op->active_next->active_prev = op->active_prev;
651 }
652 op->active_next = NULL;
653 op->active_prev = NULL;
654} 668}
655 669
656/* 670/*
657 * update_object() updates the the map. 671 * update_object() updates the the map.
658 * It takes into account invisible objects (and represent squares covered 672 * It takes into account invisible objects (and represent squares covered
671 * UP_OBJ_FACE: only the objects face has changed. 685 * UP_OBJ_FACE: only the objects face has changed.
672 */ 686 */
673void 687void
674update_object (object *op, int action) 688update_object (object *op, int action)
675{ 689{
676 MoveType move_on, move_off, move_block, move_slow;
677
678 if (op == NULL) 690 if (op == NULL)
679 { 691 {
680 /* this should never happen */ 692 /* this should never happen */
681 LOG (llevDebug, "update_object() called for NULL object.\n"); 693 LOG (llevDebug, "update_object() called for NULL object.\n");
682 return; 694 return;
695 */ 707 */
696 if (!op->map || op->map->in_memory == MAP_SAVING) 708 if (!op->map || op->map->in_memory == MAP_SAVING)
697 return; 709 return;
698 710
699 /* make sure the object is within map boundaries */ 711 /* make sure the object is within map boundaries */
700 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 712 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
701 { 713 {
702 LOG (llevError, "update_object() called for object out of map!\n"); 714 LOG (llevError, "update_object() called for object out of map!\n");
703#ifdef MANY_CORES 715#ifdef MANY_CORES
704 abort (); 716 abort ();
705#endif 717#endif
706 return; 718 return;
707 } 719 }
708 720
709 mapspace &m = op->ms (); 721 mapspace &m = op->ms ();
710 722
711 if (m.flags_ & P_NEED_UPDATE) 723 if (!(m.flags_ & P_UPTODATE))
712 /* nop */; 724 /* nop */;
713 else if (action == UP_OBJ_INSERT) 725 else if (action == UP_OBJ_INSERT)
714 { 726 {
715 // this is likely overkill, TODO: revisit (schmorp) 727 // this is likely overkill, TODO: revisit (schmorp)
716 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 728 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
725 /* This isn't perfect, but I don't expect a lot of objects to 737 /* This isn't perfect, but I don't expect a lot of objects to
726 * to have move_allow right now. 738 * to have move_allow right now.
727 */ 739 */
728 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 740 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
729 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 741 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
730 m.flags_ = P_NEED_UPDATE; 742 m.flags_ = 0;
731 } 743 }
732 /* if the object is being removed, we can't make intelligent 744 /* if the object is being removed, we can't make intelligent
733 * decisions, because remove_ob can't really pass the object 745 * decisions, because remove_ob can't really pass the object
734 * that is being removed. 746 * that is being removed.
735 */ 747 */
736 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 748 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
737 m.flags_ = P_NEED_UPDATE; 749 m.flags_ = 0;
738 else if (action == UP_OBJ_FACE) 750 else if (action == UP_OBJ_FACE)
739 /* Nothing to do for that case */ ; 751 /* Nothing to do for that case */ ;
740 else 752 else
741 LOG (llevError, "update_object called with invalid action: %d\n", action); 753 LOG (llevError, "update_object called with invalid action: %d\n", action);
742 754
743 if (op->more) 755 if (op->more)
744 update_object (op->more, action); 756 update_object (op->more, action);
745} 757}
746 758
747object::vector object::mortals;
748object::vector object::objects; // not yet used
749object *object::first;
750
751void object::free_mortals ()
752{
753 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
754 if ((*i)->refcnt)
755 ++i; // further delay freeing
756 else
757 {
758 delete *i;
759 mortals.erase (i);
760 }
761}
762
763object::object () 759object::object ()
764{ 760{
765 SET_FLAG (this, FLAG_REMOVED); 761 SET_FLAG (this, FLAG_REMOVED);
766 762
767 expmul = 1.0; 763 expmul = 1.0;
768 face = blank_face; 764 face = blank_face;
769} 765}
770 766
771object::~object () 767object::~object ()
772{ 768{
769 unlink ();
770
773 free_key_values (this); 771 free_key_values (this);
774} 772}
775 773
774static int object_count;
775
776void object::link () 776void object::link ()
777{ 777{
778 assert (!index);//D
779 uuid = UUID::gen ();
778 count = ++ob_count; 780 count = ++object_count;
779 uuid = gen_uuid ();
780 781
781 prev = 0; 782 refcnt_inc ();
782 next = object::first; 783 objects.insert (this);
783
784 if (object::first)
785 object::first->prev = this;
786
787 object::first = this;
788} 784}
789 785
790void object::unlink () 786void object::unlink ()
791{ 787{
792 if (this == object::first) 788 if (!index)
793 object::first = next; 789 return;
794 790
795 /* Remove this object from the list of used objects */ 791 objects.erase (this);
796 if (prev) prev->next = next; 792 refcnt_dec ();
797 if (next) next->prev = prev; 793}
798 794
799 prev = 0; 795void
800 next = 0; 796object::activate ()
797{
798 /* If already on active list, don't do anything */
799 if (active)
800 return;
801
802 if (has_active_speed ())
803 actives.insert (this);
804}
805
806void
807object::activate_recursive ()
808{
809 activate ();
810
811 for (object *op = inv; op; op = op->below)
812 op->activate_recursive ();
813}
814
815/* This function removes object 'op' from the list of active
816 * objects.
817 * This should only be used for style maps or other such
818 * reference maps where you don't want an object that isn't
819 * in play chewing up cpu time getting processed.
820 * The reverse of this is to call update_ob_speed, which
821 * will do the right thing based on the speed of the object.
822 */
823void
824object::deactivate ()
825{
826 /* If not on the active list, nothing needs to be done */
827 if (!active)
828 return;
829
830 actives.erase (this);
831}
832
833void
834object::deactivate_recursive ()
835{
836 for (object *op = inv; op; op = op->below)
837 op->deactivate_recursive ();
838
839 deactivate ();
840}
841
842void
843object::set_flag_inv (int flag, int value)
844{
845 for (object *op = inv; op; op = op->below)
846 {
847 op->flag [flag] = value;
848 op->set_flag_inv (flag, value);
849 }
850}
851
852/*
853 * Remove and free all objects in the inventory of the given object.
854 * object.c ?
855 */
856void
857object::destroy_inv (bool drop_to_ground)
858{
859 // need to check first, because the checks below might segfault
860 // as we might be on an invalid mapspace and crossfire code
861 // is too buggy to ensure that the inventory is empty.
862 // corollary: if you create arrows etc. with stuff in tis inventory,
863 // cf will crash below with off-map x and y
864 if (!inv)
865 return;
866
867 /* Only if the space blocks everything do we not process -
868 * if some form of movement is allowed, let objects
869 * drop on that space.
870 */
871 if (!drop_to_ground
872 || !map
873 || map->in_memory != MAP_IN_MEMORY
874 || map->nodrop
875 || ms ().move_block == MOVE_ALL)
876 {
877 while (inv)
878 {
879 inv->destroy_inv (drop_to_ground);
880 inv->destroy ();
881 }
882 }
883 else
884 { /* Put objects in inventory onto this space */
885 while (inv)
886 {
887 object *op = inv;
888
889 if (op->flag [FLAG_STARTEQUIP]
890 || op->flag [FLAG_NO_DROP]
891 || op->type == RUNE
892 || op->type == TRAP
893 || op->flag [FLAG_IS_A_TEMPLATE]
894 || op->flag [FLAG_DESTROY_ON_DEATH])
895 op->destroy ();
896 else
897 map->insert (op, x, y);
898 }
899 }
801} 900}
802 901
803object *object::create () 902object *object::create ()
804{ 903{
805 object *op = new object; 904 object *op = new object;
806 op->link (); 905 op->link ();
807 return op; 906 return op;
808} 907}
809 908
810/* 909void
811 * free_object() frees everything allocated by an object, removes 910object::do_destroy ()
812 * it from the list of used objects, and puts it on the list of
813 * free objects. The IS_FREED() flag is set in the object.
814 * The object must have been removed by remove_ob() first for
815 * this function to succeed.
816 *
817 * If destroy_inventory is set, free inventory as well. Else drop items in
818 * inventory to the ground.
819 */
820void object::destroy (bool destroy_inventory)
821{ 911{
822 if (QUERY_FLAG (this, FLAG_FREED)) 912 attachable::do_destroy ();
823 return;
824 913
825 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 914 if (flag [FLAG_IS_LINKED])
915 remove_button_link (this);
916
917 if (flag [FLAG_FRIENDLY])
826 remove_friendly_object (this); 918 remove_friendly_object (this);
827 919
828 if (!QUERY_FLAG (this, FLAG_REMOVED)) 920 if (!flag [FLAG_REMOVED])
829 remove (); 921 remove ();
830 922
831 SET_FLAG (this, FLAG_FREED); 923 destroy_inv (true);
832 924
833 if (more) 925 deactivate ();
834 { 926 unlink ();
835 more->destroy (destroy_inventory);
836 more = 0;
837 }
838 927
839 if (inv) 928 flag [FLAG_FREED] = 1;
840 {
841 /* Only if the space blocks everything do we not process -
842 * if some form of movement is allowed, let objects
843 * drop on that space.
844 */
845 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
846 {
847 object *op = inv;
848
849 while (op)
850 {
851 object *tmp = op->below;
852 op->destroy (destroy_inventory);
853 op = tmp;
854 }
855 }
856 else
857 { /* Put objects in inventory onto this space */
858 object *op = inv;
859
860 while (op)
861 {
862 object *tmp = op->below;
863
864 op->remove ();
865
866 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
867 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
868 op->destroy ();
869 else
870 {
871 op->x = x;
872 op->y = y;
873 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
874 }
875
876 op = tmp;
877 }
878 }
879 }
880 929
881 // hack to ensure that freed objects still have a valid map 930 // hack to ensure that freed objects still have a valid map
882 { 931 {
883 static maptile *freed_map; // freed objects are moved here to avoid crashes 932 static maptile *freed_map; // freed objects are moved here to avoid crashes
884 933
885 if (!freed_map) 934 if (!freed_map)
886 { 935 {
887 freed_map = new maptile; 936 freed_map = new maptile;
888 937
938 freed_map->path = "<freed objects map>";
889 freed_map->name = "/internal/freed_objects_map"; 939 freed_map->name = "/internal/freed_objects_map";
890 freed_map->width = 3; 940 freed_map->width = 3;
891 freed_map->height = 3; 941 freed_map->height = 3;
942 freed_map->nodrop = 1;
892 943
893 freed_map->allocate (); 944 freed_map->alloc ();
945 freed_map->in_memory = MAP_IN_MEMORY;
894 } 946 }
895 947
896 map = freed_map; 948 map = freed_map;
897 x = 1; 949 x = 1;
898 y = 1; 950 y = 1;
899 } 951 }
900 952
953 if (more)
954 {
955 more->destroy ();
956 more = 0;
957 }
958
959 head = 0;
960
901 // clear those pointers that likely might have circular references to us 961 // clear those pointers that likely might cause circular references
902 owner = 0; 962 owner = 0;
903 enemy = 0; 963 enemy = 0;
904 attacked_by = 0; 964 attacked_by = 0;
965 current_weapon = 0;
966}
905 967
906 // only relevant for players(?), but make sure of it anyways 968void
907 contr = 0; 969object::destroy (bool destroy_inventory)
970{
971 if (destroyed ())
972 return;
908 973
909 /* Remove object from the active list */ 974 if (destroy_inventory)
910 speed = 0; 975 destroy_inv (false);
911 update_ob_speed (this);
912 976
913 unlink (); 977 if (is_head ())
978 if (sound_destroy)
979 play_sound (sound_destroy);
980 else if (flag [FLAG_MONSTER])
981 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
914 982
915 mortals.push_back (this); 983 attachable::destroy ();
916} 984}
917 985
918/* 986/*
919 * sub_weight() recursively (outwards) subtracts a number from the 987 * sub_weight() recursively (outwards) subtracts a number from the
920 * weight of an object (and what is carried by it's environment(s)). 988 * weight of an object (and what is carried by it's environment(s)).
936 * This function removes the object op from the linked list of objects 1004 * This function removes the object op from the linked list of objects
937 * which it is currently tied to. When this function is done, the 1005 * which it is currently tied to. When this function is done, the
938 * object will have no environment. If the object previously had an 1006 * object will have no environment. If the object previously had an
939 * environment, the x and y coordinates will be updated to 1007 * environment, the x and y coordinates will be updated to
940 * the previous environment. 1008 * the previous environment.
941 * Beware: This function is called from the editor as well!
942 */ 1009 */
943void 1010void
944object::remove () 1011object::do_remove ()
945{ 1012{
946 object *tmp, *last = 0; 1013 object *tmp, *last = 0;
947 object *otmp; 1014 object *otmp;
948 1015
949 int check_walk_off;
950
951 if (QUERY_FLAG (this, FLAG_REMOVED)) 1016 if (QUERY_FLAG (this, FLAG_REMOVED))
952 return; 1017 return;
953 1018
954 SET_FLAG (this, FLAG_REMOVED); 1019 SET_FLAG (this, FLAG_REMOVED);
1020 INVOKE_OBJECT (REMOVE, this);
955 1021
956 if (more) 1022 if (more)
957 more->remove (); 1023 more->remove ();
958 1024
959 /* 1025 /*
972 * to save cpu time. 1038 * to save cpu time.
973 */ 1039 */
974 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1040 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
975 otmp->update_stats (); 1041 otmp->update_stats ();
976 1042
977 if (above != NULL) 1043 if (above)
978 above->below = below; 1044 above->below = below;
979 else 1045 else
980 env->inv = below; 1046 env->inv = below;
981 1047
982 if (below != NULL) 1048 if (below)
983 below->above = above; 1049 below->above = above;
984 1050
985 /* we set up values so that it could be inserted into 1051 /* we set up values so that it could be inserted into
986 * the map, but we don't actually do that - it is up 1052 * the map, but we don't actually do that - it is up
987 * to the caller to decide what we want to do. 1053 * to the caller to decide what we want to do.
991 above = 0, below = 0; 1057 above = 0, below = 0;
992 env = 0; 1058 env = 0;
993 } 1059 }
994 else if (map) 1060 else if (map)
995 { 1061 {
996 /* Re did the following section of code - it looks like it had 1062 if (type == PLAYER)
997 * lots of logic for things we no longer care about
998 */ 1063 {
1064 // leaving a spot always closes any open container on the ground
1065 if (container && !container->env)
1066 // this causes spurious floorbox updates, but it ensures
1067 // that the CLOSE event is being sent.
1068 close_container ();
1069
1070 --map->players;
1071 map->touch ();
1072 }
1073
1074 map->dirty = true;
1075 mapspace &ms = this->ms ();
999 1076
1000 /* link the object above us */ 1077 /* link the object above us */
1001 if (above) 1078 if (above)
1002 above->below = below; 1079 above->below = below;
1003 else 1080 else
1004 map->at (x, y).top = below; /* we were top, set new top */ 1081 ms.top = below; /* we were top, set new top */
1005 1082
1006 /* Relink the object below us, if there is one */ 1083 /* Relink the object below us, if there is one */
1007 if (below) 1084 if (below)
1008 below->above = above; 1085 below->above = above;
1009 else 1086 else
1011 /* Nothing below, which means we need to relink map object for this space 1088 /* Nothing below, which means we need to relink map object for this space
1012 * use translated coordinates in case some oddness with map tiling is 1089 * use translated coordinates in case some oddness with map tiling is
1013 * evident 1090 * evident
1014 */ 1091 */
1015 if (GET_MAP_OB (map, x, y) != this) 1092 if (GET_MAP_OB (map, x, y) != this)
1016 {
1017 char *dump = dump_object (this);
1018 LOG (llevError,
1019 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1093 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 ());
1020 free (dump);
1021 dump = dump_object (GET_MAP_OB (map, x, y));
1022 LOG (llevError, "%s\n", dump);
1023 free (dump);
1024 }
1025 1094
1026 map->at (x, y).bottom = above; /* goes on above it. */ 1095 ms.bot = above; /* goes on above it. */
1027 } 1096 }
1028 1097
1029 above = 0; 1098 above = 0;
1030 below = 0; 1099 below = 0;
1031 1100
1032 if (map->in_memory == MAP_SAVING) 1101 if (map->in_memory == MAP_SAVING)
1033 return; 1102 return;
1034 1103
1035 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1104 int check_walk_off = !flag [FLAG_NO_APPLY];
1036 1105
1106 if (object *pl = ms.player ())
1107 {
1108 if (pl->container == this)
1109 /* If a container that the player is currently using somehow gets
1110 * removed (most likely destroyed), update the player view
1111 * appropriately.
1112 */
1113 pl->close_container ();
1114
1115 pl->contr->ns->floorbox_update ();
1116 }
1117
1037 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1118 for (tmp = ms.bot; tmp; tmp = tmp->above)
1038 { 1119 {
1039 /* No point updating the players look faces if he is the object 1120 /* No point updating the players look faces if he is the object
1040 * being removed. 1121 * being removed.
1041 */ 1122 */
1042 1123
1043 if (tmp->type == PLAYER && tmp != this)
1044 {
1045 /* If a container that the player is currently using somehow gets
1046 * removed (most likely destroyed), update the player view
1047 * appropriately.
1048 */
1049 if (tmp->container == this)
1050 {
1051 CLEAR_FLAG (this, FLAG_APPLIED);
1052 tmp->container = 0;
1053 }
1054
1055 tmp->contr->ns->floorbox_update ();
1056 }
1057
1058 /* See if player moving off should effect something */ 1124 /* See if object moving off should effect something */
1059 if (check_walk_off 1125 if (check_walk_off
1060 && ((move_type & tmp->move_off) 1126 && ((move_type & tmp->move_off)
1061 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1127 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1062 { 1128 {
1063 move_apply (tmp, this, 0); 1129 move_apply (tmp, this, 0);
1064 1130
1065 if (destroyed ()) 1131 if (destroyed ())
1066 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1132 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1067 } 1133 }
1068 1134
1069 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1070
1071 if (tmp->above == tmp)
1072 tmp->above = 0;
1073
1074 last = tmp; 1135 last = tmp;
1075 } 1136 }
1076 1137
1077 /* last == NULL of there are no objects on this space */ 1138 /* last == NULL if there are no objects on this space */
1139 //TODO: this makes little sense, why only update the topmost object?
1078 if (!last) 1140 if (!last)
1079 map->at (x, y).flags_ = P_NEED_UPDATE; 1141 map->at (x, y).flags_ = 0;
1080 else 1142 else
1081 update_object (last, UP_OBJ_REMOVE); 1143 update_object (last, UP_OBJ_REMOVE);
1082 1144
1083 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1145 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1084 update_all_los (map, x, y); 1146 update_all_los (map, x, y);
1085 } 1147 }
1086} 1148}
1087 1149
1088/* 1150/*
1097merge_ob (object *op, object *top) 1159merge_ob (object *op, object *top)
1098{ 1160{
1099 if (!op->nrof) 1161 if (!op->nrof)
1100 return 0; 1162 return 0;
1101 1163
1102 if (top == NULL) 1164 if (!top)
1103 for (top = op; top != NULL && top->above != NULL; top = top->above); 1165 for (top = op; top && top->above; top = top->above)
1166 ;
1104 1167
1105 for (; top != NULL; top = top->below) 1168 for (; top; top = top->below)
1106 { 1169 {
1107 if (top == op) 1170 if (top == op)
1108 continue; 1171 continue;
1109 1172
1110 if (object::can_merge (op, top)) 1173 if (object::can_merge (op, top))
1119 } 1182 }
1120 1183
1121 return 0; 1184 return 0;
1122} 1185}
1123 1186
1187void
1188object::expand_tail ()
1189{
1190 if (more)
1191 return;
1192
1193 object *prev = this;
1194
1195 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1196 {
1197 object *op = arch_to_object (at);
1198
1199 op->name = name;
1200 op->name_pl = name_pl;
1201 op->title = title;
1202
1203 op->head = this;
1204 prev->more = op;
1205
1206 prev = op;
1207 }
1208}
1209
1124/* 1210/*
1125 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1211 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1126 * job preparing multi-part monsters 1212 * job preparing multi-part monsters.
1127 */ 1213 */
1128object * 1214object *
1129insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1215insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1130{ 1216{
1131 object *tmp;
1132
1133 if (op->head)
1134 op = op->head;
1135
1136 for (tmp = op; tmp; tmp = tmp->more) 1217 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1137 { 1218 {
1138 tmp->x = x + tmp->arch->clone.x; 1219 tmp->x = x + tmp->arch->x;
1139 tmp->y = y + tmp->arch->clone.y; 1220 tmp->y = y + tmp->arch->y;
1140 } 1221 }
1141 1222
1142 return insert_ob_in_map (op, m, originator, flag); 1223 return insert_ob_in_map (op, m, originator, flag);
1143} 1224}
1144 1225
1160 * Return value: 1241 * Return value:
1161 * new object if 'op' was merged with other object 1242 * new object if 'op' was merged with other object
1162 * NULL if 'op' was destroyed 1243 * NULL if 'op' was destroyed
1163 * just 'op' otherwise 1244 * just 'op' otherwise
1164 */ 1245 */
1165
1166object * 1246object *
1167insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1247insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1168{ 1248{
1249 assert (!op->flag [FLAG_FREED]);
1250
1169 object *tmp, *top, *floor = NULL; 1251 object *top, *floor = NULL;
1170 sint16 x, y;
1171 1252
1172 if (QUERY_FLAG (op, FLAG_FREED)) 1253 op->remove ();
1173 {
1174 LOG (llevError, "Trying to insert freed object!\n");
1175 return NULL;
1176 }
1177
1178 if (m == NULL)
1179 {
1180 char *dump = dump_object (op);
1181 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1182 free (dump);
1183 return op;
1184 }
1185
1186 if (out_of_map (m, op->x, op->y))
1187 {
1188 char *dump = dump_object (op);
1189 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1190#ifdef MANY_CORES
1191 /* Better to catch this here, as otherwise the next use of this object
1192 * is likely to cause a crash. Better to find out where it is getting
1193 * improperly inserted.
1194 */
1195 abort ();
1196#endif
1197 free (dump);
1198 return op;
1199 }
1200
1201 if (!QUERY_FLAG (op, FLAG_REMOVED))
1202 {
1203 char *dump = dump_object (op);
1204 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1205 free (dump);
1206 return op;
1207 }
1208
1209 if (op->more != NULL)
1210 {
1211 /* The part may be on a different map. */
1212
1213 object *more = op->more;
1214
1215 /* We really need the caller to normalize coordinates - if
1216 * we set the map, that doesn't work if the location is within
1217 * a map and this is straddling an edge. So only if coordinate
1218 * is clear wrong do we normalize it.
1219 */
1220 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1221 more->map = get_map_from_coord (m, &more->x, &more->y);
1222 else if (!more->map)
1223 {
1224 /* For backwards compatibility - when not dealing with tiled maps,
1225 * more->map should always point to the parent.
1226 */
1227 more->map = m;
1228 }
1229
1230 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1231 {
1232 if (!op->head)
1233 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1234
1235 return NULL;
1236 }
1237 }
1238
1239 CLEAR_FLAG (op, FLAG_REMOVED);
1240 1254
1241 /* Ideally, the caller figures this out. However, it complicates a lot 1255 /* Ideally, the caller figures this out. However, it complicates a lot
1242 * 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
1243 * need extra work 1257 * need extra work
1244 */ 1258 */
1245 op->map = get_map_from_coord (m, &op->x, &op->y); 1259 if (!xy_normalise (m, op->x, op->y))
1246 x = op->x; 1260 {
1247 y = op->y; 1261 op->destroy ();
1262 return 0;
1263 }
1264
1265 if (object *more = op->more)
1266 if (!insert_ob_in_map (more, m, originator, flag))
1267 return 0;
1268
1269 CLEAR_FLAG (op, FLAG_REMOVED);
1270
1271 op->map = m;
1272 mapspace &ms = op->ms ();
1248 1273
1249 /* this has to be done after we translate the coordinates. 1274 /* this has to be done after we translate the coordinates.
1250 */ 1275 */
1251 if (op->nrof && !(flag & INS_NO_MERGE)) 1276 if (op->nrof && !(flag & INS_NO_MERGE))
1252 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1277 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1253 if (object::can_merge (op, tmp)) 1278 if (object::can_merge (op, tmp))
1254 { 1279 {
1255 op->nrof += tmp->nrof; 1280 op->nrof += tmp->nrof;
1256 tmp->destroy (); 1281 tmp->destroy ();
1257 } 1282 }
1274 op->below = originator->below; 1299 op->below = originator->below;
1275 1300
1276 if (op->below) 1301 if (op->below)
1277 op->below->above = op; 1302 op->below->above = op;
1278 else 1303 else
1279 op->ms ().bottom = op; 1304 ms.bot = op;
1280 1305
1281 /* since *below* originator, no need to update top */ 1306 /* since *below* originator, no need to update top */
1282 originator->below = op; 1307 originator->below = op;
1283 } 1308 }
1284 else 1309 else
1285 { 1310 {
1311 top = ms.bot;
1312
1286 /* If there are other objects, then */ 1313 /* If there are other objects, then */
1287 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1314 if (top)
1288 { 1315 {
1289 object *last = NULL; 1316 object *last = 0;
1290 1317
1291 /* 1318 /*
1292 * If there are multiple objects on this space, we do some trickier handling. 1319 * If there are multiple objects on this space, we do some trickier handling.
1293 * We've already dealt with merging if appropriate. 1320 * We've already dealt with merging if appropriate.
1294 * Generally, we want to put the new object on top. But if 1321 * Generally, we want to put the new object on top. But if
1298 * once we get to them. This reduces the need to traverse over all of 1325 * once we get to them. This reduces the need to traverse over all of
1299 * them when adding another one - this saves quite a bit of cpu time 1326 * them when adding another one - this saves quite a bit of cpu time
1300 * when lots of spells are cast in one area. Currently, it is presumed 1327 * when lots of spells are cast in one area. Currently, it is presumed
1301 * that flying non pickable objects are spell objects. 1328 * that flying non pickable objects are spell objects.
1302 */ 1329 */
1303 1330 for (top = ms.bot; top; top = top->above)
1304 while (top != NULL)
1305 { 1331 {
1306 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1332 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1307 floor = top; 1333 floor = top;
1308 1334
1309 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1335 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1312 top = top->below; 1338 top = top->below;
1313 break; 1339 break;
1314 } 1340 }
1315 1341
1316 last = top; 1342 last = top;
1317 top = top->above;
1318 } 1343 }
1319 1344
1320 /* Don't want top to be NULL, so set it to the last valid object */ 1345 /* Don't want top to be NULL, so set it to the last valid object */
1321 top = last; 1346 top = last;
1322 1347
1324 * looks like instead of lots of conditions here. 1349 * looks like instead of lots of conditions here.
1325 * makes things faster, and effectively the same result. 1350 * makes things faster, and effectively the same result.
1326 */ 1351 */
1327 1352
1328 /* Have object 'fall below' other objects that block view. 1353 /* Have object 'fall below' other objects that block view.
1329 * Unless those objects are exits, type 66 1354 * Unless those objects are exits.
1330 * If INS_ON_TOP is used, don't do this processing 1355 * If INS_ON_TOP is used, don't do this processing
1331 * Need to find the object that in fact blocks view, otherwise 1356 * Need to find the object that in fact blocks view, otherwise
1332 * stacking is a bit odd. 1357 * stacking is a bit odd.
1333 */ 1358 */
1334 if (!(flag & INS_ON_TOP) && 1359 if (!(flag & INS_ON_TOP)
1335 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1360 && ms.flags () & P_BLOCKSVIEW
1361 && (op->face && !faces [op->face].visibility))
1336 { 1362 {
1337 for (last = top; last != floor; last = last->below) 1363 for (last = top; last != floor; last = last->below)
1338 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1364 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1339 break; 1365 break;
1366
1340 /* Check to see if we found the object that blocks view, 1367 /* Check to see if we found the object that blocks view,
1341 * and make sure we have a below pointer for it so that 1368 * and make sure we have a below pointer for it so that
1342 * we can get inserted below this one, which requires we 1369 * we can get inserted below this one, which requires we
1343 * set top to the object below us. 1370 * set top to the object below us.
1344 */ 1371 */
1345 if (last && last->below && last != floor) 1372 if (last && last->below && last != floor)
1346 top = last->below; 1373 top = last->below;
1347 } 1374 }
1348 } /* If objects on this space */ 1375 } /* If objects on this space */
1349 1376
1350 if (flag & INS_MAP_LOAD)
1351 top = GET_MAP_TOP (op->map, op->x, op->y);
1352
1353 if (flag & INS_ABOVE_FLOOR_ONLY) 1377 if (flag & INS_ABOVE_FLOOR_ONLY)
1354 top = floor; 1378 top = floor;
1355 1379
1356 /* Top is the object that our object (op) is going to get inserted above. 1380 /* Top is the object that our object (op) is going to get inserted above.
1357 */ 1381 */
1358 1382
1359 /* First object on this space */ 1383 /* First object on this space */
1360 if (!top) 1384 if (!top)
1361 { 1385 {
1362 op->above = GET_MAP_OB (op->map, op->x, op->y); 1386 op->above = ms.bot;
1363 1387
1364 if (op->above) 1388 if (op->above)
1365 op->above->below = op; 1389 op->above->below = op;
1366 1390
1367 op->below = NULL; 1391 op->below = 0;
1368 op->ms ().bottom = op; 1392 ms.bot = op;
1369 } 1393 }
1370 else 1394 else
1371 { /* get inserted into the stack above top */ 1395 { /* get inserted into the stack above top */
1372 op->above = top->above; 1396 op->above = top->above;
1373 1397
1376 1400
1377 op->below = top; 1401 op->below = top;
1378 top->above = op; 1402 top->above = op;
1379 } 1403 }
1380 1404
1381 if (op->above == NULL) 1405 if (!op->above)
1382 op->ms ().top = op; 1406 ms.top = op;
1383 } /* else not INS_BELOW_ORIGINATOR */ 1407 } /* else not INS_BELOW_ORIGINATOR */
1384 1408
1385 if (op->type == PLAYER) 1409 if (op->type == PLAYER)
1410 {
1386 op->contr->do_los = 1; 1411 op->contr->do_los = 1;
1412 ++op->map->players;
1413 op->map->touch ();
1414 }
1387 1415
1388 /* If we have a floor, we know the player, if any, will be above 1416 op->map->dirty = true;
1389 * it, so save a few ticks and start from there. 1417
1390 */
1391 if (!(flag & INS_MAP_LOAD))
1392 if (object *pl = op->ms ().player ()) 1418 if (object *pl = ms.player ())
1393 pl->contr->ns->floorbox_update (); 1419 pl->contr->ns->floorbox_update ();
1394 1420
1395 /* If this object glows, it may affect lighting conditions that are 1421 /* If this object glows, it may affect lighting conditions that are
1396 * visible to others on this map. But update_all_los is really 1422 * visible to others on this map. But update_all_los is really
1397 * an inefficient way to do this, as it means los for all players 1423 * an inefficient way to do this, as it means los for all players
1398 * on the map will get recalculated. The players could very well 1424 * on the map will get recalculated. The players could very well
1399 * be far away from this change and not affected in any way - 1425 * be far away from this change and not affected in any way -
1400 * this should get redone to only look for players within range, 1426 * this should get redone to only look for players within range,
1401 * or just updating the P_NEED_UPDATE for spaces within this area 1427 * or just updating the P_UPTODATE for spaces within this area
1402 * of effect may be sufficient. 1428 * of effect may be sufficient.
1403 */ 1429 */
1404 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1430 if (op->map->darkness && (op->glow_radius != 0))
1405 update_all_los (op->map, op->x, op->y); 1431 update_all_los (op->map, op->x, op->y);
1406 1432
1407 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1433 /* updates flags (blocked, alive, no magic, etc) for this map space */
1408 update_object (op, UP_OBJ_INSERT); 1434 update_object (op, UP_OBJ_INSERT);
1435
1436 INVOKE_OBJECT (INSERT, op);
1409 1437
1410 /* Don't know if moving this to the end will break anything. However, 1438 /* Don't know if moving this to the end will break anything. However,
1411 * we want to have floorbox_update called before calling this. 1439 * we want to have floorbox_update called before calling this.
1412 * 1440 *
1413 * check_move_on() must be after this because code called from 1441 * check_move_on() must be after this because code called from
1415 * blocked() and wall() work properly), and these flags are updated by 1443 * blocked() and wall() work properly), and these flags are updated by
1416 * update_object(). 1444 * update_object().
1417 */ 1445 */
1418 1446
1419 /* if this is not the head or flag has been passed, don't check walk on status */ 1447 /* if this is not the head or flag has been passed, don't check walk on status */
1420 if (!(flag & INS_NO_WALK_ON) && !op->head) 1448 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1421 { 1449 {
1422 if (check_move_on (op, originator)) 1450 if (check_move_on (op, originator))
1423 return NULL; 1451 return 0;
1424 1452
1425 /* If we are a multi part object, lets work our way through the check 1453 /* If we are a multi part object, lets work our way through the check
1426 * walk on's. 1454 * walk on's.
1427 */ 1455 */
1428 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1456 for (object *tmp = op->more; tmp; tmp = tmp->more)
1429 if (check_move_on (tmp, originator)) 1457 if (check_move_on (tmp, originator))
1430 return NULL; 1458 return 0;
1431 } 1459 }
1432 1460
1433 return op; 1461 return op;
1434} 1462}
1435 1463
1442{ 1470{
1443 object *tmp, *tmp1; 1471 object *tmp, *tmp1;
1444 1472
1445 /* first search for itself and remove any old instances */ 1473 /* first search for itself and remove any old instances */
1446 1474
1447 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1475 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1448 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1476 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1449 tmp->destroy (); 1477 tmp->destroy ();
1450 1478
1451 tmp1 = arch_to_object (archetype::find (arch_string)); 1479 tmp1 = arch_to_object (archetype::find (arch_string));
1452 1480
1453 tmp1->x = op->x; 1481 tmp1->x = op->x;
1454 tmp1->y = op->y; 1482 tmp1->y = op->y;
1455 insert_ob_in_map (tmp1, op->map, op, 0); 1483 insert_ob_in_map (tmp1, op->map, op, 0);
1484}
1485
1486object *
1487object::insert_at (object *where, object *originator, int flags)
1488{
1489 return where->map->insert (this, where->x, where->y, originator, flags);
1456} 1490}
1457 1491
1458/* 1492/*
1459 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1493 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1460 * is returned contains nr objects, and the remaining parts contains 1494 * is returned contains nr objects, and the remaining parts contains
1461 * the rest (or is removed and freed if that number is 0). 1495 * the rest (or is removed and freed if that number is 0).
1462 * On failure, NULL is returned, and the reason put into the 1496 * On failure, NULL is returned, and the reason put into the
1463 * global static errmsg array. 1497 * global static errmsg array.
1464 */ 1498 */
1465
1466object * 1499object *
1467get_split_ob (object *orig_ob, uint32 nr) 1500get_split_ob (object *orig_ob, uint32 nr)
1468{ 1501{
1469 object *newob; 1502 object *newob;
1470 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1503 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501 * the amount of an object. If the amount reaches 0, the object 1534 * the amount of an object. If the amount reaches 0, the object
1502 * is subsequently removed and freed. 1535 * is subsequently removed and freed.
1503 * 1536 *
1504 * Return value: 'op' if something is left, NULL if the amount reached 0 1537 * Return value: 'op' if something is left, NULL if the amount reached 0
1505 */ 1538 */
1506
1507object * 1539object *
1508decrease_ob_nr (object *op, uint32 i) 1540decrease_ob_nr (object *op, uint32 i)
1509{ 1541{
1510 object *tmp; 1542 object *tmp;
1511 player *pl;
1512 1543
1513 if (i == 0) /* objects with op->nrof require this check */ 1544 if (i == 0) /* objects with op->nrof require this check */
1514 return op; 1545 return op;
1515 1546
1516 if (i > op->nrof) 1547 if (i > op->nrof)
1529 * IMO, searching through all the players will mostly 1560 * IMO, searching through all the players will mostly
1530 * likely be quicker than following op->env to the map, 1561 * likely be quicker than following op->env to the map,
1531 * and then searching the map for a player. 1562 * and then searching the map for a player.
1532 */ 1563 */
1533 if (!tmp) 1564 if (!tmp)
1534 { 1565 for_all_players (pl)
1535 for (pl = first_player; pl; pl = pl->next)
1536 if (pl->ob->container == op->env) 1566 if (pl->ob->container == op->env)
1537 { 1567 {
1538 tmp = pl->ob; 1568 tmp = pl->ob;
1539 break; 1569 break;
1540 } 1570 }
1541 }
1542 1571
1543 if (i < op->nrof) 1572 if (i < op->nrof)
1544 { 1573 {
1545 sub_weight (op->env, op->weight * i); 1574 sub_weight (op->env, op->weight * i);
1546 op->nrof -= i; 1575 op->nrof -= i;
1589 1618
1590/* 1619/*
1591 * add_weight(object, weight) adds the specified weight to an object, 1620 * add_weight(object, weight) adds the specified weight to an object,
1592 * and also updates how much the environment(s) is/are carrying. 1621 * and also updates how much the environment(s) is/are carrying.
1593 */ 1622 */
1594
1595void 1623void
1596add_weight (object *op, signed long weight) 1624add_weight (object *op, signed long weight)
1597{ 1625{
1598 while (op != NULL) 1626 while (op != NULL)
1599 { 1627 {
1614 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1642 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1615 free (dump); 1643 free (dump);
1616 return op; 1644 return op;
1617 } 1645 }
1618 1646
1619 if (where->head) 1647 if (where->head_ () != where)
1620 { 1648 {
1621 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1649 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1622 where = where->head; 1650 where = where->head;
1623 } 1651 }
1624 1652
1625 return where->insert (op); 1653 return where->insert (op);
1626} 1654}
1631 * inside the object environment. 1659 * inside the object environment.
1632 * 1660 *
1633 * The function returns now pointer to inserted item, and return value can 1661 * The function returns now pointer to inserted item, and return value can
1634 * be != op, if items are merged. -Tero 1662 * be != op, if items are merged. -Tero
1635 */ 1663 */
1636
1637object * 1664object *
1638object::insert (object *op) 1665object::insert (object *op)
1639{ 1666{
1640 object *tmp, *otmp;
1641
1642 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1667 if (!QUERY_FLAG (op, FLAG_REMOVED))
1643 op->remove (); 1668 op->remove ();
1644 1669
1645 if (op->more) 1670 if (op->more)
1646 { 1671 {
1648 return op; 1673 return op;
1649 } 1674 }
1650 1675
1651 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1676 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1652 CLEAR_FLAG (op, FLAG_REMOVED); 1677 CLEAR_FLAG (op, FLAG_REMOVED);
1678
1653 if (op->nrof) 1679 if (op->nrof)
1654 { 1680 {
1655 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1681 for (object *tmp = inv; tmp; tmp = tmp->below)
1656 if (object::can_merge (tmp, op)) 1682 if (object::can_merge (tmp, op))
1657 { 1683 {
1658 /* return the original object and remove inserted object 1684 /* return the original object and remove inserted object
1659 (client needs the original object) */ 1685 (client needs the original object) */
1660 tmp->nrof += op->nrof; 1686 tmp->nrof += op->nrof;
1679 add_weight (this, op->weight * op->nrof); 1705 add_weight (this, op->weight * op->nrof);
1680 } 1706 }
1681 else 1707 else
1682 add_weight (this, (op->weight + op->carrying)); 1708 add_weight (this, (op->weight + op->carrying));
1683 1709
1684 otmp = this->in_player (); 1710 if (object *otmp = this->in_player ())
1685 if (otmp && otmp->contr)
1686 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1711 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1687 otmp->update_stats (); 1712 otmp->update_stats ();
1688 1713
1714 op->owner = 0; // its his/hers now. period.
1689 op->map = 0; 1715 op->map = 0;
1690 op->env = this; 1716 op->env = this;
1691 op->above = 0; 1717 op->above = 0;
1692 op->below = 0; 1718 op->below = 0;
1693 op->x = 0, op->y = 0; 1719 op->x = op->y = 0;
1694 1720
1695 /* 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 */
1696 if ((op->glow_radius != 0) && map) 1722 if (op->glow_radius && map)
1697 { 1723 {
1698#ifdef DEBUG_LIGHTS 1724#ifdef DEBUG_LIGHTS
1699 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);
1700#endif /* DEBUG_LIGHTS */ 1726#endif /* DEBUG_LIGHTS */
1701 if (MAP_DARKNESS (map)) 1727 if (map->darkness)
1702 update_all_los (map, x, y); 1728 update_all_los (map, x, y);
1703 } 1729 }
1704 1730
1705 /* 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.
1706 * It sure simplifies this function... 1732 * It sure simplifies this function...
1711 { 1737 {
1712 op->below = inv; 1738 op->below = inv;
1713 op->below->above = op; 1739 op->below->above = op;
1714 inv = op; 1740 inv = op;
1715 } 1741 }
1742
1743 INVOKE_OBJECT (INSERT, this);
1716 1744
1717 return op; 1745 return op;
1718} 1746}
1719 1747
1720/* 1748/*
1735 * 1763 *
1736 * 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
1737 * 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
1738 * on top. 1766 * on top.
1739 */ 1767 */
1740
1741int 1768int
1742check_move_on (object *op, object *originator) 1769check_move_on (object *op, object *originator)
1743{ 1770{
1744 object *tmp; 1771 object *tmp;
1745 maptile *m = op->map; 1772 maptile *m = op->map;
1772 1799
1773 /* The objects have to be checked from top to bottom. 1800 /* The objects have to be checked from top to bottom.
1774 * Hence, we first go to the top: 1801 * Hence, we first go to the top:
1775 */ 1802 */
1776 1803
1777 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)
1778 { 1805 {
1779 /* Trim the search when we find the first other spell effect 1806 /* Trim the search when we find the first other spell effect
1780 * 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,
1781 * we don't need to check all of them. 1808 * we don't need to check all of them.
1782 */ 1809 */
1800 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1827 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1801 ((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))
1802 { 1829 {
1803 1830
1804 float 1831 float
1805 diff = tmp->move_slow_penalty * FABS (op->speed); 1832 diff = tmp->move_slow_penalty * fabs (op->speed);
1806 1833
1807 if (op->type == PLAYER) 1834 if (op->type == PLAYER)
1808 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)) ||
1809 (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)))
1810 diff /= 4.0; 1837 diff /= 4.0;
1837/* 1864/*
1838 * present_arch(arch, map, x, y) searches for any objects with 1865 * present_arch(arch, map, x, y) searches for any objects with
1839 * a matching archetype at the given map and coordinates. 1866 * a matching archetype at the given map and coordinates.
1840 * The first matching object is returned, or NULL if none. 1867 * The first matching object is returned, or NULL if none.
1841 */ 1868 */
1842
1843object * 1869object *
1844present_arch (const archetype *at, maptile *m, int x, int y) 1870present_arch (const archetype *at, maptile *m, int x, int y)
1845{ 1871{
1846 object *
1847 tmp;
1848
1849 if (m == NULL || out_of_map (m, x, y)) 1872 if (!m || out_of_map (m, x, y))
1850 { 1873 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1874 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1875 return NULL;
1853 } 1876 }
1854 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)
1855 if (tmp->arch == at) 1879 if (tmp->arch == at)
1856 return tmp; 1880 return tmp;
1881
1857 return NULL; 1882 return NULL;
1858} 1883}
1859 1884
1860/* 1885/*
1861 * present(type, map, x, y) searches for any objects with 1886 * present(type, map, x, y) searches for any objects with
1862 * a matching type variable at the given map and coordinates. 1887 * a matching type variable at the given map and coordinates.
1863 * The first matching object is returned, or NULL if none. 1888 * The first matching object is returned, or NULL if none.
1864 */ 1889 */
1865
1866object * 1890object *
1867present (unsigned char type, maptile *m, int x, int y) 1891present (unsigned char type, maptile *m, int x, int y)
1868{ 1892{
1869 object *
1870 tmp;
1871
1872 if (out_of_map (m, x, y)) 1893 if (out_of_map (m, x, y))
1873 { 1894 {
1874 LOG (llevError, "Present called outside map.\n"); 1895 LOG (llevError, "Present called outside map.\n");
1875 return NULL; 1896 return NULL;
1876 } 1897 }
1877 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)
1878 if (tmp->type == type) 1900 if (tmp->type == type)
1879 return tmp; 1901 return tmp;
1902
1880 return NULL; 1903 return NULL;
1881} 1904}
1882 1905
1883/* 1906/*
1884 * present_in_ob(type, object) searches for any objects with 1907 * present_in_ob(type, object) searches for any objects with
1885 * a matching type variable in the inventory of the given object. 1908 * a matching type variable in the inventory of the given object.
1886 * The first matching object is returned, or NULL if none. 1909 * The first matching object is returned, or NULL if none.
1887 */ 1910 */
1888
1889object * 1911object *
1890present_in_ob (unsigned char type, const object *op) 1912present_in_ob (unsigned char type, const object *op)
1891{ 1913{
1892 object *
1893 tmp;
1894
1895 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1914 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1896 if (tmp->type == type) 1915 if (tmp->type == type)
1897 return tmp; 1916 return tmp;
1917
1898 return NULL; 1918 return NULL;
1899} 1919}
1900 1920
1901/* 1921/*
1902 * present_in_ob (type, str, object) searches for any objects with 1922 * present_in_ob (type, str, object) searches for any objects with
1910 * 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
1911 * 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
1912 * 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
1913 * to be unique. 1933 * to be unique.
1914 */ 1934 */
1915
1916object * 1935object *
1917present_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)
1918{ 1937{
1919 object *
1920 tmp;
1921
1922 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1938 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1923 {
1924 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1939 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1925 return tmp; 1940 return tmp;
1926 } 1941
1927 return NULL; 1942 return 0;
1928} 1943}
1929 1944
1930/* 1945/*
1931 * present_arch_in_ob(archetype, object) searches for any objects with 1946 * present_arch_in_ob(archetype, object) searches for any objects with
1932 * a matching archetype in the inventory of the given object. 1947 * a matching archetype in the inventory of the given object.
1933 * The first matching object is returned, or NULL if none. 1948 * The first matching object is returned, or NULL if none.
1934 */ 1949 */
1935
1936object * 1950object *
1937present_arch_in_ob (const archetype *at, const object *op) 1951present_arch_in_ob (const archetype *at, const object *op)
1938{ 1952{
1939 object *
1940 tmp;
1941
1942 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1953 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1943 if (tmp->arch == at) 1954 if (tmp->arch == at)
1944 return tmp; 1955 return tmp;
1956
1945 return NULL; 1957 return NULL;
1946} 1958}
1947 1959
1948/* 1960/*
1949 * activate recursively a flag on an object inventory 1961 * activate recursively a flag on an object inventory
1950 */ 1962 */
1951void 1963void
1952flag_inv (object *op, int flag) 1964flag_inv (object *op, int flag)
1953{ 1965{
1954 object *
1955 tmp;
1956
1957 if (op->inv)
1958 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1966 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 { 1967 {
1960 SET_FLAG (tmp, flag); 1968 SET_FLAG (tmp, flag);
1961 flag_inv (tmp, flag); 1969 flag_inv (tmp, flag);
1962 } 1970 }
1963} /* 1971}
1972
1973/*
1964 * desactivate recursively a flag on an object inventory 1974 * deactivate recursively a flag on an object inventory
1965 */ 1975 */
1966void 1976void
1967unflag_inv (object *op, int flag) 1977unflag_inv (object *op, int flag)
1968{ 1978{
1969 object *
1970 tmp;
1971
1972 if (op->inv)
1973 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1979 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1974 { 1980 {
1975 CLEAR_FLAG (tmp, flag); 1981 CLEAR_FLAG (tmp, flag);
1976 unflag_inv (tmp, flag); 1982 unflag_inv (tmp, flag);
1977 } 1983 }
1978}
1979
1980/*
1981 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1982 * all it's inventory (recursively).
1983 * If checksums are used, a player will get set_cheat called for
1984 * him/her-self and all object carried by a call to this function.
1985 */
1986
1987void
1988set_cheat (object *op)
1989{
1990 SET_FLAG (op, FLAG_WAS_WIZ);
1991 flag_inv (op, FLAG_WAS_WIZ);
1992} 1984}
1993 1985
1994/* 1986/*
1995 * find_free_spot(object, map, x, y, start, stop) will search for 1987 * find_free_spot(object, map, x, y, start, stop) will search for
1996 * a spot at the given map and coordinates which will be able to contain 1988 * a spot at the given map and coordinates which will be able to contain
1998 * to search (see the freearr_x/y[] definition). 1990 * to search (see the freearr_x/y[] definition).
1999 * It returns a random choice among the alternatives found. 1991 * It returns a random choice among the alternatives found.
2000 * start and stop are where to start relative to the free_arr array (1,9 1992 * start and stop are where to start relative to the free_arr array (1,9
2001 * does all 4 immediate directions). This returns the index into the 1993 * does all 4 immediate directions). This returns the index into the
2002 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1994 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2003 * Note - this only checks to see if there is space for the head of the
2004 * object - if it is a multispace object, this should be called for all
2005 * pieces.
2006 * Note2: This function does correctly handle tiled maps, but does not 1995 * Note: This function does correctly handle tiled maps, but does not
2007 * inform the caller. However, insert_ob_in_map will update as 1996 * inform the caller. However, insert_ob_in_map will update as
2008 * necessary, so the caller shouldn't need to do any special work. 1997 * necessary, so the caller shouldn't need to do any special work.
2009 * Note - updated to take an object instead of archetype - this is necessary 1998 * Note - updated to take an object instead of archetype - this is necessary
2010 * because arch_blocked (now ob_blocked) needs to know the movement type 1999 * because arch_blocked (now ob_blocked) needs to know the movement type
2011 * to know if the space in question will block the object. We can't use 2000 * to know if the space in question will block the object. We can't use
2012 * the archetype because that isn't correct if the monster has been 2001 * the archetype because that isn't correct if the monster has been
2013 * customized, changed states, etc. 2002 * customized, changed states, etc.
2014 */ 2003 */
2015
2016int 2004int
2017find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2005find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2018{ 2006{
2019 int
2020 i,
2021 index = 0, flag;
2022 static int
2023 altern[SIZEOFFREE]; 2007 int altern[SIZEOFFREE];
2008 int index = 0, flag;
2024 2009
2025 for (i = start; i < stop; i++) 2010 for (int i = start; i < stop; i++)
2026 { 2011 {
2027 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2012 mapxy pos (m, x, y); pos.move (i);
2028 if (!flag) 2013
2014 if (!pos.normalise ())
2015 continue;
2016
2017 mapspace &ms = *pos;
2018
2019 if (ms.flags () & P_IS_ALIVE)
2020 continue;
2021
2022 /* However, often
2023 * ob doesn't have any move type (when used to place exits)
2024 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2025 */
2026 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2027 {
2029 altern[index++] = i; 2028 altern [index++] = i;
2029 continue;
2030 }
2030 2031
2031 /* Basically, if we find a wall on a space, we cut down the search size. 2032 /* Basically, if we find a wall on a space, we cut down the search size.
2032 * In this way, we won't return spaces that are on another side of a wall. 2033 * In this way, we won't return spaces that are on another side of a wall.
2033 * This mostly work, but it cuts down the search size in all directions - 2034 * This mostly work, but it cuts down the search size in all directions -
2034 * if the space being examined only has a wall to the north and empty 2035 * if the space being examined only has a wall to the north and empty
2035 * spaces in all the other directions, this will reduce the search space 2036 * spaces in all the other directions, this will reduce the search space
2036 * to only the spaces immediately surrounding the target area, and 2037 * to only the spaces immediately surrounding the target area, and
2037 * won't look 2 spaces south of the target space. 2038 * won't look 2 spaces south of the target space.
2038 */ 2039 */
2039 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2040 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2041 {
2040 stop = maxfree[i]; 2042 stop = maxfree[i];
2043 continue;
2044 }
2045
2046 /* Note it is intentional that we check ob - the movement type of the
2047 * head of the object should correspond for the entire object.
2048 */
2049 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2050 continue;
2051
2052 if (ob->blocked (m, pos.x, pos.y))
2053 continue;
2054
2055 altern [index++] = i;
2041 } 2056 }
2042 2057
2043 if (!index) 2058 if (!index)
2044 return -1; 2059 return -1;
2045 2060
2046 return altern[RANDOM () % index]; 2061 return altern [rndm (index)];
2047} 2062}
2048 2063
2049/* 2064/*
2050 * find_first_free_spot(archetype, maptile, x, y) works like 2065 * find_first_free_spot(archetype, maptile, x, y) works like
2051 * find_free_spot(), but it will search max number of squares. 2066 * find_free_spot(), but it will search max number of squares.
2052 * But it will return the first available spot, not a random choice. 2067 * But it will return the first available spot, not a random choice.
2053 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2068 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2054 */ 2069 */
2055
2056int 2070int
2057find_first_free_spot (const object *ob, maptile *m, int x, int y) 2071find_first_free_spot (const object *ob, maptile *m, int x, int y)
2058{ 2072{
2059 int
2060 i;
2061
2062 for (i = 0; i < SIZEOFFREE; i++) 2073 for (int i = 0; i < SIZEOFFREE; i++)
2063 {
2064 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2074 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2065 return i; 2075 return i;
2066 } 2076
2067 return -1; 2077 return -1;
2068} 2078}
2069 2079
2070/* 2080/*
2071 * The function permute(arr, begin, end) randomly reorders the array 2081 * The function permute(arr, begin, end) randomly reorders the array
2072 * arr[begin..end-1]. 2082 * arr[begin..end-1].
2083 * now uses a fisher-yates shuffle, old permute was broken
2073 */ 2084 */
2074static void 2085static void
2075permute (int *arr, int begin, int end) 2086permute (int *arr, int begin, int end)
2076{ 2087{
2077 int 2088 arr += begin;
2078 i,
2079 j,
2080 tmp,
2081 len;
2082
2083 len = end - begin; 2089 end -= begin;
2084 for (i = begin; i < end; i++)
2085 {
2086 j = begin + RANDOM () % len;
2087 2090
2088 tmp = arr[i]; 2091 while (--end)
2089 arr[i] = arr[j]; 2092 swap (arr [end], arr [rndm (end + 1)]);
2090 arr[j] = tmp;
2091 }
2092} 2093}
2093 2094
2094/* new function to make monster searching more efficient, and effective! 2095/* new function to make monster searching more efficient, and effective!
2095 * This basically returns a randomized array (in the passed pointer) of 2096 * This basically returns a randomized array (in the passed pointer) of
2096 * the spaces to find monsters. In this way, it won't always look for 2097 * the spaces to find monsters. In this way, it won't always look for
2099 * the 3x3 area will be searched, just not in a predictable order. 2100 * the 3x3 area will be searched, just not in a predictable order.
2100 */ 2101 */
2101void 2102void
2102get_search_arr (int *search_arr) 2103get_search_arr (int *search_arr)
2103{ 2104{
2104 int 2105 int i;
2105 i;
2106 2106
2107 for (i = 0; i < SIZEOFFREE; i++) 2107 for (i = 0; i < SIZEOFFREE; i++)
2108 {
2109 search_arr[i] = i; 2108 search_arr[i] = i;
2110 }
2111 2109
2112 permute (search_arr, 1, SIZEOFFREE1 + 1); 2110 permute (search_arr, 1, SIZEOFFREE1 + 1);
2113 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2111 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2114 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2112 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2115} 2113}
2124 * Perhaps incorrectly, but I'm making the assumption that exclude 2122 * Perhaps incorrectly, but I'm making the assumption that exclude
2125 * is actually want is going to try and move there. We need this info 2123 * is actually want is going to try and move there. We need this info
2126 * because we have to know what movement the thing looking to move 2124 * because we have to know what movement the thing looking to move
2127 * there is capable of. 2125 * there is capable of.
2128 */ 2126 */
2129
2130int 2127int
2131find_dir (maptile *m, int x, int y, object *exclude) 2128find_dir (maptile *m, int x, int y, object *exclude)
2132{ 2129{
2133 int
2134 i,
2135 max = SIZEOFFREE, mflags; 2130 int i, max = SIZEOFFREE, mflags;
2136 2131
2137 sint16 nx, ny; 2132 sint16 nx, ny;
2138 object * 2133 object *tmp;
2139 tmp;
2140 maptile * 2134 maptile *mp;
2141 mp;
2142 2135
2143 MoveType blocked, move_type; 2136 MoveType blocked, move_type;
2144 2137
2145 if (exclude && exclude->head) 2138 if (exclude && exclude->head_ () != exclude)
2146 { 2139 {
2147 exclude = exclude->head; 2140 exclude = exclude->head;
2148 move_type = exclude->move_type; 2141 move_type = exclude->move_type;
2149 } 2142 }
2150 else 2143 else
2163 2156
2164 if (mflags & P_OUT_OF_MAP) 2157 if (mflags & P_OUT_OF_MAP)
2165 max = maxfree[i]; 2158 max = maxfree[i];
2166 else 2159 else
2167 { 2160 {
2168 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2161 mapspace &ms = mp->at (nx, ny);
2162
2163 blocked = ms.move_block;
2169 2164
2170 if ((move_type & blocked) == move_type) 2165 if ((move_type & blocked) == move_type)
2171 max = maxfree[i]; 2166 max = maxfree[i];
2172 else if (mflags & P_IS_ALIVE) 2167 else if (mflags & P_IS_ALIVE)
2173 { 2168 {
2174 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2169 for (tmp = ms.bot; tmp; tmp = tmp->above)
2175 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2170 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2171 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2176 break; 2172 break;
2177 2173
2178 if (tmp) 2174 if (tmp)
2179 return freedir[i]; 2175 return freedir[i];
2180 } 2176 }
2186 2182
2187/* 2183/*
2188 * distance(object 1, object 2) will return the square of the 2184 * distance(object 1, object 2) will return the square of the
2189 * distance between the two given objects. 2185 * distance between the two given objects.
2190 */ 2186 */
2191
2192int 2187int
2193distance (const object *ob1, const object *ob2) 2188distance (const object *ob1, const object *ob2)
2194{ 2189{
2195 int i;
2196
2197 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2190 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2198 return i;
2199} 2191}
2200 2192
2201/* 2193/*
2202 * find_dir_2(delta-x,delta-y) will return a direction in which 2194 * find_dir_2(delta-x,delta-y) will return a direction in which
2203 * an object which has subtracted the x and y coordinates of another 2195 * an object which has subtracted the x and y coordinates of another
2204 * object, needs to travel toward it. 2196 * object, needs to travel toward it.
2205 */ 2197 */
2206
2207int 2198int
2208find_dir_2 (int x, int y) 2199find_dir_2 (int x, int y)
2209{ 2200{
2210 int q; 2201 int q;
2211 2202
2240 2231
2241 return 3; 2232 return 3;
2242} 2233}
2243 2234
2244/* 2235/*
2245 * absdir(int): Returns a number between 1 and 8, which represent
2246 * the "absolute" direction of a number (it actually takes care of
2247 * "overflow" in previous calculations of a direction).
2248 */
2249
2250int
2251absdir (int d)
2252{
2253 while (d < 1)
2254 d += 8;
2255 while (d > 8)
2256 d -= 8;
2257 return d;
2258}
2259
2260/*
2261 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2236 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2262 * between two directions (which are expected to be absolute (see absdir()) 2237 * between two directions (which are expected to be absolute (see absdir())
2263 */ 2238 */
2264
2265int 2239int
2266dirdiff (int dir1, int dir2) 2240dirdiff (int dir1, int dir2)
2267{ 2241{
2268 int 2242 int d;
2269 d;
2270 2243
2271 d = abs (dir1 - dir2); 2244 d = abs (dir1 - dir2);
2272 if (d > 4) 2245 if (d > 4)
2273 d = 8 - d; 2246 d = 8 - d;
2247
2274 return d; 2248 return d;
2275} 2249}
2276 2250
2277/* peterm: 2251/* peterm:
2278 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2252 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2281 * This basically means that if direction is 15, then it could either go 2255 * This basically means that if direction is 15, then it could either go
2282 * direction 4, 14, or 16 to get back to where we are. 2256 * direction 4, 14, or 16 to get back to where we are.
2283 * Moved from spell_util.c to object.c with the other related direction 2257 * Moved from spell_util.c to object.c with the other related direction
2284 * functions. 2258 * functions.
2285 */ 2259 */
2286
2287int
2288 reduction_dir[SIZEOFFREE][3] = { 2260int reduction_dir[SIZEOFFREE][3] = {
2289 {0, 0, 0}, /* 0 */ 2261 {0, 0, 0}, /* 0 */
2290 {0, 0, 0}, /* 1 */ 2262 {0, 0, 0}, /* 1 */
2291 {0, 0, 0}, /* 2 */ 2263 {0, 0, 0}, /* 2 */
2292 {0, 0, 0}, /* 3 */ 2264 {0, 0, 0}, /* 3 */
2293 {0, 0, 0}, /* 4 */ 2265 {0, 0, 0}, /* 4 */
2384 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2356 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2385 * core dumps if they do. 2357 * core dumps if they do.
2386 * 2358 *
2387 * Add a check so we can't pick up invisible objects (0.93.8) 2359 * Add a check so we can't pick up invisible objects (0.93.8)
2388 */ 2360 */
2389
2390int 2361int
2391can_pick (const object *who, const object *item) 2362can_pick (const object *who, const object *item)
2392{ 2363{
2393 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2364 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2394 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2365 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2399 * create clone from object to another 2370 * create clone from object to another
2400 */ 2371 */
2401object * 2372object *
2402object_create_clone (object *asrc) 2373object_create_clone (object *asrc)
2403{ 2374{
2404 object *dst = 0, *tmp, *src, *part, *prev, *item; 2375 object *dst = 0, *tmp, *src, *prev, *item;
2405 2376
2406 if (!asrc) 2377 if (!asrc)
2407 return 0; 2378 return 0;
2408 2379
2409 src = asrc;
2410 if (src->head)
2411 src = src->head; 2380 src = asrc->head_ ();
2412 2381
2413 prev = 0; 2382 prev = 0;
2414 for (part = src; part; part = part->more) 2383 for (object *part = src; part; part = part->more)
2415 { 2384 {
2416 tmp = part->clone (); 2385 tmp = part->clone ();
2417 tmp->x -= src->x; 2386 tmp->x -= src->x;
2418 tmp->y -= src->y; 2387 tmp->y -= src->y;
2419 2388
2437 insert_ob_in_ob (object_create_clone (item), dst); 2406 insert_ob_in_ob (object_create_clone (item), dst);
2438 2407
2439 return dst; 2408 return dst;
2440} 2409}
2441 2410
2442/* GROS - Creates an object using a string representing its content. */
2443/* Basically, we save the content of the string to a temp file, then call */
2444/* load_object on it. I admit it is a highly inefficient way to make things, */
2445/* but it was simple to make and allows reusing the load_object function. */
2446/* Remember not to use load_object_str in a time-critical situation. */
2447/* Also remember that multiparts objects are not supported for now. */
2448
2449object *
2450load_object_str (const char *obstr)
2451{
2452 object *op;
2453 char filename[MAX_BUF];
2454
2455 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2456
2457 FILE *tempfile = fopen (filename, "w");
2458
2459 if (tempfile == NULL)
2460 {
2461 LOG (llevError, "Error - Unable to access load object temp file\n");
2462 return NULL;
2463 }
2464
2465 fprintf (tempfile, obstr);
2466 fclose (tempfile);
2467
2468 op = object::create ();
2469
2470 object_thawer thawer (filename);
2471
2472 if (thawer)
2473 load_object (thawer, op, 0);
2474
2475 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2476 CLEAR_FLAG (op, FLAG_REMOVED);
2477
2478 return op;
2479}
2480
2481/* This returns the first object in who's inventory that 2411/* This returns the first object in who's inventory that
2482 * has the same type and subtype match. 2412 * has the same type and subtype match.
2483 * returns NULL if no match. 2413 * returns NULL if no match.
2484 */ 2414 */
2485object * 2415object *
2486find_obj_by_type_subtype (const object *who, int type, int subtype) 2416find_obj_by_type_subtype (const object *who, int type, int subtype)
2487{ 2417{
2488 object *tmp;
2489
2490 for (tmp = who->inv; tmp; tmp = tmp->below) 2418 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2491 if (tmp->type == type && tmp->subtype == subtype) 2419 if (tmp->type == type && tmp->subtype == subtype)
2492 return tmp; 2420 return tmp;
2493 2421
2494 return NULL; 2422 return 0;
2495} 2423}
2496 2424
2497/* If ob has a field named key, return the link from the list, 2425/* If ob has a field named key, return the link from the list,
2498 * otherwise return NULL. 2426 * otherwise return NULL.
2499 * 2427 *
2501 * do the desired thing. 2429 * do the desired thing.
2502 */ 2430 */
2503key_value * 2431key_value *
2504get_ob_key_link (const object *ob, const char *key) 2432get_ob_key_link (const object *ob, const char *key)
2505{ 2433{
2506 key_value *link;
2507
2508 for (link = ob->key_values; link != NULL; link = link->next) 2434 for (key_value *link = ob->key_values; link; link = link->next)
2509 if (link->key == key) 2435 if (link->key == key)
2510 return link; 2436 return link;
2511 2437
2512 return NULL; 2438 return 0;
2513} 2439}
2514 2440
2515/* 2441/*
2516 * Returns the value of op has an extra_field for key, or NULL. 2442 * Returns the value of op has an extra_field for key, or NULL.
2517 * 2443 *
2542 if (link->key == canonical_key) 2468 if (link->key == canonical_key)
2543 return link->value; 2469 return link->value;
2544 2470
2545 return 0; 2471 return 0;
2546} 2472}
2547
2548 2473
2549/* 2474/*
2550 * Updates the canonical_key in op to value. 2475 * Updates the canonical_key in op to value.
2551 * 2476 *
2552 * canonical_key is a shared string (value doesn't have to be). 2477 * canonical_key is a shared string (value doesn't have to be).
2557 * Returns TRUE on success. 2482 * Returns TRUE on success.
2558 */ 2483 */
2559int 2484int
2560set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2485set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2561{ 2486{
2562 key_value *
2563 field = NULL, *last = NULL; 2487 key_value *field = NULL, *last = NULL;
2564 2488
2565 for (field = op->key_values; field != NULL; field = field->next) 2489 for (field = op->key_values; field != NULL; field = field->next)
2566 { 2490 {
2567 if (field->key != canonical_key) 2491 if (field->key != canonical_key)
2568 { 2492 {
2577 /* Basically, if the archetype has this key set, 2501 /* Basically, if the archetype has this key set,
2578 * we need to store the null value so when we save 2502 * we need to store the null value so when we save
2579 * it, we save the empty value so that when we load, 2503 * it, we save the empty value so that when we load,
2580 * we get this value back again. 2504 * we get this value back again.
2581 */ 2505 */
2582 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2506 if (get_ob_key_link (op->arch, canonical_key))
2583 field->value = 0; 2507 field->value = 0;
2584 else 2508 else
2585 { 2509 {
2586 if (last) 2510 if (last)
2587 last->next = field->next; 2511 last->next = field->next;
2596 /* IF we get here, key doesn't exist */ 2520 /* IF we get here, key doesn't exist */
2597 2521
2598 /* No field, we'll have to add it. */ 2522 /* No field, we'll have to add it. */
2599 2523
2600 if (!add_key) 2524 if (!add_key)
2601 {
2602 return FALSE; 2525 return FALSE;
2603 } 2526
2604 /* There isn't any good reason to store a null 2527 /* There isn't any good reason to store a null
2605 * value in the key/value list. If the archetype has 2528 * value in the key/value list. If the archetype has
2606 * this key, then we should also have it, so shouldn't 2529 * this key, then we should also have it, so shouldn't
2607 * be here. If user wants to store empty strings, 2530 * be here. If user wants to store empty strings,
2608 * should pass in "" 2531 * should pass in ""
2657 } 2580 }
2658 else 2581 else
2659 item = item->env; 2582 item = item->env;
2660} 2583}
2661 2584
2585const char *
2586object::flag_desc (char *desc, int len) const
2587{
2588 char *p = desc;
2589 bool first = true;
2590
2591 *p = 0;
2592
2593 for (int i = 0; i < NUM_FLAGS; i++)
2594 {
2595 if (len <= 10) // magic constant!
2596 {
2597 snprintf (p, len, ",...");
2598 break;
2599 }
2600
2601 if (flag [i])
2602 {
2603 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2604 len -= cnt;
2605 p += cnt;
2606 first = false;
2607 }
2608 }
2609
2610 return desc;
2611}
2612
2662// return a suitable string describing an objetc in enough detail to find it 2613// return a suitable string describing an object in enough detail to find it
2663const char * 2614const char *
2664object::debug_desc (char *info) const 2615object::debug_desc (char *info) const
2665{ 2616{
2617 char flagdesc[512];
2666 char info2[256 * 3]; 2618 char info2[256 * 4];
2667 char *p = info; 2619 char *p = info;
2668 2620
2669 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2621 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2670 count, 2622 count,
2623 uuid.c_str (),
2671 &name, 2624 &name,
2672 title ? " " : "", 2625 title ? "\",title:\"" : "",
2673 title ? (const char *)title : ""); 2626 title ? (const char *)title : "",
2627 flag_desc (flagdesc, 512), type);
2674 2628
2675 if (env) 2629 if (!this->flag[FLAG_REMOVED] && env)
2676 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2630 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2677 2631
2678 if (map) 2632 if (map)
2679 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2633 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2680 2634
2681 return info; 2635 return info;
2682} 2636}
2683 2637
2684const char * 2638const char *
2685object::debug_desc () const 2639object::debug_desc () const
2686{ 2640{
2687 static char info[256 * 3]; 2641 static char info[3][256 * 4];
2642 static int info_idx;
2643
2688 return debug_desc (info); 2644 return debug_desc (info [++info_idx % 3]);
2689} 2645}
2690 2646
2647struct region *
2648object::region () const
2649{
2650 return map ? map->region (x, y)
2651 : region::default_region ();
2652}
2653
2654const materialtype_t *
2655object::dominant_material () const
2656{
2657 if (materialtype_t *mt = name_to_material (materialname))
2658 return mt;
2659
2660 return name_to_material (shstr_unknown);
2661}
2662
2663void
2664object::open_container (object *new_container)
2665{
2666 if (container == new_container)
2667 return;
2668
2669 if (object *old_container = container)
2670 {
2671 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2672 return;
2673
2674#if 0
2675 // remove the "Close old_container" object.
2676 if (object *closer = old_container->inv)
2677 if (closer->type == CLOSE_CON)
2678 closer->destroy ();
2679#endif
2680
2681 old_container->flag [FLAG_APPLIED] = 0;
2682 container = 0;
2683
2684 esrv_update_item (UPD_FLAGS, this, old_container);
2685 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2686 play_sound (sound_find ("chest_close"));
2687 }
2688
2689 if (new_container)
2690 {
2691 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2692 return;
2693
2694 // TODO: this does not seem to serve any purpose anymore?
2695#if 0
2696 // insert the "Close Container" object.
2697 if (archetype *closer = new_container->other_arch)
2698 {
2699 object *closer = arch_to_object (new_container->other_arch);
2700 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2701 new_container->insert (closer);
2702 }
2703#endif
2704
2705 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2706
2707 new_container->flag [FLAG_APPLIED] = 1;
2708 container = new_container;
2709
2710 esrv_update_item (UPD_FLAGS, this, new_container);
2711 esrv_send_inventory (this, new_container);
2712 play_sound (sound_find ("chest_open"));
2713 }
2714}
2715
2716object *
2717object::force_find (const shstr name)
2718{
2719 /* cycle through his inventory to look for the MARK we want to
2720 * place
2721 */
2722 for (object *tmp = inv; tmp; tmp = tmp->below)
2723 if (tmp->type == FORCE && tmp->slaying == name)
2724 return splay (tmp);
2725
2726 return 0;
2727}
2728
2729void
2730object::force_add (const shstr name, int duration)
2731{
2732 if (object *force = force_find (name))
2733 force->destroy ();
2734
2735 object *force = get_archetype (FORCE_NAME);
2736
2737 force->slaying = name;
2738 force->stats.food = 1;
2739 force->speed_left = -1.f;
2740
2741 force->set_speed (duration ? 1.f / duration : 0.f);
2742 force->flag [FLAG_IS_USED_UP] = true;
2743 force->flag [FLAG_APPLIED] = true;
2744
2745 insert (force);
2746}
2747
2748void
2749object::play_sound (faceidx sound) const
2750{
2751 if (!sound)
2752 return;
2753
2754 if (flag [FLAG_REMOVED])
2755 return;
2756
2757 if (env)
2758 {
2759 if (object *pl = in_player ())
2760 pl->contr->play_sound (sound);
2761 }
2762 else
2763 map->play_sound (sound, x, y);
2764}
2765

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines