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.172 by root, Wed Aug 1 20:44:11 2007 UTC vs.
Revision 1.209 by root, Mon Apr 21 06:35:26 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27#include <global.h> 24#include <global.h>
28#include <stdio.h> 25#include <stdio.h>
29#include <sys/types.h> 26#include <sys/types.h>
30#include <sys/uio.h> 27#include <sys/uio.h>
31#include <object.h> 28#include <object.h>
33#include <sproto.h> 30#include <sproto.h>
34#include <loader.h> 31#include <loader.h>
35 32
36#include <bitset> 33#include <bitset>
37 34
38int nrofallocobjects = 0; 35UUID UUID::cur;
39static UUID uuid; 36static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
41 38
42objectvec objects; 39objectvec objects;
43activevec actives; 40activevec actives;
44 41
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, 42short freearr_x[SIZEOFFREE] = {
43 0,
44 0, 1, 1, 1, 0, -1, -1, -1,
45 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 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
47}; 47};
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, 48short freearr_y[SIZEOFFREE] = {
49 0,
50 -1, -1, 0, 1, 1, 1, 0, -1,
51 -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 52 -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}; 53};
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, 54int maxfree[SIZEOFFREE] = {
55 0,
56 9, 10, 13, 14, 17, 18, 21, 22,
57 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 58 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}; 59};
54int freedir[SIZEOFFREE] = { 60int 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, 61 0,
62 1, 2, 3, 4, 5, 6, 7, 8,
63 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 64 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}; 65};
58 66
59static void 67static void
60write_uuid (void) 68write_uuid (uval64 skip, bool sync)
61{ 69{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 70 CALL_BEGIN (2);
63 71 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 72 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 73 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 74 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} 75}
79 76
80static void 77static void
81read_uuid (void) 78read_uuid (void)
82{ 79{
83 char filename[MAX_BUF]; 80 char filename[MAX_BUF];
84 81
85 sprintf (filename, "%s/uuid", settings.localdir); 82 sprintf (filename, "%s/uuid", settings.localdir);
86 83
84 seq_next_save = 0;
85
87 FILE *fp; 86 FILE *fp;
88 87
89 if (!(fp = fopen (filename, "r"))) 88 if (!(fp = fopen (filename, "r")))
90 { 89 {
91 if (errno == ENOENT) 90 if (errno == ENOENT)
92 { 91 {
93 LOG (llevInfo, "RESET uid to 1\n"); 92 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 93 UUID::cur.seq = 0;
95 write_uuid (); 94 write_uuid (UUID_GAP, true);
96 return; 95 return;
97 } 96 }
98 97
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 99 _exit (1);
101 } 100 }
102 101
103 int version; 102 UUID::BUF buf;
104 unsigned long long uid; 103 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 104 fgets (buf, sizeof (buf), fp);
105
106 if (!UUID::cur.parse (buf))
106 { 107 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 108 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 109 _exit (1);
109 } 110 }
110 111
111 uuid.seq = uid; 112 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 113
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 114 write_uuid (UUID_GAP, true);
114 fclose (fp); 115 fclose (fp);
115} 116}
116 117
117UUID 118UUID
118gen_uuid () 119UUID::gen ()
119{ 120{
120 UUID uid; 121 UUID uid;
121 122
122 uid.seq = ++uuid.seq; 123 uid.seq = ++cur.seq;
123 124
124 if (!(uuid.seq & (UUID_SKIP - 1))) 125 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 126 {
127 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
128 write_uuid (UUID_GAP, false);
129 }
130
126 131
127 return uid; 132 return uid;
128} 133}
129 134
130void 135void
131init_uuid () 136UUID::init ()
132{ 137{
133 read_uuid (); 138 read_uuid ();
134} 139}
135 140
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 141/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137static int 142static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 143compare_ob_value_lists_one (const object *wants, const object *has)
139{ 144{
140 key_value *wants_field; 145 key_value *wants_field;
141 146
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 147 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
150 key_value *has_field; 155 key_value *has_field;
151 156
152 /* Look for a field in has with the same key. */ 157 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key); 158 has_field = get_ob_key_link (has, wants_field->key);
154 159
155 if (has_field == NULL) 160 if (!has_field)
156 {
157 /* No field with that name. */ 161 return 0; /* No field with that name. */
158 return FALSE;
159 }
160 162
161 /* Found the matching field. */ 163 /* Found the matching field. */
162 if (has_field->value != wants_field->value) 164 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */ 165 return 0; /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167 166
168 /* If we get here, we found a match. Now for the next field in wants. */ 167 /* If we get here, we found a match. Now for the next field in wants. */
169 } 168 }
170 169
171 /* If we get here, every field in wants has a matching field in has. */ 170 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 171 return 1;
173} 172}
174 173
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 174/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 175static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 176compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 177{
179 /* However, there may be fields in has which aren't partnered in wants, 178 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 179 * so we need to run the comparison *twice*. :(
181 */ 180 */
202 || ob1->speed != ob2->speed 201 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 202 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 203 || ob1->name != ob2->name)
205 return 0; 204 return 0;
206 205
207 //TODO: this ain't working well, use nicer and correct overflow check 206 /* 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 207 * for unsigned overflow (2c), second part checks whether the result
209 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * would fit into a 32 bit signed int, which is often used to hold
210 * used to store nrof). 209 * nrof values.
211 */ 210 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 212 return 0;
214 213
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 214 /* 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 215 * 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 216 * 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 217 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 218 * flags lose any meaning.
220 */ 219 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 220 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223 222
224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226 225
227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 226 if (ob1->arch->name != ob2->arch->name
228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 227 || ob1->name != ob2->name
230 || ob1->title != ob2->title 228 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 229 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 230 || ob1->weight != ob2->weight
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235 || ob1->attacktype != ob2->attacktype 231 || ob1->attacktype != ob2->attacktype
236 || ob1->magic != ob2->magic 232 || ob1->magic != ob2->magic
237 || ob1->slaying != ob2->slaying 233 || ob1->slaying != ob2->slaying
238 || ob1->skill != ob2->skill 234 || ob1->skill != ob2->skill
239 || ob1->value != ob2->value 235 || ob1->value != ob2->value
246 || ob1->move_block != ob2->move_block 242 || ob1->move_block != ob2->move_block
247 || ob1->move_allow != ob2->move_allow 243 || ob1->move_allow != ob2->move_allow
248 || ob1->move_on != ob2->move_on 244 || ob1->move_on != ob2->move_on
249 || ob1->move_off != ob2->move_off 245 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 246 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 247 || ob1->move_slow_penalty != ob2->move_slow_penalty
248 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
249 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252 return 0; 250 return 0;
253 251
252 if ((ob1->flag ^ ob2->flag)
253 .reset (FLAG_INV_LOCKED)
254 .reset (FLAG_CLIENT_SENT)
255 .reset (FLAG_REMOVED)
256 .any ())
257 return 0;
258
254 /* This is really a spellbook check - really, we should 259 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 260 * not merge objects with real inventories, as splitting them
261 * is hard.
256 */ 262 */
257 if (ob1->inv || ob2->inv) 263 if (ob1->inv || ob2->inv)
258 { 264 {
259 /* if one object has inventory but the other doesn't, not equiv */ 265 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 266 return 0; /* inventories differ in length */
261 return 0;
262 267
263 /* Now check to see if the two inventory objects could merge */ 268 if (ob1->inv->below || ob2->inv->below)
269 return 0; /* more than one object in inv */
270
264 if (!object::can_merge (ob1->inv, ob2->inv)) 271 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 272 return 0; /* inventory objects differ */
266 273
267 /* inventory ok - still need to check rest of this object to see 274 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 275 * if it is valid.
269 */ 276 */
270 } 277 }
289 if (ob1->level != ob2->level) 296 if (ob1->level != ob2->level)
290 return 0; 297 return 0;
291 break; 298 break;
292 } 299 }
293 300
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 301 if (ob1->key_values || ob2->key_values)
295 { 302 {
296 /* At least one of these has key_values. */ 303 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 304 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 305 return 0; /* One has fields, but the other one doesn't. */
299 return 0; 306
300 else if (!compare_ob_value_lists (ob1, ob2)) 307 if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 308 return 0;
302 } 309 }
303 310
304 if (ob1->self || ob2->self) 311 if (ob1->self || ob2->self)
305 { 312 {
306 ob1->optimise (); 313 ob1->optimise ();
307 ob2->optimise (); 314 ob2->optimise ();
308 315
309 if (ob1->self || ob2->self) 316 if (ob1->self || ob2->self)
317 {
318 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
319 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
320
321 if (k1 != k2)
322 return 0;
323
324 if (k1 == 0)
325 return 1;
326
310 if (!cfperl_can_merge (ob1, ob2)) 327 if (!cfperl_can_merge (ob1, ob2))
311 return 0; 328 return 0;
329 }
312 } 330 }
313 331
314 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
315 return 1; 333 return 1;
316} 334}
317 335
336// adjust weight per container type ("of holding")
337static sint32
338weight_adjust (object *op, sint32 weight)
339{
340 return op->type == CONTAINER
341 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342 : weight;
343}
344
318/* 345/*
346 * adjust_weight(object, weight) adds the specified weight to an object,
347 * and also updates how much the environment(s) is/are carrying.
348 */
349static void
350adjust_weight (object *op, sint32 weight)
351{
352 while (op)
353 {
354 weight = weight_adjust (op, weight);
355
356 op->carrying += weight;
357 op = op->env;
358 }
359}
360
361/*
319 * sum_weight() is a recursive function which calculates the weight 362 * this is a recursive function which calculates the weight
320 * an object is carrying. It goes through in figures out how much 363 * an object is carrying. It goes through op and figures out how much
321 * containers are carrying, and sums it up. 364 * containers are carrying, and sums it up.
322 */ 365 */
323long 366void
324sum_weight (object *op) 367object::update_weight ()
325{ 368{
326 long sum; 369 sint32 sum = 0;
327 object *inv;
328 370
329 for (sum = 0, inv = op->inv; inv; inv = inv->below) 371 for (object *op = inv; op; op = op->below)
330 { 372 {
331 if (inv->inv) 373 if (op->inv)
332 sum_weight (inv); 374 op->update_weight ();
333 375
334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 376 sum += op->total_weight ();
335 } 377 }
336 378
337 if (op->type == CONTAINER && op->stats.Str) 379 carrying = weight_adjust (this, sum);
338 sum = (sum * (100 - op->stats.Str)) / 100;
339
340 if (op->carrying != sum)
341 op->carrying = sum;
342
343 return sum;
344} 380}
345 381
346/** 382/*
347 * Return the outermost environment object for a given object. 383 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
348 */
349
350object *
351object_get_env_recursive (object *op)
352{
353 while (op->env != NULL)
354 op = op->env;
355 return op;
356}
357
358/*
359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360 * Some error messages.
361 * The result of the dump is stored in the static global errmsg array.
362 */ 384 */
363char * 385char *
364dump_object (object *op) 386dump_object (object *op)
365{ 387{
366 if (!op) 388 if (!op)
374/* 396/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 397 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 398 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 399 * If it's not a multi-object, it is returned.
378 */ 400 */
379
380object * 401object *
381get_nearest_part (object *op, const object *pl) 402get_nearest_part (object *op, const object *pl)
382{ 403{
383 object *tmp, *closest; 404 object *tmp, *closest;
384 int last_dist, i; 405 int last_dist, i;
385 406
386 if (op->more == NULL) 407 if (!op->more)
387 return op; 408 return op;
409
388 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 410 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
411 tmp;
412 tmp = tmp->more)
389 if ((i = distance (tmp, pl)) < last_dist) 413 if ((i = distance (tmp, pl)) < last_dist)
390 closest = tmp, last_dist = i; 414 closest = tmp, last_dist = i;
415
391 return closest; 416 return closest;
392} 417}
393 418
394/* 419/*
395 * Returns the object which has the count-variable equal to the argument. 420 * Returns the object which has the count-variable equal to the argument.
421 * VERRRY slow.
396 */ 422 */
397object * 423object *
398find_object (tag_t i) 424find_object (tag_t i)
399{ 425{
400 for_all_objects (op) 426 for_all_objects (op)
420 break; 446 break;
421 447
422 return op; 448 return op;
423} 449}
424 450
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 451/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 452 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 453 * skill and experience objects.
454 * ACTUALLY NO! investigate! TODO
434 */ 455 */
435void 456void
436object::set_owner (object *owner) 457object::set_owner (object *owner)
437{ 458{
459 // allow objects which own objects
438 if (!owner) 460 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 461 while (owner->owner)
449 owner = owner->owner; 462 owner = owner->owner;
463
464 if (flag [FLAG_FREED])
465 {
466 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
467 return;
468 }
450 469
451 this->owner = owner; 470 this->owner = owner;
452} 471}
453 472
454int 473int
586object::copy_to (object *dst) 605object::copy_to (object *dst)
587{ 606{
588 *dst = *this; 607 *dst = *this;
589 608
590 if (speed < 0) 609 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 610 dst->speed_left -= rndm ();
592 611
593 dst->set_speed (dst->speed); 612 dst->set_speed (dst->speed);
594} 613}
595 614
596void 615void
597object::instantiate () 616object::instantiate ()
598{ 617{
599 if (!uuid.seq) // HACK 618 if (!uuid.seq) // HACK
600 uuid = gen_uuid (); 619 uuid = UUID::gen ();
601 620
602 speed_left = -0.1f; 621 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really 622 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything. 623 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting 624 * by doing so, when a monster is created, it has good starting
764static int object_count; 783static int object_count;
765 784
766void object::link () 785void object::link ()
767{ 786{
768 assert (!index);//D 787 assert (!index);//D
769 uuid = gen_uuid (); 788 uuid = UUID::gen ();
770 count = ++object_count; 789 count = ++object_count;
771 790
772 refcnt_inc (); 791 refcnt_inc ();
773 objects.insert (this); 792 objects.insert (this);
774} 793}
858 * if some form of movement is allowed, let objects 877 * if some form of movement is allowed, let objects
859 * drop on that space. 878 * drop on that space.
860 */ 879 */
861 if (!drop_to_ground 880 if (!drop_to_ground
862 || !map 881 || !map
863 || map->in_memory != MAP_IN_MEMORY 882 || map->in_memory != MAP_ACTIVE
864 || map->nodrop 883 || map->nodrop
865 || ms ().move_block == MOVE_ALL) 884 || ms ().move_block == MOVE_ALL)
866 { 885 {
867 while (inv) 886 while (inv)
868 { 887 {
923 942
924 if (!freed_map) 943 if (!freed_map)
925 { 944 {
926 freed_map = new maptile; 945 freed_map = new maptile;
927 946
947 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 948 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 949 freed_map->width = 3;
930 freed_map->height = 3; 950 freed_map->height = 3;
951 freed_map->nodrop = 1;
931 952
932 freed_map->alloc (); 953 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY; 954 freed_map->in_memory = MAP_ACTIVE;
934 } 955 }
935 956
936 map = freed_map; 957 map = freed_map;
937 x = 1; 958 x = 1;
938 y = 1; 959 y = 1;
960 return; 981 return;
961 982
962 if (destroy_inventory) 983 if (destroy_inventory)
963 destroy_inv (false); 984 destroy_inv (false);
964 985
986 if (is_head ())
965 if (sound_destroy) 987 if (sound_destroy)
966 play_sound (sound_destroy); 988 play_sound (sound_destroy);
967 else if (flag [FLAG_MONSTER]) 989 else if (flag [FLAG_MONSTER])
968 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 990 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
969 991
970 attachable::destroy (); 992 attachable::destroy ();
971}
972
973/*
974 * sub_weight() recursively (outwards) subtracts a number from the
975 * weight of an object (and what is carried by it's environment(s)).
976 */
977void
978sub_weight (object *op, signed long weight)
979{
980 while (op != NULL)
981 {
982 if (op->type == CONTAINER)
983 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
984
985 op->carrying -= weight;
986 op = op->env;
987 }
988} 993}
989 994
990/* op->remove (): 995/* op->remove ():
991 * This function removes the object op from the linked list of objects 996 * This function removes the object op from the linked list of objects
992 * which it is currently tied to. When this function is done, the 997 * which it is currently tied to. When this function is done, the
1013 * In this case, the object to be removed is in someones 1018 * In this case, the object to be removed is in someones
1014 * inventory. 1019 * inventory.
1015 */ 1020 */
1016 if (env) 1021 if (env)
1017 { 1022 {
1023 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
1018 if (nrof) 1027 if (below)
1019 sub_weight (env, weight * nrof); 1028 below->above = above;
1020 else 1029
1021 sub_weight (env, weight + carrying); 1030 /* we set up values so that it could be inserted into
1031 * the map, but we don't actually do that - it is up
1032 * to the caller to decide what we want to do.
1033 */
1034 map = env->map;
1035 x = env->x;
1036 y = env->y;
1037 above = 0;
1038 below = 0;
1039 env = 0;
1022 1040
1023 /* NO_FIX_PLAYER is set when a great many changes are being 1041 /* NO_FIX_PLAYER is set when a great many changes are being
1024 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
1025 * to save cpu time. 1043 * to save cpu time.
1026 */ 1044 */
1027 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1028 otmp->update_stats (); 1046 otmp->update_stats ();
1029
1030 if (above)
1031 above->below = below;
1032 else
1033 env->inv = below;
1034
1035 if (below)
1036 below->above = above;
1037
1038 /* we set up values so that it could be inserted into
1039 * the map, but we don't actually do that - it is up
1040 * to the caller to decide what we want to do.
1041 */
1042 x = env->x, y = env->y;
1043 map = env->map;
1044 above = 0, below = 0;
1045 env = 0;
1046 } 1047 }
1047 else if (map) 1048 else if (map)
1048 { 1049 {
1049 if (type == PLAYER) 1050 if (type == PLAYER)
1050 { 1051 {
1088 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
1089 return; 1090 return;
1090 1091
1091 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
1092 1093
1094 if (object *pl = ms.player ())
1095 {
1096 if (pl->container == this)
1097 /* If a container that the player is currently using somehow gets
1098 * removed (most likely destroyed), update the player view
1099 * appropriately.
1100 */
1101 pl->close_container ();
1102
1103 pl->contr->ns->floorbox_update ();
1104 }
1105
1093 for (tmp = ms.bot; tmp; tmp = tmp->above) 1106 for (tmp = ms.bot; tmp; tmp = tmp->above)
1094 { 1107 {
1095 /* No point updating the players look faces if he is the object 1108 /* No point updating the players look faces if he is the object
1096 * being removed. 1109 * being removed.
1097 */ 1110 */
1098
1099 if (tmp->type == PLAYER && tmp != this)
1100 {
1101 /* If a container that the player is currently using somehow gets
1102 * removed (most likely destroyed), update the player view
1103 * appropriately.
1104 */
1105 if (tmp->container == this)
1106 {
1107 flag [FLAG_APPLIED] = 0;
1108 tmp->container = 0;
1109 }
1110
1111 if (tmp->contr->ns)
1112 tmp->contr->ns->floorbox_update ();
1113 }
1114 1111
1115 /* See if object moving off should effect something */ 1112 /* See if object moving off should effect something */
1116 if (check_walk_off 1113 if (check_walk_off
1117 && ((move_type & tmp->move_off) 1114 && ((move_type & tmp->move_off)
1118 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1150merge_ob (object *op, object *top) 1147merge_ob (object *op, object *top)
1151{ 1148{
1152 if (!op->nrof) 1149 if (!op->nrof)
1153 return 0; 1150 return 0;
1154 1151
1155 if (top) 1152 if (!top)
1156 for (top = op; top && top->above; top = top->above) 1153 for (top = op; top && top->above; top = top->above)
1157 ; 1154 ;
1158 1155
1159 for (; top; top = top->below) 1156 for (; top; top = top->below)
1160 { 1157 {
1241 1238
1242 object *top, *floor = NULL; 1239 object *top, *floor = NULL;
1243 1240
1244 op->remove (); 1241 op->remove ();
1245 1242
1246#if 0
1247 if (!m->active != !op->active)
1248 if (m->active)
1249 op->activate_recursive ();
1250 else
1251 op->deactivate_recursive ();
1252#endif
1253
1254 if (out_of_map (m, op->x, op->y))
1255 {
1256 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1257#ifdef MANY_CORES
1258 /* Better to catch this here, as otherwise the next use of this object
1259 * is likely to cause a crash. Better to find out where it is getting
1260 * improperly inserted.
1261 */
1262 abort ();
1263#endif
1264 return op;
1265 }
1266
1267 if (object *more = op->more)
1268 if (!insert_ob_in_map (more, m, originator, flag))
1269 return 0;
1270
1271 CLEAR_FLAG (op, FLAG_REMOVED);
1272
1273 /* Ideally, the caller figures this out. However, it complicates a lot 1243 /* Ideally, the caller figures this out. However, it complicates a lot
1274 * of areas of callers (eg, anything that uses find_free_spot would now 1244 * of areas of callers (eg, anything that uses find_free_spot would now
1275 * need extra work 1245 * need extra work
1276 */ 1246 */
1277 if (!xy_normalise (m, op->x, op->y)) 1247 if (!xy_normalise (m, op->x, op->y))
1248 {
1249 op->destroy ();
1278 return 0; 1250 return 0;
1251 }
1252
1253 if (object *more = op->more)
1254 if (!insert_ob_in_map (more, m, originator, flag))
1255 return 0;
1256
1257 CLEAR_FLAG (op, FLAG_REMOVED);
1279 1258
1280 op->map = m; 1259 op->map = m;
1281 mapspace &ms = op->ms (); 1260 mapspace &ms = op->ms ();
1282 1261
1283 /* this has to be done after we translate the coordinates. 1262 /* this has to be done after we translate the coordinates.
1285 if (op->nrof && !(flag & INS_NO_MERGE)) 1264 if (op->nrof && !(flag & INS_NO_MERGE))
1286 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1287 if (object::can_merge (op, tmp)) 1266 if (object::can_merge (op, tmp))
1288 { 1267 {
1289 op->nrof += tmp->nrof; 1268 op->nrof += tmp->nrof;
1290 tmp->destroy (); 1269 tmp->destroy (1);
1291 } 1270 }
1292 1271
1293 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1272 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1294 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1273 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1295 1274
1318 else 1297 else
1319 { 1298 {
1320 top = ms.bot; 1299 top = ms.bot;
1321 1300
1322 /* If there are other objects, then */ 1301 /* If there are other objects, then */
1323 if ((!(flag & INS_MAP_LOAD)) && top) 1302 if (top)
1324 { 1303 {
1325 object *last = 0; 1304 object *last = 0;
1326 1305
1327 /* 1306 /*
1328 * If there are multiple objects on this space, we do some trickier handling. 1307 * If there are multiple objects on this space, we do some trickier handling.
1380 */ 1359 */
1381 if (last && last->below && last != floor) 1360 if (last && last->below && last != floor)
1382 top = last->below; 1361 top = last->below;
1383 } 1362 }
1384 } /* If objects on this space */ 1363 } /* If objects on this space */
1385 if (flag & INS_MAP_LOAD)
1386 top = ms.top;
1387 1364
1388 if (flag & INS_ABOVE_FLOOR_ONLY) 1365 if (flag & INS_ABOVE_FLOOR_ONLY)
1389 top = floor; 1366 top = floor;
1390 1367
1391 /* Top is the object that our object (op) is going to get inserted above. 1368 /* Top is the object that our object (op) is going to get inserted above.
1424 op->map->touch (); 1401 op->map->touch ();
1425 } 1402 }
1426 1403
1427 op->map->dirty = true; 1404 op->map->dirty = true;
1428 1405
1429 /* If we have a floor, we know the player, if any, will be above
1430 * it, so save a few ticks and start from there.
1431 */
1432 if (!(flag & INS_MAP_LOAD))
1433 if (object *pl = ms.player ()) 1406 if (object *pl = ms.player ())
1434 if (pl->contr->ns)
1435 pl->contr->ns->floorbox_update (); 1407 pl->contr->ns->floorbox_update ();
1436 1408
1437 /* If this object glows, it may affect lighting conditions that are 1409 /* If this object glows, it may affect lighting conditions that are
1438 * visible to others on this map. But update_all_los is really 1410 * visible to others on this map. But update_all_los is really
1439 * an inefficient way to do this, as it means los for all players 1411 * an inefficient way to do this, as it means los for all players
1440 * on the map will get recalculated. The players could very well 1412 * on the map will get recalculated. The players could very well
1482 * op is the object to insert it under: supplies x and the map. 1454 * op is the object to insert it under: supplies x and the map.
1483 */ 1455 */
1484void 1456void
1485replace_insert_ob_in_map (const char *arch_string, object *op) 1457replace_insert_ob_in_map (const char *arch_string, object *op)
1486{ 1458{
1487 object *tmp, *tmp1;
1488
1489 /* first search for itself and remove any old instances */ 1459 /* first search for itself and remove any old instances */
1490 1460
1491 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1461 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1492 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1462 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1493 tmp->destroy (); 1463 tmp->destroy (1);
1494 1464
1495 tmp1 = arch_to_object (archetype::find (arch_string)); 1465 object *tmp = arch_to_object (archetype::find (arch_string));
1496 1466
1497 tmp1->x = op->x; 1467 tmp->x = op->x;
1498 tmp1->y = op->y; 1468 tmp->y = op->y;
1469
1499 insert_ob_in_map (tmp1, op->map, op, 0); 1470 insert_ob_in_map (tmp, op->map, op, 0);
1500} 1471}
1501 1472
1502object * 1473object *
1503object::insert_at (object *where, object *originator, int flags) 1474object::insert_at (object *where, object *originator, int flags)
1504{ 1475{
1476 if (where->env)
1477 return where->env->insert (this);
1478 else
1505 return where->map->insert (this, where->x, where->y, originator, flags); 1479 return where->map->insert (this, where->x, where->y, originator, flags);
1480}
1481
1482// find player who can see this object
1483static object *
1484visible_to (object *op)
1485{
1486 if (!op->flag [FLAG_REMOVED])
1487 {
1488 // see if we are in a container of sorts
1489 if (object *env = op->env)
1490 {
1491 // the player inventory itself is always visible
1492 if (env->type == PLAYER)
1493 return env;
1494
1495 // else a player could have our env open
1496 env = env->outer_env ();
1497
1498 // the player itself is always on a map, so we will find him here
1499 // even if our inv is in a player.
1500 if (env->is_on_map ())
1501 if (object *pl = env->ms ().player ())
1502 if (pl->container == op->env)
1503 return pl;
1504 }
1505 else
1506 {
1507 // maybe there is a player standing on the same mapspace
1508 if (object *pl = env->ms ().player ())
1509 return pl;
1510 }
1511 }
1512
1513 return 0;
1514}
1515
1516/*
1517 * decrease(object, number) decreases a specified number from
1518 * the amount of an object. If the amount reaches 0, the object
1519 * is subsequently removed and freed.
1520 *
1521 * Return value: 'op' if something is left, NULL if the amount reached 0
1522 */
1523bool
1524object::decrease (sint32 nr)
1525{
1526 nr = min (nr, nrof);
1527
1528 if (!nr)
1529 return 1;
1530
1531 nrof -= nr;
1532
1533 object *visible = visible_to (this);
1534
1535 if (nrof)
1536 {
1537 adjust_weight (env, -weight * nr); // carrying == 0
1538
1539 if (visible)
1540 esrv_send_item (visible, this);
1541
1542 return 1;
1543 }
1544 else
1545 {
1546 if (visible)
1547 esrv_del_item (visible->contr, count);
1548
1549 this->destroy (1);
1550 return 0;
1551 }
1506} 1552}
1507 1553
1508/* 1554/*
1509 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1555 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1510 * is returned contains nr objects, and the remaining parts contains 1556 * is returned contains nr objects, and the remaining parts contains
1511 * the rest (or is removed and freed if that number is 0). 1557 * the rest (or is removed and freed if that number is 0).
1512 * On failure, NULL is returned, and the reason put into the 1558 * On failure, NULL is returned, and the reason put into the
1513 * global static errmsg array. 1559 * global static errmsg array.
1514 */ 1560 */
1515object * 1561object *
1562object::split (sint32 nr)
1563{
1564 if (nrof < nr)
1565 return 0;
1566 else if (nrof == nr)
1567 {
1568 remove ();
1569 return this;
1570 }
1571 else
1572 {
1573 decrease (nr);
1574
1575 object *op = object_create_clone (this);
1576 op->nrof = nr;
1577 return op;
1578 }
1579}
1580
1581//TODO: remove, but semantics differs from split_nr
1582object *
1516get_split_ob (object *orig_ob, uint32 nr) 1583get_split_ob (object *orig_ob, uint32 nr)
1517{ 1584{
1518 object *newob;
1519 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1520
1521 if (orig_ob->nrof < nr) 1585 if (orig_ob->nrof < nr)
1522 { 1586 {
1523 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1587 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1524 return NULL;
1525 }
1526
1527 newob = object_create_clone (orig_ob);
1528
1529 if ((orig_ob->nrof -= nr) < 1)
1530 orig_ob->destroy (1);
1531 else if (!is_removed)
1532 {
1533 if (orig_ob->env != NULL)
1534 sub_weight (orig_ob->env, orig_ob->weight * nr);
1535 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1536 {
1537 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1538 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1539 return NULL;
1540 }
1541 }
1542
1543 newob->nrof = nr;
1544
1545 return newob;
1546}
1547
1548/*
1549 * decrease_ob_nr(object, number) decreases a specified number from
1550 * the amount of an object. If the amount reaches 0, the object
1551 * is subsequently removed and freed.
1552 *
1553 * Return value: 'op' if something is left, NULL if the amount reached 0
1554 */
1555object *
1556decrease_ob_nr (object *op, uint32 i)
1557{
1558 object *tmp;
1559
1560 if (i == 0) /* objects with op->nrof require this check */
1561 return op;
1562
1563 if (i > op->nrof)
1564 i = op->nrof;
1565
1566 if (QUERY_FLAG (op, FLAG_REMOVED))
1567 op->nrof -= i;
1568 else if (op->env)
1569 {
1570 /* is this object in the players inventory, or sub container
1571 * therein?
1572 */
1573 tmp = op->in_player ();
1574 /* nope. Is this a container the player has opened?
1575 * If so, set tmp to that player.
1576 * IMO, searching through all the players will mostly
1577 * likely be quicker than following op->env to the map,
1578 * and then searching the map for a player.
1579 */
1580 if (!tmp)
1581 for_all_players (pl)
1582 if (pl->ob->container == op->env)
1583 {
1584 tmp = pl->ob;
1585 break;
1586 }
1587
1588 if (i < op->nrof)
1589 {
1590 sub_weight (op->env, op->weight * i);
1591 op->nrof -= i;
1592 if (tmp)
1593 esrv_send_item (tmp, op);
1594 }
1595 else
1596 {
1597 op->remove ();
1598 op->nrof = 0;
1599 if (tmp)
1600 esrv_del_item (tmp->contr, op->count);
1601 }
1602 }
1603 else
1604 {
1605 object *above = op->above;
1606
1607 if (i < op->nrof)
1608 op->nrof -= i;
1609 else
1610 {
1611 op->remove ();
1612 op->nrof = 0;
1613 }
1614
1615 /* Since we just removed op, op->above is null */
1616 for (tmp = above; tmp; tmp = tmp->above)
1617 if (tmp->type == PLAYER)
1618 {
1619 if (op->nrof)
1620 esrv_send_item (tmp, op);
1621 else
1622 esrv_del_item (tmp->contr, op->count);
1623 }
1624 }
1625
1626 if (op->nrof)
1627 return op;
1628 else
1629 {
1630 op->destroy ();
1631 return 0; 1588 return 0;
1632 } 1589 }
1633}
1634 1590
1635/* 1591 return orig_ob->split (nr);
1636 * add_weight(object, weight) adds the specified weight to an object,
1637 * and also updates how much the environment(s) is/are carrying.
1638 */
1639void
1640add_weight (object *op, signed long weight)
1641{
1642 while (op != NULL)
1643 {
1644 if (op->type == CONTAINER)
1645 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1646
1647 op->carrying += weight;
1648 op = op->env;
1649 }
1650} 1592}
1651 1593
1652object * 1594object *
1653insert_ob_in_ob (object *op, object *where) 1595insert_ob_in_ob (object *op, object *where)
1654{ 1596{
1678 * be != op, if items are merged. -Tero 1620 * be != op, if items are merged. -Tero
1679 */ 1621 */
1680object * 1622object *
1681object::insert (object *op) 1623object::insert (object *op)
1682{ 1624{
1683 object *tmp, *otmp;
1684
1685 if (!QUERY_FLAG (op, FLAG_REMOVED))
1686 op->remove ();
1687
1688 if (op->more) 1625 if (op->more)
1689 { 1626 {
1690 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1627 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1691 return op; 1628 return op;
1692 } 1629 }
1693 1630
1694 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1631 op->remove ();
1695 CLEAR_FLAG (op, FLAG_REMOVED); 1632
1633 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1634
1696 if (op->nrof) 1635 if (op->nrof)
1697 {
1698 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1636 for (object *tmp = inv; tmp; tmp = tmp->below)
1699 if (object::can_merge (tmp, op)) 1637 if (object::can_merge (tmp, op))
1700 { 1638 {
1701 /* return the original object and remove inserted object 1639 /* return the original object and remove inserted object
1702 (client needs the original object) */ 1640 (client needs the original object) */
1703 tmp->nrof += op->nrof; 1641 tmp->nrof += op->nrof;
1704 /* Weight handling gets pretty funky. Since we are adding to 1642 op->destroy (1);
1705 * tmp->nrof, we need to increase the weight.
1706 */
1707 add_weight (this, op->weight * op->nrof);
1708 SET_FLAG (op, FLAG_REMOVED);
1709 op->destroy (); /* free the inserted object */
1710 op = tmp; 1643 op = tmp;
1711 op->remove (); /* and fix old object's links */ 1644 goto inserted;
1712 CLEAR_FLAG (op, FLAG_REMOVED);
1713 break;
1714 } 1645 }
1715 1646
1716 /* I assume combined objects have no inventory 1647 op->owner = 0; // it's his/hers now. period.
1717 * We add the weight - this object could have just been removed 1648 op->map = 0;
1718 * (if it was possible to merge). calling remove_ob will subtract 1649 op->x = 0;
1719 * the weight, so we need to add it in again, since we actually do 1650 op->y = 0;
1720 * the linking below
1721 */
1722 add_weight (this, op->weight * op->nrof);
1723 }
1724 else
1725 add_weight (this, (op->weight + op->carrying));
1726 1651
1727 otmp = this->in_player (); 1652 op->above = 0;
1728 if (otmp && otmp->contr) 1653 op->below = inv;
1654 op->env = this;
1655
1656 if (inv)
1657 inv->above = op;
1658
1659 inv = op;
1660
1661 op->flag [FLAG_REMOVED] = 0;
1662
1663 adjust_weight (this, op->total_weight ());
1664
1665inserted:
1666 /* reset the light list and los of the players on the map */
1667 if (op->glow_radius && map && map->darkness)
1668 update_all_los (map, x, y);
1669
1670 if (object *otmp = in_player ())
1729 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1671 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1730 otmp->update_stats (); 1672 otmp->update_stats ();
1731
1732 op->map = 0;
1733 op->env = this;
1734 op->above = 0;
1735 op->below = 0;
1736 op->x = 0, op->y = 0;
1737
1738 /* reset the light list and los of the players on the map */
1739 if ((op->glow_radius != 0) && map)
1740 {
1741#ifdef DEBUG_LIGHTS
1742 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1743#endif /* DEBUG_LIGHTS */
1744 if (map->darkness)
1745 update_all_los (map, x, y);
1746 }
1747
1748 /* Client has no idea of ordering so lets not bother ordering it here.
1749 * It sure simplifies this function...
1750 */
1751 if (!inv)
1752 inv = op;
1753 else
1754 {
1755 op->below = inv;
1756 op->below->above = op;
1757 inv = op;
1758 }
1759 1673
1760 INVOKE_OBJECT (INSERT, this); 1674 INVOKE_OBJECT (INSERT, this);
1761 1675
1762 return op; 1676 return op;
1763} 1677}
1978 * activate recursively a flag on an object inventory 1892 * activate recursively a flag on an object inventory
1979 */ 1893 */
1980void 1894void
1981flag_inv (object *op, int flag) 1895flag_inv (object *op, int flag)
1982{ 1896{
1983 if (op->inv)
1984 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1897 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1985 { 1898 {
1986 SET_FLAG (tmp, flag); 1899 SET_FLAG (tmp, flag);
1987 flag_inv (tmp, flag); 1900 flag_inv (tmp, flag);
1988 } 1901 }
1989} 1902}
1990 1903
1991/* 1904/*
1992 * deactivate recursively a flag on an object inventory 1905 * deactivate recursively a flag on an object inventory
1993 */ 1906 */
1994void 1907void
1995unflag_inv (object *op, int flag) 1908unflag_inv (object *op, int flag)
1996{ 1909{
1997 if (op->inv)
1998 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1910 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1999 { 1911 {
2000 CLEAR_FLAG (tmp, flag); 1912 CLEAR_FLAG (tmp, flag);
2001 unflag_inv (tmp, flag); 1913 unflag_inv (tmp, flag);
2002 } 1914 }
2003} 1915}
2004 1916
2005/* 1917/*
2006 * find_free_spot(object, map, x, y, start, stop) will search for 1918 * find_free_spot(object, map, x, y, start, stop) will search for
2007 * a spot at the given map and coordinates which will be able to contain 1919 * a spot at the given map and coordinates which will be able to contain
2009 * to search (see the freearr_x/y[] definition). 1921 * to search (see the freearr_x/y[] definition).
2010 * It returns a random choice among the alternatives found. 1922 * It returns a random choice among the alternatives found.
2011 * start and stop are where to start relative to the free_arr array (1,9 1923 * start and stop are where to start relative to the free_arr array (1,9
2012 * does all 4 immediate directions). This returns the index into the 1924 * does all 4 immediate directions). This returns the index into the
2013 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1925 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2014 * Note - this only checks to see if there is space for the head of the
2015 * object - if it is a multispace object, this should be called for all
2016 * pieces.
2017 * Note2: This function does correctly handle tiled maps, but does not 1926 * Note: This function does correctly handle tiled maps, but does not
2018 * inform the caller. However, insert_ob_in_map will update as 1927 * inform the caller. However, insert_ob_in_map will update as
2019 * necessary, so the caller shouldn't need to do any special work. 1928 * necessary, so the caller shouldn't need to do any special work.
2020 * Note - updated to take an object instead of archetype - this is necessary 1929 * Note - updated to take an object instead of archetype - this is necessary
2021 * because arch_blocked (now ob_blocked) needs to know the movement type 1930 * because arch_blocked (now ob_blocked) needs to know the movement type
2022 * to know if the space in question will block the object. We can't use 1931 * to know if the space in question will block the object. We can't use
2024 * customized, changed states, etc. 1933 * customized, changed states, etc.
2025 */ 1934 */
2026int 1935int
2027find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1936find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2028{ 1937{
1938 int altern[SIZEOFFREE];
2029 int index = 0, flag; 1939 int index = 0, flag;
2030 int altern[SIZEOFFREE];
2031 1940
2032 for (int i = start; i < stop; i++) 1941 for (int i = start; i < stop; i++)
2033 { 1942 {
2034 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1943 mapxy pos (m, x, y); pos.move (i);
2035 if (!flag) 1944
1945 if (!pos.normalise ())
1946 continue;
1947
1948 mapspace &ms = *pos;
1949
1950 if (ms.flags () & P_IS_ALIVE)
1951 continue;
1952
1953 /* However, often
1954 * ob doesn't have any move type (when used to place exits)
1955 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1956 */
1957 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1958 {
2036 altern [index++] = i; 1959 altern [index++] = i;
1960 continue;
1961 }
2037 1962
2038 /* Basically, if we find a wall on a space, we cut down the search size. 1963 /* Basically, if we find a wall on a space, we cut down the search size.
2039 * In this way, we won't return spaces that are on another side of a wall. 1964 * In this way, we won't return spaces that are on another side of a wall.
2040 * This mostly work, but it cuts down the search size in all directions - 1965 * This mostly work, but it cuts down the search size in all directions -
2041 * if the space being examined only has a wall to the north and empty 1966 * if the space being examined only has a wall to the north and empty
2042 * spaces in all the other directions, this will reduce the search space 1967 * spaces in all the other directions, this will reduce the search space
2043 * to only the spaces immediately surrounding the target area, and 1968 * to only the spaces immediately surrounding the target area, and
2044 * won't look 2 spaces south of the target space. 1969 * won't look 2 spaces south of the target space.
2045 */ 1970 */
2046 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1971 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1972 {
2047 stop = maxfree[i]; 1973 stop = maxfree[i];
1974 continue;
1975 }
1976
1977 /* Note it is intentional that we check ob - the movement type of the
1978 * head of the object should correspond for the entire object.
1979 */
1980 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1981 continue;
1982
1983 if (ob->blocked (m, pos.x, pos.y))
1984 continue;
1985
1986 altern [index++] = i;
2048 } 1987 }
2049 1988
2050 if (!index) 1989 if (!index)
2051 return -1; 1990 return -1;
2052 1991
2061 */ 2000 */
2062int 2001int
2063find_first_free_spot (const object *ob, maptile *m, int x, int y) 2002find_first_free_spot (const object *ob, maptile *m, int x, int y)
2064{ 2003{
2065 for (int i = 0; i < SIZEOFFREE; i++) 2004 for (int i = 0; i < SIZEOFFREE; i++)
2066 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2005 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2067 return i; 2006 return i;
2068 2007
2069 return -1; 2008 return -1;
2070} 2009}
2071 2010
2348 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2287 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2349 * core dumps if they do. 2288 * core dumps if they do.
2350 * 2289 *
2351 * Add a check so we can't pick up invisible objects (0.93.8) 2290 * Add a check so we can't pick up invisible objects (0.93.8)
2352 */ 2291 */
2353
2354int 2292int
2355can_pick (const object *who, const object *item) 2293can_pick (const object *who, const object *item)
2356{ 2294{
2357 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2295 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2358 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2296 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2609{ 2547{
2610 char flagdesc[512]; 2548 char flagdesc[512];
2611 char info2[256 * 4]; 2549 char info2[256 * 4];
2612 char *p = info; 2550 char *p = info;
2613 2551
2614 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2552 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2615 count, uuid.seq, 2553 count,
2554 uuid.c_str (),
2616 &name, 2555 &name,
2617 title ? "\",title:\"" : "", 2556 title ? "\",title:\"" : "",
2618 title ? (const char *)title : "", 2557 title ? (const char *)title : "",
2619 flag_desc (flagdesc, 512), type); 2558 flag_desc (flagdesc, 512), type);
2620 2559
2621 if (env) 2560 if (!this->flag[FLAG_REMOVED] && env)
2622 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2561 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2623 2562
2624 if (map) 2563 if (map)
2625 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2564 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2626 2565
2673 old_container->flag [FLAG_APPLIED] = 0; 2612 old_container->flag [FLAG_APPLIED] = 0;
2674 container = 0; 2613 container = 0;
2675 2614
2676 esrv_update_item (UPD_FLAGS, this, old_container); 2615 esrv_update_item (UPD_FLAGS, this, old_container);
2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2616 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2617 play_sound (sound_find ("chest_close"));
2678 } 2618 }
2679 2619
2680 if (new_container) 2620 if (new_container)
2681 { 2621 {
2682 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2622 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2698 new_container->flag [FLAG_APPLIED] = 1; 2638 new_container->flag [FLAG_APPLIED] = 1;
2699 container = new_container; 2639 container = new_container;
2700 2640
2701 esrv_update_item (UPD_FLAGS, this, new_container); 2641 esrv_update_item (UPD_FLAGS, this, new_container);
2702 esrv_send_inventory (this, new_container); 2642 esrv_send_inventory (this, new_container);
2643 play_sound (sound_find ("chest_open"));
2703 } 2644 }
2704} 2645}
2705 2646
2706object * 2647object *
2707object::force_find (const shstr name) 2648object::force_find (const shstr name)
2733 force->flag [FLAG_APPLIED] = true; 2674 force->flag [FLAG_APPLIED] = true;
2734 2675
2735 insert (force); 2676 insert (force);
2736} 2677}
2737 2678
2679void
2680object::play_sound (faceidx sound)
2681{
2682 if (!sound)
2683 return;
2684
2685 if (flag [FLAG_REMOVED])
2686 return;
2687
2688 if (env)
2689 {
2690 if (object *pl = in_player ())
2691 pl->contr->play_sound (sound);
2692 }
2693 else
2694 map->play_sound (sound, x, y);
2695}
2696

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines