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.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.207 by root, Sun Apr 20 23:25:09 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
27#include <global.h> 28#include <global.h>
28#include <stdio.h> 29#include <stdio.h>
29#include <sys/types.h> 30#include <sys/types.h>
30#include <sys/uio.h> 31#include <sys/uio.h>
31#include <object.h> 32#include <object.h>
32#include <funcpoint.h> 33#include <funcpoint.h>
34#include <sproto.h>
33#include <loader.h> 35#include <loader.h>
34 36
35#include <bitset> 37#include <bitset>
36 38
37int nrofallocobjects = 0; 39UUID UUID::cur;
38static UUID uuid; 40static uint64_t seq_next_save;
39const uint64 UUID_SKIP = 1<<19; 41static const uint64 UUID_GAP = 1<<19;
40 42
41object *active_objects; /* List of active objects that need to be processed */ 43objectvec objects;
44activevec actives;
42 45
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 46short freearr_x[SIZEOFFREE] = {
47 0,
48 0, 1, 1, 1, 0, -1, -1, -1,
49 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 50 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}; 51};
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, 52short freearr_y[SIZEOFFREE] = {
53 0,
54 -1, -1, 0, 1, 1, 1, 0, -1,
55 -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 56 -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}; 57};
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, 58int maxfree[SIZEOFFREE] = {
59 0,
60 9, 10, 13, 14, 17, 18, 21, 22,
61 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 62 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}; 63};
52int freedir[SIZEOFFREE] = { 64int 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, 65 0,
66 1, 2, 3, 4, 5, 6, 7, 8,
67 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 68 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}; 69};
56 70
57static void 71static void
58write_uuid (void) 72write_uuid (uval64 skip, bool sync)
59{ 73{
60 char filename1[MAX_BUF], filename2[MAX_BUF]; 74 CALL_BEGIN (2);
61 75 CALL_ARG_SV (newSVval64 (skip));
62 sprintf (filename1, "%s/uuid", settings.localdir); 76 CALL_ARG_SV (boolSV (sync));
63 sprintf (filename2, "%s/uuid~", settings.localdir); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
64 78 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} 79}
77 80
78static void 81static void
79read_uuid (void) 82read_uuid (void)
80{ 83{
81 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
82 85
83 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
84 87
88 seq_next_save = 0;
89
85 FILE *fp; 90 FILE *fp;
86 91
87 if (!(fp = fopen (filename, "r"))) 92 if (!(fp = fopen (filename, "r")))
88 { 93 {
89 if (errno == ENOENT) 94 if (errno == ENOENT)
90 { 95 {
91 LOG (llevInfo, "RESET uid to 1\n"); 96 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0; 97 UUID::cur.seq = 0;
93 write_uuid (); 98 write_uuid (UUID_GAP, true);
94 return; 99 return;
95 } 100 }
96 101
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 103 _exit (1);
99 } 104 }
100 105
101 int version; 106 UUID::BUF buf;
102 unsigned long long uid; 107 buf[0] = 0;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 108 fgets (buf, sizeof (buf), fp);
109
110 if (!UUID::cur.parse (buf))
104 { 111 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 112 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106 _exit (1); 113 _exit (1);
107 } 114 }
108 115
109 uuid.seq = uid; 116 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110 write_uuid (); 117
111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 118 write_uuid (UUID_GAP, true);
112 fclose (fp); 119 fclose (fp);
113} 120}
114 121
115UUID 122UUID
116gen_uuid () 123UUID::gen ()
117{ 124{
118 UUID uid; 125 UUID uid;
119 126
120 uid.seq = ++uuid.seq; 127 uid.seq = ++cur.seq;
121 128
122 if (!(uuid.seq & (UUID_SKIP - 1))) 129 if (expect_false (cur.seq >= seq_next_save))
123 write_uuid (); 130 {
131 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
132 write_uuid (UUID_GAP, false);
133 }
134
124 135
125 return uid; 136 return uid;
126} 137}
127 138
128void 139void
129init_uuid () 140UUID::init ()
130{ 141{
131 read_uuid (); 142 read_uuid ();
132} 143}
133 144
134/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 145/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
135static int 146static bool
136compare_ob_value_lists_one (const object *wants, const object *has) 147compare_ob_value_lists_one (const object *wants, const object *has)
137{ 148{
138 key_value *wants_field; 149 key_value *wants_field;
139 150
140 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 151 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
148 key_value *has_field; 159 key_value *has_field;
149 160
150 /* Look for a field in has with the same key. */ 161 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 162 has_field = get_ob_key_link (has, wants_field->key);
152 163
153 if (has_field == NULL) 164 if (!has_field)
154 {
155 /* No field with that name. */ 165 return 0; /* No field with that name. */
156 return FALSE;
157 }
158 166
159 /* Found the matching field. */ 167 /* Found the matching field. */
160 if (has_field->value != wants_field->value) 168 if (has_field->value != wants_field->value)
161 {
162 /* Values don't match, so this half of the comparison is false. */ 169 return 0; /* Values don't match, so this half of the comparison is false. */
163 return FALSE;
164 }
165 170
166 /* If we get here, we found a match. Now for the next field in wants. */ 171 /* If we get here, we found a match. Now for the next field in wants. */
167 } 172 }
168 173
169 /* If we get here, every field in wants has a matching field in has. */ 174 /* If we get here, every field in wants has a matching field in has. */
170 return TRUE; 175 return 1;
171} 176}
172 177
173/* Returns TRUE if ob1 has the same key_values as ob2. */ 178/* Returns TRUE if ob1 has the same key_values as ob2. */
174static int 179static bool
175compare_ob_value_lists (const object *ob1, const object *ob2) 180compare_ob_value_lists (const object *ob1, const object *ob2)
176{ 181{
177 /* However, there may be fields in has which aren't partnered in wants, 182 /* However, there may be fields in has which aren't partnered in wants,
178 * so we need to run the comparison *twice*. :( 183 * so we need to run the comparison *twice*. :(
179 */ 184 */
200 || ob1->speed != ob2->speed 205 || ob1->speed != ob2->speed
201 || ob1->value != ob2->value 206 || ob1->value != ob2->value
202 || ob1->name != ob2->name) 207 || ob1->name != ob2->name)
203 return 0; 208 return 0;
204 209
205 //TODO: this ain't working well, use nicer and correct overflow check 210 /* Do not merge objects if nrof would overflow. First part checks
206 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 211 * for unsigned overflow (2c), second part checks wether the result
207 * value could not be stored in a sint32 (which unfortunately sometimes is 212 * would fit into a 32 bit signed int, which is often used to hold
208 * used to store nrof). 213 * nrof values.
209 */ 214 */
210 if (ob1->nrof + ob2->nrof >= 1UL << 31) 215 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
211 return 0; 216 return 0;
212 217
213 /* If the objects have been identified, set the BEEN_APPLIED flag. 218 /* If the objects have been identified, set the BEEN_APPLIED flag.
214 * This is to the comparison of the flags below will be OK. We 219 * This is to the comparison of the flags below will be OK. We
215 * just can't ignore the been applied or identified flags, as they 220 * just can't ignore the been applied or identified flags, as they
216 * are not equal - just if it has been identified, the been_applied 221 * are not equal - just if it has been identified, the been_applied
217 * flags lose any meaning. 222 * flags lose any meaning.
218 */ 223 */
219 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
247 || ob1->move_off != ob2->move_off 252 || ob1->move_off != ob2->move_off
248 || ob1->move_slow != ob2->move_slow 253 || ob1->move_slow != ob2->move_slow
249 || ob1->move_slow_penalty != ob2->move_slow_penalty) 254 || ob1->move_slow_penalty != ob2->move_slow_penalty)
250 return 0; 255 return 0;
251 256
252 /* This is really a spellbook check - really, we should 257 /* This is really a spellbook check - we should in general
253 * check all objects in the inventory. 258 * not merge objects with real inventories, as splitting them
259 * is hard.
254 */ 260 */
255 if (ob1->inv || ob2->inv) 261 if (ob1->inv || ob2->inv)
256 { 262 {
257 /* if one object has inventory but the other doesn't, not equiv */ 263 if (!(ob1->inv && ob2->inv))
258 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 264 return 0; /* inventories differ in length */
259 return 0;
260 265
261 /* Now check to see if the two inventory objects could merge */ 266 if (ob1->inv->below || ob2->inv->below)
267 return 0; /* more than one object in inv */
268
262 if (!object::can_merge (ob1->inv, ob2->inv)) 269 if (!object::can_merge (ob1->inv, ob2->inv))
263 return 0; 270 return 0; /* inventory objects differ */
264 271
265 /* inventory ok - still need to check rest of this object to see 272 /* inventory ok - still need to check rest of this object to see
266 * if it is valid. 273 * if it is valid.
267 */ 274 */
268 } 275 }
287 if (ob1->level != ob2->level) 294 if (ob1->level != ob2->level)
288 return 0; 295 return 0;
289 break; 296 break;
290 } 297 }
291 298
292 if (ob1->key_values != NULL || ob2->key_values != NULL) 299 if (ob1->key_values || ob2->key_values)
293 { 300 {
294 /* At least one of these has key_values. */ 301 /* At least one of these has key_values. */
295 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 302 if ((!ob1->key_values) != (!ob2->key_values))
296 /* One has fields, but the other one doesn't. */ 303 /* One has fields, but the other one doesn't. */
297 return 0; 304 return 0;
298 else if (!compare_ob_value_lists (ob1, ob2)) 305 else if (!compare_ob_value_lists (ob1, ob2))
299 return 0; 306 return 0;
300 } 307 }
301 308
302 //TODO: generate an event or call into perl for additional checks
303 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
304 { 310 {
305 ob1->optimise (); 311 ob1->optimise ();
306 ob2->optimise (); 312 ob2->optimise ();
307 313
308 if (ob1->self || ob2->self) 314 if (ob1->self || ob2->self)
315 {
316 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
317 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
318
319 if (k1 != k2)
309 return 0; 320 return 0;
321 else if (k1 == 0)
322 return 1;
323 else if (!cfperl_can_merge (ob1, ob2))
324 return 0;
325 }
310 } 326 }
311 327
312 /* Everything passes, must be OK. */ 328 /* Everything passes, must be OK. */
313 return 1; 329 return 1;
314} 330}
315 331
332static sint32
333weight_adjust (object *op, sint32 weight)
334{
335 return op->type == CONTAINER
336 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
337 : weight;
338}
339
316/* 340/*
341 * add_weight(object, weight) adds the specified weight to an object,
342 * and also updates how much the environment(s) is/are carrying.
343 */
344static void
345add_weight (object *op, sint32 weight)
346{
347 while (op)
348 {
349 weight = weight_adjust (op, weight);
350
351 op->carrying += weight;
352 op = op->env;
353 }
354}
355
356/*
357 * sub_weight() recursively (outwards) subtracts a number from the
358 * weight of an object (and what is carried by it's environment(s)).
359 */
360static void
361sub_weight (object *op, long weight)
362{
363 add_weight (op, -weight);
364}
365
366/*
317 * sum_weight() is a recursive function which calculates the weight 367 * this is a recursive function which calculates the weight
318 * an object is carrying. It goes through in figures out how much 368 * an object is carrying. It goes through op and figures out how much
319 * containers are carrying, and sums it up. 369 * containers are carrying, and sums it up.
320 */ 370 */
321long 371void
322sum_weight (object *op) 372object::update_weight ()
323{ 373{
324 long sum; 374 sint32 sum = 0;
325 object *inv;
326 375
327 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 376 for (object *op = inv; op; op = op->below)
328 { 377 {
329 if (inv->inv) 378 if (op->inv)
330 sum_weight (inv); 379 op->update_weight ();
331 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332 }
333 380
334 if (op->type == CONTAINER && op->stats.Str) 381 sum += op->total_weight ();
335 sum = (sum * (100 - op->stats.Str)) / 100; 382 }
336 383
337 if (op->carrying != sum) 384 carrying = weight_adjust (this, sum);
338 op->carrying = sum;
339
340 return sum;
341}
342
343/**
344 * Return the outermost environment object for a given object.
345 */
346
347object *
348object_get_env_recursive (object *op)
349{
350 while (op->env != NULL)
351 op = op->env;
352 return op;
353} 385}
354 386
355/* 387/*
356 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 388 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357 * Some error messages. 389 * Some error messages.
358 * The result of the dump is stored in the static global errmsg array. 390 * The result of the dump is stored in the static global errmsg array.
359 */ 391 */
360
361char * 392char *
362dump_object (object *op) 393dump_object (object *op)
363{ 394{
364 if (!op) 395 if (!op)
365 return strdup ("[NULLOBJ]"); 396 return strdup ("[NULLOBJ]");
366 397
367 object_freezer freezer; 398 object_freezer freezer;
368 save_object (freezer, op, 1); 399 op->write (freezer);
369 return freezer.as_string (); 400 return freezer.as_string ();
370} 401}
371 402
372/* 403/*
373 * get_nearest_part(multi-object, object 2) returns the part of the 404 * get_nearest_part(multi-object, object 2) returns the part of the
374 * multi-object 1 which is closest to the second object. 405 * multi-object 1 which is closest to the second object.
375 * If it's not a multi-object, it is returned. 406 * If it's not a multi-object, it is returned.
376 */ 407 */
377
378object * 408object *
379get_nearest_part (object *op, const object *pl) 409get_nearest_part (object *op, const object *pl)
380{ 410{
381 object *tmp, *closest; 411 object *tmp, *closest;
382 int last_dist, i; 412 int last_dist, i;
390} 420}
391 421
392/* 422/*
393 * Returns the object which has the count-variable equal to the argument. 423 * Returns the object which has the count-variable equal to the argument.
394 */ 424 */
395
396object * 425object *
397find_object (tag_t i) 426find_object (tag_t i)
398{ 427{
399 for (object *op = object::first; op; op = op->next) 428 for_all_objects (op)
400 if (op->count == i) 429 if (op->count == i)
401 return op; 430 return op;
402 431
403 return 0; 432 return 0;
404} 433}
405 434
406/* 435/*
407 * Returns the first object which has a name equal to the argument. 436 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 437 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 438 * Enables features like "patch <name-of-other-player> food 999"
410 */ 439 */
411
412object * 440object *
413find_object_name (const char *str) 441find_object_name (const char *str)
414{ 442{
415 shstr_cmp str_ (str); 443 shstr_cmp str_ (str);
416 object *op; 444 object *op;
417 445
418 for (op = object::first; op != NULL; op = op->next) 446 for_all_objects (op)
419 if (op->name == str_) 447 if (op->name == str_)
420 break; 448 break;
421 449
422 return op; 450 return op;
423} 451}
424 452
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 453/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 454 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 455 * skill and experience objects.
456 * ACTUALLY NO! investigate! TODO
434 */ 457 */
435void 458void
436object::set_owner (object *owner) 459object::set_owner (object *owner)
437{ 460{
461 // allow objects which own objects
438 if (!owner) 462 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 463 while (owner->owner)
449 owner = owner->owner; 464 owner = owner->owner;
465
466 if (flag [FLAG_FREED])
467 {
468 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
469 return;
470 }
450 471
451 this->owner = owner; 472 this->owner = owner;
473}
474
475int
476object::slottype () const
477{
478 if (type == SKILL)
479 {
480 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
481 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
482 }
483 else
484 {
485 if (slot [body_combat].info) return slot_combat;
486 if (slot [body_range ].info) return slot_ranged;
487 }
488
489 return slot_none;
490}
491
492bool
493object::change_weapon (object *ob)
494{
495 if (current_weapon == ob)
496 return true;
497
498 if (chosen_skill)
499 chosen_skill->flag [FLAG_APPLIED] = false;
500
501 current_weapon = ob;
502 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
503
504 if (chosen_skill)
505 chosen_skill->flag [FLAG_APPLIED] = true;
506
507 update_stats ();
508
509 if (ob)
510 {
511 // now check wether any body locations became invalid, in which case
512 // we cannot apply the weapon at the moment.
513 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
514 if (slot[i].used < 0)
515 {
516 current_weapon = chosen_skill = 0;
517 update_stats ();
518
519 new_draw_info_format (NDI_UNIQUE, 0, this,
520 "You try to balance all your items at once, "
521 "but the %s is just too much for your body. "
522 "[You need to unapply some items first.]", &ob->name);
523 return false;
524 }
525
526 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
527 }
528 else
529 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
530
531 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
532 {
533 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
534 &name, ob->debug_desc ());
535 return false;
536 }
537
538 return true;
452} 539}
453 540
454/* Zero the key_values on op, decrementing the shared-string 541/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 542 * refcounts and freeing the links.
456 */ 543 */
457static void 544static void
458free_key_values (object *op) 545free_key_values (object *op)
459{ 546{
460 for (key_value *i = op->key_values; i != 0;) 547 for (key_value *i = op->key_values; i; )
461 { 548 {
462 key_value *next = i->next; 549 key_value *next = i->next;
463 delete i; 550 delete i;
464 551
465 i = next; 552 i = next;
466 } 553 }
467 554
468 op->key_values = 0; 555 op->key_values = 0;
469} 556}
470 557
471/* 558object &
472 * copy_to first frees everything allocated by the dst object, 559object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 560{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 561 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 562 bool is_removed = flag [FLAG_REMOVED];
484 563
485 *(object_copy *)dst = *this; 564 *(object_copy *)this = src;
486 565
487 if (is_freed) 566 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 567 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495 568
496 /* Copy over key_values, if any. */ 569 /* Copy over key_values, if any. */
497 if (key_values) 570 if (src.key_values)
498 { 571 {
499 key_value *tail = 0; 572 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 573 key_values = 0;
503 574
504 for (i = key_values; i; i = i->next) 575 for (key_value *i = src.key_values; i; i = i->next)
505 { 576 {
506 key_value *new_link = new key_value; 577 key_value *new_link = new key_value;
507 578
508 new_link->next = 0; 579 new_link->next = 0;
509 new_link->key = i->key; 580 new_link->key = i->key;
510 new_link->value = i->value; 581 new_link->value = i->value;
511 582
512 /* Try and be clever here, too. */ 583 /* Try and be clever here, too. */
513 if (!dst->key_values) 584 if (!key_values)
514 { 585 {
515 dst->key_values = new_link; 586 key_values = new_link;
516 tail = new_link; 587 tail = new_link;
517 } 588 }
518 else 589 else
519 { 590 {
520 tail->next = new_link; 591 tail->next = new_link;
521 tail = new_link; 592 tail = new_link;
522 } 593 }
523 } 594 }
524 } 595 }
596}
597
598/*
599 * copy_to first frees everything allocated by the dst object,
600 * and then copies the contents of itself into the second
601 * object, allocating what needs to be allocated. Basically, any
602 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
603 * if the first object is freed, the pointers in the new object
604 * will point at garbage.
605 */
606void
607object::copy_to (object *dst)
608{
609 *dst = *this;
610
611 if (speed < 0)
612 dst->speed_left -= rndm ();
525 613
526 dst->set_speed (dst->speed); 614 dst->set_speed (dst->speed);
615}
616
617void
618object::instantiate ()
619{
620 if (!uuid.seq) // HACK
621 uuid = UUID::gen ();
622
623 speed_left = -0.1f;
624 /* copy the body_info to the body_used - this is only really
625 * need for monsters, but doesn't hurt to do it for everything.
626 * by doing so, when a monster is created, it has good starting
627 * values for the body_used info, so when items are created
628 * for it, they can be properly equipped.
629 */
630 for (int i = NUM_BODY_LOCATIONS; i--; )
631 slot[i].used = slot[i].info;
632
633 attachable::instantiate ();
527} 634}
528 635
529object * 636object *
530object::clone () 637object::clone ()
531{ 638{
564 } 671 }
565 672
566 this->speed = speed; 673 this->speed = speed;
567 674
568 if (has_active_speed ()) 675 if (has_active_speed ())
569 activate (false); 676 activate ();
570 else 677 else
571 deactivate (false); 678 deactivate ();
572} 679}
573 680
574/* 681/*
575 * update_object() updates the the map. 682 * update_object() updates the the map.
576 * It takes into account invisible objects (and represent squares covered 683 * It takes into account invisible objects (and represent squares covered
589 * UP_OBJ_FACE: only the objects face has changed. 696 * UP_OBJ_FACE: only the objects face has changed.
590 */ 697 */
591void 698void
592update_object (object *op, int action) 699update_object (object *op, int action)
593{ 700{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 701 if (op == NULL)
597 { 702 {
598 /* this should never happen */ 703 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 704 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 705 return;
624 return; 729 return;
625 } 730 }
626 731
627 mapspace &m = op->ms (); 732 mapspace &m = op->ms ();
628 733
629 if (m.flags_ & P_NEED_UPDATE) 734 if (!(m.flags_ & P_UPTODATE))
630 /* nop */; 735 /* nop */;
631 else if (action == UP_OBJ_INSERT) 736 else if (action == UP_OBJ_INSERT)
632 { 737 {
633 // this is likely overkill, TODO: revisit (schmorp) 738 // this is likely overkill, TODO: revisit (schmorp)
634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 739 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
643 /* This isn't perfect, but I don't expect a lot of objects to 748 /* This isn't perfect, but I don't expect a lot of objects to
644 * to have move_allow right now. 749 * to have move_allow right now.
645 */ 750 */
646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 751 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 752 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648 m.flags_ = P_NEED_UPDATE; 753 m.flags_ = 0;
649 } 754 }
650 /* if the object is being removed, we can't make intelligent 755 /* if the object is being removed, we can't make intelligent
651 * decisions, because remove_ob can't really pass the object 756 * decisions, because remove_ob can't really pass the object
652 * that is being removed. 757 * that is being removed.
653 */ 758 */
654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 759 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655 m.flags_ = P_NEED_UPDATE; 760 m.flags_ = 0;
656 else if (action == UP_OBJ_FACE) 761 else if (action == UP_OBJ_FACE)
657 /* Nothing to do for that case */ ; 762 /* Nothing to do for that case */ ;
658 else 763 else
659 LOG (llevError, "update_object called with invalid action: %d\n", action); 764 LOG (llevError, "update_object called with invalid action: %d\n", action);
660 765
661 if (op->more) 766 if (op->more)
662 update_object (op->more, action); 767 update_object (op->more, action);
663} 768}
664 769
665object::vector object::objects; // not yet used
666object *object::first;
667
668object::object () 770object::object ()
669{ 771{
670 SET_FLAG (this, FLAG_REMOVED); 772 SET_FLAG (this, FLAG_REMOVED);
671 773
672 expmul = 1.0; 774 expmul = 1.0;
673 face = blank_face; 775 face = blank_face;
674} 776}
675 777
676object::~object () 778object::~object ()
677{ 779{
780 unlink ();
781
678 free_key_values (this); 782 free_key_values (this);
679} 783}
680 784
785static int object_count;
786
681void object::link () 787void object::link ()
682{ 788{
789 assert (!index);//D
790 uuid = UUID::gen ();
683 count = ++ob_count; 791 count = ++object_count;
684 uuid = gen_uuid ();
685 792
686 prev = 0; 793 refcnt_inc ();
687 next = object::first; 794 objects.insert (this);
688
689 if (object::first)
690 object::first->prev = this;
691
692 object::first = this;
693} 795}
694 796
695void object::unlink () 797void object::unlink ()
696{ 798{
697 if (this == object::first) 799 if (!index)
698 object::first = next; 800 return;
699 801
700 /* Remove this object from the list of used objects */ 802 objects.erase (this);
701 if (prev) prev->next = next; 803 refcnt_dec ();
702 if (next) next->prev = prev;
703
704 prev = 0;
705 next = 0;
706} 804}
707 805
708void 806void
709object::activate (bool recursive) 807object::activate ()
710{ 808{
809 /* If already on active list, don't do anything */
810 if (active)
811 return;
812
711 if (has_active_speed ()) 813 if (has_active_speed ())
712 { 814 actives.insert (this);
713 /* If already on active list, don't do anything */ 815}
714 if (active_next || active_prev || this == active_objects)
715 return;
716 816
717 /* process_events() expects us to insert the object at the beginning 817void
718 * of the list. */ 818object::activate_recursive ()
719 active_next = active_objects; 819{
820 activate ();
720 821
721 if (active_next)
722 active_next->active_prev = this;
723
724 active_objects = this;
725 }
726
727 if (recursive)
728 for (object *op = inv; op; op = op->above) 822 for (object *op = inv; op; op = op->below)
729 op->activate (1); 823 op->activate_recursive ();
730} 824}
731 825
732/* This function removes object 'op' from the list of active 826/* This function removes object 'op' from the list of active
733 * objects. 827 * objects.
734 * This should only be used for style maps or other such 828 * This should only be used for style maps or other such
736 * in play chewing up cpu time getting processed. 830 * in play chewing up cpu time getting processed.
737 * The reverse of this is to call update_ob_speed, which 831 * The reverse of this is to call update_ob_speed, which
738 * will do the right thing based on the speed of the object. 832 * will do the right thing based on the speed of the object.
739 */ 833 */
740void 834void
741object::deactivate (bool recursive) 835object::deactivate ()
742{ 836{
743 /* If not on the active list, nothing needs to be done */ 837 /* If not on the active list, nothing needs to be done */
744 if (!active_next && !active_prev && this != active_objects) 838 if (!active)
745 return; 839 return;
746 840
747 if (active_prev == 0) 841 actives.erase (this);
748 { 842}
749 active_objects = active_next;
750 if (active_next)
751 active_next->active_prev = 0;
752 }
753 else
754 {
755 active_prev->active_next = active_next;
756 if (active_next)
757 active_next->active_prev = active_prev;
758 }
759 843
760 active_next = 0; 844void
761 active_prev = 0; 845object::deactivate_recursive ()
762 846{
763 if (recursive)
764 for (object *op = inv; op; op = op->above) 847 for (object *op = inv; op; op = op->below)
848 op->deactivate_recursive ();
849
765 op->deactivate (1); 850 deactivate ();
851}
852
853void
854object::set_flag_inv (int flag, int value)
855{
856 for (object *op = inv; op; op = op->below)
857 {
858 op->flag [flag] = value;
859 op->set_flag_inv (flag, value);
860 }
766} 861}
767 862
768/* 863/*
769 * Remove and free all objects in the inventory of the given object. 864 * Remove and free all objects in the inventory of the given object.
770 * object.c ? 865 * object.c ?
784 * if some form of movement is allowed, let objects 879 * if some form of movement is allowed, let objects
785 * drop on that space. 880 * drop on that space.
786 */ 881 */
787 if (!drop_to_ground 882 if (!drop_to_ground
788 || !map 883 || !map
789 || map->in_memory != MAP_IN_MEMORY 884 || map->in_memory != MAP_ACTIVE
885 || map->nodrop
790 || ms ().move_block == MOVE_ALL) 886 || ms ().move_block == MOVE_ALL)
791 { 887 {
792 while (inv) 888 while (inv)
793 { 889 {
794 inv->destroy_inv (drop_to_ground); 890 inv->destroy_inv (drop_to_ground);
803 899
804 if (op->flag [FLAG_STARTEQUIP] 900 if (op->flag [FLAG_STARTEQUIP]
805 || op->flag [FLAG_NO_DROP] 901 || op->flag [FLAG_NO_DROP]
806 || op->type == RUNE 902 || op->type == RUNE
807 || op->type == TRAP 903 || op->type == TRAP
808 || op->flag [FLAG_IS_A_TEMPLATE]) 904 || op->flag [FLAG_IS_A_TEMPLATE]
905 || op->flag [FLAG_DESTROY_ON_DEATH])
809 op->destroy (); 906 op->destroy ();
810 else 907 else
811 map->insert (op, x, y); 908 map->insert (op, x, y);
812 } 909 }
813 } 910 }
821} 918}
822 919
823void 920void
824object::do_destroy () 921object::do_destroy ()
825{ 922{
923 attachable::do_destroy ();
924
826 if (flag [FLAG_IS_LINKED]) 925 if (flag [FLAG_IS_LINKED])
827 remove_button_link (this); 926 remove_button_link (this);
828 927
829 if (flag [FLAG_FRIENDLY]) 928 if (flag [FLAG_FRIENDLY])
830 remove_friendly_object (this); 929 remove_friendly_object (this);
831 930
832 if (!flag [FLAG_REMOVED]) 931 if (!flag [FLAG_REMOVED])
833 remove (); 932 remove ();
834 933
835 if (flag [FLAG_FREED]) 934 destroy_inv (true);
836 return;
837 935
838 set_speed (0); 936 deactivate ();
937 unlink ();
839 938
840 flag [FLAG_FREED] = 1; 939 flag [FLAG_FREED] = 1;
841
842 attachable::do_destroy ();
843
844 destroy_inv (true);
845 unlink ();
846 940
847 // hack to ensure that freed objects still have a valid map 941 // hack to ensure that freed objects still have a valid map
848 { 942 {
849 static maptile *freed_map; // freed objects are moved here to avoid crashes 943 static maptile *freed_map; // freed objects are moved here to avoid crashes
850 944
851 if (!freed_map) 945 if (!freed_map)
852 { 946 {
853 freed_map = new maptile; 947 freed_map = new maptile;
854 948
949 freed_map->path = "<freed objects map>";
855 freed_map->name = "/internal/freed_objects_map"; 950 freed_map->name = "/internal/freed_objects_map";
856 freed_map->width = 3; 951 freed_map->width = 3;
857 freed_map->height = 3; 952 freed_map->height = 3;
953 freed_map->nodrop = 1;
858 954
859 freed_map->alloc (); 955 freed_map->alloc ();
956 freed_map->in_memory = MAP_ACTIVE;
860 } 957 }
861 958
862 map = freed_map; 959 map = freed_map;
863 x = 1; 960 x = 1;
864 y = 1; 961 y = 1;
865 } 962 }
866 963
867 head = 0;
868
869 if (more) 964 if (more)
870 { 965 {
871 more->destroy (); 966 more->destroy ();
872 more = 0; 967 more = 0;
873 } 968 }
874 969
970 head = 0;
971
875 // clear those pointers that likely might have circular references to us 972 // clear those pointers that likely might cause circular references
876 owner = 0; 973 owner = 0;
877 enemy = 0; 974 enemy = 0;
878 attacked_by = 0; 975 attacked_by = 0;
879 976 current_weapon = 0;
880 // only relevant for players(?), but make sure of it anyways
881 contr = 0;
882} 977}
883 978
884void 979void
885object::destroy (bool destroy_inventory) 980object::destroy (bool destroy_inventory)
886{ 981{
888 return; 983 return;
889 984
890 if (destroy_inventory) 985 if (destroy_inventory)
891 destroy_inv (false); 986 destroy_inv (false);
892 987
988 if (is_head ())
989 if (sound_destroy)
990 play_sound (sound_destroy);
991 else if (flag [FLAG_MONSTER])
992 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
993
893 attachable::destroy (); 994 attachable::destroy ();
894}
895
896/*
897 * sub_weight() recursively (outwards) subtracts a number from the
898 * weight of an object (and what is carried by it's environment(s)).
899 */
900void
901sub_weight (object *op, signed long weight)
902{
903 while (op != NULL)
904 {
905 if (op->type == CONTAINER)
906 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
907
908 op->carrying -= weight;
909 op = op->env;
910 }
911} 995}
912 996
913/* op->remove (): 997/* op->remove ():
914 * This function removes the object op from the linked list of objects 998 * This function removes the object op from the linked list of objects
915 * which it is currently tied to. When this function is done, the 999 * which it is currently tied to. When this function is done, the
916 * object will have no environment. If the object previously had an 1000 * object will have no environment. If the object previously had an
917 * environment, the x and y coordinates will be updated to 1001 * environment, the x and y coordinates will be updated to
918 * the previous environment. 1002 * the previous environment.
919 * Beware: This function is called from the editor as well!
920 */ 1003 */
921void 1004void
922object::remove () 1005object::do_remove ()
923{ 1006{
924 object *tmp, *last = 0; 1007 object *tmp, *last = 0;
925 object *otmp; 1008 object *otmp;
926 1009
927 if (QUERY_FLAG (this, FLAG_REMOVED)) 1010 if (QUERY_FLAG (this, FLAG_REMOVED))
970 } 1053 }
971 else if (map) 1054 else if (map)
972 { 1055 {
973 if (type == PLAYER) 1056 if (type == PLAYER)
974 { 1057 {
1058 // leaving a spot always closes any open container on the ground
1059 if (container && !container->env)
1060 // this causes spurious floorbox updates, but it ensures
1061 // that the CLOSE event is being sent.
1062 close_container ();
1063
975 --map->players; 1064 --map->players;
976 map->last_access = runtime; 1065 map->touch ();
977 } 1066 }
978 1067
1068 map->dirty = true;
1069 mapspace &ms = this->ms ();
979 1070
980 /* link the object above us */ 1071 /* link the object above us */
981 if (above) 1072 if (above)
982 above->below = below; 1073 above->below = below;
983 else 1074 else
984 map->at (x, y).top = below; /* we were top, set new top */ 1075 ms.top = below; /* we were top, set new top */
985 1076
986 /* Relink the object below us, if there is one */ 1077 /* Relink the object below us, if there is one */
987 if (below) 1078 if (below)
988 below->above = above; 1079 below->above = above;
989 else 1080 else
991 /* Nothing below, which means we need to relink map object for this space 1082 /* Nothing below, which means we need to relink map object for this space
992 * use translated coordinates in case some oddness with map tiling is 1083 * use translated coordinates in case some oddness with map tiling is
993 * evident 1084 * evident
994 */ 1085 */
995 if (GET_MAP_OB (map, x, y) != this) 1086 if (GET_MAP_OB (map, x, y) != this)
996 {
997 char *dump = dump_object (this);
998 LOG (llevError,
999 "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); 1087 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 ());
1000 free (dump);
1001 dump = dump_object (GET_MAP_OB (map, x, y));
1002 LOG (llevError, "%s\n", dump);
1003 free (dump);
1004 }
1005 1088
1006 map->at (x, y).bot = above; /* goes on above it. */ 1089 ms.bot = above; /* goes on above it. */
1007 } 1090 }
1008 1091
1009 above = 0; 1092 above = 0;
1010 below = 0; 1093 below = 0;
1011 1094
1012 if (map->in_memory == MAP_SAVING) 1095 if (map->in_memory == MAP_SAVING)
1013 return; 1096 return;
1014 1097
1015 int check_walk_off = !flag [FLAG_NO_APPLY]; 1098 int check_walk_off = !flag [FLAG_NO_APPLY];
1016 1099
1100 if (object *pl = ms.player ())
1101 {
1102 if (pl->container == this)
1103 /* If a container that the player is currently using somehow gets
1104 * removed (most likely destroyed), update the player view
1105 * appropriately.
1106 */
1107 pl->close_container ();
1108
1109 pl->contr->ns->floorbox_update ();
1110 }
1111
1017 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1112 for (tmp = ms.bot; tmp; tmp = tmp->above)
1018 { 1113 {
1019 /* No point updating the players look faces if he is the object 1114 /* No point updating the players look faces if he is the object
1020 * being removed. 1115 * being removed.
1021 */ 1116 */
1022
1023 if (tmp->type == PLAYER && tmp != this)
1024 {
1025 /* If a container that the player is currently using somehow gets
1026 * removed (most likely destroyed), update the player view
1027 * appropriately.
1028 */
1029 if (tmp->container == this)
1030 {
1031 flag [FLAG_APPLIED] = 0;
1032 tmp->container = 0;
1033 }
1034
1035 if (tmp->contr->ns)
1036 tmp->contr->ns->floorbox_update ();
1037 }
1038 1117
1039 /* See if object moving off should effect something */ 1118 /* See if object moving off should effect something */
1040 if (check_walk_off 1119 if (check_walk_off
1041 && ((move_type & tmp->move_off) 1120 && ((move_type & tmp->move_off)
1042 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1121 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1045 1124
1046 if (destroyed ()) 1125 if (destroyed ())
1047 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1126 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1048 } 1127 }
1049 1128
1050 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1051 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1052 if (tmp->above == tmp)
1053 tmp->above = 0;
1054
1055 last = tmp; 1129 last = tmp;
1056 } 1130 }
1057 1131
1058 /* last == NULL if there are no objects on this space */ 1132 /* last == NULL if there are no objects on this space */
1059 //TODO: this makes little sense, why only update the topmost object? 1133 //TODO: this makes little sense, why only update the topmost object?
1060 if (!last) 1134 if (!last)
1061 map->at (x, y).flags_ = P_NEED_UPDATE; 1135 map->at (x, y).flags_ = 0;
1062 else 1136 else
1063 update_object (last, UP_OBJ_REMOVE); 1137 update_object (last, UP_OBJ_REMOVE);
1064 1138
1065 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1139 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1066 update_all_los (map, x, y); 1140 update_all_los (map, x, y);
1079merge_ob (object *op, object *top) 1153merge_ob (object *op, object *top)
1080{ 1154{
1081 if (!op->nrof) 1155 if (!op->nrof)
1082 return 0; 1156 return 0;
1083 1157
1084 if (top) 1158 if (!top)
1085 for (top = op; top && top->above; top = top->above) 1159 for (top = op; top && top->above; top = top->above)
1086 ; 1160 ;
1087 1161
1088 for (; top; top = top->below) 1162 for (; top; top = top->below)
1089 { 1163 {
1102 } 1176 }
1103 1177
1104 return 0; 1178 return 0;
1105} 1179}
1106 1180
1181void
1182object::expand_tail ()
1183{
1184 if (more)
1185 return;
1186
1187 object *prev = this;
1188
1189 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1190 {
1191 object *op = arch_to_object (at);
1192
1193 op->name = name;
1194 op->name_pl = name_pl;
1195 op->title = title;
1196
1197 op->head = this;
1198 prev->more = op;
1199
1200 prev = op;
1201 }
1202}
1203
1107/* 1204/*
1108 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1205 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1109 * job preparing multi-part monsters 1206 * job preparing multi-part monsters.
1110 */ 1207 */
1111object * 1208object *
1112insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1209insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1113{ 1210{
1114 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1211 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1115 { 1212 {
1116 tmp->x = x + tmp->arch->clone.x; 1213 tmp->x = x + tmp->arch->x;
1117 tmp->y = y + tmp->arch->clone.y; 1214 tmp->y = y + tmp->arch->y;
1118 } 1215 }
1119 1216
1120 return insert_ob_in_map (op, m, originator, flag); 1217 return insert_ob_in_map (op, m, originator, flag);
1121} 1218}
1122 1219
1141 * just 'op' otherwise 1238 * just 'op' otherwise
1142 */ 1239 */
1143object * 1240object *
1144insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1241insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1145{ 1242{
1243 assert (!op->flag [FLAG_FREED]);
1244
1146 object *tmp, *top, *floor = NULL; 1245 object *top, *floor = NULL;
1147 sint16 x, y;
1148 1246
1149 if (QUERY_FLAG (op, FLAG_FREED)) 1247 op->remove ();
1150 {
1151 LOG (llevError, "Trying to insert freed object!\n");
1152 return NULL;
1153 }
1154
1155 if (!m)
1156 {
1157 char *dump = dump_object (op);
1158 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1159 free (dump);
1160 return op;
1161 }
1162
1163 if (out_of_map (m, op->x, op->y))
1164 {
1165 char *dump = dump_object (op);
1166 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1167#ifdef MANY_CORES
1168 /* Better to catch this here, as otherwise the next use of this object
1169 * is likely to cause a crash. Better to find out where it is getting
1170 * improperly inserted.
1171 */
1172 abort ();
1173#endif
1174 free (dump);
1175 return op;
1176 }
1177
1178 if (!QUERY_FLAG (op, FLAG_REMOVED))
1179 {
1180 char *dump = dump_object (op);
1181 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1182 free (dump);
1183 return op;
1184 }
1185
1186 if (op->more)
1187 {
1188 /* The part may be on a different map. */
1189
1190 object *more = op->more;
1191
1192 /* We really need the caller to normalize coordinates - if
1193 * we set the map, that doesn't work if the location is within
1194 * a map and this is straddling an edge. So only if coordinate
1195 * is clear wrong do we normalize it.
1196 */
1197 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1198 more->map = get_map_from_coord (m, &more->x, &more->y);
1199 else if (!more->map)
1200 {
1201 /* For backwards compatibility - when not dealing with tiled maps,
1202 * more->map should always point to the parent.
1203 */
1204 more->map = m;
1205 }
1206
1207 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1208 {
1209 if (!op->head)
1210 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1211
1212 return 0;
1213 }
1214 }
1215
1216 CLEAR_FLAG (op, FLAG_REMOVED);
1217 1248
1218 /* Ideally, the caller figures this out. However, it complicates a lot 1249 /* Ideally, the caller figures this out. However, it complicates a lot
1219 * of areas of callers (eg, anything that uses find_free_spot would now 1250 * of areas of callers (eg, anything that uses find_free_spot would now
1220 * need extra work 1251 * need extra work
1221 */ 1252 */
1222 op->map = get_map_from_coord (m, &op->x, &op->y); 1253 if (!xy_normalise (m, op->x, op->y))
1223 x = op->x; 1254 {
1224 y = op->y; 1255 op->destroy ();
1256 return 0;
1257 }
1258
1259 if (object *more = op->more)
1260 if (!insert_ob_in_map (more, m, originator, flag))
1261 return 0;
1262
1263 CLEAR_FLAG (op, FLAG_REMOVED);
1264
1265 op->map = m;
1266 mapspace &ms = op->ms ();
1225 1267
1226 /* this has to be done after we translate the coordinates. 1268 /* this has to be done after we translate the coordinates.
1227 */ 1269 */
1228 if (op->nrof && !(flag & INS_NO_MERGE)) 1270 if (op->nrof && !(flag & INS_NO_MERGE))
1229 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1271 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1230 if (object::can_merge (op, tmp)) 1272 if (object::can_merge (op, tmp))
1231 { 1273 {
1232 op->nrof += tmp->nrof; 1274 op->nrof += tmp->nrof;
1233 tmp->destroy (); 1275 tmp->destroy ();
1234 } 1276 }
1251 op->below = originator->below; 1293 op->below = originator->below;
1252 1294
1253 if (op->below) 1295 if (op->below)
1254 op->below->above = op; 1296 op->below->above = op;
1255 else 1297 else
1256 op->ms ().bot = op; 1298 ms.bot = op;
1257 1299
1258 /* since *below* originator, no need to update top */ 1300 /* since *below* originator, no need to update top */
1259 originator->below = op; 1301 originator->below = op;
1260 } 1302 }
1261 else 1303 else
1262 { 1304 {
1305 top = ms.bot;
1306
1263 /* If there are other objects, then */ 1307 /* If there are other objects, then */
1264 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1308 if (top)
1265 { 1309 {
1266 object *last = 0; 1310 object *last = 0;
1267 1311
1268 /* 1312 /*
1269 * If there are multiple objects on this space, we do some trickier handling. 1313 * If there are multiple objects on this space, we do some trickier handling.
1275 * once we get to them. This reduces the need to traverse over all of 1319 * once we get to them. This reduces the need to traverse over all of
1276 * them when adding another one - this saves quite a bit of cpu time 1320 * them when adding another one - this saves quite a bit of cpu time
1277 * when lots of spells are cast in one area. Currently, it is presumed 1321 * when lots of spells are cast in one area. Currently, it is presumed
1278 * that flying non pickable objects are spell objects. 1322 * that flying non pickable objects are spell objects.
1279 */ 1323 */
1280 while (top) 1324 for (top = ms.bot; top; top = top->above)
1281 { 1325 {
1282 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1326 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1283 floor = top; 1327 floor = top;
1284 1328
1285 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1329 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1288 top = top->below; 1332 top = top->below;
1289 break; 1333 break;
1290 } 1334 }
1291 1335
1292 last = top; 1336 last = top;
1293 top = top->above;
1294 } 1337 }
1295 1338
1296 /* Don't want top to be NULL, so set it to the last valid object */ 1339 /* Don't want top to be NULL, so set it to the last valid object */
1297 top = last; 1340 top = last;
1298 1341
1300 * looks like instead of lots of conditions here. 1343 * looks like instead of lots of conditions here.
1301 * makes things faster, and effectively the same result. 1344 * makes things faster, and effectively the same result.
1302 */ 1345 */
1303 1346
1304 /* Have object 'fall below' other objects that block view. 1347 /* Have object 'fall below' other objects that block view.
1305 * Unless those objects are exits, type 66 1348 * Unless those objects are exits.
1306 * If INS_ON_TOP is used, don't do this processing 1349 * If INS_ON_TOP is used, don't do this processing
1307 * Need to find the object that in fact blocks view, otherwise 1350 * Need to find the object that in fact blocks view, otherwise
1308 * stacking is a bit odd. 1351 * stacking is a bit odd.
1309 */ 1352 */
1310 if (!(flag & INS_ON_TOP) && 1353 if (!(flag & INS_ON_TOP)
1311 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1354 && ms.flags () & P_BLOCKSVIEW
1355 && (op->face && !faces [op->face].visibility))
1312 { 1356 {
1313 for (last = top; last != floor; last = last->below) 1357 for (last = top; last != floor; last = last->below)
1314 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1358 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315 break; 1359 break;
1360
1316 /* Check to see if we found the object that blocks view, 1361 /* Check to see if we found the object that blocks view,
1317 * and make sure we have a below pointer for it so that 1362 * and make sure we have a below pointer for it so that
1318 * we can get inserted below this one, which requires we 1363 * we can get inserted below this one, which requires we
1319 * set top to the object below us. 1364 * set top to the object below us.
1320 */ 1365 */
1321 if (last && last->below && last != floor) 1366 if (last && last->below && last != floor)
1322 top = last->below; 1367 top = last->below;
1323 } 1368 }
1324 } /* If objects on this space */ 1369 } /* If objects on this space */
1325 1370
1326 if (flag & INS_MAP_LOAD)
1327 top = GET_MAP_TOP (op->map, op->x, op->y);
1328
1329 if (flag & INS_ABOVE_FLOOR_ONLY) 1371 if (flag & INS_ABOVE_FLOOR_ONLY)
1330 top = floor; 1372 top = floor;
1331 1373
1332 /* Top is the object that our object (op) is going to get inserted above. 1374 /* Top is the object that our object (op) is going to get inserted above.
1333 */ 1375 */
1334 1376
1335 /* First object on this space */ 1377 /* First object on this space */
1336 if (!top) 1378 if (!top)
1337 { 1379 {
1338 op->above = GET_MAP_OB (op->map, op->x, op->y); 1380 op->above = ms.bot;
1339 1381
1340 if (op->above) 1382 if (op->above)
1341 op->above->below = op; 1383 op->above->below = op;
1342 1384
1343 op->below = 0; 1385 op->below = 0;
1344 op->ms ().bot = op; 1386 ms.bot = op;
1345 } 1387 }
1346 else 1388 else
1347 { /* get inserted into the stack above top */ 1389 { /* get inserted into the stack above top */
1348 op->above = top->above; 1390 op->above = top->above;
1349 1391
1353 op->below = top; 1395 op->below = top;
1354 top->above = op; 1396 top->above = op;
1355 } 1397 }
1356 1398
1357 if (!op->above) 1399 if (!op->above)
1358 op->ms ().top = op; 1400 ms.top = op;
1359 } /* else not INS_BELOW_ORIGINATOR */ 1401 } /* else not INS_BELOW_ORIGINATOR */
1360 1402
1361 if (op->type == PLAYER) 1403 if (op->type == PLAYER)
1362 { 1404 {
1363 op->contr->do_los = 1; 1405 op->contr->do_los = 1;
1364 ++op->map->players; 1406 ++op->map->players;
1365 op->map->last_access = runtime; 1407 op->map->touch ();
1366 } 1408 }
1367 1409
1368 /* If we have a floor, we know the player, if any, will be above 1410 op->map->dirty = true;
1369 * it, so save a few ticks and start from there. 1411
1370 */
1371 if (!(flag & INS_MAP_LOAD))
1372 if (object *pl = op->ms ().player ()) 1412 if (object *pl = ms.player ())
1373 if (pl->contr->ns)
1374 pl->contr->ns->floorbox_update (); 1413 pl->contr->ns->floorbox_update ();
1375 1414
1376 /* If this object glows, it may affect lighting conditions that are 1415 /* If this object glows, it may affect lighting conditions that are
1377 * visible to others on this map. But update_all_los is really 1416 * visible to others on this map. But update_all_los is really
1378 * an inefficient way to do this, as it means los for all players 1417 * an inefficient way to do this, as it means los for all players
1379 * on the map will get recalculated. The players could very well 1418 * on the map will get recalculated. The players could very well
1380 * be far away from this change and not affected in any way - 1419 * be far away from this change and not affected in any way -
1381 * this should get redone to only look for players within range, 1420 * this should get redone to only look for players within range,
1382 * or just updating the P_NEED_UPDATE for spaces within this area 1421 * or just updating the P_UPTODATE for spaces within this area
1383 * of effect may be sufficient. 1422 * of effect may be sufficient.
1384 */ 1423 */
1385 if (op->map->darkness && (op->glow_radius != 0)) 1424 if (op->map->darkness && (op->glow_radius != 0))
1386 update_all_los (op->map, op->x, op->y); 1425 update_all_los (op->map, op->x, op->y);
1387 1426
1398 * blocked() and wall() work properly), and these flags are updated by 1437 * blocked() and wall() work properly), and these flags are updated by
1399 * update_object(). 1438 * update_object().
1400 */ 1439 */
1401 1440
1402 /* if this is not the head or flag has been passed, don't check walk on status */ 1441 /* if this is not the head or flag has been passed, don't check walk on status */
1403 if (!(flag & INS_NO_WALK_ON) && !op->head) 1442 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404 { 1443 {
1405 if (check_move_on (op, originator)) 1444 if (check_move_on (op, originator))
1406 return 0; 1445 return 0;
1407 1446
1408 /* If we are a multi part object, lets work our way through the check 1447 /* If we are a multi part object, lets work our way through the check
1409 * walk on's. 1448 * walk on's.
1410 */ 1449 */
1411 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1450 for (object *tmp = op->more; tmp; tmp = tmp->more)
1412 if (check_move_on (tmp, originator)) 1451 if (check_move_on (tmp, originator))
1413 return 0; 1452 return 0;
1414 } 1453 }
1415 1454
1416 return op; 1455 return op;
1425{ 1464{
1426 object *tmp, *tmp1; 1465 object *tmp, *tmp1;
1427 1466
1428 /* first search for itself and remove any old instances */ 1467 /* first search for itself and remove any old instances */
1429 1468
1430 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1469 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1470 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432 tmp->destroy (); 1471 tmp->destroy ();
1433 1472
1434 tmp1 = arch_to_object (archetype::find (arch_string)); 1473 tmp1 = arch_to_object (archetype::find (arch_string));
1435 1474
1436 tmp1->x = op->x; 1475 tmp1->x = op->x;
1439} 1478}
1440 1479
1441object * 1480object *
1442object::insert_at (object *where, object *originator, int flags) 1481object::insert_at (object *where, object *originator, int flags)
1443{ 1482{
1483 if (where->env)
1484 return where->env->insert (this);
1485 else
1444 where->map->insert (this, where->x, where->y, originator, flags); 1486 return where->map->insert (this, where->x, where->y, originator, flags);
1445} 1487}
1446 1488
1447/* 1489/*
1448 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1490 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1449 * is returned contains nr objects, and the remaining parts contains 1491 * is returned contains nr objects, and the remaining parts contains
1469 orig_ob->destroy (1); 1511 orig_ob->destroy (1);
1470 else if (!is_removed) 1512 else if (!is_removed)
1471 { 1513 {
1472 if (orig_ob->env != NULL) 1514 if (orig_ob->env != NULL)
1473 sub_weight (orig_ob->env, orig_ob->weight * nr); 1515 sub_weight (orig_ob->env, orig_ob->weight * nr);
1474 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1516 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1475 { 1517 {
1476 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1518 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1477 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); 1519 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1478 return NULL; 1520 return NULL;
1479 } 1521 }
1489 * the amount of an object. If the amount reaches 0, the object 1531 * the amount of an object. If the amount reaches 0, the object
1490 * is subsequently removed and freed. 1532 * is subsequently removed and freed.
1491 * 1533 *
1492 * Return value: 'op' if something is left, NULL if the amount reached 0 1534 * Return value: 'op' if something is left, NULL if the amount reached 0
1493 */ 1535 */
1494
1495object * 1536object *
1496decrease_ob_nr (object *op, uint32 i) 1537decrease_ob_nr (object *op, uint32 i)
1497{ 1538{
1498 object *tmp; 1539 object *tmp;
1499 1540
1570 op->destroy (); 1611 op->destroy ();
1571 return 0; 1612 return 0;
1572 } 1613 }
1573} 1614}
1574 1615
1575/*
1576 * add_weight(object, weight) adds the specified weight to an object,
1577 * and also updates how much the environment(s) is/are carrying.
1578 */
1579
1580void
1581add_weight (object *op, signed long weight)
1582{
1583 while (op != NULL)
1584 {
1585 if (op->type == CONTAINER)
1586 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1587
1588 op->carrying += weight;
1589 op = op->env;
1590 }
1591}
1592
1593object * 1616object *
1594insert_ob_in_ob (object *op, object *where) 1617insert_ob_in_ob (object *op, object *where)
1595{ 1618{
1596 if (!where) 1619 if (!where)
1597 { 1620 {
1599 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1622 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1600 free (dump); 1623 free (dump);
1601 return op; 1624 return op;
1602 } 1625 }
1603 1626
1604 if (where->head) 1627 if (where->head_ () != where)
1605 { 1628 {
1606 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1629 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1607 where = where->head; 1630 where = where->head;
1608 } 1631 }
1609 1632
1610 return where->insert (op); 1633 return where->insert (op);
1611} 1634}
1616 * inside the object environment. 1639 * inside the object environment.
1617 * 1640 *
1618 * The function returns now pointer to inserted item, and return value can 1641 * The function returns now pointer to inserted item, and return value can
1619 * be != op, if items are merged. -Tero 1642 * be != op, if items are merged. -Tero
1620 */ 1643 */
1621
1622object * 1644object *
1623object::insert (object *op) 1645object::insert (object *op)
1624{ 1646{
1625 object *tmp, *otmp;
1626
1627 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1647 if (!QUERY_FLAG (op, FLAG_REMOVED))
1628 op->remove (); 1648 op->remove ();
1629 1649
1630 if (op->more) 1650 if (op->more)
1631 { 1651 {
1633 return op; 1653 return op;
1634 } 1654 }
1635 1655
1636 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1656 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1637 CLEAR_FLAG (op, FLAG_REMOVED); 1657 CLEAR_FLAG (op, FLAG_REMOVED);
1658
1638 if (op->nrof) 1659 if (op->nrof)
1639 { 1660 {
1640 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1661 for (object *tmp = inv; tmp; tmp = tmp->below)
1641 if (object::can_merge (tmp, op)) 1662 if (object::can_merge (tmp, op))
1642 { 1663 {
1643 /* return the original object and remove inserted object 1664 /* return the original object and remove inserted object
1644 (client needs the original object) */ 1665 (client needs the original object) */
1645 tmp->nrof += op->nrof; 1666 tmp->nrof += op->nrof;
1664 add_weight (this, op->weight * op->nrof); 1685 add_weight (this, op->weight * op->nrof);
1665 } 1686 }
1666 else 1687 else
1667 add_weight (this, (op->weight + op->carrying)); 1688 add_weight (this, (op->weight + op->carrying));
1668 1689
1669 otmp = this->in_player (); 1690 if (object *otmp = this->in_player ())
1670 if (otmp && otmp->contr)
1671 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1691 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1672 otmp->update_stats (); 1692 otmp->update_stats ();
1673 1693
1694 op->owner = 0; // its his/hers now. period.
1674 op->map = 0; 1695 op->map = 0;
1675 op->env = this; 1696 op->env = this;
1676 op->above = 0; 1697 op->above = 0;
1677 op->below = 0; 1698 op->below = 0;
1678 op->x = 0, op->y = 0; 1699 op->x = op->y = 0;
1679 1700
1680 /* reset the light list and los of the players on the map */ 1701 /* reset the light list and los of the players on the map */
1681 if ((op->glow_radius != 0) && map) 1702 if (op->glow_radius && map)
1682 { 1703 {
1683#ifdef DEBUG_LIGHTS 1704#ifdef DEBUG_LIGHTS
1684 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1705 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1685#endif /* DEBUG_LIGHTS */ 1706#endif /* DEBUG_LIGHTS */
1686 if (map->darkness) 1707 if (map->darkness)
1758 1779
1759 /* The objects have to be checked from top to bottom. 1780 /* The objects have to be checked from top to bottom.
1760 * Hence, we first go to the top: 1781 * Hence, we first go to the top:
1761 */ 1782 */
1762 1783
1763 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1784 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764 { 1785 {
1765 /* Trim the search when we find the first other spell effect 1786 /* Trim the search when we find the first other spell effect
1766 * this helps performance so that if a space has 50 spell objects, 1787 * this helps performance so that if a space has 50 spell objects,
1767 * we don't need to check all of them. 1788 * we don't need to check all of them.
1768 */ 1789 */
1786 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1807 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1787 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1808 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788 { 1809 {
1789 1810
1790 float 1811 float
1791 diff = tmp->move_slow_penalty * FABS (op->speed); 1812 diff = tmp->move_slow_penalty * fabs (op->speed);
1792 1813
1793 if (op->type == PLAYER) 1814 if (op->type == PLAYER)
1794 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1815 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1795 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1816 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796 diff /= 4.0; 1817 diff /= 4.0;
1826 * The first matching object is returned, or NULL if none. 1847 * The first matching object is returned, or NULL if none.
1827 */ 1848 */
1828object * 1849object *
1829present_arch (const archetype *at, maptile *m, int x, int y) 1850present_arch (const archetype *at, maptile *m, int x, int y)
1830{ 1851{
1831 if (m == NULL || out_of_map (m, x, y)) 1852 if (!m || out_of_map (m, x, y))
1832 { 1853 {
1833 LOG (llevError, "Present_arch called outside map.\n"); 1854 LOG (llevError, "Present_arch called outside map.\n");
1834 return NULL; 1855 return NULL;
1835 } 1856 }
1836 1857
1837 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1858 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838 if (tmp->arch == at) 1859 if (tmp->arch == at)
1839 return tmp; 1860 return tmp;
1840 1861
1841 return NULL; 1862 return NULL;
1842} 1863}
1853 { 1874 {
1854 LOG (llevError, "Present called outside map.\n"); 1875 LOG (llevError, "Present called outside map.\n");
1855 return NULL; 1876 return NULL;
1856 } 1877 }
1857 1878
1858 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1879 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859 if (tmp->type == type) 1880 if (tmp->type == type)
1860 return tmp; 1881 return tmp;
1861 1882
1862 return NULL; 1883 return NULL;
1863} 1884}
1920 * activate recursively a flag on an object inventory 1941 * activate recursively a flag on an object inventory
1921 */ 1942 */
1922void 1943void
1923flag_inv (object *op, int flag) 1944flag_inv (object *op, int flag)
1924{ 1945{
1925 if (op->inv)
1926 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1946 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1927 { 1947 {
1928 SET_FLAG (tmp, flag); 1948 SET_FLAG (tmp, flag);
1929 flag_inv (tmp, flag); 1949 flag_inv (tmp, flag);
1930 } 1950 }
1931} 1951}
1932 1952
1933/* 1953/*
1934 * deactivate recursively a flag on an object inventory 1954 * deactivate recursively a flag on an object inventory
1935 */ 1955 */
1936void 1956void
1937unflag_inv (object *op, int flag) 1957unflag_inv (object *op, int flag)
1938{ 1958{
1939 if (op->inv)
1940 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1959 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1941 { 1960 {
1942 CLEAR_FLAG (tmp, flag); 1961 CLEAR_FLAG (tmp, flag);
1943 unflag_inv (tmp, flag); 1962 unflag_inv (tmp, flag);
1944 } 1963 }
1945}
1946
1947/*
1948 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1949 * all it's inventory (recursively).
1950 * If checksums are used, a player will get set_cheat called for
1951 * him/her-self and all object carried by a call to this function.
1952 */
1953void
1954set_cheat (object *op)
1955{
1956 SET_FLAG (op, FLAG_WAS_WIZ);
1957 flag_inv (op, FLAG_WAS_WIZ);
1958} 1964}
1959 1965
1960/* 1966/*
1961 * find_free_spot(object, map, x, y, start, stop) will search for 1967 * find_free_spot(object, map, x, y, start, stop) will search for
1962 * a spot at the given map and coordinates which will be able to contain 1968 * a spot at the given map and coordinates which will be able to contain
1964 * to search (see the freearr_x/y[] definition). 1970 * to search (see the freearr_x/y[] definition).
1965 * It returns a random choice among the alternatives found. 1971 * It returns a random choice among the alternatives found.
1966 * start and stop are where to start relative to the free_arr array (1,9 1972 * start and stop are where to start relative to the free_arr array (1,9
1967 * does all 4 immediate directions). This returns the index into the 1973 * does all 4 immediate directions). This returns the index into the
1968 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1974 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1969 * Note - this only checks to see if there is space for the head of the
1970 * object - if it is a multispace object, this should be called for all
1971 * pieces.
1972 * Note2: This function does correctly handle tiled maps, but does not 1975 * Note: This function does correctly handle tiled maps, but does not
1973 * inform the caller. However, insert_ob_in_map will update as 1976 * inform the caller. However, insert_ob_in_map will update as
1974 * necessary, so the caller shouldn't need to do any special work. 1977 * necessary, so the caller shouldn't need to do any special work.
1975 * Note - updated to take an object instead of archetype - this is necessary 1978 * Note - updated to take an object instead of archetype - this is necessary
1976 * because arch_blocked (now ob_blocked) needs to know the movement type 1979 * because arch_blocked (now ob_blocked) needs to know the movement type
1977 * to know if the space in question will block the object. We can't use 1980 * to know if the space in question will block the object. We can't use
1979 * customized, changed states, etc. 1982 * customized, changed states, etc.
1980 */ 1983 */
1981int 1984int
1982find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1985find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1983{ 1986{
1987 int altern[SIZEOFFREE];
1984 int index = 0, flag; 1988 int index = 0, flag;
1985 int altern[SIZEOFFREE];
1986 1989
1987 for (int i = start; i < stop; i++) 1990 for (int i = start; i < stop; i++)
1988 { 1991 {
1989 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1992 mapxy pos (m, x, y); pos.move (i);
1990 if (!flag) 1993
1994 if (!pos.normalise ())
1995 continue;
1996
1997 mapspace &ms = *pos;
1998
1999 if (ms.flags () & P_IS_ALIVE)
2000 continue;
2001
2002 /* However, often
2003 * ob doesn't have any move type (when used to place exits)
2004 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2005 */
2006 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2007 {
1991 altern [index++] = i; 2008 altern [index++] = i;
2009 continue;
2010 }
1992 2011
1993 /* Basically, if we find a wall on a space, we cut down the search size. 2012 /* Basically, if we find a wall on a space, we cut down the search size.
1994 * In this way, we won't return spaces that are on another side of a wall. 2013 * In this way, we won't return spaces that are on another side of a wall.
1995 * This mostly work, but it cuts down the search size in all directions - 2014 * This mostly work, but it cuts down the search size in all directions -
1996 * if the space being examined only has a wall to the north and empty 2015 * if the space being examined only has a wall to the north and empty
1997 * spaces in all the other directions, this will reduce the search space 2016 * spaces in all the other directions, this will reduce the search space
1998 * to only the spaces immediately surrounding the target area, and 2017 * to only the spaces immediately surrounding the target area, and
1999 * won't look 2 spaces south of the target space. 2018 * won't look 2 spaces south of the target space.
2000 */ 2019 */
2001 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2020 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2021 {
2002 stop = maxfree[i]; 2022 stop = maxfree[i];
2023 continue;
2024 }
2025
2026 /* Note it is intentional that we check ob - the movement type of the
2027 * head of the object should correspond for the entire object.
2028 */
2029 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2030 continue;
2031
2032 if (ob->blocked (m, pos.x, pos.y))
2033 continue;
2034
2035 altern [index++] = i;
2003 } 2036 }
2004 2037
2005 if (!index) 2038 if (!index)
2006 return -1; 2039 return -1;
2007 2040
2008 return altern[RANDOM () % index]; 2041 return altern [rndm (index)];
2009} 2042}
2010 2043
2011/* 2044/*
2012 * find_first_free_spot(archetype, maptile, x, y) works like 2045 * find_first_free_spot(archetype, maptile, x, y) works like
2013 * find_free_spot(), but it will search max number of squares. 2046 * find_free_spot(), but it will search max number of squares.
2016 */ 2049 */
2017int 2050int
2018find_first_free_spot (const object *ob, maptile *m, int x, int y) 2051find_first_free_spot (const object *ob, maptile *m, int x, int y)
2019{ 2052{
2020 for (int i = 0; i < SIZEOFFREE; i++) 2053 for (int i = 0; i < SIZEOFFREE; i++)
2021 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2054 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2022 return i; 2055 return i;
2023 2056
2024 return -1; 2057 return -1;
2025} 2058}
2026 2059
2034{ 2067{
2035 arr += begin; 2068 arr += begin;
2036 end -= begin; 2069 end -= begin;
2037 2070
2038 while (--end) 2071 while (--end)
2039 swap (arr [end], arr [RANDOM () % (end + 1)]); 2072 swap (arr [end], arr [rndm (end + 1)]);
2040} 2073}
2041 2074
2042/* new function to make monster searching more efficient, and effective! 2075/* new function to make monster searching more efficient, and effective!
2043 * This basically returns a randomized array (in the passed pointer) of 2076 * This basically returns a randomized array (in the passed pointer) of
2044 * the spaces to find monsters. In this way, it won't always look for 2077 * the spaces to find monsters. In this way, it won't always look for
2080 object *tmp; 2113 object *tmp;
2081 maptile *mp; 2114 maptile *mp;
2082 2115
2083 MoveType blocked, move_type; 2116 MoveType blocked, move_type;
2084 2117
2085 if (exclude && exclude->head) 2118 if (exclude && exclude->head_ () != exclude)
2086 { 2119 {
2087 exclude = exclude->head; 2120 exclude = exclude->head;
2088 move_type = exclude->move_type; 2121 move_type = exclude->move_type;
2089 } 2122 }
2090 else 2123 else
2113 max = maxfree[i]; 2146 max = maxfree[i];
2114 else if (mflags & P_IS_ALIVE) 2147 else if (mflags & P_IS_ALIVE)
2115 { 2148 {
2116 for (tmp = ms.bot; tmp; tmp = tmp->above) 2149 for (tmp = ms.bot; tmp; tmp = tmp->above)
2117 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2150 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2151 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119 break; 2152 break;
2120 2153
2121 if (tmp) 2154 if (tmp)
2122 return freedir[i]; 2155 return freedir[i];
2123 } 2156 }
2178 2211
2179 return 3; 2212 return 3;
2180} 2213}
2181 2214
2182/* 2215/*
2183 * absdir(int): Returns a number between 1 and 8, which represent
2184 * the "absolute" direction of a number (it actually takes care of
2185 * "overflow" in previous calculations of a direction).
2186 */
2187
2188int
2189absdir (int d)
2190{
2191 while (d < 1)
2192 d += 8;
2193
2194 while (d > 8)
2195 d -= 8;
2196
2197 return d;
2198}
2199
2200/*
2201 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2216 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202 * between two directions (which are expected to be absolute (see absdir()) 2217 * between two directions (which are expected to be absolute (see absdir())
2203 */ 2218 */
2204
2205int 2219int
2206dirdiff (int dir1, int dir2) 2220dirdiff (int dir1, int dir2)
2207{ 2221{
2208 int d; 2222 int d;
2209 2223
2322 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2336 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2323 * core dumps if they do. 2337 * core dumps if they do.
2324 * 2338 *
2325 * Add a check so we can't pick up invisible objects (0.93.8) 2339 * Add a check so we can't pick up invisible objects (0.93.8)
2326 */ 2340 */
2327
2328int 2341int
2329can_pick (const object *who, const object *item) 2342can_pick (const object *who, const object *item)
2330{ 2343{
2331 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2344 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2332 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2345 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2337 * create clone from object to another 2350 * create clone from object to another
2338 */ 2351 */
2339object * 2352object *
2340object_create_clone (object *asrc) 2353object_create_clone (object *asrc)
2341{ 2354{
2342 object *dst = 0, *tmp, *src, *part, *prev, *item; 2355 object *dst = 0, *tmp, *src, *prev, *item;
2343 2356
2344 if (!asrc) 2357 if (!asrc)
2345 return 0; 2358 return 0;
2346 2359
2347 src = asrc;
2348 if (src->head)
2349 src = src->head; 2360 src = asrc->head_ ();
2350 2361
2351 prev = 0; 2362 prev = 0;
2352 for (part = src; part; part = part->more) 2363 for (object *part = src; part; part = part->more)
2353 { 2364 {
2354 tmp = part->clone (); 2365 tmp = part->clone ();
2355 tmp->x -= src->x; 2366 tmp->x -= src->x;
2356 tmp->y -= src->y; 2367 tmp->y -= src->y;
2357 2368
2373 2384
2374 for (item = src->inv; item; item = item->below) 2385 for (item = src->inv; item; item = item->below)
2375 insert_ob_in_ob (object_create_clone (item), dst); 2386 insert_ob_in_ob (object_create_clone (item), dst);
2376 2387
2377 return dst; 2388 return dst;
2378}
2379
2380/* GROS - Creates an object using a string representing its content. */
2381/* Basically, we save the content of the string to a temp file, then call */
2382/* load_object on it. I admit it is a highly inefficient way to make things, */
2383/* but it was simple to make and allows reusing the load_object function. */
2384/* Remember not to use load_object_str in a time-critical situation. */
2385/* Also remember that multiparts objects are not supported for now. */
2386object *
2387load_object_str (const char *obstr)
2388{
2389 object *op;
2390 char filename[MAX_BUF];
2391
2392 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394 FILE *tempfile = fopen (filename, "w");
2395
2396 if (tempfile == NULL)
2397 {
2398 LOG (llevError, "Error - Unable to access load object temp file\n");
2399 return NULL;
2400 }
2401
2402 fprintf (tempfile, obstr);
2403 fclose (tempfile);
2404
2405 op = object::create ();
2406
2407 object_thawer thawer (filename);
2408
2409 if (thawer)
2410 load_object (thawer, op, 0);
2411
2412 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413 CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415 return op;
2416} 2389}
2417 2390
2418/* This returns the first object in who's inventory that 2391/* This returns the first object in who's inventory that
2419 * has the same type and subtype match. 2392 * has the same type and subtype match.
2420 * returns NULL if no match. 2393 * returns NULL if no match.
2475 if (link->key == canonical_key) 2448 if (link->key == canonical_key)
2476 return link->value; 2449 return link->value;
2477 2450
2478 return 0; 2451 return 0;
2479} 2452}
2480
2481 2453
2482/* 2454/*
2483 * Updates the canonical_key in op to value. 2455 * Updates the canonical_key in op to value.
2484 * 2456 *
2485 * canonical_key is a shared string (value doesn't have to be). 2457 * canonical_key is a shared string (value doesn't have to be).
2509 /* Basically, if the archetype has this key set, 2481 /* Basically, if the archetype has this key set,
2510 * we need to store the null value so when we save 2482 * we need to store the null value so when we save
2511 * it, we save the empty value so that when we load, 2483 * it, we save the empty value so that when we load,
2512 * we get this value back again. 2484 * we get this value back again.
2513 */ 2485 */
2514 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2486 if (get_ob_key_link (op->arch, canonical_key))
2515 field->value = 0; 2487 field->value = 0;
2516 else 2488 else
2517 { 2489 {
2518 if (last) 2490 if (last)
2519 last->next = field->next; 2491 last->next = field->next;
2588 } 2560 }
2589 else 2561 else
2590 item = item->env; 2562 item = item->env;
2591} 2563}
2592 2564
2593
2594const char * 2565const char *
2595object::flag_desc (char *desc, int len) const 2566object::flag_desc (char *desc, int len) const
2596{ 2567{
2597 char *p = desc; 2568 char *p = desc;
2598 bool first = true; 2569 bool first = true;
2599 2570
2571 *p = 0;
2572
2600 for (int i = 0; i < NUM_FLAGS; i++) 2573 for (int i = 0; i < NUM_FLAGS; i++)
2601 { 2574 {
2602 if (len <= 10) // magic constant! 2575 if (len <= 10) // magic constant!
2603 { 2576 {
2604 snprintf (p, len, ",..."); 2577 snprintf (p, len, ",...");
2605 break; 2578 break;
2606 } 2579 }
2607 2580
2608 if (flag[i]) 2581 if (flag [i])
2609 { 2582 {
2610 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); 2583 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611 len -= cnt; 2584 len -= cnt;
2612 p += cnt; 2585 p += cnt;
2613 first = false; 2586 first = false;
2615 } 2588 }
2616 2589
2617 return desc; 2590 return desc;
2618} 2591}
2619 2592
2620// return a suitable string describing an objetc in enough detail to find it 2593// return a suitable string describing an object in enough detail to find it
2621const char * 2594const char *
2622object::debug_desc (char *info) const 2595object::debug_desc (char *info) const
2623{ 2596{
2624 char flagdesc[512]; 2597 char flagdesc[512];
2625 char info2[256 * 4]; 2598 char info2[256 * 4];
2626 char *p = info; 2599 char *p = info;
2627 2600
2628 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2601 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2629 count, uuid.seq, 2602 count,
2603 uuid.c_str (),
2630 &name, 2604 &name,
2631 title ? "\",title:" : "", 2605 title ? "\",title:\"" : "",
2632 title ? (const char *)title : "", 2606 title ? (const char *)title : "",
2633 flag_desc (flagdesc, 512), type); 2607 flag_desc (flagdesc, 512), type);
2634 2608
2635 if (env) 2609 if (!this->flag[FLAG_REMOVED] && env)
2636 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2610 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2637 2611
2638 if (map) 2612 if (map)
2639 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2613 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2640 2614
2642} 2616}
2643 2617
2644const char * 2618const char *
2645object::debug_desc () const 2619object::debug_desc () const
2646{ 2620{
2647 static char info[256 * 3]; 2621 static char info[3][256 * 4];
2622 static int info_idx;
2623
2648 return debug_desc (info); 2624 return debug_desc (info [++info_idx % 3]);
2649} 2625}
2650 2626
2627struct region *
2628object::region () const
2629{
2630 return map ? map->region (x, y)
2631 : region::default_region ();
2632}
2633
2634const materialtype_t *
2635object::dominant_material () const
2636{
2637 if (materialtype_t *mt = name_to_material (materialname))
2638 return mt;
2639
2640 return name_to_material (shstr_unknown);
2641}
2642
2643void
2644object::open_container (object *new_container)
2645{
2646 if (container == new_container)
2647 return;
2648
2649 if (object *old_container = container)
2650 {
2651 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2652 return;
2653
2654#if 0
2655 // remove the "Close old_container" object.
2656 if (object *closer = old_container->inv)
2657 if (closer->type == CLOSE_CON)
2658 closer->destroy ();
2659#endif
2660
2661 old_container->flag [FLAG_APPLIED] = 0;
2662 container = 0;
2663
2664 esrv_update_item (UPD_FLAGS, this, old_container);
2665 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2666 play_sound (sound_find ("chest_close"));
2667 }
2668
2669 if (new_container)
2670 {
2671 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2672 return;
2673
2674 // TODO: this does not seem to serve any purpose anymore?
2675#if 0
2676 // insert the "Close Container" object.
2677 if (archetype *closer = new_container->other_arch)
2678 {
2679 object *closer = arch_to_object (new_container->other_arch);
2680 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2681 new_container->insert (closer);
2682 }
2683#endif
2684
2685 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2686
2687 new_container->flag [FLAG_APPLIED] = 1;
2688 container = new_container;
2689
2690 esrv_update_item (UPD_FLAGS, this, new_container);
2691 esrv_send_inventory (this, new_container);
2692 play_sound (sound_find ("chest_open"));
2693 }
2694}
2695
2696object *
2697object::force_find (const shstr name)
2698{
2699 /* cycle through his inventory to look for the MARK we want to
2700 * place
2701 */
2702 for (object *tmp = inv; tmp; tmp = tmp->below)
2703 if (tmp->type == FORCE && tmp->slaying == name)
2704 return splay (tmp);
2705
2706 return 0;
2707}
2708
2709void
2710object::force_add (const shstr name, int duration)
2711{
2712 if (object *force = force_find (name))
2713 force->destroy ();
2714
2715 object *force = get_archetype (FORCE_NAME);
2716
2717 force->slaying = name;
2718 force->stats.food = 1;
2719 force->speed_left = -1.f;
2720
2721 force->set_speed (duration ? 1.f / duration : 0.f);
2722 force->flag [FLAG_IS_USED_UP] = true;
2723 force->flag [FLAG_APPLIED] = true;
2724
2725 insert (force);
2726}
2727
2728void
2729object::play_sound (faceidx sound) const
2730{
2731 if (!sound)
2732 return;
2733
2734 if (flag [FLAG_REMOVED])
2735 return;
2736
2737 if (env)
2738 {
2739 if (object *pl = in_player ())
2740 pl->contr->play_sound (sound);
2741 }
2742 else
2743 map->play_sound (sound, x, y);
2744}
2745

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines