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.146 by root, Fri May 11 21:07:13 2007 UTC vs.
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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>
34#include <sproto.h> 34#include <sproto.h>
35#include <loader.h> 35#include <loader.h>
36 36
37#include <bitset> 37#include <bitset>
38 38
39int nrofallocobjects = 0; 39UUID UUID::cur;
40static UUID uuid; 40static uint64_t seq_next_save;
41const uint64 UUID_SKIP = 1<<19; 41static const uint64 UUID_GAP = 1<<19;
42 42
43objectvec objects; 43objectvec objects;
44activevec actives; 44activevec actives;
45 45
46short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 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,
47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 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
48}; 51};
49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 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,
50 -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
51}; 57};
52int 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,
53 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
54}; 63};
55int freedir[SIZEOFFREE] = { 64int freedir[SIZEOFFREE] = {
56 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,
57 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
58}; 69};
59 70
60static void 71static void
61write_uuid (void) 72write_uuid (uval64 skip, bool sync)
62{ 73{
63 char filename1[MAX_BUF], filename2[MAX_BUF]; 74 CALL_BEGIN (2);
64 75 CALL_ARG_SV (newSVval64 (skip));
65 sprintf (filename1, "%s/uuid", settings.localdir); 76 CALL_ARG_SV (boolSV (sync));
66 sprintf (filename2, "%s/uuid~", settings.localdir); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
67 78 CALL_END;
68 FILE *fp;
69
70 if (!(fp = fopen (filename2, "w")))
71 {
72 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73 return;
74 }
75
76 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77 fclose (fp);
78 rename (filename2, filename1);
79} 79}
80 80
81static void 81static void
82read_uuid (void) 82read_uuid (void)
83{ 83{
84 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
85 85
86 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
87 87
88 seq_next_save = 0;
89
88 FILE *fp; 90 FILE *fp;
89 91
90 if (!(fp = fopen (filename, "r"))) 92 if (!(fp = fopen (filename, "r")))
91 { 93 {
92 if (errno == ENOENT) 94 if (errno == ENOENT)
93 { 95 {
94 LOG (llevInfo, "RESET uid to 1\n"); 96 LOG (llevInfo, "RESET uid to 1\n");
95 uuid.seq = 0; 97 UUID::cur.seq = 0;
96 write_uuid (); 98 write_uuid (UUID_GAP, true);
97 return; 99 return;
98 } 100 }
99 101
100 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101 _exit (1); 103 _exit (1);
102 } 104 }
103 105
104 int version; 106 UUID::BUF buf;
105 unsigned long long uid; 107 buf[0] = 0;
106 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 108 fgets (buf, sizeof (buf), fp);
109
110 if (!UUID::cur.parse (buf))
107 { 111 {
108 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 112 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109 _exit (1); 113 _exit (1);
110 } 114 }
111 115
112 uuid.seq = uid; 116 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113 write_uuid (); 117
114 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 118 write_uuid (UUID_GAP, true);
115 fclose (fp); 119 fclose (fp);
116} 120}
117 121
118UUID 122UUID
119gen_uuid () 123UUID::gen ()
120{ 124{
121 UUID uid; 125 UUID uid;
122 126
123 uid.seq = ++uuid.seq; 127 uid.seq = ++cur.seq;
124 128
125 if (!(uuid.seq & (UUID_SKIP - 1))) 129 if (expect_false (cur.seq >= seq_next_save))
126 write_uuid (); 130 {
131 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
132 write_uuid (UUID_GAP, false);
133 }
134
127 135
128 return uid; 136 return uid;
129} 137}
130 138
131void 139void
132init_uuid () 140UUID::init ()
133{ 141{
134 read_uuid (); 142 read_uuid ();
135} 143}
136 144
137/* 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. */
138static int 146static bool
139compare_ob_value_lists_one (const object *wants, const object *has) 147compare_ob_value_lists_one (const object *wants, const object *has)
140{ 148{
141 key_value *wants_field; 149 key_value *wants_field;
142 150
143 /* 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
151 key_value *has_field; 159 key_value *has_field;
152 160
153 /* Look for a field in has with the same key. */ 161 /* Look for a field in has with the same key. */
154 has_field = get_ob_key_link (has, wants_field->key); 162 has_field = get_ob_key_link (has, wants_field->key);
155 163
156 if (has_field == NULL) 164 if (!has_field)
157 {
158 /* No field with that name. */ 165 return 0; /* No field with that name. */
159 return FALSE;
160 }
161 166
162 /* Found the matching field. */ 167 /* Found the matching field. */
163 if (has_field->value != wants_field->value) 168 if (has_field->value != wants_field->value)
164 {
165 /* 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. */
166 return FALSE;
167 }
168 170
169 /* 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. */
170 } 172 }
171 173
172 /* 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. */
173 return TRUE; 175 return 1;
174} 176}
175 177
176/* Returns TRUE if ob1 has the same key_values as ob2. */ 178/* Returns TRUE if ob1 has the same key_values as ob2. */
177static int 179static bool
178compare_ob_value_lists (const object *ob1, const object *ob2) 180compare_ob_value_lists (const object *ob1, const object *ob2)
179{ 181{
180 /* 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,
181 * so we need to run the comparison *twice*. :( 183 * so we need to run the comparison *twice*. :(
182 */ 184 */
203 || ob1->speed != ob2->speed 205 || ob1->speed != ob2->speed
204 || ob1->value != ob2->value 206 || ob1->value != ob2->value
205 || ob1->name != ob2->name) 207 || ob1->name != ob2->name)
206 return 0; 208 return 0;
207 209
208 //TODO: this ain't working well, use nicer and correct overflow check 210 /* Do not merge objects if nrof would overflow. First part checks
209 /* 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
210 * 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
211 * used to store nrof). 213 * nrof values.
212 */ 214 */
213 if (ob1->nrof + ob2->nrof >= 1UL << 31) 215 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214 return 0; 216 return 0;
215 217
216 /* If the objects have been identified, set the BEEN_APPLIED flag. 218 /* If the objects have been identified, set the BEEN_APPLIED flag.
217 * 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
218 * 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
219 * 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
220 * flags lose any meaning. 222 * flags lose any meaning.
221 */ 223 */
222 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
250 || ob1->move_off != ob2->move_off 252 || ob1->move_off != ob2->move_off
251 || ob1->move_slow != ob2->move_slow 253 || ob1->move_slow != ob2->move_slow
252 || ob1->move_slow_penalty != ob2->move_slow_penalty) 254 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 255 return 0;
254 256
255 /* This is really a spellbook check - really, we should 257 /* This is really a spellbook check - we should in general
256 * check all objects in the inventory. 258 * not merge objects with real inventories, as splitting them
259 * is hard.
257 */ 260 */
258 if (ob1->inv || ob2->inv) 261 if (ob1->inv || ob2->inv)
259 { 262 {
260 /* if one object has inventory but the other doesn't, not equiv */ 263 if (!(ob1->inv && ob2->inv))
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 264 return 0; /* inventories differ in length */
262 return 0;
263 265
264 /* 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
265 if (!object::can_merge (ob1->inv, ob2->inv)) 269 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 270 return 0; /* inventory objects differ */
267 271
268 /* 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
269 * if it is valid. 273 * if it is valid.
270 */ 274 */
271 } 275 }
290 if (ob1->level != ob2->level) 294 if (ob1->level != ob2->level)
291 return 0; 295 return 0;
292 break; 296 break;
293 } 297 }
294 298
295 if (ob1->key_values != NULL || ob2->key_values != NULL) 299 if (ob1->key_values || ob2->key_values)
296 { 300 {
297 /* At least one of these has key_values. */ 301 /* At least one of these has key_values. */
298 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 302 if ((!ob1->key_values) != (!ob2->key_values))
299 /* One has fields, but the other one doesn't. */ 303 /* One has fields, but the other one doesn't. */
300 return 0; 304 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2)) 305 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 306 return 0;
303 } 307 }
304 308
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
307 { 310 {
308 ob1->optimise (); 311 ob1->optimise ();
309 ob2->optimise (); 312 ob2->optimise ();
310 313
311 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)
312 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 }
313 } 326 }
314 327
315 /* Everything passes, must be OK. */ 328 /* Everything passes, must be OK. */
316 return 1; 329 return 1;
317} 330}
318 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
319/* 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/*
320 * sum_weight() is a recursive function which calculates the weight 367 * this is a recursive function which calculates the weight
321 * 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
322 * containers are carrying, and sums it up. 369 * containers are carrying, and sums it up.
323 */ 370 */
324long 371void
325sum_weight (object *op) 372object::update_weight ()
326{ 373{
327 long sum; 374 sint32 sum = 0;
328 object *inv;
329 375
330 for (sum = 0, inv = op->inv; inv; inv = inv->below) 376 for (object *op = inv; op; op = op->below)
331 { 377 {
332 if (inv->inv) 378 if (op->inv)
333 sum_weight (inv); 379 op->update_weight ();
334 380
335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 381 sum += op->total_weight ();
336 } 382 }
337 383
338 if (op->type == CONTAINER && op->stats.Str) 384 carrying = weight_adjust (this, sum);
339 sum = (sum * (100 - op->stats.Str)) / 100;
340
341 if (op->carrying != sum)
342 op->carrying = sum;
343
344 return sum;
345}
346
347/**
348 * Return the outermost environment object for a given object.
349 */
350
351object *
352object_get_env_recursive (object *op)
353{
354 while (op->env != NULL)
355 op = op->env;
356 return op;
357} 385}
358 386
359/* 387/*
360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 388 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361 * Some error messages. 389 * Some error messages.
375/* 403/*
376 * 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
377 * multi-object 1 which is closest to the second object. 405 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 406 * If it's not a multi-object, it is returned.
379 */ 407 */
380
381object * 408object *
382get_nearest_part (object *op, const object *pl) 409get_nearest_part (object *op, const object *pl)
383{ 410{
384 object *tmp, *closest; 411 object *tmp, *closest;
385 int last_dist, i; 412 int last_dist, i;
421 break; 448 break;
422 449
423 return op; 450 return op;
424} 451}
425 452
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 453/*
433 * 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
434 * skill and experience objects. 455 * skill and experience objects.
456 * ACTUALLY NO! investigate! TODO
435 */ 457 */
436void 458void
437object::set_owner (object *owner) 459object::set_owner (object *owner)
438{ 460{
461 // allow objects which own objects
439 if (!owner) 462 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 463 while (owner->owner)
450 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 }
451 471
452 this->owner = owner; 472 this->owner = owner;
453} 473}
454 474
455void 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
456object::set_weapon (object *ob) 493object::change_weapon (object *ob)
457{ 494{
458 if (current_weapon == ob) 495 if (current_weapon == ob)
459 return; 496 return true;
460
461 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
462 497
463 if (chosen_skill) 498 if (chosen_skill)
464 chosen_skill->flag [FLAG_APPLIED] = false; 499 chosen_skill->flag [FLAG_APPLIED] = false;
465 500
466 current_weapon = ob; 501 current_weapon = ob;
467 chosen_skill = ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); 502 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
468 503
469 if (chosen_skill) 504 if (chosen_skill)
470 chosen_skill->flag [FLAG_APPLIED] = true; 505 chosen_skill->flag [FLAG_APPLIED] = true;
471 506
472 update_stats (); 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;
473} 539}
474 540
475/* Zero the key_values on op, decrementing the shared-string 541/* Zero the key_values on op, decrementing the shared-string
476 * refcounts and freeing the links. 542 * refcounts and freeing the links.
477 */ 543 */
541object::copy_to (object *dst) 607object::copy_to (object *dst)
542{ 608{
543 *dst = *this; 609 *dst = *this;
544 610
545 if (speed < 0) 611 if (speed < 0)
546 dst->speed_left = speed_left - rndm (); 612 dst->speed_left -= rndm ();
547 613
548 dst->set_speed (dst->speed); 614 dst->set_speed (dst->speed);
549} 615}
550 616
551void 617void
552object::instantiate () 618object::instantiate ()
553{ 619{
554 if (!uuid.seq) // HACK 620 if (!uuid.seq) // HACK
555 uuid = gen_uuid (); 621 uuid = UUID::gen ();
556 622
557 speed_left = -0.1f; 623 speed_left = -0.1f;
558 /* 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
559 * 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.
560 * 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
719static int object_count; 785static int object_count;
720 786
721void object::link () 787void object::link ()
722{ 788{
723 assert (!index);//D 789 assert (!index);//D
724 uuid = gen_uuid (); 790 uuid = UUID::gen ();
725 count = ++object_count; 791 count = ++object_count;
726 792
727 refcnt_inc (); 793 refcnt_inc ();
728 objects.insert (this); 794 objects.insert (this);
729} 795}
813 * if some form of movement is allowed, let objects 879 * if some form of movement is allowed, let objects
814 * drop on that space. 880 * drop on that space.
815 */ 881 */
816 if (!drop_to_ground 882 if (!drop_to_ground
817 || !map 883 || !map
818 || map->in_memory != MAP_IN_MEMORY 884 || map->in_memory != MAP_ACTIVE
819 || map->nodrop 885 || map->nodrop
820 || ms ().move_block == MOVE_ALL) 886 || ms ().move_block == MOVE_ALL)
821 { 887 {
822 while (inv) 888 while (inv)
823 { 889 {
878 944
879 if (!freed_map) 945 if (!freed_map)
880 { 946 {
881 freed_map = new maptile; 947 freed_map = new maptile;
882 948
949 freed_map->path = "<freed objects map>";
883 freed_map->name = "/internal/freed_objects_map"; 950 freed_map->name = "/internal/freed_objects_map";
884 freed_map->width = 3; 951 freed_map->width = 3;
885 freed_map->height = 3; 952 freed_map->height = 3;
953 freed_map->nodrop = 1;
886 954
887 freed_map->alloc (); 955 freed_map->alloc ();
888 freed_map->in_memory = MAP_IN_MEMORY; 956 freed_map->in_memory = MAP_ACTIVE;
889 } 957 }
890 958
891 map = freed_map; 959 map = freed_map;
892 x = 1; 960 x = 1;
893 y = 1; 961 y = 1;
894 } 962 }
895 963
896 head = 0;
897
898 if (more) 964 if (more)
899 { 965 {
900 more->destroy (); 966 more->destroy ();
901 more = 0; 967 more = 0;
902 } 968 }
903 969
970 head = 0;
971
904 // clear those pointers that likely might have circular references to us 972 // clear those pointers that likely might cause circular references
905 owner = 0; 973 owner = 0;
906 enemy = 0; 974 enemy = 0;
907 attacked_by = 0; 975 attacked_by = 0;
976 current_weapon = 0;
908} 977}
909 978
910void 979void
911object::destroy (bool destroy_inventory) 980object::destroy (bool destroy_inventory)
912{ 981{
914 return; 983 return;
915 984
916 if (destroy_inventory) 985 if (destroy_inventory)
917 destroy_inv (false); 986 destroy_inv (false);
918 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
919 attachable::destroy (); 994 attachable::destroy ();
920}
921
922/*
923 * sub_weight() recursively (outwards) subtracts a number from the
924 * weight of an object (and what is carried by it's environment(s)).
925 */
926void
927sub_weight (object *op, signed long weight)
928{
929 while (op != NULL)
930 {
931 if (op->type == CONTAINER)
932 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
933
934 op->carrying -= weight;
935 op = op->env;
936 }
937} 995}
938 996
939/* op->remove (): 997/* op->remove ():
940 * 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
941 * 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
1037 if (map->in_memory == MAP_SAVING) 1095 if (map->in_memory == MAP_SAVING)
1038 return; 1096 return;
1039 1097
1040 int check_walk_off = !flag [FLAG_NO_APPLY]; 1098 int check_walk_off = !flag [FLAG_NO_APPLY];
1041 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
1042 for (tmp = ms.bot; tmp; tmp = tmp->above) 1112 for (tmp = ms.bot; tmp; tmp = tmp->above)
1043 { 1113 {
1044 /* 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
1045 * being removed. 1115 * being removed.
1046 */ 1116 */
1047
1048 if (tmp->type == PLAYER && tmp != this)
1049 {
1050 /* If a container that the player is currently using somehow gets
1051 * removed (most likely destroyed), update the player view
1052 * appropriately.
1053 */
1054 if (tmp->container == this)
1055 {
1056 flag [FLAG_APPLIED] = 0;
1057 tmp->container = 0;
1058 }
1059
1060 if (tmp->contr->ns)
1061 tmp->contr->ns->floorbox_update ();
1062 }
1063 1117
1064 /* See if object moving off should effect something */ 1118 /* See if object moving off should effect something */
1065 if (check_walk_off 1119 if (check_walk_off
1066 && ((move_type & tmp->move_off) 1120 && ((move_type & tmp->move_off)
1067 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1121 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1070 1124
1071 if (destroyed ()) 1125 if (destroyed ())
1072 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 ());
1073 } 1127 }
1074 1128
1075 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1076 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1077 if (tmp->above == tmp)
1078 tmp->above = 0;
1079
1080 last = tmp; 1129 last = tmp;
1081 } 1130 }
1082 1131
1083 /* last == NULL if there are no objects on this space */ 1132 /* last == NULL if there are no objects on this space */
1084 //TODO: this makes little sense, why only update the topmost object? 1133 //TODO: this makes little sense, why only update the topmost object?
1104merge_ob (object *op, object *top) 1153merge_ob (object *op, object *top)
1105{ 1154{
1106 if (!op->nrof) 1155 if (!op->nrof)
1107 return 0; 1156 return 0;
1108 1157
1109 if (top) 1158 if (!top)
1110 for (top = op; top && top->above; top = top->above) 1159 for (top = op; top && top->above; top = top->above)
1111 ; 1160 ;
1112 1161
1113 for (; top; top = top->below) 1162 for (; top; top = top->below)
1114 { 1163 {
1135 if (more) 1184 if (more)
1136 return; 1185 return;
1137 1186
1138 object *prev = this; 1187 object *prev = this;
1139 1188
1140 for (archetype *at = arch->more; at; at = at->more) 1189 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1141 { 1190 {
1142 object *op = arch_to_object (at); 1191 object *op = arch_to_object (at);
1143 1192
1144 op->name = name; 1193 op->name = name;
1145 op->name_pl = name_pl; 1194 op->name_pl = name_pl;
1159object * 1208object *
1160insert_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)
1161{ 1210{
1162 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1211 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1163 { 1212 {
1164 tmp->x = x + tmp->arch->clone.x; 1213 tmp->x = x + tmp->arch->x;
1165 tmp->y = y + tmp->arch->clone.y; 1214 tmp->y = y + tmp->arch->y;
1166 } 1215 }
1167 1216
1168 return insert_ob_in_map (op, m, originator, flag); 1217 return insert_ob_in_map (op, m, originator, flag);
1169} 1218}
1170 1219
1191object * 1240object *
1192insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1241insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1193{ 1242{
1194 assert (!op->flag [FLAG_FREED]); 1243 assert (!op->flag [FLAG_FREED]);
1195 1244
1196 object *tmp, *top, *floor = NULL; 1245 object *top, *floor = NULL;
1197 1246
1198 op->remove (); 1247 op->remove ();
1199
1200#if 0
1201 if (!m->active != !op->active)
1202 if (m->active)
1203 op->activate_recursive ();
1204 else
1205 op->deactivate_recursive ();
1206#endif
1207
1208 if (out_of_map (m, op->x, op->y))
1209 {
1210 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1211#ifdef MANY_CORES
1212 /* Better to catch this here, as otherwise the next use of this object
1213 * is likely to cause a crash. Better to find out where it is getting
1214 * improperly inserted.
1215 */
1216 abort ();
1217#endif
1218 return op;
1219 }
1220
1221 if (object *more = op->more)
1222 {
1223 if (!insert_ob_in_map (more, m, originator, flag))
1224 {
1225 if (!op->head)
1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227
1228 return 0;
1229 }
1230 }
1231
1232 CLEAR_FLAG (op, FLAG_REMOVED);
1233 1248
1234 /* Ideally, the caller figures this out. However, it complicates a lot 1249 /* Ideally, the caller figures this out. However, it complicates a lot
1235 * 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
1236 * need extra work 1251 * need extra work
1237 */ 1252 */
1238 if (!xy_normalise (m, op->x, op->y)) 1253 if (!xy_normalise (m, op->x, op->y))
1254 {
1255 op->destroy ();
1239 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);
1240 1264
1241 op->map = m; 1265 op->map = m;
1242 mapspace &ms = op->ms (); 1266 mapspace &ms = op->ms ();
1243 1267
1244 /* this has to be done after we translate the coordinates. 1268 /* this has to be done after we translate the coordinates.
1245 */ 1269 */
1246 if (op->nrof && !(flag & INS_NO_MERGE)) 1270 if (op->nrof && !(flag & INS_NO_MERGE))
1247 for (tmp = ms.bot; tmp; tmp = tmp->above) 1271 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1248 if (object::can_merge (op, tmp)) 1272 if (object::can_merge (op, tmp))
1249 { 1273 {
1250 op->nrof += tmp->nrof; 1274 op->nrof += tmp->nrof;
1251 tmp->destroy (); 1275 tmp->destroy ();
1252 } 1276 }
1279 else 1303 else
1280 { 1304 {
1281 top = ms.bot; 1305 top = ms.bot;
1282 1306
1283 /* If there are other objects, then */ 1307 /* If there are other objects, then */
1284 if ((!(flag & INS_MAP_LOAD)) && top) 1308 if (top)
1285 { 1309 {
1286 object *last = 0; 1310 object *last = 0;
1287 1311
1288 /* 1312 /*
1289 * 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.
1342 if (last && last->below && last != floor) 1366 if (last && last->below && last != floor)
1343 top = last->below; 1367 top = last->below;
1344 } 1368 }
1345 } /* If objects on this space */ 1369 } /* If objects on this space */
1346 1370
1347 if (flag & INS_MAP_LOAD)
1348 top = ms.top;
1349
1350 if (flag & INS_ABOVE_FLOOR_ONLY) 1371 if (flag & INS_ABOVE_FLOOR_ONLY)
1351 top = floor; 1372 top = floor;
1352 1373
1353 /* 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.
1354 */ 1375 */
1386 op->map->touch (); 1407 op->map->touch ();
1387 } 1408 }
1388 1409
1389 op->map->dirty = true; 1410 op->map->dirty = true;
1390 1411
1391 /* If we have a floor, we know the player, if any, will be above
1392 * it, so save a few ticks and start from there.
1393 */
1394 if (!(flag & INS_MAP_LOAD))
1395 if (object *pl = ms.player ()) 1412 if (object *pl = ms.player ())
1396 if (pl->contr->ns)
1397 pl->contr->ns->floorbox_update (); 1413 pl->contr->ns->floorbox_update ();
1398 1414
1399 /* If this object glows, it may affect lighting conditions that are 1415 /* If this object glows, it may affect lighting conditions that are
1400 * 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
1401 * 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
1402 * on the map will get recalculated. The players could very well 1418 * on the map will get recalculated. The players could very well
1421 * blocked() and wall() work properly), and these flags are updated by 1437 * blocked() and wall() work properly), and these flags are updated by
1422 * update_object(). 1438 * update_object().
1423 */ 1439 */
1424 1440
1425 /* 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 */
1426 if (!(flag & INS_NO_WALK_ON) && !op->head) 1442 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1427 { 1443 {
1428 if (check_move_on (op, originator)) 1444 if (check_move_on (op, originator))
1429 return 0; 1445 return 0;
1430 1446
1431 /* 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
1432 * walk on's. 1448 * walk on's.
1433 */ 1449 */
1434 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1450 for (object *tmp = op->more; tmp; tmp = tmp->more)
1435 if (check_move_on (tmp, originator)) 1451 if (check_move_on (tmp, originator))
1436 return 0; 1452 return 0;
1437 } 1453 }
1438 1454
1439 return op; 1455 return op;
1449 object *tmp, *tmp1; 1465 object *tmp, *tmp1;
1450 1466
1451 /* first search for itself and remove any old instances */ 1467 /* first search for itself and remove any old instances */
1452 1468
1453 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1469 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1454 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1470 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1455 tmp->destroy (); 1471 tmp->destroy ();
1456 1472
1457 tmp1 = arch_to_object (archetype::find (arch_string)); 1473 tmp1 = arch_to_object (archetype::find (arch_string));
1458 1474
1459 tmp1->x = op->x; 1475 tmp1->x = op->x;
1462} 1478}
1463 1479
1464object * 1480object *
1465object::insert_at (object *where, object *originator, int flags) 1481object::insert_at (object *where, object *originator, int flags)
1466{ 1482{
1483 if (where->env)
1484 return where->env->insert (this);
1485 else
1467 return where->map->insert (this, where->x, where->y, originator, flags); 1486 return where->map->insert (this, where->x, where->y, originator, flags);
1468} 1487}
1469 1488
1470/* 1489/*
1471 * 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
1472 * is returned contains nr objects, and the remaining parts contains 1491 * is returned contains nr objects, and the remaining parts contains
1492 orig_ob->destroy (1); 1511 orig_ob->destroy (1);
1493 else if (!is_removed) 1512 else if (!is_removed)
1494 { 1513 {
1495 if (orig_ob->env != NULL) 1514 if (orig_ob->env != NULL)
1496 sub_weight (orig_ob->env, orig_ob->weight * nr); 1515 sub_weight (orig_ob->env, orig_ob->weight * nr);
1497 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)
1498 { 1517 {
1499 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.");
1500 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");
1501 return NULL; 1520 return NULL;
1502 } 1521 }
1592 op->destroy (); 1611 op->destroy ();
1593 return 0; 1612 return 0;
1594 } 1613 }
1595} 1614}
1596 1615
1597/*
1598 * add_weight(object, weight) adds the specified weight to an object,
1599 * and also updates how much the environment(s) is/are carrying.
1600 */
1601void
1602add_weight (object *op, signed long weight)
1603{
1604 while (op != NULL)
1605 {
1606 if (op->type == CONTAINER)
1607 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1608
1609 op->carrying += weight;
1610 op = op->env;
1611 }
1612}
1613
1614object * 1616object *
1615insert_ob_in_ob (object *op, object *where) 1617insert_ob_in_ob (object *op, object *where)
1616{ 1618{
1617 if (!where) 1619 if (!where)
1618 { 1620 {
1620 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);
1621 free (dump); 1623 free (dump);
1622 return op; 1624 return op;
1623 } 1625 }
1624 1626
1625 if (where->head) 1627 if (where->head_ () != where)
1626 { 1628 {
1627 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");
1628 where = where->head; 1630 where = where->head;
1629 } 1631 }
1630 1632
1631 return where->insert (op); 1633 return where->insert (op);
1632} 1634}
1640 * be != op, if items are merged. -Tero 1642 * be != op, if items are merged. -Tero
1641 */ 1643 */
1642object * 1644object *
1643object::insert (object *op) 1645object::insert (object *op)
1644{ 1646{
1645 object *tmp, *otmp;
1646
1647 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1647 if (!QUERY_FLAG (op, FLAG_REMOVED))
1648 op->remove (); 1648 op->remove ();
1649 1649
1650 if (op->more) 1650 if (op->more)
1651 { 1651 {
1653 return op; 1653 return op;
1654 } 1654 }
1655 1655
1656 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1656 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1657 CLEAR_FLAG (op, FLAG_REMOVED); 1657 CLEAR_FLAG (op, FLAG_REMOVED);
1658
1658 if (op->nrof) 1659 if (op->nrof)
1659 { 1660 {
1660 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1661 for (object *tmp = inv; tmp; tmp = tmp->below)
1661 if (object::can_merge (tmp, op)) 1662 if (object::can_merge (tmp, op))
1662 { 1663 {
1663 /* return the original object and remove inserted object 1664 /* return the original object and remove inserted object
1664 (client needs the original object) */ 1665 (client needs the original object) */
1665 tmp->nrof += op->nrof; 1666 tmp->nrof += op->nrof;
1684 add_weight (this, op->weight * op->nrof); 1685 add_weight (this, op->weight * op->nrof);
1685 } 1686 }
1686 else 1687 else
1687 add_weight (this, (op->weight + op->carrying)); 1688 add_weight (this, (op->weight + op->carrying));
1688 1689
1689 otmp = this->in_player (); 1690 if (object *otmp = this->in_player ())
1690 if (otmp && otmp->contr)
1691 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1691 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1692 otmp->update_stats (); 1692 otmp->update_stats ();
1693 1693
1694 op->owner = 0; // its his/hers now. period.
1694 op->map = 0; 1695 op->map = 0;
1695 op->env = this; 1696 op->env = this;
1696 op->above = 0; 1697 op->above = 0;
1697 op->below = 0; 1698 op->below = 0;
1698 op->x = 0, op->y = 0; 1699 op->x = op->y = 0;
1699 1700
1700 /* 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 */
1701 if ((op->glow_radius != 0) && map) 1702 if (op->glow_radius && map)
1702 { 1703 {
1703#ifdef DEBUG_LIGHTS 1704#ifdef DEBUG_LIGHTS
1704 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);
1705#endif /* DEBUG_LIGHTS */ 1706#endif /* DEBUG_LIGHTS */
1706 if (map->darkness) 1707 if (map->darkness)
1940 * activate recursively a flag on an object inventory 1941 * activate recursively a flag on an object inventory
1941 */ 1942 */
1942void 1943void
1943flag_inv (object *op, int flag) 1944flag_inv (object *op, int flag)
1944{ 1945{
1945 if (op->inv)
1946 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1946 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1947 { 1947 {
1948 SET_FLAG (tmp, flag); 1948 SET_FLAG (tmp, flag);
1949 flag_inv (tmp, flag); 1949 flag_inv (tmp, flag);
1950 } 1950 }
1951} 1951}
1952 1952
1953/* 1953/*
1954 * deactivate recursively a flag on an object inventory 1954 * deactivate recursively a flag on an object inventory
1955 */ 1955 */
1956void 1956void
1957unflag_inv (object *op, int flag) 1957unflag_inv (object *op, int flag)
1958{ 1958{
1959 if (op->inv)
1960 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1959 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1961 { 1960 {
1962 CLEAR_FLAG (tmp, flag); 1961 CLEAR_FLAG (tmp, flag);
1963 unflag_inv (tmp, flag); 1962 unflag_inv (tmp, flag);
1964 } 1963 }
1965}
1966
1967/*
1968 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1969 * all it's inventory (recursively).
1970 * If checksums are used, a player will get set_cheat called for
1971 * him/her-self and all object carried by a call to this function.
1972 */
1973void
1974set_cheat (object *op)
1975{
1976 SET_FLAG (op, FLAG_WAS_WIZ);
1977 flag_inv (op, FLAG_WAS_WIZ);
1978} 1964}
1979 1965
1980/* 1966/*
1981 * 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
1982 * 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
1984 * to search (see the freearr_x/y[] definition). 1970 * to search (see the freearr_x/y[] definition).
1985 * It returns a random choice among the alternatives found. 1971 * It returns a random choice among the alternatives found.
1986 * 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
1987 * does all 4 immediate directions). This returns the index into the 1973 * does all 4 immediate directions). This returns the index into the
1988 * 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)
1989 * Note - this only checks to see if there is space for the head of the
1990 * object - if it is a multispace object, this should be called for all
1991 * pieces.
1992 * Note2: This function does correctly handle tiled maps, but does not 1975 * Note: This function does correctly handle tiled maps, but does not
1993 * inform the caller. However, insert_ob_in_map will update as 1976 * inform the caller. However, insert_ob_in_map will update as
1994 * 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.
1995 * 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
1996 * 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
1997 * 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
1999 * customized, changed states, etc. 1982 * customized, changed states, etc.
2000 */ 1983 */
2001int 1984int
2002find_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)
2003{ 1986{
1987 int altern[SIZEOFFREE];
2004 int index = 0, flag; 1988 int index = 0, flag;
2005 int altern[SIZEOFFREE];
2006 1989
2007 for (int i = start; i < stop; i++) 1990 for (int i = start; i < stop; i++)
2008 { 1991 {
2009 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1992 mapxy pos (m, x, y); pos.move (i);
2010 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 {
2011 altern [index++] = i; 2008 altern [index++] = i;
2009 continue;
2010 }
2012 2011
2013 /* 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.
2014 * 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.
2015 * 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 -
2016 * 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
2017 * 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
2018 * to only the spaces immediately surrounding the target area, and 2017 * to only the spaces immediately surrounding the target area, and
2019 * won't look 2 spaces south of the target space. 2018 * won't look 2 spaces south of the target space.
2020 */ 2019 */
2021 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2020 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2021 {
2022 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;
2023 } 2036 }
2024 2037
2025 if (!index) 2038 if (!index)
2026 return -1; 2039 return -1;
2027 2040
2036 */ 2049 */
2037int 2050int
2038find_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)
2039{ 2052{
2040 for (int i = 0; i < SIZEOFFREE; i++) 2053 for (int i = 0; i < SIZEOFFREE; i++)
2041 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]))
2042 return i; 2055 return i;
2043 2056
2044 return -1; 2057 return -1;
2045} 2058}
2046 2059
2100 object *tmp; 2113 object *tmp;
2101 maptile *mp; 2114 maptile *mp;
2102 2115
2103 MoveType blocked, move_type; 2116 MoveType blocked, move_type;
2104 2117
2105 if (exclude && exclude->head) 2118 if (exclude && exclude->head_ () != exclude)
2106 { 2119 {
2107 exclude = exclude->head; 2120 exclude = exclude->head;
2108 move_type = exclude->move_type; 2121 move_type = exclude->move_type;
2109 } 2122 }
2110 else 2123 else
2133 max = maxfree[i]; 2146 max = maxfree[i];
2134 else if (mflags & P_IS_ALIVE) 2147 else if (mflags & P_IS_ALIVE)
2135 { 2148 {
2136 for (tmp = ms.bot; tmp; tmp = tmp->above) 2149 for (tmp = ms.bot; tmp; tmp = tmp->above)
2137 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2150 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2138 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2151 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2139 break; 2152 break;
2140 2153
2141 if (tmp) 2154 if (tmp)
2142 return freedir[i]; 2155 return freedir[i];
2143 } 2156 }
2323 * 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
2324 * core dumps if they do. 2337 * core dumps if they do.
2325 * 2338 *
2326 * 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)
2327 */ 2340 */
2328
2329int 2341int
2330can_pick (const object *who, const object *item) 2342can_pick (const object *who, const object *item)
2331{ 2343{
2332 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2344 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2333 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2345 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2338 * create clone from object to another 2350 * create clone from object to another
2339 */ 2351 */
2340object * 2352object *
2341object_create_clone (object *asrc) 2353object_create_clone (object *asrc)
2342{ 2354{
2343 object *dst = 0, *tmp, *src, *part, *prev, *item; 2355 object *dst = 0, *tmp, *src, *prev, *item;
2344 2356
2345 if (!asrc) 2357 if (!asrc)
2346 return 0; 2358 return 0;
2347 2359
2348 src = asrc;
2349 if (src->head)
2350 src = src->head; 2360 src = asrc->head_ ();
2351 2361
2352 prev = 0; 2362 prev = 0;
2353 for (part = src; part; part = part->more) 2363 for (object *part = src; part; part = part->more)
2354 { 2364 {
2355 tmp = part->clone (); 2365 tmp = part->clone ();
2356 tmp->x -= src->x; 2366 tmp->x -= src->x;
2357 tmp->y -= src->y; 2367 tmp->y -= src->y;
2358 2368
2471 /* Basically, if the archetype has this key set, 2481 /* Basically, if the archetype has this key set,
2472 * we need to store the null value so when we save 2482 * we need to store the null value so when we save
2473 * it, we save the empty value so that when we load, 2483 * it, we save the empty value so that when we load,
2474 * we get this value back again. 2484 * we get this value back again.
2475 */ 2485 */
2476 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2486 if (get_ob_key_link (op->arch, canonical_key))
2477 field->value = 0; 2487 field->value = 0;
2478 else 2488 else
2479 { 2489 {
2480 if (last) 2490 if (last)
2481 last->next = field->next; 2491 last->next = field->next;
2550 } 2560 }
2551 else 2561 else
2552 item = item->env; 2562 item = item->env;
2553} 2563}
2554 2564
2555
2556const char * 2565const char *
2557object::flag_desc (char *desc, int len) const 2566object::flag_desc (char *desc, int len) const
2558{ 2567{
2559 char *p = desc; 2568 char *p = desc;
2560 bool first = true; 2569 bool first = true;
2587{ 2596{
2588 char flagdesc[512]; 2597 char flagdesc[512];
2589 char info2[256 * 4]; 2598 char info2[256 * 4];
2590 char *p = info; 2599 char *p = info;
2591 2600
2592 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}",
2593 count, uuid.seq, 2602 count,
2603 uuid.c_str (),
2594 &name, 2604 &name,
2595 title ? "\",title:\"" : "", 2605 title ? "\",title:\"" : "",
2596 title ? (const char *)title : "", 2606 title ? (const char *)title : "",
2597 flag_desc (flagdesc, 512), type); 2607 flag_desc (flagdesc, 512), type);
2598 2608
2599 if (env) 2609 if (!this->flag[FLAG_REMOVED] && env)
2600 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2610 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2601 2611
2602 if (map) 2612 if (map)
2603 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);
2604 2614
2622} 2632}
2623 2633
2624const materialtype_t * 2634const materialtype_t *
2625object::dominant_material () const 2635object::dominant_material () const
2626{ 2636{
2627 if (materialtype_t *mat = name_to_material (materialname)) 2637 if (materialtype_t *mt = name_to_material (materialname))
2628 return mat; 2638 return mt;
2629 2639
2630 // omfg this is slow, this has to be temporary :)
2631 shstr unknown ("unknown");
2632
2633 return name_to_material (unknown); 2640 return name_to_material (shstr_unknown);
2634} 2641}
2635 2642
2636void 2643void
2637object::open_container (object *new_container) 2644object::open_container (object *new_container)
2638{ 2645{
2654 old_container->flag [FLAG_APPLIED] = 0; 2661 old_container->flag [FLAG_APPLIED] = 0;
2655 container = 0; 2662 container = 0;
2656 2663
2657 esrv_update_item (UPD_FLAGS, this, old_container); 2664 esrv_update_item (UPD_FLAGS, this, old_container);
2658 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"));
2659 } 2667 }
2660 2668
2661 if (new_container) 2669 if (new_container)
2662 { 2670 {
2663 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2671 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2679 new_container->flag [FLAG_APPLIED] = 1; 2687 new_container->flag [FLAG_APPLIED] = 1;
2680 container = new_container; 2688 container = new_container;
2681 2689
2682 esrv_update_item (UPD_FLAGS, this, new_container); 2690 esrv_update_item (UPD_FLAGS, this, new_container);
2683 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)
2684 } 2738 {
2739 if (object *pl = in_player ())
2740 pl->contr->play_sound (sound);
2741 }
2742 else
2743 map->play_sound (sound, x, y);
2685} 2744}
2686 2745
2687

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines