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.135 by root, Sun Mar 11 02:12:44 2007 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 (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.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
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. */
27
28#include <global.h> 28#include <global.h>
29#include <stdio.h> 29#include <stdio.h>
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/uio.h> 31#include <sys/uio.h>
32#include <object.h> 32#include <object.h>
33#include <funcpoint.h> 33#include <funcpoint.h>
34#include <sproto.h>
34#include <loader.h> 35#include <loader.h>
35 36
36#include <bitset> 37#include <bitset>
37 38
38int nrofallocobjects = 0; 39UUID UUID::cur;
39static UUID uuid; 40static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 41static const uint64 UUID_GAP = 1<<19;
41 42
42objectvec objects; 43objectvec objects;
43activevec actives; 44activevec actives;
44 45
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, 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,
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 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
47}; 51};
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, 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,
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 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
50}; 57};
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, 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,
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 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
53}; 63};
54int freedir[SIZEOFFREE] = { 64int 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, 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,
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 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
57}; 69};
58 70
59static void 71static void
60write_uuid (void) 72write_uuid (uval64 skip, bool sync)
61{ 73{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 74 CALL_BEGIN (2);
63 75 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 76 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 78 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} 79}
79 80
80static void 81static void
81read_uuid (void) 82read_uuid (void)
82{ 83{
83 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
84 85
85 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
86 87
88 seq_next_save = 0;
89
87 FILE *fp; 90 FILE *fp;
88 91
89 if (!(fp = fopen (filename, "r"))) 92 if (!(fp = fopen (filename, "r")))
90 { 93 {
91 if (errno == ENOENT) 94 if (errno == ENOENT)
92 { 95 {
93 LOG (llevInfo, "RESET uid to 1\n"); 96 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 97 UUID::cur.seq = 0;
95 write_uuid (); 98 write_uuid (UUID_GAP, true);
96 return; 99 return;
97 } 100 }
98 101
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 103 _exit (1);
101 } 104 }
102 105
103 int version; 106 UUID::BUF buf;
104 unsigned long long uid; 107 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 108 fgets (buf, sizeof (buf), fp);
109
110 if (!UUID::cur.parse (buf))
106 { 111 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 112 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 113 _exit (1);
109 } 114 }
110 115
111 uuid.seq = uid; 116 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 117
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 118 write_uuid (UUID_GAP, true);
114 fclose (fp); 119 fclose (fp);
115} 120}
116 121
117UUID 122UUID
118gen_uuid () 123UUID::gen ()
119{ 124{
120 UUID uid; 125 UUID uid;
121 126
122 uid.seq = ++uuid.seq; 127 uid.seq = ++cur.seq;
123 128
124 if (!(uuid.seq & (UUID_SKIP - 1))) 129 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 130 {
131 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
132 write_uuid (UUID_GAP, false);
133 }
134
126 135
127 return uid; 136 return uid;
128} 137}
129 138
130void 139void
131init_uuid () 140UUID::init ()
132{ 141{
133 read_uuid (); 142 read_uuid ();
134} 143}
135 144
136/* 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. */
137static int 146static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 147compare_ob_value_lists_one (const object *wants, const object *has)
139{ 148{
140 key_value *wants_field; 149 key_value *wants_field;
141 150
142 /* 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
150 key_value *has_field; 159 key_value *has_field;
151 160
152 /* Look for a field in has with the same key. */ 161 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key); 162 has_field = get_ob_key_link (has, wants_field->key);
154 163
155 if (has_field == NULL) 164 if (!has_field)
156 {
157 /* No field with that name. */ 165 return 0; /* No field with that name. */
158 return FALSE;
159 }
160 166
161 /* Found the matching field. */ 167 /* Found the matching field. */
162 if (has_field->value != wants_field->value) 168 if (has_field->value != wants_field->value)
163 {
164 /* 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. */
165 return FALSE;
166 }
167 170
168 /* 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. */
169 } 172 }
170 173
171 /* 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. */
172 return TRUE; 175 return 1;
173} 176}
174 177
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 178/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 179static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 180compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 181{
179 /* 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,
180 * so we need to run the comparison *twice*. :( 183 * so we need to run the comparison *twice*. :(
181 */ 184 */
202 || ob1->speed != ob2->speed 205 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 206 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 207 || ob1->name != ob2->name)
205 return 0; 208 return 0;
206 209
207 //TODO: this ain't working well, use nicer and correct overflow check 210 /* 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 211 * for unsigned overflow (2c), second part checks wether the result
209 * 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
210 * used to store nrof). 213 * nrof values.
211 */ 214 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 215 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 216 return 0;
214 217
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 218 /* 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 219 * 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 220 * 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 221 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 222 * flags lose any meaning.
220 */ 223 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
249 || ob1->move_off != ob2->move_off 252 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 253 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 254 || ob1->move_slow_penalty != ob2->move_slow_penalty)
252 return 0; 255 return 0;
253 256
254 /* This is really a spellbook check - really, we should 257 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 258 * not merge objects with real inventories, as splitting them
259 * is hard.
256 */ 260 */
257 if (ob1->inv || ob2->inv) 261 if (ob1->inv || ob2->inv)
258 { 262 {
259 /* if one object has inventory but the other doesn't, not equiv */ 263 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 264 return 0; /* inventories differ in length */
261 return 0;
262 265
263 /* 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
264 if (!object::can_merge (ob1->inv, ob2->inv)) 269 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 270 return 0; /* inventory objects differ */
266 271
267 /* 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
268 * if it is valid. 273 * if it is valid.
269 */ 274 */
270 } 275 }
289 if (ob1->level != ob2->level) 294 if (ob1->level != ob2->level)
290 return 0; 295 return 0;
291 break; 296 break;
292 } 297 }
293 298
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 299 if (ob1->key_values || ob2->key_values)
295 { 300 {
296 /* At least one of these has key_values. */ 301 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 302 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 303 /* One has fields, but the other one doesn't. */
299 return 0; 304 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 305 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 306 return 0;
302 } 307 }
303 308
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
306 { 310 {
307 ob1->optimise (); 311 ob1->optimise ();
308 ob2->optimise (); 312 ob2->optimise ();
309 313
310 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)
311 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 }
312 } 326 }
313 327
314 /* Everything passes, must be OK. */ 328 /* Everything passes, must be OK. */
315 return 1; 329 return 1;
316} 330}
317 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
318/* 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/*
319 * sum_weight() is a recursive function which calculates the weight 367 * this is a recursive function which calculates the weight
320 * 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
321 * containers are carrying, and sums it up. 369 * containers are carrying, and sums it up.
322 */ 370 */
323long 371void
324sum_weight (object *op) 372object::update_weight ()
325{ 373{
326 long sum; 374 sint32 sum = 0;
327 object *inv;
328 375
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 376 for (object *op = inv; op; op = op->below)
330 { 377 {
331 if (inv->inv) 378 if (op->inv)
332 sum_weight (inv); 379 op->update_weight ();
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 }
335 380
336 if (op->type == CONTAINER && op->stats.Str) 381 sum += op->total_weight ();
337 sum = (sum * (100 - op->stats.Str)) / 100; 382 }
338 383
339 if (op->carrying != sum) 384 carrying = weight_adjust (this, sum);
340 op->carrying = sum;
341
342 return sum;
343}
344
345/**
346 * Return the outermost environment object for a given object.
347 */
348
349object *
350object_get_env_recursive (object *op)
351{
352 while (op->env != NULL)
353 op = op->env;
354 return op;
355} 385}
356 386
357/* 387/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 388 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 389 * Some error messages.
373/* 403/*
374 * 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
375 * multi-object 1 which is closest to the second object. 405 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 406 * If it's not a multi-object, it is returned.
377 */ 407 */
378
379object * 408object *
380get_nearest_part (object *op, const object *pl) 409get_nearest_part (object *op, const object *pl)
381{ 410{
382 object *tmp, *closest; 411 object *tmp, *closest;
383 int last_dist, i; 412 int last_dist, i;
419 break; 448 break;
420 449
421 return op; 450 return op;
422} 451}
423 452
424void
425free_all_object_data ()
426{
427 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428}
429
430/* 453/*
431 * 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
432 * skill and experience objects. 455 * skill and experience objects.
456 * ACTUALLY NO! investigate! TODO
433 */ 457 */
434void 458void
435object::set_owner (object *owner) 459object::set_owner (object *owner)
436{ 460{
461 // allow objects which own objects
437 if (!owner) 462 if (owner)
438 return;
439
440 /* next line added to allow objects which own objects */
441 /* Add a check for ownercounts in here, as I got into an endless loop
442 * with the fireball owning a poison cloud which then owned the
443 * fireball. I believe that was caused by one of the objects getting
444 * freed and then another object replacing it. Since the ownercounts
445 * didn't match, this check is valid and I believe that cause is valid.
446 */
447 while (owner->owner) 463 while (owner->owner)
448 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 }
449 471
450 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;
451} 539}
452 540
453/* Zero the key_values on op, decrementing the shared-string 541/* Zero the key_values on op, decrementing the shared-string
454 * refcounts and freeing the links. 542 * refcounts and freeing the links.
455 */ 543 */
456static void 544static void
457free_key_values (object *op) 545free_key_values (object *op)
458{ 546{
459 for (key_value *i = op->key_values; i != 0;) 547 for (key_value *i = op->key_values; i; )
460 { 548 {
461 key_value *next = i->next; 549 key_value *next = i->next;
462 delete i; 550 delete i;
463 551
464 i = next; 552 i = next;
465 } 553 }
466 554
467 op->key_values = 0; 555 op->key_values = 0;
468} 556}
469 557
470/* 558object &
471 * copy_to first frees everything allocated by the dst object, 559object::operator =(const object &src)
472 * and then copies the contents of itself into the second
473 * object, allocating what needs to be allocated. Basically, any
474 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
475 * if the first object is freed, the pointers in the new object
476 * will point at garbage.
477 */
478void
479object::copy_to (object *dst)
480{ 560{
481 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 561 bool is_freed = flag [FLAG_FREED];
482 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 562 bool is_removed = flag [FLAG_REMOVED];
483 563
484 *(object_copy *)dst = *this; 564 *(object_copy *)this = src;
485 565
486 if (is_freed) 566 flag [FLAG_FREED] = is_freed;
487 SET_FLAG (dst, FLAG_FREED); 567 flag [FLAG_REMOVED] = is_removed;
488
489 if (is_removed)
490 SET_FLAG (dst, FLAG_REMOVED);
491
492 if (speed < 0)
493 dst->speed_left = speed_left - rndm ();
494 568
495 /* Copy over key_values, if any. */ 569 /* Copy over key_values, if any. */
496 if (key_values) 570 if (src.key_values)
497 { 571 {
498 key_value *tail = 0; 572 key_value *tail = 0;
499 key_value *i;
500
501 dst->key_values = 0; 573 key_values = 0;
502 574
503 for (i = key_values; i; i = i->next) 575 for (key_value *i = src.key_values; i; i = i->next)
504 { 576 {
505 key_value *new_link = new key_value; 577 key_value *new_link = new key_value;
506 578
507 new_link->next = 0; 579 new_link->next = 0;
508 new_link->key = i->key; 580 new_link->key = i->key;
509 new_link->value = i->value; 581 new_link->value = i->value;
510 582
511 /* Try and be clever here, too. */ 583 /* Try and be clever here, too. */
512 if (!dst->key_values) 584 if (!key_values)
513 { 585 {
514 dst->key_values = new_link; 586 key_values = new_link;
515 tail = new_link; 587 tail = new_link;
516 } 588 }
517 else 589 else
518 { 590 {
519 tail->next = new_link; 591 tail->next = new_link;
520 tail = new_link; 592 tail = new_link;
521 } 593 }
522 } 594 }
523 } 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 ();
524 613
525 dst->set_speed (dst->speed); 614 dst->set_speed (dst->speed);
526} 615}
527 616
528void 617void
529object::instantiate () 618object::instantiate ()
530{ 619{
531 if (!uuid.seq) // HACK 620 if (!uuid.seq) // HACK
532 uuid = gen_uuid (); 621 uuid = UUID::gen ();
533 622
534 speed_left = -0.1f; 623 speed_left = -0.1f;
535 /* copy the body_info to the body_used - this is only really 624 /* copy the body_info to the body_used - this is only really
536 * need for monsters, but doesn't hurt to do it for everything. 625 * need for monsters, but doesn't hurt to do it for everything.
537 * by doing so, when a monster is created, it has good starting 626 * by doing so, when a monster is created, it has good starting
538 * values for the body_used info, so when items are created 627 * values for the body_used info, so when items are created
539 * for it, they can be properly equipped. 628 * for it, they can be properly equipped.
540 */ 629 */
541 memcpy (body_used, body_info, sizeof (body_used)); 630 for (int i = NUM_BODY_LOCATIONS; i--; )
631 slot[i].used = slot[i].info;
542 632
543 attachable::instantiate (); 633 attachable::instantiate ();
544} 634}
545 635
546object * 636object *
695static int object_count; 785static int object_count;
696 786
697void object::link () 787void object::link ()
698{ 788{
699 assert (!index);//D 789 assert (!index);//D
700 uuid = gen_uuid (); 790 uuid = UUID::gen ();
701 count = ++object_count; 791 count = ++object_count;
702 792
703 refcnt_inc (); 793 refcnt_inc ();
704 objects.insert (this); 794 objects.insert (this);
705} 795}
789 * if some form of movement is allowed, let objects 879 * if some form of movement is allowed, let objects
790 * drop on that space. 880 * drop on that space.
791 */ 881 */
792 if (!drop_to_ground 882 if (!drop_to_ground
793 || !map 883 || !map
794 || map->in_memory != MAP_IN_MEMORY 884 || map->in_memory != MAP_ACTIVE
795 || map->nodrop 885 || map->nodrop
796 || ms ().move_block == MOVE_ALL) 886 || ms ().move_block == MOVE_ALL)
797 { 887 {
798 while (inv) 888 while (inv)
799 { 889 {
834 924
835 if (flag [FLAG_IS_LINKED]) 925 if (flag [FLAG_IS_LINKED])
836 remove_button_link (this); 926 remove_button_link (this);
837 927
838 if (flag [FLAG_FRIENDLY]) 928 if (flag [FLAG_FRIENDLY])
839 {
840 remove_friendly_object (this); 929 remove_friendly_object (this);
841
842 if (type == GOLEM
843 && owner
844 && owner->type == PLAYER
845 && owner->contr->ranges[range_golem] == this)
846 owner->contr->ranges[range_golem] = 0;
847 }
848 930
849 if (!flag [FLAG_REMOVED]) 931 if (!flag [FLAG_REMOVED])
850 remove (); 932 remove ();
851 933
852 destroy_inv (true); 934 destroy_inv (true);
862 944
863 if (!freed_map) 945 if (!freed_map)
864 { 946 {
865 freed_map = new maptile; 947 freed_map = new maptile;
866 948
949 freed_map->path = "<freed objects map>";
867 freed_map->name = "/internal/freed_objects_map"; 950 freed_map->name = "/internal/freed_objects_map";
868 freed_map->width = 3; 951 freed_map->width = 3;
869 freed_map->height = 3; 952 freed_map->height = 3;
953 freed_map->nodrop = 1;
870 954
871 freed_map->alloc (); 955 freed_map->alloc ();
872 freed_map->in_memory = MAP_IN_MEMORY; 956 freed_map->in_memory = MAP_ACTIVE;
873 } 957 }
874 958
875 map = freed_map; 959 map = freed_map;
876 x = 1; 960 x = 1;
877 y = 1; 961 y = 1;
878 } 962 }
879 963
880 head = 0;
881
882 if (more) 964 if (more)
883 { 965 {
884 more->destroy (); 966 more->destroy ();
885 more = 0; 967 more = 0;
886 } 968 }
887 969
970 head = 0;
971
888 // clear those pointers that likely might have circular references to us 972 // clear those pointers that likely might cause circular references
889 owner = 0; 973 owner = 0;
890 enemy = 0; 974 enemy = 0;
891 attacked_by = 0; 975 attacked_by = 0;
976 current_weapon = 0;
892} 977}
893 978
894void 979void
895object::destroy (bool destroy_inventory) 980object::destroy (bool destroy_inventory)
896{ 981{
898 return; 983 return;
899 984
900 if (destroy_inventory) 985 if (destroy_inventory)
901 destroy_inv (false); 986 destroy_inv (false);
902 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
903 attachable::destroy (); 994 attachable::destroy ();
904}
905
906/*
907 * sub_weight() recursively (outwards) subtracts a number from the
908 * weight of an object (and what is carried by it's environment(s)).
909 */
910void
911sub_weight (object *op, signed long weight)
912{
913 while (op != NULL)
914 {
915 if (op->type == CONTAINER)
916 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
917
918 op->carrying -= weight;
919 op = op->env;
920 }
921} 995}
922 996
923/* op->remove (): 997/* op->remove ():
924 * 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
925 * 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
1021 if (map->in_memory == MAP_SAVING) 1095 if (map->in_memory == MAP_SAVING)
1022 return; 1096 return;
1023 1097
1024 int check_walk_off = !flag [FLAG_NO_APPLY]; 1098 int check_walk_off = !flag [FLAG_NO_APPLY];
1025 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
1026 for (tmp = ms.bot; tmp; tmp = tmp->above) 1112 for (tmp = ms.bot; tmp; tmp = tmp->above)
1027 { 1113 {
1028 /* 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
1029 * being removed. 1115 * being removed.
1030 */ 1116 */
1031
1032 if (tmp->type == PLAYER && tmp != this)
1033 {
1034 /* If a container that the player is currently using somehow gets
1035 * removed (most likely destroyed), update the player view
1036 * appropriately.
1037 */
1038 if (tmp->container == this)
1039 {
1040 flag [FLAG_APPLIED] = 0;
1041 tmp->container = 0;
1042 }
1043
1044 if (tmp->contr->ns)
1045 tmp->contr->ns->floorbox_update ();
1046 }
1047 1117
1048 /* See if object moving off should effect something */ 1118 /* See if object moving off should effect something */
1049 if (check_walk_off 1119 if (check_walk_off
1050 && ((move_type & tmp->move_off) 1120 && ((move_type & tmp->move_off)
1051 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1121 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1054 1124
1055 if (destroyed ()) 1125 if (destroyed ())
1056 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 ());
1057 } 1127 }
1058 1128
1059 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1060 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1061 if (tmp->above == tmp)
1062 tmp->above = 0;
1063
1064 last = tmp; 1129 last = tmp;
1065 } 1130 }
1066 1131
1067 /* last == NULL if there are no objects on this space */ 1132 /* last == NULL if there are no objects on this space */
1068 //TODO: this makes little sense, why only update the topmost object? 1133 //TODO: this makes little sense, why only update the topmost object?
1088merge_ob (object *op, object *top) 1153merge_ob (object *op, object *top)
1089{ 1154{
1090 if (!op->nrof) 1155 if (!op->nrof)
1091 return 0; 1156 return 0;
1092 1157
1093 if (top) 1158 if (!top)
1094 for (top = op; top && top->above; top = top->above) 1159 for (top = op; top && top->above; top = top->above)
1095 ; 1160 ;
1096 1161
1097 for (; top; top = top->below) 1162 for (; top; top = top->below)
1098 { 1163 {
1111 } 1176 }
1112 1177
1113 return 0; 1178 return 0;
1114} 1179}
1115 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
1116/* 1204/*
1117 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1205 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1118 * job preparing multi-part monsters. 1206 * job preparing multi-part monsters.
1119 */ 1207 */
1120object * 1208object *
1121insert_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)
1122{ 1210{
1123 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1211 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1124 { 1212 {
1125 tmp->x = x + tmp->arch->clone.x; 1213 tmp->x = x + tmp->arch->x;
1126 tmp->y = y + tmp->arch->clone.y; 1214 tmp->y = y + tmp->arch->y;
1127 } 1215 }
1128 1216
1129 return insert_ob_in_map (op, m, originator, flag); 1217 return insert_ob_in_map (op, m, originator, flag);
1130} 1218}
1131 1219
1150 * just 'op' otherwise 1238 * just 'op' otherwise
1151 */ 1239 */
1152object * 1240object *
1153insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1241insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1154{ 1242{
1243 assert (!op->flag [FLAG_FREED]);
1244
1155 object *tmp, *top, *floor = NULL; 1245 object *top, *floor = NULL;
1156
1157 if (QUERY_FLAG (op, FLAG_FREED))
1158 {
1159 LOG (llevError, "Trying to insert freed object!\n");
1160 return NULL;
1161 }
1162
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1165 1246
1166 op->remove (); 1247 op->remove ();
1167
1168 if (!m)
1169 {
1170 char *dump = dump_object (op);
1171 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1172 free (dump);
1173 return op;
1174 }
1175
1176 if (out_of_map (m, op->x, op->y))
1177 {
1178 char *dump = dump_object (op);
1179 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1180#ifdef MANY_CORES
1181 /* Better to catch this here, as otherwise the next use of this object
1182 * is likely to cause a crash. Better to find out where it is getting
1183 * improperly inserted.
1184 */
1185 abort ();
1186#endif
1187 free (dump);
1188 return op;
1189 }
1190
1191 if (object *more = op->more)
1192 {
1193 if (!insert_ob_in_map (more, m, originator, flag))
1194 {
1195 if (!op->head)
1196 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1197
1198 return 0;
1199 }
1200 }
1201
1202 CLEAR_FLAG (op, FLAG_REMOVED);
1203 1248
1204 /* Ideally, the caller figures this out. However, it complicates a lot 1249 /* Ideally, the caller figures this out. However, it complicates a lot
1205 * 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
1206 * need extra work 1251 * need extra work
1207 */ 1252 */
1208 if (!xy_normalise (m, op->x, op->y)) 1253 if (!xy_normalise (m, op->x, op->y))
1254 {
1255 op->destroy ();
1209 return 0; 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);
1210 1264
1211 op->map = m; 1265 op->map = m;
1212 mapspace &ms = op->ms (); 1266 mapspace &ms = op->ms ();
1213 1267
1214 /* this has to be done after we translate the coordinates. 1268 /* this has to be done after we translate the coordinates.
1215 */ 1269 */
1216 if (op->nrof && !(flag & INS_NO_MERGE)) 1270 if (op->nrof && !(flag & INS_NO_MERGE))
1217 for (tmp = ms.bot; tmp; tmp = tmp->above) 1271 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1218 if (object::can_merge (op, tmp)) 1272 if (object::can_merge (op, tmp))
1219 { 1273 {
1220 op->nrof += tmp->nrof; 1274 op->nrof += tmp->nrof;
1221 tmp->destroy (); 1275 tmp->destroy ();
1222 } 1276 }
1249 else 1303 else
1250 { 1304 {
1251 top = ms.bot; 1305 top = ms.bot;
1252 1306
1253 /* If there are other objects, then */ 1307 /* If there are other objects, then */
1254 if ((!(flag & INS_MAP_LOAD)) && top) 1308 if (top)
1255 { 1309 {
1256 object *last = 0; 1310 object *last = 0;
1257 1311
1258 /* 1312 /*
1259 * 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.
1312 if (last && last->below && last != floor) 1366 if (last && last->below && last != floor)
1313 top = last->below; 1367 top = last->below;
1314 } 1368 }
1315 } /* If objects on this space */ 1369 } /* If objects on this space */
1316 1370
1317 if (flag & INS_MAP_LOAD)
1318 top = ms.top;
1319
1320 if (flag & INS_ABOVE_FLOOR_ONLY) 1371 if (flag & INS_ABOVE_FLOOR_ONLY)
1321 top = floor; 1372 top = floor;
1322 1373
1323 /* 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.
1324 */ 1375 */
1356 op->map->touch (); 1407 op->map->touch ();
1357 } 1408 }
1358 1409
1359 op->map->dirty = true; 1410 op->map->dirty = true;
1360 1411
1361 /* If we have a floor, we know the player, if any, will be above
1362 * it, so save a few ticks and start from there.
1363 */
1364 if (!(flag & INS_MAP_LOAD))
1365 if (object *pl = ms.player ()) 1412 if (object *pl = ms.player ())
1366 if (pl->contr->ns)
1367 pl->contr->ns->floorbox_update (); 1413 pl->contr->ns->floorbox_update ();
1368 1414
1369 /* If this object glows, it may affect lighting conditions that are 1415 /* If this object glows, it may affect lighting conditions that are
1370 * 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
1371 * 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
1372 * on the map will get recalculated. The players could very well 1418 * on the map will get recalculated. The players could very well
1391 * blocked() and wall() work properly), and these flags are updated by 1437 * blocked() and wall() work properly), and these flags are updated by
1392 * update_object(). 1438 * update_object().
1393 */ 1439 */
1394 1440
1395 /* 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 */
1396 if (!(flag & INS_NO_WALK_ON) && !op->head) 1442 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1397 { 1443 {
1398 if (check_move_on (op, originator)) 1444 if (check_move_on (op, originator))
1399 return 0; 1445 return 0;
1400 1446
1401 /* 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
1402 * walk on's. 1448 * walk on's.
1403 */ 1449 */
1404 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1450 for (object *tmp = op->more; tmp; tmp = tmp->more)
1405 if (check_move_on (tmp, originator)) 1451 if (check_move_on (tmp, originator))
1406 return 0; 1452 return 0;
1407 } 1453 }
1408 1454
1409 return op; 1455 return op;
1419 object *tmp, *tmp1; 1465 object *tmp, *tmp1;
1420 1466
1421 /* first search for itself and remove any old instances */ 1467 /* first search for itself and remove any old instances */
1422 1468
1423 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1469 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1424 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1470 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1425 tmp->destroy (); 1471 tmp->destroy ();
1426 1472
1427 tmp1 = arch_to_object (archetype::find (arch_string)); 1473 tmp1 = arch_to_object (archetype::find (arch_string));
1428 1474
1429 tmp1->x = op->x; 1475 tmp1->x = op->x;
1430 tmp1->y = op->y; 1476 tmp1->y = op->y;
1431 insert_ob_in_map (tmp1, op->map, op, 0); 1477 insert_ob_in_map (tmp1, op->map, op, 0);
1432} 1478}
1433 1479
1434// XXX: function not returning object*
1435object * 1480object *
1436object::insert_at (object *where, object *originator, int flags) 1481object::insert_at (object *where, object *originator, int flags)
1437{ 1482{
1483 if (where->env)
1484 return where->env->insert (this);
1485 else
1438 where->map->insert (this, where->x, where->y, originator, flags); 1486 return where->map->insert (this, where->x, where->y, originator, flags);
1439} 1487}
1440 1488
1441/* 1489/*
1442 * 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
1443 * is returned contains nr objects, and the remaining parts contains 1491 * is returned contains nr objects, and the remaining parts contains
1463 orig_ob->destroy (1); 1511 orig_ob->destroy (1);
1464 else if (!is_removed) 1512 else if (!is_removed)
1465 { 1513 {
1466 if (orig_ob->env != NULL) 1514 if (orig_ob->env != NULL)
1467 sub_weight (orig_ob->env, orig_ob->weight * nr); 1515 sub_weight (orig_ob->env, orig_ob->weight * nr);
1468 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)
1469 { 1517 {
1470 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.");
1471 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");
1472 return NULL; 1520 return NULL;
1473 } 1521 }
1483 * 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
1484 * is subsequently removed and freed. 1532 * is subsequently removed and freed.
1485 * 1533 *
1486 * 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
1487 */ 1535 */
1488
1489object * 1536object *
1490decrease_ob_nr (object *op, uint32 i) 1537decrease_ob_nr (object *op, uint32 i)
1491{ 1538{
1492 object *tmp; 1539 object *tmp;
1493 1540
1564 op->destroy (); 1611 op->destroy ();
1565 return 0; 1612 return 0;
1566 } 1613 }
1567} 1614}
1568 1615
1569/*
1570 * add_weight(object, weight) adds the specified weight to an object,
1571 * and also updates how much the environment(s) is/are carrying.
1572 */
1573
1574void
1575add_weight (object *op, signed long weight)
1576{
1577 while (op != NULL)
1578 {
1579 if (op->type == CONTAINER)
1580 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1581
1582 op->carrying += weight;
1583 op = op->env;
1584 }
1585}
1586
1587object * 1616object *
1588insert_ob_in_ob (object *op, object *where) 1617insert_ob_in_ob (object *op, object *where)
1589{ 1618{
1590 if (!where) 1619 if (!where)
1591 { 1620 {
1593 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);
1594 free (dump); 1623 free (dump);
1595 return op; 1624 return op;
1596 } 1625 }
1597 1626
1598 if (where->head) 1627 if (where->head_ () != where)
1599 { 1628 {
1600 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");
1601 where = where->head; 1630 where = where->head;
1602 } 1631 }
1603 1632
1604 return where->insert (op); 1633 return where->insert (op);
1605} 1634}
1610 * inside the object environment. 1639 * inside the object environment.
1611 * 1640 *
1612 * 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
1613 * be != op, if items are merged. -Tero 1642 * be != op, if items are merged. -Tero
1614 */ 1643 */
1615
1616object * 1644object *
1617object::insert (object *op) 1645object::insert (object *op)
1618{ 1646{
1619 object *tmp, *otmp;
1620
1621 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1647 if (!QUERY_FLAG (op, FLAG_REMOVED))
1622 op->remove (); 1648 op->remove ();
1623 1649
1624 if (op->more) 1650 if (op->more)
1625 { 1651 {
1627 return op; 1653 return op;
1628 } 1654 }
1629 1655
1630 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1656 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1631 CLEAR_FLAG (op, FLAG_REMOVED); 1657 CLEAR_FLAG (op, FLAG_REMOVED);
1658
1632 if (op->nrof) 1659 if (op->nrof)
1633 { 1660 {
1634 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1661 for (object *tmp = inv; tmp; tmp = tmp->below)
1635 if (object::can_merge (tmp, op)) 1662 if (object::can_merge (tmp, op))
1636 { 1663 {
1637 /* return the original object and remove inserted object 1664 /* return the original object and remove inserted object
1638 (client needs the original object) */ 1665 (client needs the original object) */
1639 tmp->nrof += op->nrof; 1666 tmp->nrof += op->nrof;
1658 add_weight (this, op->weight * op->nrof); 1685 add_weight (this, op->weight * op->nrof);
1659 } 1686 }
1660 else 1687 else
1661 add_weight (this, (op->weight + op->carrying)); 1688 add_weight (this, (op->weight + op->carrying));
1662 1689
1663 otmp = this->in_player (); 1690 if (object *otmp = this->in_player ())
1664 if (otmp && otmp->contr)
1665 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1691 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1666 otmp->update_stats (); 1692 otmp->update_stats ();
1667 1693
1694 op->owner = 0; // its his/hers now. period.
1668 op->map = 0; 1695 op->map = 0;
1669 op->env = this; 1696 op->env = this;
1670 op->above = 0; 1697 op->above = 0;
1671 op->below = 0; 1698 op->below = 0;
1672 op->x = 0, op->y = 0; 1699 op->x = op->y = 0;
1673 1700
1674 /* 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 */
1675 if ((op->glow_radius != 0) && map) 1702 if (op->glow_radius && map)
1676 { 1703 {
1677#ifdef DEBUG_LIGHTS 1704#ifdef DEBUG_LIGHTS
1678 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);
1679#endif /* DEBUG_LIGHTS */ 1706#endif /* DEBUG_LIGHTS */
1680 if (map->darkness) 1707 if (map->darkness)
1914 * activate recursively a flag on an object inventory 1941 * activate recursively a flag on an object inventory
1915 */ 1942 */
1916void 1943void
1917flag_inv (object *op, int flag) 1944flag_inv (object *op, int flag)
1918{ 1945{
1919 if (op->inv)
1920 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1946 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1921 { 1947 {
1922 SET_FLAG (tmp, flag); 1948 SET_FLAG (tmp, flag);
1923 flag_inv (tmp, flag); 1949 flag_inv (tmp, flag);
1924 } 1950 }
1925} 1951}
1926 1952
1927/* 1953/*
1928 * deactivate recursively a flag on an object inventory 1954 * deactivate recursively a flag on an object inventory
1929 */ 1955 */
1930void 1956void
1931unflag_inv (object *op, int flag) 1957unflag_inv (object *op, int flag)
1932{ 1958{
1933 if (op->inv)
1934 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1959 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1935 { 1960 {
1936 CLEAR_FLAG (tmp, flag); 1961 CLEAR_FLAG (tmp, flag);
1937 unflag_inv (tmp, flag); 1962 unflag_inv (tmp, flag);
1938 } 1963 }
1939}
1940
1941/*
1942 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1943 * all it's inventory (recursively).
1944 * If checksums are used, a player will get set_cheat called for
1945 * him/her-self and all object carried by a call to this function.
1946 */
1947void
1948set_cheat (object *op)
1949{
1950 SET_FLAG (op, FLAG_WAS_WIZ);
1951 flag_inv (op, FLAG_WAS_WIZ);
1952} 1964}
1953 1965
1954/* 1966/*
1955 * 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
1956 * 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
1958 * to search (see the freearr_x/y[] definition). 1970 * to search (see the freearr_x/y[] definition).
1959 * It returns a random choice among the alternatives found. 1971 * It returns a random choice among the alternatives found.
1960 * 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
1961 * does all 4 immediate directions). This returns the index into the 1973 * does all 4 immediate directions). This returns the index into the
1962 * 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)
1963 * Note - this only checks to see if there is space for the head of the
1964 * object - if it is a multispace object, this should be called for all
1965 * pieces.
1966 * Note2: This function does correctly handle tiled maps, but does not 1975 * Note: This function does correctly handle tiled maps, but does not
1967 * inform the caller. However, insert_ob_in_map will update as 1976 * inform the caller. However, insert_ob_in_map will update as
1968 * 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.
1969 * 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
1970 * 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
1971 * 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
1973 * customized, changed states, etc. 1982 * customized, changed states, etc.
1974 */ 1983 */
1975int 1984int
1976find_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)
1977{ 1986{
1987 int altern[SIZEOFFREE];
1978 int index = 0, flag; 1988 int index = 0, flag;
1979 int altern[SIZEOFFREE];
1980 1989
1981 for (int i = start; i < stop; i++) 1990 for (int i = start; i < stop; i++)
1982 { 1991 {
1983 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1992 mapxy pos (m, x, y); pos.move (i);
1984 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 {
1985 altern [index++] = i; 2008 altern [index++] = i;
2009 continue;
2010 }
1986 2011
1987 /* 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.
1988 * 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.
1989 * 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 -
1990 * 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
1991 * 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
1992 * to only the spaces immediately surrounding the target area, and 2017 * to only the spaces immediately surrounding the target area, and
1993 * won't look 2 spaces south of the target space. 2018 * won't look 2 spaces south of the target space.
1994 */ 2019 */
1995 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2020 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2021 {
1996 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;
1997 } 2036 }
1998 2037
1999 if (!index) 2038 if (!index)
2000 return -1; 2039 return -1;
2001 2040
2010 */ 2049 */
2011int 2050int
2012find_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)
2013{ 2052{
2014 for (int i = 0; i < SIZEOFFREE; i++) 2053 for (int i = 0; i < SIZEOFFREE; i++)
2015 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]))
2016 return i; 2055 return i;
2017 2056
2018 return -1; 2057 return -1;
2019} 2058}
2020 2059
2074 object *tmp; 2113 object *tmp;
2075 maptile *mp; 2114 maptile *mp;
2076 2115
2077 MoveType blocked, move_type; 2116 MoveType blocked, move_type;
2078 2117
2079 if (exclude && exclude->head) 2118 if (exclude && exclude->head_ () != exclude)
2080 { 2119 {
2081 exclude = exclude->head; 2120 exclude = exclude->head;
2082 move_type = exclude->move_type; 2121 move_type = exclude->move_type;
2083 } 2122 }
2084 else 2123 else
2107 max = maxfree[i]; 2146 max = maxfree[i];
2108 else if (mflags & P_IS_ALIVE) 2147 else if (mflags & P_IS_ALIVE)
2109 { 2148 {
2110 for (tmp = ms.bot; tmp; tmp = tmp->above) 2149 for (tmp = ms.bot; tmp; tmp = tmp->above)
2111 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2150 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2112 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2151 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2113 break; 2152 break;
2114 2153
2115 if (tmp) 2154 if (tmp)
2116 return freedir[i]; 2155 return freedir[i];
2117 } 2156 }
2297 * 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
2298 * core dumps if they do. 2337 * core dumps if they do.
2299 * 2338 *
2300 * 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)
2301 */ 2340 */
2302
2303int 2341int
2304can_pick (const object *who, const object *item) 2342can_pick (const object *who, const object *item)
2305{ 2343{
2306 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2344 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2307 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2345 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2312 * create clone from object to another 2350 * create clone from object to another
2313 */ 2351 */
2314object * 2352object *
2315object_create_clone (object *asrc) 2353object_create_clone (object *asrc)
2316{ 2354{
2317 object *dst = 0, *tmp, *src, *part, *prev, *item; 2355 object *dst = 0, *tmp, *src, *prev, *item;
2318 2356
2319 if (!asrc) 2357 if (!asrc)
2320 return 0; 2358 return 0;
2321 2359
2322 src = asrc;
2323 if (src->head)
2324 src = src->head; 2360 src = asrc->head_ ();
2325 2361
2326 prev = 0; 2362 prev = 0;
2327 for (part = src; part; part = part->more) 2363 for (object *part = src; part; part = part->more)
2328 { 2364 {
2329 tmp = part->clone (); 2365 tmp = part->clone ();
2330 tmp->x -= src->x; 2366 tmp->x -= src->x;
2331 tmp->y -= src->y; 2367 tmp->y -= src->y;
2332 2368
2412 if (link->key == canonical_key) 2448 if (link->key == canonical_key)
2413 return link->value; 2449 return link->value;
2414 2450
2415 return 0; 2451 return 0;
2416} 2452}
2417
2418 2453
2419/* 2454/*
2420 * Updates the canonical_key in op to value. 2455 * Updates the canonical_key in op to value.
2421 * 2456 *
2422 * 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).
2446 /* Basically, if the archetype has this key set, 2481 /* Basically, if the archetype has this key set,
2447 * we need to store the null value so when we save 2482 * we need to store the null value so when we save
2448 * it, we save the empty value so that when we load, 2483 * it, we save the empty value so that when we load,
2449 * we get this value back again. 2484 * we get this value back again.
2450 */ 2485 */
2451 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2486 if (get_ob_key_link (op->arch, canonical_key))
2452 field->value = 0; 2487 field->value = 0;
2453 else 2488 else
2454 { 2489 {
2455 if (last) 2490 if (last)
2456 last->next = field->next; 2491 last->next = field->next;
2525 } 2560 }
2526 else 2561 else
2527 item = item->env; 2562 item = item->env;
2528} 2563}
2529 2564
2530
2531const char * 2565const char *
2532object::flag_desc (char *desc, int len) const 2566object::flag_desc (char *desc, int len) const
2533{ 2567{
2534 char *p = desc; 2568 char *p = desc;
2535 bool first = true; 2569 bool first = true;
2562{ 2596{
2563 char flagdesc[512]; 2597 char flagdesc[512];
2564 char info2[256 * 4]; 2598 char info2[256 * 4];
2565 char *p = info; 2599 char *p = info;
2566 2600
2567 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}",
2568 count, uuid.seq, 2602 count,
2603 uuid.c_str (),
2569 &name, 2604 &name,
2570 title ? "\",title:\"" : "", 2605 title ? "\",title:\"" : "",
2571 title ? (const char *)title : "", 2606 title ? (const char *)title : "",
2572 flag_desc (flagdesc, 512), type); 2607 flag_desc (flagdesc, 512), type);
2573 2608
2574 if (env) 2609 if (!this->flag[FLAG_REMOVED] && env)
2575 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2610 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2576 2611
2577 if (map) 2612 if (map)
2578 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);
2579 2614
2581} 2616}
2582 2617
2583const char * 2618const char *
2584object::debug_desc () const 2619object::debug_desc () const
2585{ 2620{
2586 static char info[256 * 4]; 2621 static char info[3][256 * 4];
2622 static int info_idx;
2623
2587 return debug_desc (info); 2624 return debug_desc (info [++info_idx % 3]);
2588}
2589
2590const char *
2591object::debug_desc2 () const
2592{
2593 static char info[256 * 4];
2594 return debug_desc (info);
2595} 2625}
2596 2626
2597struct region * 2627struct region *
2598object::region () const 2628object::region () const
2599{ 2629{
2602} 2632}
2603 2633
2604const materialtype_t * 2634const materialtype_t *
2605object::dominant_material () const 2635object::dominant_material () const
2606{ 2636{
2607 if (materialtype_t *mat = name_to_material (materialname)) 2637 if (materialtype_t *mt = name_to_material (materialname))
2608 return mat; 2638 return mt;
2609 2639
2610 // omfg this is slow, this has to be temporary :)
2611 shstr unknown ("unknown");
2612
2613 return name_to_material (unknown); 2640 return name_to_material (shstr_unknown);
2614} 2641}
2615 2642
2616void 2643void
2617object::open_container (object *new_container) 2644object::open_container (object *new_container)
2618{ 2645{
2634 old_container->flag [FLAG_APPLIED] = 0; 2661 old_container->flag [FLAG_APPLIED] = 0;
2635 container = 0; 2662 container = 0;
2636 2663
2637 esrv_update_item (UPD_FLAGS, this, old_container); 2664 esrv_update_item (UPD_FLAGS, this, old_container);
2638 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (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"));
2639 } 2667 }
2640 2668
2641 if (new_container) 2669 if (new_container)
2642 { 2670 {
2643 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2671 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2659 new_container->flag [FLAG_APPLIED] = 1; 2687 new_container->flag [FLAG_APPLIED] = 1;
2660 container = new_container; 2688 container = new_container;
2661 2689
2662 esrv_update_item (UPD_FLAGS, this, new_container); 2690 esrv_update_item (UPD_FLAGS, this, new_container);
2663 esrv_send_inventory (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)
2664 } 2738 {
2739 if (object *pl = in_player ())
2740 pl->contr->play_sound (sound);
2741 }
2742 else
2743 map->play_sound (sound, x, y);
2665} 2744}
2666 2745
2667

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines