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.109 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.206 by root, Tue Apr 15 14:21:04 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
28#include <global.h> 27#include <global.h>
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38UUID UUID::cur;
39static UUID uuid; 39static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 40static const uint64 UUID_GAP = 1<<19;
41 41
42objectvec objects; 42objectvec objects;
43activevec actives; 43activevec actives;
44 44
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 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,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 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
47}; 50};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 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,
49 -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
50}; 56};
51int 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,
52 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
53}; 62};
54int freedir[SIZEOFFREE] = { 63int freedir[SIZEOFFREE] = {
55 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,
56 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
57}; 68};
58 69
59static void 70static void
60write_uuid (void) 71write_uuid (uval64 skip, bool sync)
61{ 72{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 73 CALL_BEGIN (2);
63 74 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 75 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 77 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 78}
79 79
80static void 80static void
81read_uuid (void) 81read_uuid (void)
82{ 82{
83 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
84 84
85 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
86 86
87 seq_next_save = 0;
88
87 FILE *fp; 89 FILE *fp;
88 90
89 if (!(fp = fopen (filename, "r"))) 91 if (!(fp = fopen (filename, "r")))
90 { 92 {
91 if (errno == ENOENT) 93 if (errno == ENOENT)
92 { 94 {
93 LOG (llevInfo, "RESET uid to 1\n"); 95 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 96 UUID::cur.seq = 0;
95 write_uuid (); 97 write_uuid (UUID_GAP, true);
96 return; 98 return;
97 } 99 }
98 100
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 102 _exit (1);
101 } 103 }
102 104
103 int version; 105 UUID::BUF buf;
104 unsigned long long uid; 106 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
106 { 110 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 112 _exit (1);
109 } 113 }
110 114
111 uuid.seq = uid; 115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 116
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 117 write_uuid (UUID_GAP, true);
114 fclose (fp); 118 fclose (fp);
115} 119}
116 120
117UUID 121UUID
118gen_uuid () 122UUID::gen ()
119{ 123{
120 UUID uid; 124 UUID uid;
121 125
122 uid.seq = ++uuid.seq; 126 uid.seq = ++cur.seq;
123 127
124 if (!(uuid.seq & (UUID_SKIP - 1))) 128 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
126 134
127 return uid; 135 return uid;
128} 136}
129 137
130void 138void
131init_uuid () 139UUID::init ()
132{ 140{
133 read_uuid (); 141 read_uuid ();
134} 142}
135 143
136/* 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. */
137static int 145static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 146compare_ob_value_lists_one (const object *wants, const object *has)
139{ 147{
140 key_value *wants_field; 148 key_value *wants_field;
141 149
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 150 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
150 key_value *has_field; 158 key_value *has_field;
151 159
152 /* Look for a field in has with the same key. */ 160 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key); 161 has_field = get_ob_key_link (has, wants_field->key);
154 162
155 if (has_field == NULL) 163 if (!has_field)
156 {
157 /* No field with that name. */ 164 return 0; /* No field with that name. */
158 return FALSE;
159 }
160 165
161 /* Found the matching field. */ 166 /* Found the matching field. */
162 if (has_field->value != wants_field->value) 167 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */ 168 return 0; /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167 169
168 /* If we get here, we found a match. Now for the next field in wants. */ 170 /* If we get here, we found a match. Now for the next field in wants. */
169 } 171 }
170 172
171 /* If we get here, every field in wants has a matching field in has. */ 173 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 174 return 1;
173} 175}
174 176
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 177/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 178static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 179compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 180{
179 /* However, there may be fields in has which aren't partnered in wants, 181 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 182 * so we need to run the comparison *twice*. :(
181 */ 183 */
202 || ob1->speed != ob2->speed 204 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 205 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 206 || ob1->name != ob2->name)
205 return 0; 207 return 0;
206 208
207 //TODO: this ain't working well, use nicer and correct overflow check 209 /* Do not merge objects if nrof would overflow. First part checks
208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 210 * for unsigned overflow (2c), second part checks wether the result
209 * value could not be stored in a sint32 (which unfortunately sometimes is 211 * would fit into a 32 bit signed int, which is often used to hold
210 * used to store nrof). 212 * nrof values.
211 */ 213 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 214 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 215 return 0;
214 216
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 217 /* If the objects have been identified, set the BEEN_APPLIED flag.
216 * This is to the comparison of the flags below will be OK. We 218 * This is to the comparison of the flags below will be OK. We
217 * just can't ignore the been applied or identified flags, as they 219 * just can't ignore the been applied or identified flags, as they
218 * are not equal - just if it has been identified, the been_applied 220 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 221 * flags lose any meaning.
220 */ 222 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
249 || ob1->move_off != ob2->move_off 251 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 252 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 253 || ob1->move_slow_penalty != ob2->move_slow_penalty)
252 return 0; 254 return 0;
253 255
254 /* This is really a spellbook check - really, we should 256 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 257 * not merge objects with real inventories, as splitting them
258 * is hard.
256 */ 259 */
257 if (ob1->inv || ob2->inv) 260 if (ob1->inv || ob2->inv)
258 { 261 {
259 /* if one object has inventory but the other doesn't, not equiv */ 262 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 263 return 0; /* inventories differ in length */
261 return 0;
262 264
263 /* Now check to see if the two inventory objects could merge */ 265 if (ob1->inv->below || ob2->inv->below)
266 return 0; /* more than one object in inv */
267
264 if (!object::can_merge (ob1->inv, ob2->inv)) 268 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 269 return 0; /* inventory objects differ */
266 270
267 /* inventory ok - still need to check rest of this object to see 271 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 272 * if it is valid.
269 */ 273 */
270 } 274 }
289 if (ob1->level != ob2->level) 293 if (ob1->level != ob2->level)
290 return 0; 294 return 0;
291 break; 295 break;
292 } 296 }
293 297
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 298 if (ob1->key_values || ob2->key_values)
295 { 299 {
296 /* At least one of these has key_values. */ 300 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 301 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 302 /* One has fields, but the other one doesn't. */
299 return 0; 303 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 304 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 305 return 0;
302 } 306 }
303 307
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 308 if (ob1->self || ob2->self)
306 { 309 {
307 ob1->optimise (); 310 ob1->optimise ();
308 ob2->optimise (); 311 ob2->optimise ();
309 312
310 if (ob1->self || ob2->self) 313 if (ob1->self || ob2->self)
314 {
315 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
316 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
317
318 if (k1 != k2)
311 return 0; 319 return 0;
320 else if (k1 == 0)
321 return 1;
322 else if (!cfperl_can_merge (ob1, ob2))
323 return 0;
324 }
312 } 325 }
313 326
314 /* Everything passes, must be OK. */ 327 /* Everything passes, must be OK. */
315 return 1; 328 return 1;
316} 329}
324sum_weight (object *op) 337sum_weight (object *op)
325{ 338{
326 long sum; 339 long sum;
327 object *inv; 340 object *inv;
328 341
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 342 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 343 {
331 if (inv->inv) 344 if (inv->inv)
332 sum_weight (inv); 345 sum_weight (inv);
346
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 347 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 348 }
335 349
336 if (op->type == CONTAINER && op->stats.Str) 350 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 351 sum = (sum * (100 - op->stats.Str)) / 100;
357/* 371/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 372 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 373 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 374 * The result of the dump is stored in the static global errmsg array.
361 */ 375 */
362
363char * 376char *
364dump_object (object *op) 377dump_object (object *op)
365{ 378{
366 if (!op) 379 if (!op)
367 return strdup ("[NULLOBJ]"); 380 return strdup ("[NULLOBJ]");
368 381
369 object_freezer freezer; 382 object_freezer freezer;
370 save_object (freezer, op, 1); 383 op->write (freezer);
371 return freezer.as_string (); 384 return freezer.as_string ();
372} 385}
373 386
374/* 387/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 388 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 389 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 390 * If it's not a multi-object, it is returned.
378 */ 391 */
379
380object * 392object *
381get_nearest_part (object *op, const object *pl) 393get_nearest_part (object *op, const object *pl)
382{ 394{
383 object *tmp, *closest; 395 object *tmp, *closest;
384 int last_dist, i; 396 int last_dist, i;
395 * Returns the object which has the count-variable equal to the argument. 407 * Returns the object which has the count-variable equal to the argument.
396 */ 408 */
397object * 409object *
398find_object (tag_t i) 410find_object (tag_t i)
399{ 411{
400 return ((unsigned int)i) < objects.size () 412 for_all_objects (op)
401 ? objects [i] 413 if (op->count == i)
402 : 0; 414 return op;
415
416 return 0;
403} 417}
404 418
405/* 419/*
406 * Returns the first object which has a name equal to the argument. 420 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 421 * Used only by the patch command, but not all that useful.
418 break; 432 break;
419 433
420 return op; 434 return op;
421} 435}
422 436
423void
424free_all_object_data ()
425{
426 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
427}
428
429/* 437/*
430 * Sets the owner and sets the skill and exp pointers to owner's current 438 * Sets the owner and sets the skill and exp pointers to owner's current
431 * skill and experience objects. 439 * skill and experience objects.
440 * ACTUALLY NO! investigate! TODO
432 */ 441 */
433void 442void
434object::set_owner (object *owner) 443object::set_owner (object *owner)
435{ 444{
445 // allow objects which own objects
436 if (!owner) 446 if (owner)
437 return;
438
439 /* next line added to allow objects which own objects */
440 /* Add a check for ownercounts in here, as I got into an endless loop
441 * with the fireball owning a poison cloud which then owned the
442 * fireball. I believe that was caused by one of the objects getting
443 * freed and then another object replacing it. Since the ownercounts
444 * didn't match, this check is valid and I believe that cause is valid.
445 */
446 while (owner->owner) 447 while (owner->owner)
447 owner = owner->owner; 448 owner = owner->owner;
449
450 if (flag [FLAG_FREED])
451 {
452 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
453 return;
454 }
448 455
449 this->owner = owner; 456 this->owner = owner;
457}
458
459int
460object::slottype () const
461{
462 if (type == SKILL)
463 {
464 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
465 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
466 }
467 else
468 {
469 if (slot [body_combat].info) return slot_combat;
470 if (slot [body_range ].info) return slot_ranged;
471 }
472
473 return slot_none;
474}
475
476bool
477object::change_weapon (object *ob)
478{
479 if (current_weapon == ob)
480 return true;
481
482 if (chosen_skill)
483 chosen_skill->flag [FLAG_APPLIED] = false;
484
485 current_weapon = ob;
486 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
487
488 if (chosen_skill)
489 chosen_skill->flag [FLAG_APPLIED] = true;
490
491 update_stats ();
492
493 if (ob)
494 {
495 // now check wether any body locations became invalid, in which case
496 // we cannot apply the weapon at the moment.
497 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
498 if (slot[i].used < 0)
499 {
500 current_weapon = chosen_skill = 0;
501 update_stats ();
502
503 new_draw_info_format (NDI_UNIQUE, 0, this,
504 "You try to balance all your items at once, "
505 "but the %s is just too much for your body. "
506 "[You need to unapply some items first.]", &ob->name);
507 return false;
508 }
509
510 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
511 }
512 else
513 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
514
515 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
516 {
517 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
518 &name, ob->debug_desc ());
519 return false;
520 }
521
522 return true;
450} 523}
451 524
452/* Zero the key_values on op, decrementing the shared-string 525/* Zero the key_values on op, decrementing the shared-string
453 * refcounts and freeing the links. 526 * refcounts and freeing the links.
454 */ 527 */
455static void 528static void
456free_key_values (object *op) 529free_key_values (object *op)
457{ 530{
458 for (key_value *i = op->key_values; i != 0;) 531 for (key_value *i = op->key_values; i; )
459 { 532 {
460 key_value *next = i->next; 533 key_value *next = i->next;
461 delete i; 534 delete i;
462 535
463 i = next; 536 i = next;
464 } 537 }
465 538
466 op->key_values = 0; 539 op->key_values = 0;
467} 540}
468 541
469/* 542object &
470 * copy_to first frees everything allocated by the dst object, 543object::operator =(const object &src)
471 * and then copies the contents of itself into the second
472 * object, allocating what needs to be allocated. Basically, any
473 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
474 * if the first object is freed, the pointers in the new object
475 * will point at garbage.
476 */
477void
478object::copy_to (object *dst)
479{ 544{
480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 545 bool is_freed = flag [FLAG_FREED];
481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 546 bool is_removed = flag [FLAG_REMOVED];
482 547
483 *(object_copy *)dst = *this; 548 *(object_copy *)this = src;
484 549
485 if (is_freed) 550 flag [FLAG_FREED] = is_freed;
486 SET_FLAG (dst, FLAG_FREED); 551 flag [FLAG_REMOVED] = is_removed;
487
488 if (is_removed)
489 SET_FLAG (dst, FLAG_REMOVED);
490
491 if (speed < 0)
492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493 552
494 /* Copy over key_values, if any. */ 553 /* Copy over key_values, if any. */
495 if (key_values) 554 if (src.key_values)
496 { 555 {
497 key_value *tail = 0; 556 key_value *tail = 0;
498 key_value *i;
499
500 dst->key_values = 0; 557 key_values = 0;
501 558
502 for (i = key_values; i; i = i->next) 559 for (key_value *i = src.key_values; i; i = i->next)
503 { 560 {
504 key_value *new_link = new key_value; 561 key_value *new_link = new key_value;
505 562
506 new_link->next = 0; 563 new_link->next = 0;
507 new_link->key = i->key; 564 new_link->key = i->key;
508 new_link->value = i->value; 565 new_link->value = i->value;
509 566
510 /* Try and be clever here, too. */ 567 /* Try and be clever here, too. */
511 if (!dst->key_values) 568 if (!key_values)
512 { 569 {
513 dst->key_values = new_link; 570 key_values = new_link;
514 tail = new_link; 571 tail = new_link;
515 } 572 }
516 else 573 else
517 { 574 {
518 tail->next = new_link; 575 tail->next = new_link;
519 tail = new_link; 576 tail = new_link;
520 } 577 }
521 } 578 }
522 } 579 }
580}
581
582/*
583 * copy_to first frees everything allocated by the dst object,
584 * and then copies the contents of itself into the second
585 * object, allocating what needs to be allocated. Basically, any
586 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
587 * if the first object is freed, the pointers in the new object
588 * will point at garbage.
589 */
590void
591object::copy_to (object *dst)
592{
593 *dst = *this;
594
595 if (speed < 0)
596 dst->speed_left -= rndm ();
523 597
524 dst->set_speed (dst->speed); 598 dst->set_speed (dst->speed);
599}
600
601void
602object::instantiate ()
603{
604 if (!uuid.seq) // HACK
605 uuid = UUID::gen ();
606
607 speed_left = -0.1f;
608 /* copy the body_info to the body_used - this is only really
609 * need for monsters, but doesn't hurt to do it for everything.
610 * by doing so, when a monster is created, it has good starting
611 * values for the body_used info, so when items are created
612 * for it, they can be properly equipped.
613 */
614 for (int i = NUM_BODY_LOCATIONS; i--; )
615 slot[i].used = slot[i].info;
616
617 attachable::instantiate ();
525} 618}
526 619
527object * 620object *
528object::clone () 621object::clone ()
529{ 622{
587 * UP_OBJ_FACE: only the objects face has changed. 680 * UP_OBJ_FACE: only the objects face has changed.
588 */ 681 */
589void 682void
590update_object (object *op, int action) 683update_object (object *op, int action)
591{ 684{
592 MoveType move_on, move_off, move_block, move_slow;
593
594 if (op == NULL) 685 if (op == NULL)
595 { 686 {
596 /* this should never happen */ 687 /* this should never happen */
597 LOG (llevDebug, "update_object() called for NULL object.\n"); 688 LOG (llevDebug, "update_object() called for NULL object.\n");
598 return; 689 return;
658 749
659 if (op->more) 750 if (op->more)
660 update_object (op->more, action); 751 update_object (op->more, action);
661} 752}
662 753
663object *object::first;
664
665object::object () 754object::object ()
666{ 755{
667 SET_FLAG (this, FLAG_REMOVED); 756 SET_FLAG (this, FLAG_REMOVED);
668 757
669 expmul = 1.0; 758 expmul = 1.0;
670 face = blank_face; 759 face = blank_face;
671} 760}
672 761
673object::~object () 762object::~object ()
674{ 763{
764 unlink ();
765
675 free_key_values (this); 766 free_key_values (this);
676} 767}
677 768
769static int object_count;
770
678void object::link () 771void object::link ()
679{ 772{
680 uuid = gen_uuid (); 773 assert (!index);//D
774 uuid = UUID::gen ();
775 count = ++object_count;
681 776
682 refcnt_inc (); 777 refcnt_inc ();
683 objects.insert (this); 778 objects.insert (this);
684} 779}
685 780
686void object::unlink () 781void object::unlink ()
687{ 782{
783 if (!index)
784 return;
785
688 objects.erase (this); 786 objects.erase (this);
689 refcnt_dec (); 787 refcnt_dec ();
690} 788}
691 789
692void 790void
765 * if some form of movement is allowed, let objects 863 * if some form of movement is allowed, let objects
766 * drop on that space. 864 * drop on that space.
767 */ 865 */
768 if (!drop_to_ground 866 if (!drop_to_ground
769 || !map 867 || !map
770 || map->in_memory != MAP_IN_MEMORY 868 || map->in_memory != MAP_ACTIVE
869 || map->nodrop
771 || ms ().move_block == MOVE_ALL) 870 || ms ().move_block == MOVE_ALL)
772 { 871 {
773 while (inv) 872 while (inv)
774 { 873 {
775 inv->destroy_inv (drop_to_ground); 874 inv->destroy_inv (drop_to_ground);
784 883
785 if (op->flag [FLAG_STARTEQUIP] 884 if (op->flag [FLAG_STARTEQUIP]
786 || op->flag [FLAG_NO_DROP] 885 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE 886 || op->type == RUNE
788 || op->type == TRAP 887 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE]) 888 || op->flag [FLAG_IS_A_TEMPLATE]
889 || op->flag [FLAG_DESTROY_ON_DEATH])
790 op->destroy (); 890 op->destroy ();
791 else 891 else
792 map->insert (op, x, y); 892 map->insert (op, x, y);
793 } 893 }
794 } 894 }
802} 902}
803 903
804void 904void
805object::do_destroy () 905object::do_destroy ()
806{ 906{
907 attachable::do_destroy ();
908
807 if (flag [FLAG_IS_LINKED]) 909 if (flag [FLAG_IS_LINKED])
808 remove_button_link (this); 910 remove_button_link (this);
809 911
810 if (flag [FLAG_FRIENDLY]) 912 if (flag [FLAG_FRIENDLY])
811 remove_friendly_object (this); 913 remove_friendly_object (this);
812 914
813 if (!flag [FLAG_REMOVED]) 915 if (!flag [FLAG_REMOVED])
814 remove (); 916 remove ();
815 917
816 if (flag [FLAG_FREED]) 918 destroy_inv (true);
817 return;
818 919
819 set_speed (0); 920 deactivate ();
921 unlink ();
820 922
821 flag [FLAG_FREED] = 1; 923 flag [FLAG_FREED] = 1;
822
823 attachable::do_destroy ();
824
825 destroy_inv (true);
826 unlink ();
827 924
828 // hack to ensure that freed objects still have a valid map 925 // hack to ensure that freed objects still have a valid map
829 { 926 {
830 static maptile *freed_map; // freed objects are moved here to avoid crashes 927 static maptile *freed_map; // freed objects are moved here to avoid crashes
831 928
832 if (!freed_map) 929 if (!freed_map)
833 { 930 {
834 freed_map = new maptile; 931 freed_map = new maptile;
835 932
933 freed_map->path = "<freed objects map>";
836 freed_map->name = "/internal/freed_objects_map"; 934 freed_map->name = "/internal/freed_objects_map";
837 freed_map->width = 3; 935 freed_map->width = 3;
838 freed_map->height = 3; 936 freed_map->height = 3;
937 freed_map->nodrop = 1;
839 938
840 freed_map->alloc (); 939 freed_map->alloc ();
841 freed_map->in_memory = MAP_IN_MEMORY; 940 freed_map->in_memory = MAP_ACTIVE;
842 } 941 }
843 942
844 map = freed_map; 943 map = freed_map;
845 x = 1; 944 x = 1;
846 y = 1; 945 y = 1;
847 } 946 }
848 947
849 head = 0;
850
851 if (more) 948 if (more)
852 { 949 {
853 more->destroy (); 950 more->destroy ();
854 more = 0; 951 more = 0;
855 } 952 }
856 953
954 head = 0;
955
857 // clear those pointers that likely might have circular references to us 956 // clear those pointers that likely might cause circular references
858 owner = 0; 957 owner = 0;
859 enemy = 0; 958 enemy = 0;
860 attacked_by = 0; 959 attacked_by = 0;
960 current_weapon = 0;
861} 961}
862 962
863void 963void
864object::destroy (bool destroy_inventory) 964object::destroy (bool destroy_inventory)
865{ 965{
866 if (destroyed ()) 966 if (destroyed ())
867 return; 967 return;
868 968
869 if (destroy_inventory) 969 if (destroy_inventory)
870 destroy_inv (false); 970 destroy_inv (false);
971
972 if (is_head ())
973 if (sound_destroy)
974 play_sound (sound_destroy);
975 else if (flag [FLAG_MONSTER])
976 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
871 977
872 attachable::destroy (); 978 attachable::destroy ();
873} 979}
874 980
875/* 981/*
893 * This function removes the object op from the linked list of objects 999 * This function removes the object op from the linked list of objects
894 * which it is currently tied to. When this function is done, the 1000 * which it is currently tied to. When this function is done, the
895 * object will have no environment. If the object previously had an 1001 * object will have no environment. If the object previously had an
896 * environment, the x and y coordinates will be updated to 1002 * environment, the x and y coordinates will be updated to
897 * the previous environment. 1003 * the previous environment.
898 * Beware: This function is called from the editor as well!
899 */ 1004 */
900void 1005void
901object::remove () 1006object::do_remove ()
902{ 1007{
903 object *tmp, *last = 0; 1008 object *tmp, *last = 0;
904 object *otmp; 1009 object *otmp;
905 1010
906 if (QUERY_FLAG (this, FLAG_REMOVED)) 1011 if (QUERY_FLAG (this, FLAG_REMOVED))
949 } 1054 }
950 else if (map) 1055 else if (map)
951 { 1056 {
952 if (type == PLAYER) 1057 if (type == PLAYER)
953 { 1058 {
1059 // leaving a spot always closes any open container on the ground
1060 if (container && !container->env)
1061 // this causes spurious floorbox updates, but it ensures
1062 // that the CLOSE event is being sent.
1063 close_container ();
1064
954 --map->players; 1065 --map->players;
955 map->touch (); 1066 map->touch ();
956 } 1067 }
957 1068
958 map->dirty = true; 1069 map->dirty = true;
1070 mapspace &ms = this->ms ();
959 1071
960 /* link the object above us */ 1072 /* link the object above us */
961 if (above) 1073 if (above)
962 above->below = below; 1074 above->below = below;
963 else 1075 else
964 map->at (x, y).top = below; /* we were top, set new top */ 1076 ms.top = below; /* we were top, set new top */
965 1077
966 /* Relink the object below us, if there is one */ 1078 /* Relink the object below us, if there is one */
967 if (below) 1079 if (below)
968 below->above = above; 1080 below->above = above;
969 else 1081 else
971 /* Nothing below, which means we need to relink map object for this space 1083 /* Nothing below, which means we need to relink map object for this space
972 * use translated coordinates in case some oddness with map tiling is 1084 * use translated coordinates in case some oddness with map tiling is
973 * evident 1085 * evident
974 */ 1086 */
975 if (GET_MAP_OB (map, x, y) != this) 1087 if (GET_MAP_OB (map, x, y) != this)
976 {
977 char *dump = dump_object (this);
978 LOG (llevError,
979 "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); 1088 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 ());
980 free (dump);
981 dump = dump_object (GET_MAP_OB (map, x, y));
982 LOG (llevError, "%s\n", dump);
983 free (dump);
984 }
985 1089
986 map->at (x, y).bot = above; /* goes on above it. */ 1090 ms.bot = above; /* goes on above it. */
987 } 1091 }
988 1092
989 above = 0; 1093 above = 0;
990 below = 0; 1094 below = 0;
991 1095
992 if (map->in_memory == MAP_SAVING) 1096 if (map->in_memory == MAP_SAVING)
993 return; 1097 return;
994 1098
995 int check_walk_off = !flag [FLAG_NO_APPLY]; 1099 int check_walk_off = !flag [FLAG_NO_APPLY];
996 1100
1101 if (object *pl = ms.player ())
1102 {
1103 if (pl->container == this)
1104 /* If a container that the player is currently using somehow gets
1105 * removed (most likely destroyed), update the player view
1106 * appropriately.
1107 */
1108 pl->close_container ();
1109
1110 pl->contr->ns->floorbox_update ();
1111 }
1112
997 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1113 for (tmp = ms.bot; tmp; tmp = tmp->above)
998 { 1114 {
999 /* No point updating the players look faces if he is the object 1115 /* No point updating the players look faces if he is the object
1000 * being removed. 1116 * being removed.
1001 */ 1117 */
1002
1003 if (tmp->type == PLAYER && tmp != this)
1004 {
1005 /* If a container that the player is currently using somehow gets
1006 * removed (most likely destroyed), update the player view
1007 * appropriately.
1008 */
1009 if (tmp->container == this)
1010 {
1011 flag [FLAG_APPLIED] = 0;
1012 tmp->container = 0;
1013 }
1014
1015 if (tmp->contr->ns)
1016 tmp->contr->ns->floorbox_update ();
1017 }
1018 1118
1019 /* See if object moving off should effect something */ 1119 /* See if object moving off should effect something */
1020 if (check_walk_off 1120 if (check_walk_off
1021 && ((move_type & tmp->move_off) 1121 && ((move_type & tmp->move_off)
1022 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1122 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1025 1125
1026 if (destroyed ()) 1126 if (destroyed ())
1027 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1127 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1028 } 1128 }
1029 1129
1030 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1031 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1032 if (tmp->above == tmp)
1033 tmp->above = 0;
1034
1035 last = tmp; 1130 last = tmp;
1036 } 1131 }
1037 1132
1038 /* last == NULL if there are no objects on this space */ 1133 /* last == NULL if there are no objects on this space */
1039 //TODO: this makes little sense, why only update the topmost object? 1134 //TODO: this makes little sense, why only update the topmost object?
1059merge_ob (object *op, object *top) 1154merge_ob (object *op, object *top)
1060{ 1155{
1061 if (!op->nrof) 1156 if (!op->nrof)
1062 return 0; 1157 return 0;
1063 1158
1064 if (top) 1159 if (!top)
1065 for (top = op; top && top->above; top = top->above) 1160 for (top = op; top && top->above; top = top->above)
1066 ; 1161 ;
1067 1162
1068 for (; top; top = top->below) 1163 for (; top; top = top->below)
1069 { 1164 {
1082 } 1177 }
1083 1178
1084 return 0; 1179 return 0;
1085} 1180}
1086 1181
1182void
1183object::expand_tail ()
1184{
1185 if (more)
1186 return;
1187
1188 object *prev = this;
1189
1190 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1191 {
1192 object *op = arch_to_object (at);
1193
1194 op->name = name;
1195 op->name_pl = name_pl;
1196 op->title = title;
1197
1198 op->head = this;
1199 prev->more = op;
1200
1201 prev = op;
1202 }
1203}
1204
1087/* 1205/*
1088 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1206 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1089 * job preparing multi-part monsters 1207 * job preparing multi-part monsters.
1090 */ 1208 */
1091object * 1209object *
1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1210insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1093{ 1211{
1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1212 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1095 { 1213 {
1096 tmp->x = x + tmp->arch->clone.x; 1214 tmp->x = x + tmp->arch->x;
1097 tmp->y = y + tmp->arch->clone.y; 1215 tmp->y = y + tmp->arch->y;
1098 } 1216 }
1099 1217
1100 return insert_ob_in_map (op, m, originator, flag); 1218 return insert_ob_in_map (op, m, originator, flag);
1101} 1219}
1102 1220
1121 * just 'op' otherwise 1239 * just 'op' otherwise
1122 */ 1240 */
1123object * 1241object *
1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1242insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1125{ 1243{
1244 assert (!op->flag [FLAG_FREED]);
1245
1126 object *tmp, *top, *floor = NULL; 1246 object *top, *floor = NULL;
1127 sint16 x, y;
1128 1247
1129 if (QUERY_FLAG (op, FLAG_FREED)) 1248 op->remove ();
1130 {
1131 LOG (llevError, "Trying to insert freed object!\n");
1132 return NULL;
1133 }
1134
1135 if (!m)
1136 {
1137 char *dump = dump_object (op);
1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1139 free (dump);
1140 return op;
1141 }
1142
1143 if (out_of_map (m, op->x, op->y))
1144 {
1145 char *dump = dump_object (op);
1146 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1147#ifdef MANY_CORES
1148 /* Better to catch this here, as otherwise the next use of this object
1149 * is likely to cause a crash. Better to find out where it is getting
1150 * improperly inserted.
1151 */
1152 abort ();
1153#endif
1154 free (dump);
1155 return op;
1156 }
1157
1158 if (!QUERY_FLAG (op, FLAG_REMOVED))
1159 {
1160 char *dump = dump_object (op);
1161 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1162 free (dump);
1163 return op;
1164 }
1165
1166 if (op->more)
1167 {
1168 /* The part may be on a different map. */
1169
1170 object *more = op->more;
1171
1172 /* We really need the caller to normalise coordinates - if
1173 * we set the map, that doesn't work if the location is within
1174 * a map and this is straddling an edge. So only if coordinate
1175 * is clear wrong do we normalise it.
1176 */
1177 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1178 more->map = get_map_from_coord (m, &more->x, &more->y);
1179 else if (!more->map)
1180 {
1181 /* For backwards compatibility - when not dealing with tiled maps,
1182 * more->map should always point to the parent.
1183 */
1184 more->map = m;
1185 }
1186
1187 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1188 {
1189 if (!op->head)
1190 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1191
1192 return 0;
1193 }
1194 }
1195
1196 CLEAR_FLAG (op, FLAG_REMOVED);
1197 1249
1198 /* Ideally, the caller figures this out. However, it complicates a lot 1250 /* Ideally, the caller figures this out. However, it complicates a lot
1199 * of areas of callers (eg, anything that uses find_free_spot would now 1251 * of areas of callers (eg, anything that uses find_free_spot would now
1200 * need extra work 1252 * need extra work
1201 */ 1253 */
1202 op->map = get_map_from_coord (m, &op->x, &op->y); 1254 if (!xy_normalise (m, op->x, op->y))
1203 x = op->x; 1255 {
1204 y = op->y; 1256 op->destroy ();
1257 return 0;
1258 }
1259
1260 if (object *more = op->more)
1261 if (!insert_ob_in_map (more, m, originator, flag))
1262 return 0;
1263
1264 CLEAR_FLAG (op, FLAG_REMOVED);
1265
1266 op->map = m;
1267 mapspace &ms = op->ms ();
1205 1268
1206 /* this has to be done after we translate the coordinates. 1269 /* this has to be done after we translate the coordinates.
1207 */ 1270 */
1208 if (op->nrof && !(flag & INS_NO_MERGE)) 1271 if (op->nrof && !(flag & INS_NO_MERGE))
1209 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1272 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1210 if (object::can_merge (op, tmp)) 1273 if (object::can_merge (op, tmp))
1211 { 1274 {
1212 op->nrof += tmp->nrof; 1275 op->nrof += tmp->nrof;
1213 tmp->destroy (); 1276 tmp->destroy ();
1214 } 1277 }
1231 op->below = originator->below; 1294 op->below = originator->below;
1232 1295
1233 if (op->below) 1296 if (op->below)
1234 op->below->above = op; 1297 op->below->above = op;
1235 else 1298 else
1236 op->ms ().bot = op; 1299 ms.bot = op;
1237 1300
1238 /* since *below* originator, no need to update top */ 1301 /* since *below* originator, no need to update top */
1239 originator->below = op; 1302 originator->below = op;
1240 } 1303 }
1241 else 1304 else
1242 { 1305 {
1306 top = ms.bot;
1307
1243 /* If there are other objects, then */ 1308 /* If there are other objects, then */
1244 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1309 if (top)
1245 { 1310 {
1246 object *last = 0; 1311 object *last = 0;
1247 1312
1248 /* 1313 /*
1249 * If there are multiple objects on this space, we do some trickier handling. 1314 * If there are multiple objects on this space, we do some trickier handling.
1255 * once we get to them. This reduces the need to traverse over all of 1320 * once we get to them. This reduces the need to traverse over all of
1256 * them when adding another one - this saves quite a bit of cpu time 1321 * them when adding another one - this saves quite a bit of cpu time
1257 * when lots of spells are cast in one area. Currently, it is presumed 1322 * when lots of spells are cast in one area. Currently, it is presumed
1258 * that flying non pickable objects are spell objects. 1323 * that flying non pickable objects are spell objects.
1259 */ 1324 */
1260 while (top) 1325 for (top = ms.bot; top; top = top->above)
1261 { 1326 {
1262 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1327 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1263 floor = top; 1328 floor = top;
1264 1329
1265 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1330 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1268 top = top->below; 1333 top = top->below;
1269 break; 1334 break;
1270 } 1335 }
1271 1336
1272 last = top; 1337 last = top;
1273 top = top->above;
1274 } 1338 }
1275 1339
1276 /* Don't want top to be NULL, so set it to the last valid object */ 1340 /* Don't want top to be NULL, so set it to the last valid object */
1277 top = last; 1341 top = last;
1278 1342
1280 * looks like instead of lots of conditions here. 1344 * looks like instead of lots of conditions here.
1281 * makes things faster, and effectively the same result. 1345 * makes things faster, and effectively the same result.
1282 */ 1346 */
1283 1347
1284 /* Have object 'fall below' other objects that block view. 1348 /* Have object 'fall below' other objects that block view.
1285 * Unless those objects are exits, type 66 1349 * Unless those objects are exits.
1286 * If INS_ON_TOP is used, don't do this processing 1350 * If INS_ON_TOP is used, don't do this processing
1287 * Need to find the object that in fact blocks view, otherwise 1351 * Need to find the object that in fact blocks view, otherwise
1288 * stacking is a bit odd. 1352 * stacking is a bit odd.
1289 */ 1353 */
1290 if (!(flag & INS_ON_TOP) && 1354 if (!(flag & INS_ON_TOP)
1291 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1355 && ms.flags () & P_BLOCKSVIEW
1356 && (op->face && !faces [op->face].visibility))
1292 { 1357 {
1293 for (last = top; last != floor; last = last->below) 1358 for (last = top; last != floor; last = last->below)
1294 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1359 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1295 break; 1360 break;
1361
1296 /* Check to see if we found the object that blocks view, 1362 /* Check to see if we found the object that blocks view,
1297 * and make sure we have a below pointer for it so that 1363 * and make sure we have a below pointer for it so that
1298 * we can get inserted below this one, which requires we 1364 * we can get inserted below this one, which requires we
1299 * set top to the object below us. 1365 * set top to the object below us.
1300 */ 1366 */
1301 if (last && last->below && last != floor) 1367 if (last && last->below && last != floor)
1302 top = last->below; 1368 top = last->below;
1303 } 1369 }
1304 } /* If objects on this space */ 1370 } /* If objects on this space */
1305 1371
1306 if (flag & INS_MAP_LOAD)
1307 top = GET_MAP_TOP (op->map, op->x, op->y);
1308
1309 if (flag & INS_ABOVE_FLOOR_ONLY) 1372 if (flag & INS_ABOVE_FLOOR_ONLY)
1310 top = floor; 1373 top = floor;
1311 1374
1312 /* Top is the object that our object (op) is going to get inserted above. 1375 /* Top is the object that our object (op) is going to get inserted above.
1313 */ 1376 */
1314 1377
1315 /* First object on this space */ 1378 /* First object on this space */
1316 if (!top) 1379 if (!top)
1317 { 1380 {
1318 op->above = GET_MAP_OB (op->map, op->x, op->y); 1381 op->above = ms.bot;
1319 1382
1320 if (op->above) 1383 if (op->above)
1321 op->above->below = op; 1384 op->above->below = op;
1322 1385
1323 op->below = 0; 1386 op->below = 0;
1324 op->ms ().bot = op; 1387 ms.bot = op;
1325 } 1388 }
1326 else 1389 else
1327 { /* get inserted into the stack above top */ 1390 { /* get inserted into the stack above top */
1328 op->above = top->above; 1391 op->above = top->above;
1329 1392
1333 op->below = top; 1396 op->below = top;
1334 top->above = op; 1397 top->above = op;
1335 } 1398 }
1336 1399
1337 if (!op->above) 1400 if (!op->above)
1338 op->ms ().top = op; 1401 ms.top = op;
1339 } /* else not INS_BELOW_ORIGINATOR */ 1402 } /* else not INS_BELOW_ORIGINATOR */
1340 1403
1341 if (op->type == PLAYER) 1404 if (op->type == PLAYER)
1342 { 1405 {
1343 op->contr->do_los = 1; 1406 op->contr->do_los = 1;
1345 op->map->touch (); 1408 op->map->touch ();
1346 } 1409 }
1347 1410
1348 op->map->dirty = true; 1411 op->map->dirty = true;
1349 1412
1350 /* If we have a floor, we know the player, if any, will be above
1351 * it, so save a few ticks and start from there.
1352 */
1353 if (!(flag & INS_MAP_LOAD))
1354 if (object *pl = op->ms ().player ()) 1413 if (object *pl = ms.player ())
1355 if (pl->contr->ns)
1356 pl->contr->ns->floorbox_update (); 1414 pl->contr->ns->floorbox_update ();
1357 1415
1358 /* If this object glows, it may affect lighting conditions that are 1416 /* If this object glows, it may affect lighting conditions that are
1359 * visible to others on this map. But update_all_los is really 1417 * visible to others on this map. But update_all_los is really
1360 * an inefficient way to do this, as it means los for all players 1418 * an inefficient way to do this, as it means los for all players
1361 * on the map will get recalculated. The players could very well 1419 * on the map will get recalculated. The players could very well
1380 * blocked() and wall() work properly), and these flags are updated by 1438 * blocked() and wall() work properly), and these flags are updated by
1381 * update_object(). 1439 * update_object().
1382 */ 1440 */
1383 1441
1384 /* if this is not the head or flag has been passed, don't check walk on status */ 1442 /* if this is not the head or flag has been passed, don't check walk on status */
1385 if (!(flag & INS_NO_WALK_ON) && !op->head) 1443 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1386 { 1444 {
1387 if (check_move_on (op, originator)) 1445 if (check_move_on (op, originator))
1388 return 0; 1446 return 0;
1389 1447
1390 /* If we are a multi part object, lets work our way through the check 1448 /* If we are a multi part object, lets work our way through the check
1391 * walk on's. 1449 * walk on's.
1392 */ 1450 */
1393 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1451 for (object *tmp = op->more; tmp; tmp = tmp->more)
1394 if (check_move_on (tmp, originator)) 1452 if (check_move_on (tmp, originator))
1395 return 0; 1453 return 0;
1396 } 1454 }
1397 1455
1398 return op; 1456 return op;
1408 object *tmp, *tmp1; 1466 object *tmp, *tmp1;
1409 1467
1410 /* first search for itself and remove any old instances */ 1468 /* first search for itself and remove any old instances */
1411 1469
1412 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1470 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1413 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1471 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1414 tmp->destroy (); 1472 tmp->destroy ();
1415 1473
1416 tmp1 = arch_to_object (archetype::find (arch_string)); 1474 tmp1 = arch_to_object (archetype::find (arch_string));
1417 1475
1418 tmp1->x = op->x; 1476 tmp1->x = op->x;
1421} 1479}
1422 1480
1423object * 1481object *
1424object::insert_at (object *where, object *originator, int flags) 1482object::insert_at (object *where, object *originator, int flags)
1425{ 1483{
1484 if (where->env)
1485 return where->env->insert (this);
1486 else
1426 where->map->insert (this, where->x, where->y, originator, flags); 1487 return where->map->insert (this, where->x, where->y, originator, flags);
1427} 1488}
1428 1489
1429/* 1490/*
1430 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1491 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1431 * is returned contains nr objects, and the remaining parts contains 1492 * is returned contains nr objects, and the remaining parts contains
1451 orig_ob->destroy (1); 1512 orig_ob->destroy (1);
1452 else if (!is_removed) 1513 else if (!is_removed)
1453 { 1514 {
1454 if (orig_ob->env != NULL) 1515 if (orig_ob->env != NULL)
1455 sub_weight (orig_ob->env, orig_ob->weight * nr); 1516 sub_weight (orig_ob->env, orig_ob->weight * nr);
1456 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1517 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1457 { 1518 {
1458 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1519 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1459 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); 1520 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1460 return NULL; 1521 return NULL;
1461 } 1522 }
1471 * the amount of an object. If the amount reaches 0, the object 1532 * the amount of an object. If the amount reaches 0, the object
1472 * is subsequently removed and freed. 1533 * is subsequently removed and freed.
1473 * 1534 *
1474 * Return value: 'op' if something is left, NULL if the amount reached 0 1535 * Return value: 'op' if something is left, NULL if the amount reached 0
1475 */ 1536 */
1476
1477object * 1537object *
1478decrease_ob_nr (object *op, uint32 i) 1538decrease_ob_nr (object *op, uint32 i)
1479{ 1539{
1480 object *tmp; 1540 object *tmp;
1481 1541
1556 1616
1557/* 1617/*
1558 * add_weight(object, weight) adds the specified weight to an object, 1618 * add_weight(object, weight) adds the specified weight to an object,
1559 * and also updates how much the environment(s) is/are carrying. 1619 * and also updates how much the environment(s) is/are carrying.
1560 */ 1620 */
1561
1562void 1621void
1563add_weight (object *op, signed long weight) 1622add_weight (object *op, signed long weight)
1564{ 1623{
1565 while (op != NULL) 1624 while (op != NULL)
1566 { 1625 {
1581 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1640 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1582 free (dump); 1641 free (dump);
1583 return op; 1642 return op;
1584 } 1643 }
1585 1644
1586 if (where->head) 1645 if (where->head_ () != where)
1587 { 1646 {
1588 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1647 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1589 where = where->head; 1648 where = where->head;
1590 } 1649 }
1591 1650
1592 return where->insert (op); 1651 return where->insert (op);
1593} 1652}
1598 * inside the object environment. 1657 * inside the object environment.
1599 * 1658 *
1600 * The function returns now pointer to inserted item, and return value can 1659 * The function returns now pointer to inserted item, and return value can
1601 * be != op, if items are merged. -Tero 1660 * be != op, if items are merged. -Tero
1602 */ 1661 */
1603
1604object * 1662object *
1605object::insert (object *op) 1663object::insert (object *op)
1606{ 1664{
1607 object *tmp, *otmp;
1608
1609 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1610 op->remove (); 1666 op->remove ();
1611 1667
1612 if (op->more) 1668 if (op->more)
1613 { 1669 {
1615 return op; 1671 return op;
1616 } 1672 }
1617 1673
1618 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1619 CLEAR_FLAG (op, FLAG_REMOVED); 1675 CLEAR_FLAG (op, FLAG_REMOVED);
1676
1620 if (op->nrof) 1677 if (op->nrof)
1621 { 1678 {
1622 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1679 for (object *tmp = inv; tmp; tmp = tmp->below)
1623 if (object::can_merge (tmp, op)) 1680 if (object::can_merge (tmp, op))
1624 { 1681 {
1625 /* return the original object and remove inserted object 1682 /* return the original object and remove inserted object
1626 (client needs the original object) */ 1683 (client needs the original object) */
1627 tmp->nrof += op->nrof; 1684 tmp->nrof += op->nrof;
1646 add_weight (this, op->weight * op->nrof); 1703 add_weight (this, op->weight * op->nrof);
1647 } 1704 }
1648 else 1705 else
1649 add_weight (this, (op->weight + op->carrying)); 1706 add_weight (this, (op->weight + op->carrying));
1650 1707
1651 otmp = this->in_player (); 1708 if (object *otmp = this->in_player ())
1652 if (otmp && otmp->contr)
1653 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1654 otmp->update_stats (); 1710 otmp->update_stats ();
1655 1711
1712 op->owner = 0; // its his/hers now. period.
1656 op->map = 0; 1713 op->map = 0;
1657 op->env = this; 1714 op->env = this;
1658 op->above = 0; 1715 op->above = 0;
1659 op->below = 0; 1716 op->below = 0;
1660 op->x = 0, op->y = 0; 1717 op->x = op->y = 0;
1661 1718
1662 /* reset the light list and los of the players on the map */ 1719 /* reset the light list and los of the players on the map */
1663 if ((op->glow_radius != 0) && map) 1720 if (op->glow_radius && map)
1664 { 1721 {
1665#ifdef DEBUG_LIGHTS 1722#ifdef DEBUG_LIGHTS
1666 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1723 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1667#endif /* DEBUG_LIGHTS */ 1724#endif /* DEBUG_LIGHTS */
1668 if (map->darkness) 1725 if (map->darkness)
1768 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1825 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1826 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1770 { 1827 {
1771 1828
1772 float 1829 float
1773 diff = tmp->move_slow_penalty * FABS (op->speed); 1830 diff = tmp->move_slow_penalty * fabs (op->speed);
1774 1831
1775 if (op->type == PLAYER) 1832 if (op->type == PLAYER)
1776 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1833 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1777 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1834 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1778 diff /= 4.0; 1835 diff /= 4.0;
1902 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1903 */ 1960 */
1904void 1961void
1905flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1906{ 1963{
1907 if (op->inv)
1908 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1909 { 1965 {
1910 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
1911 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
1912 } 1968 }
1913} 1969}
1914 1970
1915/* 1971/*
1916 * deactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
1917 */ 1973 */
1918void 1974void
1919unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
1920{ 1976{
1921 if (op->inv)
1922 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1923 { 1978 {
1924 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
1925 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
1926 } 1981 }
1927}
1928
1929/*
1930 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1931 * all it's inventory (recursively).
1932 * If checksums are used, a player will get set_cheat called for
1933 * him/her-self and all object carried by a call to this function.
1934 */
1935void
1936set_cheat (object *op)
1937{
1938 SET_FLAG (op, FLAG_WAS_WIZ);
1939 flag_inv (op, FLAG_WAS_WIZ);
1940} 1982}
1941 1983
1942/* 1984/*
1943 * find_free_spot(object, map, x, y, start, stop) will search for 1985 * find_free_spot(object, map, x, y, start, stop) will search for
1944 * a spot at the given map and coordinates which will be able to contain 1986 * a spot at the given map and coordinates which will be able to contain
1946 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
1947 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
1948 * start and stop are where to start relative to the free_arr array (1,9 1990 * start and stop are where to start relative to the free_arr array (1,9
1949 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
1950 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1992 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1951 * Note - this only checks to see if there is space for the head of the
1952 * object - if it is a multispace object, this should be called for all
1953 * pieces.
1954 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
1955 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
1956 * necessary, so the caller shouldn't need to do any special work. 1995 * necessary, so the caller shouldn't need to do any special work.
1957 * Note - updated to take an object instead of archetype - this is necessary 1996 * Note - updated to take an object instead of archetype - this is necessary
1958 * because arch_blocked (now ob_blocked) needs to know the movement type 1997 * because arch_blocked (now ob_blocked) needs to know the movement type
1959 * to know if the space in question will block the object. We can't use 1998 * to know if the space in question will block the object. We can't use
1961 * customized, changed states, etc. 2000 * customized, changed states, etc.
1962 */ 2001 */
1963int 2002int
1964find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2003find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1965{ 2004{
2005 int altern[SIZEOFFREE];
1966 int index = 0, flag; 2006 int index = 0, flag;
1967 int altern[SIZEOFFREE];
1968 2007
1969 for (int i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
1970 { 2009 {
1971 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2010 mapxy pos (m, x, y); pos.move (i);
1972 if (!flag) 2011
2012 if (!pos.normalise ())
2013 continue;
2014
2015 mapspace &ms = *pos;
2016
2017 if (ms.flags () & P_IS_ALIVE)
2018 continue;
2019
2020 /* However, often
2021 * ob doesn't have any move type (when used to place exits)
2022 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2023 */
2024 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2025 {
1973 altern [index++] = i; 2026 altern [index++] = i;
2027 continue;
2028 }
1974 2029
1975 /* Basically, if we find a wall on a space, we cut down the search size. 2030 /* Basically, if we find a wall on a space, we cut down the search size.
1976 * In this way, we won't return spaces that are on another side of a wall. 2031 * In this way, we won't return spaces that are on another side of a wall.
1977 * This mostly work, but it cuts down the search size in all directions - 2032 * This mostly work, but it cuts down the search size in all directions -
1978 * if the space being examined only has a wall to the north and empty 2033 * if the space being examined only has a wall to the north and empty
1979 * spaces in all the other directions, this will reduce the search space 2034 * spaces in all the other directions, this will reduce the search space
1980 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
1981 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
1982 */ 2037 */
1983 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2038 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2039 {
1984 stop = maxfree[i]; 2040 stop = maxfree[i];
2041 continue;
2042 }
2043
2044 /* Note it is intentional that we check ob - the movement type of the
2045 * head of the object should correspond for the entire object.
2046 */
2047 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2048 continue;
2049
2050 if (ob->blocked (m, pos.x, pos.y))
2051 continue;
2052
2053 altern [index++] = i;
1985 } 2054 }
1986 2055
1987 if (!index) 2056 if (!index)
1988 return -1; 2057 return -1;
1989 2058
1990 return altern[RANDOM () % index]; 2059 return altern [rndm (index)];
1991} 2060}
1992 2061
1993/* 2062/*
1994 * find_first_free_spot(archetype, maptile, x, y) works like 2063 * find_first_free_spot(archetype, maptile, x, y) works like
1995 * find_free_spot(), but it will search max number of squares. 2064 * find_free_spot(), but it will search max number of squares.
1998 */ 2067 */
1999int 2068int
2000find_first_free_spot (const object *ob, maptile *m, int x, int y) 2069find_first_free_spot (const object *ob, maptile *m, int x, int y)
2001{ 2070{
2002 for (int i = 0; i < SIZEOFFREE; i++) 2071 for (int i = 0; i < SIZEOFFREE; i++)
2003 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2072 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2004 return i; 2073 return i;
2005 2074
2006 return -1; 2075 return -1;
2007} 2076}
2008 2077
2016{ 2085{
2017 arr += begin; 2086 arr += begin;
2018 end -= begin; 2087 end -= begin;
2019 2088
2020 while (--end) 2089 while (--end)
2021 swap (arr [end], arr [RANDOM () % (end + 1)]); 2090 swap (arr [end], arr [rndm (end + 1)]);
2022} 2091}
2023 2092
2024/* new function to make monster searching more efficient, and effective! 2093/* new function to make monster searching more efficient, and effective!
2025 * This basically returns a randomized array (in the passed pointer) of 2094 * This basically returns a randomized array (in the passed pointer) of
2026 * the spaces to find monsters. In this way, it won't always look for 2095 * the spaces to find monsters. In this way, it won't always look for
2062 object *tmp; 2131 object *tmp;
2063 maptile *mp; 2132 maptile *mp;
2064 2133
2065 MoveType blocked, move_type; 2134 MoveType blocked, move_type;
2066 2135
2067 if (exclude && exclude->head) 2136 if (exclude && exclude->head_ () != exclude)
2068 { 2137 {
2069 exclude = exclude->head; 2138 exclude = exclude->head;
2070 move_type = exclude->move_type; 2139 move_type = exclude->move_type;
2071 } 2140 }
2072 else 2141 else
2095 max = maxfree[i]; 2164 max = maxfree[i];
2096 else if (mflags & P_IS_ALIVE) 2165 else if (mflags & P_IS_ALIVE)
2097 { 2166 {
2098 for (tmp = ms.bot; tmp; tmp = tmp->above) 2167 for (tmp = ms.bot; tmp; tmp = tmp->above)
2099 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2168 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2100 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2169 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2101 break; 2170 break;
2102 2171
2103 if (tmp) 2172 if (tmp)
2104 return freedir[i]; 2173 return freedir[i];
2105 } 2174 }
2160 2229
2161 return 3; 2230 return 3;
2162} 2231}
2163 2232
2164/* 2233/*
2165 * absdir(int): Returns a number between 1 and 8, which represent
2166 * the "absolute" direction of a number (it actually takes care of
2167 * "overflow" in previous calculations of a direction).
2168 */
2169
2170int
2171absdir (int d)
2172{
2173 while (d < 1)
2174 d += 8;
2175
2176 while (d > 8)
2177 d -= 8;
2178
2179 return d;
2180}
2181
2182/*
2183 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2234 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2184 * between two directions (which are expected to be absolute (see absdir()) 2235 * between two directions (which are expected to be absolute (see absdir())
2185 */ 2236 */
2186
2187int 2237int
2188dirdiff (int dir1, int dir2) 2238dirdiff (int dir1, int dir2)
2189{ 2239{
2190 int d; 2240 int d;
2191 2241
2304 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2354 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2305 * core dumps if they do. 2355 * core dumps if they do.
2306 * 2356 *
2307 * Add a check so we can't pick up invisible objects (0.93.8) 2357 * Add a check so we can't pick up invisible objects (0.93.8)
2308 */ 2358 */
2309
2310int 2359int
2311can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2312{ 2361{
2313 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2314 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2319 * create clone from object to another 2368 * create clone from object to another
2320 */ 2369 */
2321object * 2370object *
2322object_create_clone (object *asrc) 2371object_create_clone (object *asrc)
2323{ 2372{
2324 object *dst = 0, *tmp, *src, *part, *prev, *item; 2373 object *dst = 0, *tmp, *src, *prev, *item;
2325 2374
2326 if (!asrc) 2375 if (!asrc)
2327 return 0; 2376 return 0;
2328 2377
2329 src = asrc;
2330 if (src->head)
2331 src = src->head; 2378 src = asrc->head_ ();
2332 2379
2333 prev = 0; 2380 prev = 0;
2334 for (part = src; part; part = part->more) 2381 for (object *part = src; part; part = part->more)
2335 { 2382 {
2336 tmp = part->clone (); 2383 tmp = part->clone ();
2337 tmp->x -= src->x; 2384 tmp->x -= src->x;
2338 tmp->y -= src->y; 2385 tmp->y -= src->y;
2339 2386
2355 2402
2356 for (item = src->inv; item; item = item->below) 2403 for (item = src->inv; item; item = item->below)
2357 insert_ob_in_ob (object_create_clone (item), dst); 2404 insert_ob_in_ob (object_create_clone (item), dst);
2358 2405
2359 return dst; 2406 return dst;
2360}
2361
2362/* GROS - Creates an object using a string representing its content. */
2363/* Basically, we save the content of the string to a temp file, then call */
2364/* load_object on it. I admit it is a highly inefficient way to make things, */
2365/* but it was simple to make and allows reusing the load_object function. */
2366/* Remember not to use load_object_str in a time-critical situation. */
2367/* Also remember that multiparts objects are not supported for now. */
2368object *
2369load_object_str (const char *obstr)
2370{
2371 object *op;
2372 char filename[MAX_BUF];
2373
2374 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2375
2376 FILE *tempfile = fopen (filename, "w");
2377
2378 if (tempfile == NULL)
2379 {
2380 LOG (llevError, "Error - Unable to access load object temp file\n");
2381 return NULL;
2382 }
2383
2384 fprintf (tempfile, obstr);
2385 fclose (tempfile);
2386
2387 op = object::create ();
2388
2389 object_thawer thawer (filename);
2390
2391 if (thawer)
2392 load_object (thawer, op, 0);
2393
2394 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2395 CLEAR_FLAG (op, FLAG_REMOVED);
2396
2397 return op;
2398} 2407}
2399 2408
2400/* This returns the first object in who's inventory that 2409/* This returns the first object in who's inventory that
2401 * has the same type and subtype match. 2410 * has the same type and subtype match.
2402 * returns NULL if no match. 2411 * returns NULL if no match.
2457 if (link->key == canonical_key) 2466 if (link->key == canonical_key)
2458 return link->value; 2467 return link->value;
2459 2468
2460 return 0; 2469 return 0;
2461} 2470}
2462
2463 2471
2464/* 2472/*
2465 * Updates the canonical_key in op to value. 2473 * Updates the canonical_key in op to value.
2466 * 2474 *
2467 * canonical_key is a shared string (value doesn't have to be). 2475 * canonical_key is a shared string (value doesn't have to be).
2491 /* Basically, if the archetype has this key set, 2499 /* Basically, if the archetype has this key set,
2492 * we need to store the null value so when we save 2500 * we need to store the null value so when we save
2493 * it, we save the empty value so that when we load, 2501 * it, we save the empty value so that when we load,
2494 * we get this value back again. 2502 * we get this value back again.
2495 */ 2503 */
2496 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2504 if (get_ob_key_link (op->arch, canonical_key))
2497 field->value = 0; 2505 field->value = 0;
2498 else 2506 else
2499 { 2507 {
2500 if (last) 2508 if (last)
2501 last->next = field->next; 2509 last->next = field->next;
2570 } 2578 }
2571 else 2579 else
2572 item = item->env; 2580 item = item->env;
2573} 2581}
2574 2582
2575
2576const char * 2583const char *
2577object::flag_desc (char *desc, int len) const 2584object::flag_desc (char *desc, int len) const
2578{ 2585{
2579 char *p = desc; 2586 char *p = desc;
2580 bool first = true; 2587 bool first = true;
2607{ 2614{
2608 char flagdesc[512]; 2615 char flagdesc[512];
2609 char info2[256 * 4]; 2616 char info2[256 * 4];
2610 char *p = info; 2617 char *p = info;
2611 2618
2612 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2619 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2613 count, uuid.seq, 2620 count,
2621 uuid.c_str (),
2614 &name, 2622 &name,
2615 title ? "\",title:" : "", 2623 title ? "\",title:\"" : "",
2616 title ? (const char *)title : "", 2624 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type); 2625 flag_desc (flagdesc, 512), type);
2618 2626
2619 if (env) 2627 if (!this->flag[FLAG_REMOVED] && env)
2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2628 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2621 2629
2622 if (map) 2630 if (map)
2623 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2631 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2624 2632
2626} 2634}
2627 2635
2628const char * 2636const char *
2629object::debug_desc () const 2637object::debug_desc () const
2630{ 2638{
2631 static char info[256 * 4]; 2639 static char info[3][256 * 4];
2640 static int info_idx;
2641
2632 return debug_desc (info); 2642 return debug_desc (info [++info_idx % 3]);
2633} 2643}
2634 2644
2645struct region *
2646object::region () const
2647{
2648 return map ? map->region (x, y)
2649 : region::default_region ();
2650}
2651
2652const materialtype_t *
2653object::dominant_material () const
2654{
2655 if (materialtype_t *mt = name_to_material (materialname))
2656 return mt;
2657
2658 return name_to_material (shstr_unknown);
2659}
2660
2661void
2662object::open_container (object *new_container)
2663{
2664 if (container == new_container)
2665 return;
2666
2667 if (object *old_container = container)
2668 {
2669 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2670 return;
2671
2672#if 0
2673 // remove the "Close old_container" object.
2674 if (object *closer = old_container->inv)
2675 if (closer->type == CLOSE_CON)
2676 closer->destroy ();
2677#endif
2678
2679 old_container->flag [FLAG_APPLIED] = 0;
2680 container = 0;
2681
2682 esrv_update_item (UPD_FLAGS, this, old_container);
2683 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2684 play_sound (sound_find ("chest_close"));
2685 }
2686
2687 if (new_container)
2688 {
2689 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2690 return;
2691
2692 // TODO: this does not seem to serve any purpose anymore?
2693#if 0
2694 // insert the "Close Container" object.
2695 if (archetype *closer = new_container->other_arch)
2696 {
2697 object *closer = arch_to_object (new_container->other_arch);
2698 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2699 new_container->insert (closer);
2700 }
2701#endif
2702
2703 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2704
2705 new_container->flag [FLAG_APPLIED] = 1;
2706 container = new_container;
2707
2708 esrv_update_item (UPD_FLAGS, this, new_container);
2709 esrv_send_inventory (this, new_container);
2710 play_sound (sound_find ("chest_open"));
2711 }
2712}
2713
2714object *
2715object::force_find (const shstr name)
2716{
2717 /* cycle through his inventory to look for the MARK we want to
2718 * place
2719 */
2720 for (object *tmp = inv; tmp; tmp = tmp->below)
2721 if (tmp->type == FORCE && tmp->slaying == name)
2722 return splay (tmp);
2723
2724 return 0;
2725}
2726
2727void
2728object::force_add (const shstr name, int duration)
2729{
2730 if (object *force = force_find (name))
2731 force->destroy ();
2732
2733 object *force = get_archetype (FORCE_NAME);
2734
2735 force->slaying = name;
2736 force->stats.food = 1;
2737 force->speed_left = -1.f;
2738
2739 force->set_speed (duration ? 1.f / duration : 0.f);
2740 force->flag [FLAG_IS_USED_UP] = true;
2741 force->flag [FLAG_APPLIED] = true;
2742
2743 insert (force);
2744}
2745
2746void
2747object::play_sound (faceidx sound) const
2748{
2749 if (!sound)
2750 return;
2751
2752 if (flag [FLAG_REMOVED])
2753 return;
2754
2755 if (env)
2756 {
2757 if (object *pl = in_player ())
2758 pl->contr->play_sound (sound);
2759 }
2760 else
2761 map->play_sound (sound, x, y);
2762}
2763

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines