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.110 by root, Sun Jan 7 23:12:03 2007 UTC vs.
Revision 1.210 by root, Mon Apr 21 07:01:40 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28#include <global.h> 24#include <global.h>
29#include <stdio.h> 25#include <stdio.h>
30#include <sys/types.h> 26#include <sys/types.h>
31#include <sys/uio.h> 27#include <sys/uio.h>
32#include <object.h> 28#include <object.h>
33#include <funcpoint.h> 29#include <funcpoint.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. */
306
307 if (!compare_ob_value_lists (ob1, ob2))
299 return 0; 308 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0;
302 } 309 }
303 310
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 311 if (ob1->self || ob2->self)
306 { 312 {
307 ob1->optimise (); 313 ob1->optimise ();
308 ob2->optimise (); 314 ob2->optimise ();
309 315
310 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)
311 return 0; 322 return 0;
323
324 if (k1 == 0)
325 return 1;
326
327 if (!cfperl_can_merge (ob1, ob2))
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 != NULL; 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 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 }
335 375
336 if (op->type == CONTAINER && op->stats.Str) 376 sum += op->total_weight ();
337 sum = (sum * (100 - op->stats.Str)) / 100; 377 }
338 378
339 if (op->carrying != sum) 379 carrying = weight_adjust (this, sum);
340 op->carrying = sum;
341
342 return sum;
343} 380}
344 381
345/** 382/*
346 * Return the outermost environment object for a given object. 383 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
347 */ 384 */
348
349object *
350object_get_env_recursive (object *op)
351{
352 while (op->env != NULL)
353 op = op->env;
354 return op;
355}
356
357/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array.
361 */
362
363char * 385char *
364dump_object (object *op) 386dump_object (object *op)
365{ 387{
366 if (!op) 388 if (!op)
367 return strdup ("[NULLOBJ]"); 389 return strdup ("[NULLOBJ]");
368 390
369 object_freezer freezer; 391 object_freezer freezer;
370 save_object (freezer, op, 1); 392 op->write (freezer);
371 return freezer.as_string (); 393 return freezer.as_string ();
372} 394}
373 395
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 return ((unsigned int)i) < objects.size () 426 for_all_objects (op)
401 ? objects [i] 427 if (op->count == i)
402 : 0; 428 return op;
429
430 return 0;
403} 431}
404 432
405/* 433/*
406 * Returns the first object which has a name equal to the argument. 434 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 435 * Used only by the patch command, but not all that useful.
418 break; 446 break;
419 447
420 return op; 448 return op;
421} 449}
422 450
423void
424free_all_object_data ()
425{
426 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
427}
428
429/* 451/*
430 * 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
431 * skill and experience objects. 453 * skill and experience objects.
454 * ACTUALLY NO! investigate! TODO
432 */ 455 */
433void 456void
434object::set_owner (object *owner) 457object::set_owner (object *owner)
435{ 458{
459 // allow objects which own objects
436 if (!owner) 460 if (owner)
437 return;
438
439 /* next line added to allow objects which own objects */
440 /* Add a check for ownercounts in here, as I got into an endless loop
441 * with the fireball owning a poison cloud which then owned the
442 * fireball. I believe that was caused by one of the objects getting
443 * freed and then another object replacing it. Since the ownercounts
444 * didn't match, this check is valid and I believe that cause is valid.
445 */
446 while (owner->owner) 461 while (owner->owner)
447 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 }
448 469
449 this->owner = owner; 470 this->owner = owner;
471}
472
473int
474object::slottype () const
475{
476 if (type == SKILL)
477 {
478 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
479 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
480 }
481 else
482 {
483 if (slot [body_combat].info) return slot_combat;
484 if (slot [body_range ].info) return slot_ranged;
485 }
486
487 return slot_none;
488}
489
490bool
491object::change_weapon (object *ob)
492{
493 if (current_weapon == ob)
494 return true;
495
496 if (chosen_skill)
497 chosen_skill->flag [FLAG_APPLIED] = false;
498
499 current_weapon = ob;
500 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
501
502 if (chosen_skill)
503 chosen_skill->flag [FLAG_APPLIED] = true;
504
505 update_stats ();
506
507 if (ob)
508 {
509 // now check wether any body locations became invalid, in which case
510 // we cannot apply the weapon at the moment.
511 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
512 if (slot[i].used < 0)
513 {
514 current_weapon = chosen_skill = 0;
515 update_stats ();
516
517 new_draw_info_format (NDI_UNIQUE, 0, this,
518 "You try to balance all your items at once, "
519 "but the %s is just too much for your body. "
520 "[You need to unapply some items first.]", &ob->name);
521 return false;
522 }
523
524 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
525 }
526 else
527 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
528
529 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
530 {
531 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
532 &name, ob->debug_desc ());
533 return false;
534 }
535
536 return true;
450} 537}
451 538
452/* Zero the key_values on op, decrementing the shared-string 539/* Zero the key_values on op, decrementing the shared-string
453 * refcounts and freeing the links. 540 * refcounts and freeing the links.
454 */ 541 */
455static void 542static void
456free_key_values (object *op) 543free_key_values (object *op)
457{ 544{
458 for (key_value *i = op->key_values; i != 0;) 545 for (key_value *i = op->key_values; i; )
459 { 546 {
460 key_value *next = i->next; 547 key_value *next = i->next;
461 delete i; 548 delete i;
462 549
463 i = next; 550 i = next;
464 } 551 }
465 552
466 op->key_values = 0; 553 op->key_values = 0;
467} 554}
468 555
469/* 556object &
470 * copy_to first frees everything allocated by the dst object, 557object::operator =(const object &src)
471 * and then copies the contents of itself into the second
472 * object, allocating what needs to be allocated. Basically, any
473 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
474 * if the first object is freed, the pointers in the new object
475 * will point at garbage.
476 */
477void
478object::copy_to (object *dst)
479{ 558{
480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 559 bool is_freed = flag [FLAG_FREED];
481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 560 bool is_removed = flag [FLAG_REMOVED];
482 561
483 *(object_copy *)dst = *this; 562 *(object_copy *)this = src;
484 563
485 if (is_freed) 564 flag [FLAG_FREED] = is_freed;
486 SET_FLAG (dst, FLAG_FREED); 565 flag [FLAG_REMOVED] = is_removed;
487
488 if (is_removed)
489 SET_FLAG (dst, FLAG_REMOVED);
490
491 if (speed < 0)
492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493 566
494 /* Copy over key_values, if any. */ 567 /* Copy over key_values, if any. */
495 if (key_values) 568 if (src.key_values)
496 { 569 {
497 key_value *tail = 0; 570 key_value *tail = 0;
498 key_value *i;
499
500 dst->key_values = 0; 571 key_values = 0;
501 572
502 for (i = key_values; i; i = i->next) 573 for (key_value *i = src.key_values; i; i = i->next)
503 { 574 {
504 key_value *new_link = new key_value; 575 key_value *new_link = new key_value;
505 576
506 new_link->next = 0; 577 new_link->next = 0;
507 new_link->key = i->key; 578 new_link->key = i->key;
508 new_link->value = i->value; 579 new_link->value = i->value;
509 580
510 /* Try and be clever here, too. */ 581 /* Try and be clever here, too. */
511 if (!dst->key_values) 582 if (!key_values)
512 { 583 {
513 dst->key_values = new_link; 584 key_values = new_link;
514 tail = new_link; 585 tail = new_link;
515 } 586 }
516 else 587 else
517 { 588 {
518 tail->next = new_link; 589 tail->next = new_link;
519 tail = new_link; 590 tail = new_link;
520 } 591 }
521 } 592 }
522 } 593 }
594}
595
596/*
597 * copy_to first frees everything allocated by the dst object,
598 * and then copies the contents of itself into the second
599 * object, allocating what needs to be allocated. Basically, any
600 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
601 * if the first object is freed, the pointers in the new object
602 * will point at garbage.
603 */
604void
605object::copy_to (object *dst)
606{
607 *dst = *this;
608
609 if (speed < 0)
610 dst->speed_left -= rndm ();
523 611
524 dst->set_speed (dst->speed); 612 dst->set_speed (dst->speed);
613}
614
615void
616object::instantiate ()
617{
618 if (!uuid.seq) // HACK
619 uuid = UUID::gen ();
620
621 speed_left = -0.1f;
622 /* copy the body_info to the body_used - this is only really
623 * need for monsters, but doesn't hurt to do it for everything.
624 * by doing so, when a monster is created, it has good starting
625 * values for the body_used info, so when items are created
626 * for it, they can be properly equipped.
627 */
628 for (int i = NUM_BODY_LOCATIONS; i--; )
629 slot[i].used = slot[i].info;
630
631 attachable::instantiate ();
525} 632}
526 633
527object * 634object *
528object::clone () 635object::clone ()
529{ 636{
587 * UP_OBJ_FACE: only the objects face has changed. 694 * UP_OBJ_FACE: only the objects face has changed.
588 */ 695 */
589void 696void
590update_object (object *op, int action) 697update_object (object *op, int action)
591{ 698{
592 MoveType move_on, move_off, move_block, move_slow;
593
594 if (op == NULL) 699 if (op == NULL)
595 { 700 {
596 /* this should never happen */ 701 /* this should never happen */
597 LOG (llevDebug, "update_object() called for NULL object.\n"); 702 LOG (llevDebug, "update_object() called for NULL object.\n");
598 return; 703 return;
658 763
659 if (op->more) 764 if (op->more)
660 update_object (op->more, action); 765 update_object (op->more, action);
661} 766}
662 767
663object *object::first;
664
665object::object () 768object::object ()
666{ 769{
667 SET_FLAG (this, FLAG_REMOVED); 770 SET_FLAG (this, FLAG_REMOVED);
668 771
669 expmul = 1.0; 772 expmul = 1.0;
670 face = blank_face; 773 face = blank_face;
671} 774}
672 775
673object::~object () 776object::~object ()
674{ 777{
778 unlink ();
779
675 free_key_values (this); 780 free_key_values (this);
676} 781}
677 782
783static int object_count;
784
678void object::link () 785void object::link ()
679{ 786{
680 uuid = gen_uuid (); 787 assert (!index);//D
788 uuid = UUID::gen ();
789 count = ++object_count;
681 790
682 refcnt_inc (); 791 refcnt_inc ();
683 objects.insert (this); 792 objects.insert (this);
684} 793}
685 794
686void object::unlink () 795void object::unlink ()
687{ 796{
797 if (!index)
798 return;
799
688 objects.erase (this); 800 objects.erase (this);
689 refcnt_dec (); 801 refcnt_dec ();
690} 802}
691 803
692void 804void
765 * if some form of movement is allowed, let objects 877 * if some form of movement is allowed, let objects
766 * drop on that space. 878 * drop on that space.
767 */ 879 */
768 if (!drop_to_ground 880 if (!drop_to_ground
769 || !map 881 || !map
770 || map->in_memory != MAP_IN_MEMORY 882 || map->in_memory != MAP_ACTIVE
883 || map->nodrop
771 || ms ().move_block == MOVE_ALL) 884 || ms ().move_block == MOVE_ALL)
772 { 885 {
773 while (inv) 886 while (inv)
774 { 887 {
775 inv->destroy_inv (drop_to_ground); 888 inv->destroy_inv (drop_to_ground);
803} 916}
804 917
805void 918void
806object::do_destroy () 919object::do_destroy ()
807{ 920{
921 attachable::do_destroy ();
922
808 if (flag [FLAG_IS_LINKED]) 923 if (flag [FLAG_IS_LINKED])
809 remove_button_link (this); 924 remove_button_link (this);
810 925
811 if (flag [FLAG_FRIENDLY]) 926 if (flag [FLAG_FRIENDLY])
812 remove_friendly_object (this); 927 remove_friendly_object (this);
813 928
814 if (!flag [FLAG_REMOVED]) 929 if (!flag [FLAG_REMOVED])
815 remove (); 930 remove ();
816 931
817 if (flag [FLAG_FREED]) 932 destroy_inv (true);
818 return;
819 933
820 set_speed (0); 934 deactivate ();
935 unlink ();
821 936
822 flag [FLAG_FREED] = 1; 937 flag [FLAG_FREED] = 1;
823
824 attachable::do_destroy ();
825
826 destroy_inv (true);
827 unlink ();
828 938
829 // hack to ensure that freed objects still have a valid map 939 // hack to ensure that freed objects still have a valid map
830 { 940 {
831 static maptile *freed_map; // freed objects are moved here to avoid crashes 941 static maptile *freed_map; // freed objects are moved here to avoid crashes
832 942
833 if (!freed_map) 943 if (!freed_map)
834 { 944 {
835 freed_map = new maptile; 945 freed_map = new maptile;
836 946
947 freed_map->path = "<freed objects map>";
837 freed_map->name = "/internal/freed_objects_map"; 948 freed_map->name = "/internal/freed_objects_map";
838 freed_map->width = 3; 949 freed_map->width = 3;
839 freed_map->height = 3; 950 freed_map->height = 3;
951 freed_map->nodrop = 1;
840 952
841 freed_map->alloc (); 953 freed_map->alloc ();
842 freed_map->in_memory = MAP_IN_MEMORY; 954 freed_map->in_memory = MAP_ACTIVE;
843 } 955 }
844 956
845 map = freed_map; 957 map = freed_map;
846 x = 1; 958 x = 1;
847 y = 1; 959 y = 1;
848 } 960 }
849 961
850 head = 0;
851
852 if (more) 962 if (more)
853 { 963 {
854 more->destroy (); 964 more->destroy ();
855 more = 0; 965 more = 0;
856 } 966 }
857 967
968 head = 0;
969
858 // clear those pointers that likely might have circular references to us 970 // clear those pointers that likely might cause circular references
859 owner = 0; 971 owner = 0;
860 enemy = 0; 972 enemy = 0;
861 attacked_by = 0; 973 attacked_by = 0;
974 current_weapon = 0;
862} 975}
863 976
864void 977void
865object::destroy (bool destroy_inventory) 978object::destroy (bool destroy_inventory)
866{ 979{
868 return; 981 return;
869 982
870 if (destroy_inventory) 983 if (destroy_inventory)
871 destroy_inv (false); 984 destroy_inv (false);
872 985
986 if (is_head ())
987 if (sound_destroy)
988 play_sound (sound_destroy);
989 else if (flag [FLAG_MONSTER])
990 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
991
873 attachable::destroy (); 992 attachable::destroy ();
874}
875
876/*
877 * sub_weight() recursively (outwards) subtracts a number from the
878 * weight of an object (and what is carried by it's environment(s)).
879 */
880void
881sub_weight (object *op, signed long weight)
882{
883 while (op != NULL)
884 {
885 if (op->type == CONTAINER)
886 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
887
888 op->carrying -= weight;
889 op = op->env;
890 }
891} 993}
892 994
893/* op->remove (): 995/* op->remove ():
894 * 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
895 * 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
896 * object will have no environment. If the object previously had an 998 * object will have no environment. If the object previously had an
897 * environment, the x and y coordinates will be updated to 999 * environment, the x and y coordinates will be updated to
898 * the previous environment. 1000 * the previous environment.
899 * Beware: This function is called from the editor as well!
900 */ 1001 */
901void 1002void
902object::remove () 1003object::do_remove ()
903{ 1004{
904 object *tmp, *last = 0; 1005 object *tmp, *last = 0;
905 object *otmp; 1006 object *otmp;
906 1007
907 if (QUERY_FLAG (this, FLAG_REMOVED)) 1008 if (QUERY_FLAG (this, FLAG_REMOVED))
917 * In this case, the object to be removed is in someones 1018 * In this case, the object to be removed is in someones
918 * inventory. 1019 * inventory.
919 */ 1020 */
920 if (env) 1021 if (env)
921 { 1022 {
1023 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
922 if (nrof) 1027 if (below)
923 sub_weight (env, weight * nrof); 1028 below->above = above;
924 else 1029
925 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;
926 1040
927 /* 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
928 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
929 * to save cpu time. 1043 * to save cpu time.
930 */ 1044 */
931 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))
932 otmp->update_stats (); 1046 otmp->update_stats ();
933
934 if (above)
935 above->below = below;
936 else
937 env->inv = below;
938
939 if (below)
940 below->above = above;
941
942 /* we set up values so that it could be inserted into
943 * the map, but we don't actually do that - it is up
944 * to the caller to decide what we want to do.
945 */
946 x = env->x, y = env->y;
947 map = env->map;
948 above = 0, below = 0;
949 env = 0;
950 } 1047 }
951 else if (map) 1048 else if (map)
952 { 1049 {
953 if (type == PLAYER) 1050 if (type == PLAYER)
954 { 1051 {
1052 // leaving a spot always closes any open container on the ground
1053 if (container && !container->env)
1054 // this causes spurious floorbox updates, but it ensures
1055 // that the CLOSE event is being sent.
1056 close_container ();
1057
955 --map->players; 1058 --map->players;
956 map->touch (); 1059 map->touch ();
957 } 1060 }
958 1061
959 map->dirty = true; 1062 map->dirty = true;
1063 mapspace &ms = this->ms ();
960 1064
961 /* link the object above us */ 1065 /* link the object above us */
962 if (above) 1066 if (above)
963 above->below = below; 1067 above->below = below;
964 else 1068 else
965 map->at (x, y).top = below; /* we were top, set new top */ 1069 ms.top = below; /* we were top, set new top */
966 1070
967 /* Relink the object below us, if there is one */ 1071 /* Relink the object below us, if there is one */
968 if (below) 1072 if (below)
969 below->above = above; 1073 below->above = above;
970 else 1074 else
972 /* Nothing below, which means we need to relink map object for this space 1076 /* Nothing below, which means we need to relink map object for this space
973 * use translated coordinates in case some oddness with map tiling is 1077 * use translated coordinates in case some oddness with map tiling is
974 * evident 1078 * evident
975 */ 1079 */
976 if (GET_MAP_OB (map, x, y) != this) 1080 if (GET_MAP_OB (map, x, y) != this)
977 {
978 char *dump = dump_object (this);
979 LOG (llevError,
980 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1081 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
981 free (dump);
982 dump = dump_object (GET_MAP_OB (map, x, y));
983 LOG (llevError, "%s\n", dump);
984 free (dump);
985 }
986 1082
987 map->at (x, y).bot = above; /* goes on above it. */ 1083 ms.bot = above; /* goes on above it. */
988 } 1084 }
989 1085
990 above = 0; 1086 above = 0;
991 below = 0; 1087 below = 0;
992 1088
993 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
994 return; 1090 return;
995 1091
996 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
997 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
998 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1106 for (tmp = ms.bot; tmp; tmp = tmp->above)
999 { 1107 {
1000 /* 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
1001 * being removed. 1109 * being removed.
1002 */ 1110 */
1003
1004 if (tmp->type == PLAYER && tmp != this)
1005 {
1006 /* If a container that the player is currently using somehow gets
1007 * removed (most likely destroyed), update the player view
1008 * appropriately.
1009 */
1010 if (tmp->container == this)
1011 {
1012 flag [FLAG_APPLIED] = 0;
1013 tmp->container = 0;
1014 }
1015
1016 if (tmp->contr->ns)
1017 tmp->contr->ns->floorbox_update ();
1018 }
1019 1111
1020 /* See if object moving off should effect something */ 1112 /* See if object moving off should effect something */
1021 if (check_walk_off 1113 if (check_walk_off
1022 && ((move_type & tmp->move_off) 1114 && ((move_type & tmp->move_off)
1023 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1026 1118
1027 if (destroyed ()) 1119 if (destroyed ())
1028 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1120 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1029 } 1121 }
1030 1122
1031 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1032 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1033 if (tmp->above == tmp)
1034 tmp->above = 0;
1035
1036 last = tmp; 1123 last = tmp;
1037 } 1124 }
1038 1125
1039 /* last == NULL if there are no objects on this space */ 1126 /* last == NULL if there are no objects on this space */
1040 //TODO: this makes little sense, why only update the topmost object? 1127 //TODO: this makes little sense, why only update the topmost object?
1060merge_ob (object *op, object *top) 1147merge_ob (object *op, object *top)
1061{ 1148{
1062 if (!op->nrof) 1149 if (!op->nrof)
1063 return 0; 1150 return 0;
1064 1151
1065 if (top) 1152 if (!top)
1066 for (top = op; top && top->above; top = top->above) 1153 for (top = op; top && top->above; top = top->above)
1067 ; 1154 ;
1068 1155
1069 for (; top; top = top->below) 1156 for (; top; top = top->below)
1070 { 1157 {
1083 } 1170 }
1084 1171
1085 return 0; 1172 return 0;
1086} 1173}
1087 1174
1175void
1176object::expand_tail ()
1177{
1178 if (more)
1179 return;
1180
1181 object *prev = this;
1182
1183 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1184 {
1185 object *op = arch_to_object (at);
1186
1187 op->name = name;
1188 op->name_pl = name_pl;
1189 op->title = title;
1190
1191 op->head = this;
1192 prev->more = op;
1193
1194 prev = op;
1195 }
1196}
1197
1088/* 1198/*
1089 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1199 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1090 * job preparing multi-part monsters 1200 * job preparing multi-part monsters.
1091 */ 1201 */
1092object * 1202object *
1093insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1203insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1094{ 1204{
1095 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1096 { 1206 {
1097 tmp->x = x + tmp->arch->clone.x; 1207 tmp->x = x + tmp->arch->x;
1098 tmp->y = y + tmp->arch->clone.y; 1208 tmp->y = y + tmp->arch->y;
1099 } 1209 }
1100 1210
1101 return insert_ob_in_map (op, m, originator, flag); 1211 return insert_ob_in_map (op, m, originator, flag);
1102} 1212}
1103 1213
1122 * just 'op' otherwise 1232 * just 'op' otherwise
1123 */ 1233 */
1124object * 1234object *
1125insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1126{ 1236{
1237 assert (!op->flag [FLAG_FREED]);
1238
1127 object *tmp, *top, *floor = NULL; 1239 object *top, *floor = NULL;
1128 sint16 x, y;
1129 1240
1130 if (QUERY_FLAG (op, FLAG_FREED)) 1241 op->remove ();
1131 {
1132 LOG (llevError, "Trying to insert freed object!\n");
1133 return NULL;
1134 }
1135
1136 if (!m)
1137 {
1138 char *dump = dump_object (op);
1139 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1140 free (dump);
1141 return op;
1142 }
1143
1144 if (out_of_map (m, op->x, op->y))
1145 {
1146 char *dump = dump_object (op);
1147 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1148#ifdef MANY_CORES
1149 /* Better to catch this here, as otherwise the next use of this object
1150 * is likely to cause a crash. Better to find out where it is getting
1151 * improperly inserted.
1152 */
1153 abort ();
1154#endif
1155 free (dump);
1156 return op;
1157 }
1158
1159 if (!QUERY_FLAG (op, FLAG_REMOVED))
1160 {
1161 char *dump = dump_object (op);
1162 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1163 free (dump);
1164 return op;
1165 }
1166
1167 if (op->more)
1168 {
1169 /* The part may be on a different map. */
1170
1171 object *more = op->more;
1172
1173 /* We really need the caller to normalise coordinates - if
1174 * we set the map, that doesn't work if the location is within
1175 * a map and this is straddling an edge. So only if coordinate
1176 * is clear wrong do we normalise it.
1177 */
1178 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1179 more->map = get_map_from_coord (m, &more->x, &more->y);
1180 else if (!more->map)
1181 {
1182 /* For backwards compatibility - when not dealing with tiled maps,
1183 * more->map should always point to the parent.
1184 */
1185 more->map = m;
1186 }
1187
1188 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1189 {
1190 if (!op->head)
1191 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1192
1193 return 0;
1194 }
1195 }
1196
1197 CLEAR_FLAG (op, FLAG_REMOVED);
1198 1242
1199 /* Ideally, the caller figures this out. However, it complicates a lot 1243 /* Ideally, the caller figures this out. However, it complicates a lot
1200 * 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
1201 * need extra work 1245 * need extra work
1202 */ 1246 */
1203 op->map = get_map_from_coord (m, &op->x, &op->y); 1247 if (!xy_normalise (m, op->x, op->y))
1204 x = op->x; 1248 {
1205 y = op->y; 1249 op->destroy ();
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);
1258
1259 op->map = m;
1260 mapspace &ms = op->ms ();
1206 1261
1207 /* this has to be done after we translate the coordinates. 1262 /* this has to be done after we translate the coordinates.
1208 */ 1263 */
1209 if (op->nrof && !(flag & INS_NO_MERGE)) 1264 if (op->nrof && !(flag & INS_NO_MERGE))
1210 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1211 if (object::can_merge (op, tmp)) 1266 if (object::can_merge (op, tmp))
1212 { 1267 {
1213 op->nrof += tmp->nrof; 1268 op->nrof += tmp->nrof;
1214 tmp->destroy (); 1269 tmp->destroy (1);
1215 } 1270 }
1216 1271
1217 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 */
1218 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1273 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1219 1274
1232 op->below = originator->below; 1287 op->below = originator->below;
1233 1288
1234 if (op->below) 1289 if (op->below)
1235 op->below->above = op; 1290 op->below->above = op;
1236 else 1291 else
1237 op->ms ().bot = op; 1292 ms.bot = op;
1238 1293
1239 /* since *below* originator, no need to update top */ 1294 /* since *below* originator, no need to update top */
1240 originator->below = op; 1295 originator->below = op;
1241 } 1296 }
1242 else 1297 else
1243 { 1298 {
1299 top = ms.bot;
1300
1244 /* If there are other objects, then */ 1301 /* If there are other objects, then */
1245 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1302 if (top)
1246 { 1303 {
1247 object *last = 0; 1304 object *last = 0;
1248 1305
1249 /* 1306 /*
1250 * 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.
1256 * once we get to them. This reduces the need to traverse over all of 1313 * once we get to them. This reduces the need to traverse over all of
1257 * them when adding another one - this saves quite a bit of cpu time 1314 * them when adding another one - this saves quite a bit of cpu time
1258 * when lots of spells are cast in one area. Currently, it is presumed 1315 * when lots of spells are cast in one area. Currently, it is presumed
1259 * that flying non pickable objects are spell objects. 1316 * that flying non pickable objects are spell objects.
1260 */ 1317 */
1261 while (top) 1318 for (top = ms.bot; top; top = top->above)
1262 { 1319 {
1263 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1320 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1264 floor = top; 1321 floor = top;
1265 1322
1266 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1323 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1269 top = top->below; 1326 top = top->below;
1270 break; 1327 break;
1271 } 1328 }
1272 1329
1273 last = top; 1330 last = top;
1274 top = top->above;
1275 } 1331 }
1276 1332
1277 /* Don't want top to be NULL, so set it to the last valid object */ 1333 /* Don't want top to be NULL, so set it to the last valid object */
1278 top = last; 1334 top = last;
1279 1335
1281 * looks like instead of lots of conditions here. 1337 * looks like instead of lots of conditions here.
1282 * makes things faster, and effectively the same result. 1338 * makes things faster, and effectively the same result.
1283 */ 1339 */
1284 1340
1285 /* Have object 'fall below' other objects that block view. 1341 /* Have object 'fall below' other objects that block view.
1286 * Unless those objects are exits, type 66 1342 * Unless those objects are exits.
1287 * If INS_ON_TOP is used, don't do this processing 1343 * If INS_ON_TOP is used, don't do this processing
1288 * Need to find the object that in fact blocks view, otherwise 1344 * Need to find the object that in fact blocks view, otherwise
1289 * stacking is a bit odd. 1345 * stacking is a bit odd.
1290 */ 1346 */
1291 if (!(flag & INS_ON_TOP) && 1347 if (!(flag & INS_ON_TOP)
1292 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1348 && ms.flags () & P_BLOCKSVIEW
1349 && (op->face && !faces [op->face].visibility))
1293 { 1350 {
1294 for (last = top; last != floor; last = last->below) 1351 for (last = top; last != floor; last = last->below)
1295 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1352 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1296 break; 1353 break;
1354
1297 /* Check to see if we found the object that blocks view, 1355 /* Check to see if we found the object that blocks view,
1298 * and make sure we have a below pointer for it so that 1356 * and make sure we have a below pointer for it so that
1299 * we can get inserted below this one, which requires we 1357 * we can get inserted below this one, which requires we
1300 * set top to the object below us. 1358 * set top to the object below us.
1301 */ 1359 */
1302 if (last && last->below && last != floor) 1360 if (last && last->below && last != floor)
1303 top = last->below; 1361 top = last->below;
1304 } 1362 }
1305 } /* If objects on this space */ 1363 } /* If objects on this space */
1306 1364
1307 if (flag & INS_MAP_LOAD)
1308 top = GET_MAP_TOP (op->map, op->x, op->y);
1309
1310 if (flag & INS_ABOVE_FLOOR_ONLY) 1365 if (flag & INS_ABOVE_FLOOR_ONLY)
1311 top = floor; 1366 top = floor;
1312 1367
1313 /* 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.
1314 */ 1369 */
1315 1370
1316 /* First object on this space */ 1371 /* First object on this space */
1317 if (!top) 1372 if (!top)
1318 { 1373 {
1319 op->above = GET_MAP_OB (op->map, op->x, op->y); 1374 op->above = ms.bot;
1320 1375
1321 if (op->above) 1376 if (op->above)
1322 op->above->below = op; 1377 op->above->below = op;
1323 1378
1324 op->below = 0; 1379 op->below = 0;
1325 op->ms ().bot = op; 1380 ms.bot = op;
1326 } 1381 }
1327 else 1382 else
1328 { /* get inserted into the stack above top */ 1383 { /* get inserted into the stack above top */
1329 op->above = top->above; 1384 op->above = top->above;
1330 1385
1334 op->below = top; 1389 op->below = top;
1335 top->above = op; 1390 top->above = op;
1336 } 1391 }
1337 1392
1338 if (!op->above) 1393 if (!op->above)
1339 op->ms ().top = op; 1394 ms.top = op;
1340 } /* else not INS_BELOW_ORIGINATOR */ 1395 } /* else not INS_BELOW_ORIGINATOR */
1341 1396
1342 if (op->type == PLAYER) 1397 if (op->type == PLAYER)
1343 { 1398 {
1344 op->contr->do_los = 1; 1399 op->contr->do_los = 1;
1346 op->map->touch (); 1401 op->map->touch ();
1347 } 1402 }
1348 1403
1349 op->map->dirty = true; 1404 op->map->dirty = true;
1350 1405
1351 /* If we have a floor, we know the player, if any, will be above
1352 * it, so save a few ticks and start from there.
1353 */
1354 if (!(flag & INS_MAP_LOAD))
1355 if (object *pl = op->ms ().player ()) 1406 if (object *pl = ms.player ())
1356 if (pl->contr->ns)
1357 pl->contr->ns->floorbox_update (); 1407 pl->contr->ns->floorbox_update ();
1358 1408
1359 /* If this object glows, it may affect lighting conditions that are 1409 /* If this object glows, it may affect lighting conditions that are
1360 * 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
1361 * 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
1362 * on the map will get recalculated. The players could very well 1412 * on the map will get recalculated. The players could very well
1381 * blocked() and wall() work properly), and these flags are updated by 1431 * blocked() and wall() work properly), and these flags are updated by
1382 * update_object(). 1432 * update_object().
1383 */ 1433 */
1384 1434
1385 /* if this is not the head or flag has been passed, don't check walk on status */ 1435 /* if this is not the head or flag has been passed, don't check walk on status */
1386 if (!(flag & INS_NO_WALK_ON) && !op->head) 1436 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1387 { 1437 {
1388 if (check_move_on (op, originator)) 1438 if (check_move_on (op, originator))
1389 return 0; 1439 return 0;
1390 1440
1391 /* If we are a multi part object, lets work our way through the check 1441 /* If we are a multi part object, lets work our way through the check
1392 * walk on's. 1442 * walk on's.
1393 */ 1443 */
1394 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1444 for (object *tmp = op->more; tmp; tmp = tmp->more)
1395 if (check_move_on (tmp, originator)) 1445 if (check_move_on (tmp, originator))
1396 return 0; 1446 return 0;
1397 } 1447 }
1398 1448
1399 return op; 1449 return op;
1404 * 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.
1405 */ 1455 */
1406void 1456void
1407replace_insert_ob_in_map (const char *arch_string, object *op) 1457replace_insert_ob_in_map (const char *arch_string, object *op)
1408{ 1458{
1409 object *tmp, *tmp1;
1410
1411 /* first search for itself and remove any old instances */ 1459 /* first search for itself and remove any old instances */
1412 1460
1413 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1461 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1414 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1462 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1415 tmp->destroy (); 1463 tmp->destroy (1);
1416 1464
1417 tmp1 = arch_to_object (archetype::find (arch_string)); 1465 object *tmp = arch_to_object (archetype::find (arch_string));
1418 1466
1419 tmp1->x = op->x; 1467 tmp->x = op->x;
1420 tmp1->y = op->y; 1468 tmp->y = op->y;
1469
1421 insert_ob_in_map (tmp1, op->map, op, 0); 1470 insert_ob_in_map (tmp, op->map, op, 0);
1422} 1471}
1423 1472
1424object * 1473object *
1425object::insert_at (object *where, object *originator, int flags) 1474object::insert_at (object *where, object *originator, int flags)
1426{ 1475{
1476 if (where->env)
1477 return where->env->insert (this);
1478 else
1427 where->map->insert (this, where->x, where->y, originator, flags); 1479 return where->map->insert (this, where->x, where->y, originator, flags);
1428} 1480}
1429 1481
1430/* 1482// find player who can see this object
1431 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1483static object *
1432 * is returned contains nr objects, and the remaining parts contains 1484visible_to (object *op)
1433 * the rest (or is removed and freed if that number is 0).
1434 * On failure, NULL is returned, and the reason put into the
1435 * global static errmsg array.
1436 */
1437object *
1438get_split_ob (object *orig_ob, uint32 nr)
1439{ 1485{
1440 object *newob; 1486 if (!op->flag [FLAG_REMOVED])
1441 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1442
1443 if (orig_ob->nrof < nr)
1444 {
1445 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1446 return NULL;
1447 } 1487 {
1448 1488 // see if we are in a container of sorts
1449 newob = object_create_clone (orig_ob); 1489 if (object *env = op->env)
1450
1451 if ((orig_ob->nrof -= nr) < 1)
1452 orig_ob->destroy (1);
1453 else if (!is_removed)
1454 {
1455 if (orig_ob->env != NULL)
1456 sub_weight (orig_ob->env, orig_ob->weight * nr);
1457 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1458 {
1459 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1460 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1461 return NULL;
1462 } 1490 {
1463 } 1491 // the player inventory itself is always visible
1492 if (env->type == PLAYER)
1493 return env;
1464 1494
1465 newob->nrof = nr; 1495 // else a player could have our env open
1496 env = env->outer_env ();
1466 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
1467 return newob; 1513 return 0;
1468} 1514}
1469 1515
1470/* 1516/*
1471 * decrease_ob_nr(object, number) decreases a specified number from 1517 * decrease(object, number) decreases a specified number from
1472 * the amount of an object. If the amount reaches 0, the object 1518 * the amount of an object. If the amount reaches 0, the object
1473 * is subsequently removed and freed. 1519 * is subsequently removed and freed.
1474 * 1520 *
1475 * Return value: 'op' if something is left, NULL if the amount reached 0 1521 * Return value: 'op' if something is left, NULL if the amount reached 0
1476 */ 1522 */
1523bool
1524object::decrease (sint32 nr)
1525{
1526 nr = min (nr, nrof);
1477 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 }
1552}
1553
1554/*
1555 * split(ob,nr) splits up ob into two parts. The part which
1556 * is returned contains nr objects, and the remaining parts contains
1557 * the rest (or is removed and returned if that number is 0).
1558 * On failure, NULL is returned.
1559 */
1478object * 1560object *
1479decrease_ob_nr (object *op, uint32 i) 1561object::split (sint32 nr)
1480{ 1562{
1481 object *tmp; 1563 if (nrof < nr)
1482
1483 if (i == 0) /* objects with op->nrof require this check */
1484 return op; 1564 return 0;
1485 1565 else if (nrof == nr)
1486 if (i > op->nrof)
1487 i = op->nrof;
1488
1489 if (QUERY_FLAG (op, FLAG_REMOVED))
1490 op->nrof -= i;
1491 else if (op->env)
1492 { 1566 {
1493 /* is this object in the players inventory, or sub container
1494 * therein?
1495 */
1496 tmp = op->in_player ();
1497 /* nope. Is this a container the player has opened?
1498 * If so, set tmp to that player.
1499 * IMO, searching through all the players will mostly
1500 * likely be quicker than following op->env to the map,
1501 * and then searching the map for a player.
1502 */
1503 if (!tmp)
1504 for_all_players (pl)
1505 if (pl->ob->container == op->env)
1506 {
1507 tmp = pl->ob;
1508 break;
1509 }
1510
1511 if (i < op->nrof)
1512 {
1513 sub_weight (op->env, op->weight * i);
1514 op->nrof -= i;
1515 if (tmp)
1516 esrv_send_item (tmp, op);
1517 }
1518 else
1519 {
1520 op->remove (); 1567 remove ();
1521 op->nrof = 0; 1568 return this;
1522 if (tmp)
1523 esrv_del_item (tmp->contr, op->count);
1524 }
1525 } 1569 }
1526 else 1570 else
1527 { 1571 {
1528 object *above = op->above; 1572 decrease (nr);
1529 1573
1530 if (i < op->nrof) 1574 object *op = object_create_clone (this);
1531 op->nrof -= i; 1575 op->nrof = nr;
1532 else
1533 {
1534 op->remove ();
1535 op->nrof = 0;
1536 }
1537
1538 /* Since we just removed op, op->above is null */
1539 for (tmp = above; tmp; tmp = tmp->above)
1540 if (tmp->type == PLAYER)
1541 {
1542 if (op->nrof)
1543 esrv_send_item (tmp, op);
1544 else
1545 esrv_del_item (tmp->contr, op->count);
1546 }
1547 }
1548
1549 if (op->nrof)
1550 return op; 1576 return op;
1551 else
1552 {
1553 op->destroy ();
1554 return 0;
1555 }
1556}
1557
1558/*
1559 * add_weight(object, weight) adds the specified weight to an object,
1560 * and also updates how much the environment(s) is/are carrying.
1561 */
1562
1563void
1564add_weight (object *op, signed long weight)
1565{
1566 while (op != NULL)
1567 {
1568 if (op->type == CONTAINER)
1569 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1570
1571 op->carrying += weight;
1572 op = op->env;
1573 } 1577 }
1574} 1578}
1575 1579
1576object * 1580object *
1577insert_ob_in_ob (object *op, object *where) 1581insert_ob_in_ob (object *op, object *where)
1582 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1586 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1583 free (dump); 1587 free (dump);
1584 return op; 1588 return op;
1585 } 1589 }
1586 1590
1587 if (where->head) 1591 if (where->head_ () != where)
1588 { 1592 {
1589 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1593 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1590 where = where->head; 1594 where = where->head;
1591 } 1595 }
1592 1596
1593 return where->insert (op); 1597 return where->insert (op);
1594} 1598}
1599 * inside the object environment. 1603 * inside the object environment.
1600 * 1604 *
1601 * The function returns now pointer to inserted item, and return value can 1605 * The function returns now pointer to inserted item, and return value can
1602 * be != op, if items are merged. -Tero 1606 * be != op, if items are merged. -Tero
1603 */ 1607 */
1604
1605object * 1608object *
1606object::insert (object *op) 1609object::insert (object *op)
1607{ 1610{
1608 object *tmp, *otmp;
1609
1610 if (!QUERY_FLAG (op, FLAG_REMOVED))
1611 op->remove ();
1612
1613 if (op->more) 1611 if (op->more)
1614 { 1612 {
1615 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1613 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1616 return op; 1614 return op;
1617 } 1615 }
1618 1616
1619 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1617 op->remove ();
1620 CLEAR_FLAG (op, FLAG_REMOVED); 1618
1619 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1620
1621 if (op->nrof) 1621 if (op->nrof)
1622 {
1623 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1622 for (object *tmp = inv; tmp; tmp = tmp->below)
1624 if (object::can_merge (tmp, op)) 1623 if (object::can_merge (tmp, op))
1625 { 1624 {
1626 /* return the original object and remove inserted object 1625 /* return the original object and remove inserted object
1627 (client needs the original object) */ 1626 (client needs the original object) */
1628 tmp->nrof += op->nrof; 1627 tmp->nrof += op->nrof;
1629 /* Weight handling gets pretty funky. Since we are adding to
1630 * tmp->nrof, we need to increase the weight.
1631 */
1632 add_weight (this, op->weight * op->nrof); 1628 adjust_weight (this, op->total_weight ());
1633 SET_FLAG (op, FLAG_REMOVED); 1629
1634 op->destroy (); /* free the inserted object */ 1630 op->destroy (1);
1635 op = tmp; 1631 op = tmp;
1636 op->remove (); /* and fix old object's links */ 1632 goto inserted;
1637 CLEAR_FLAG (op, FLAG_REMOVED);
1638 break;
1639 } 1633 }
1640 1634
1641 /* I assume combined objects have no inventory 1635 op->owner = 0; // it's his/hers now. period.
1642 * We add the weight - this object could have just been removed 1636 op->map = 0;
1643 * (if it was possible to merge). calling remove_ob will subtract 1637 op->x = 0;
1644 * the weight, so we need to add it in again, since we actually do 1638 op->y = 0;
1645 * the linking below
1646 */
1647 add_weight (this, op->weight * op->nrof);
1648 }
1649 else
1650 add_weight (this, (op->weight + op->carrying));
1651 1639
1652 otmp = this->in_player (); 1640 op->above = 0;
1653 if (otmp && otmp->contr) 1641 op->below = inv;
1642 op->env = this;
1643
1644 if (inv)
1645 inv->above = op;
1646
1647 inv = op;
1648
1649 op->flag [FLAG_REMOVED] = 0;
1650
1651 adjust_weight (this, op->total_weight ());
1652
1653inserted:
1654 /* reset the light list and los of the players on the map */
1655 if (op->glow_radius && map && map->darkness)
1656 update_all_los (map, x, y);
1657
1658 if (object *otmp = in_player ())
1654 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1659 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1655 otmp->update_stats (); 1660 otmp->update_stats ();
1656
1657 op->map = 0;
1658 op->env = this;
1659 op->above = 0;
1660 op->below = 0;
1661 op->x = 0, op->y = 0;
1662
1663 /* reset the light list and los of the players on the map */
1664 if ((op->glow_radius != 0) && map)
1665 {
1666#ifdef DEBUG_LIGHTS
1667 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1668#endif /* DEBUG_LIGHTS */
1669 if (map->darkness)
1670 update_all_los (map, x, y);
1671 }
1672
1673 /* Client has no idea of ordering so lets not bother ordering it here.
1674 * It sure simplifies this function...
1675 */
1676 if (!inv)
1677 inv = op;
1678 else
1679 {
1680 op->below = inv;
1681 op->below->above = op;
1682 inv = op;
1683 }
1684 1661
1685 INVOKE_OBJECT (INSERT, this); 1662 INVOKE_OBJECT (INSERT, this);
1686 1663
1687 return op; 1664 return op;
1688} 1665}
1769 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1746 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1770 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1747 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1771 { 1748 {
1772 1749
1773 float 1750 float
1774 diff = tmp->move_slow_penalty * FABS (op->speed); 1751 diff = tmp->move_slow_penalty * fabs (op->speed);
1775 1752
1776 if (op->type == PLAYER) 1753 if (op->type == PLAYER)
1777 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1754 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1778 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1755 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1779 diff /= 4.0; 1756 diff /= 4.0;
1903 * activate recursively a flag on an object inventory 1880 * activate recursively a flag on an object inventory
1904 */ 1881 */
1905void 1882void
1906flag_inv (object *op, int flag) 1883flag_inv (object *op, int flag)
1907{ 1884{
1908 if (op->inv)
1909 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1885 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1910 { 1886 {
1911 SET_FLAG (tmp, flag); 1887 SET_FLAG (tmp, flag);
1912 flag_inv (tmp, flag); 1888 flag_inv (tmp, flag);
1913 } 1889 }
1914} 1890}
1915 1891
1916/* 1892/*
1917 * deactivate recursively a flag on an object inventory 1893 * deactivate recursively a flag on an object inventory
1918 */ 1894 */
1919void 1895void
1920unflag_inv (object *op, int flag) 1896unflag_inv (object *op, int flag)
1921{ 1897{
1922 if (op->inv)
1923 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1898 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1924 { 1899 {
1925 CLEAR_FLAG (tmp, flag); 1900 CLEAR_FLAG (tmp, flag);
1926 unflag_inv (tmp, flag); 1901 unflag_inv (tmp, flag);
1927 } 1902 }
1928}
1929
1930/*
1931 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1932 * all it's inventory (recursively).
1933 * If checksums are used, a player will get set_cheat called for
1934 * him/her-self and all object carried by a call to this function.
1935 */
1936void
1937set_cheat (object *op)
1938{
1939 SET_FLAG (op, FLAG_WAS_WIZ);
1940 flag_inv (op, FLAG_WAS_WIZ);
1941} 1903}
1942 1904
1943/* 1905/*
1944 * find_free_spot(object, map, x, y, start, stop) will search for 1906 * find_free_spot(object, map, x, y, start, stop) will search for
1945 * a spot at the given map and coordinates which will be able to contain 1907 * a spot at the given map and coordinates which will be able to contain
1947 * to search (see the freearr_x/y[] definition). 1909 * to search (see the freearr_x/y[] definition).
1948 * It returns a random choice among the alternatives found. 1910 * It returns a random choice among the alternatives found.
1949 * start and stop are where to start relative to the free_arr array (1,9 1911 * start and stop are where to start relative to the free_arr array (1,9
1950 * does all 4 immediate directions). This returns the index into the 1912 * does all 4 immediate directions). This returns the index into the
1951 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1913 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1952 * Note - this only checks to see if there is space for the head of the
1953 * object - if it is a multispace object, this should be called for all
1954 * pieces.
1955 * Note2: This function does correctly handle tiled maps, but does not 1914 * Note: This function does correctly handle tiled maps, but does not
1956 * inform the caller. However, insert_ob_in_map will update as 1915 * inform the caller. However, insert_ob_in_map will update as
1957 * necessary, so the caller shouldn't need to do any special work. 1916 * necessary, so the caller shouldn't need to do any special work.
1958 * Note - updated to take an object instead of archetype - this is necessary 1917 * Note - updated to take an object instead of archetype - this is necessary
1959 * because arch_blocked (now ob_blocked) needs to know the movement type 1918 * because arch_blocked (now ob_blocked) needs to know the movement type
1960 * to know if the space in question will block the object. We can't use 1919 * to know if the space in question will block the object. We can't use
1962 * customized, changed states, etc. 1921 * customized, changed states, etc.
1963 */ 1922 */
1964int 1923int
1965find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1924find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1966{ 1925{
1926 int altern[SIZEOFFREE];
1967 int index = 0, flag; 1927 int index = 0, flag;
1968 int altern[SIZEOFFREE];
1969 1928
1970 for (int i = start; i < stop; i++) 1929 for (int i = start; i < stop; i++)
1971 { 1930 {
1972 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1931 mapxy pos (m, x, y); pos.move (i);
1973 if (!flag) 1932
1933 if (!pos.normalise ())
1934 continue;
1935
1936 mapspace &ms = *pos;
1937
1938 if (ms.flags () & P_IS_ALIVE)
1939 continue;
1940
1941 /* However, often
1942 * ob doesn't have any move type (when used to place exits)
1943 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1944 */
1945 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1946 {
1974 altern [index++] = i; 1947 altern [index++] = i;
1948 continue;
1949 }
1975 1950
1976 /* Basically, if we find a wall on a space, we cut down the search size. 1951 /* Basically, if we find a wall on a space, we cut down the search size.
1977 * In this way, we won't return spaces that are on another side of a wall. 1952 * In this way, we won't return spaces that are on another side of a wall.
1978 * This mostly work, but it cuts down the search size in all directions - 1953 * This mostly work, but it cuts down the search size in all directions -
1979 * if the space being examined only has a wall to the north and empty 1954 * if the space being examined only has a wall to the north and empty
1980 * spaces in all the other directions, this will reduce the search space 1955 * spaces in all the other directions, this will reduce the search space
1981 * to only the spaces immediately surrounding the target area, and 1956 * to only the spaces immediately surrounding the target area, and
1982 * won't look 2 spaces south of the target space. 1957 * won't look 2 spaces south of the target space.
1983 */ 1958 */
1984 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1959 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1960 {
1985 stop = maxfree[i]; 1961 stop = maxfree[i];
1962 continue;
1963 }
1964
1965 /* Note it is intentional that we check ob - the movement type of the
1966 * head of the object should correspond for the entire object.
1967 */
1968 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1969 continue;
1970
1971 if (ob->blocked (m, pos.x, pos.y))
1972 continue;
1973
1974 altern [index++] = i;
1986 } 1975 }
1987 1976
1988 if (!index) 1977 if (!index)
1989 return -1; 1978 return -1;
1990 1979
1991 return altern[RANDOM () % index]; 1980 return altern [rndm (index)];
1992} 1981}
1993 1982
1994/* 1983/*
1995 * find_first_free_spot(archetype, maptile, x, y) works like 1984 * find_first_free_spot(archetype, maptile, x, y) works like
1996 * find_free_spot(), but it will search max number of squares. 1985 * find_free_spot(), but it will search max number of squares.
1999 */ 1988 */
2000int 1989int
2001find_first_free_spot (const object *ob, maptile *m, int x, int y) 1990find_first_free_spot (const object *ob, maptile *m, int x, int y)
2002{ 1991{
2003 for (int i = 0; i < SIZEOFFREE; i++) 1992 for (int i = 0; i < SIZEOFFREE; i++)
2004 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 1993 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2005 return i; 1994 return i;
2006 1995
2007 return -1; 1996 return -1;
2008} 1997}
2009 1998
2017{ 2006{
2018 arr += begin; 2007 arr += begin;
2019 end -= begin; 2008 end -= begin;
2020 2009
2021 while (--end) 2010 while (--end)
2022 swap (arr [end], arr [RANDOM () % (end + 1)]); 2011 swap (arr [end], arr [rndm (end + 1)]);
2023} 2012}
2024 2013
2025/* new function to make monster searching more efficient, and effective! 2014/* new function to make monster searching more efficient, and effective!
2026 * This basically returns a randomized array (in the passed pointer) of 2015 * This basically returns a randomized array (in the passed pointer) of
2027 * the spaces to find monsters. In this way, it won't always look for 2016 * the spaces to find monsters. In this way, it won't always look for
2063 object *tmp; 2052 object *tmp;
2064 maptile *mp; 2053 maptile *mp;
2065 2054
2066 MoveType blocked, move_type; 2055 MoveType blocked, move_type;
2067 2056
2068 if (exclude && exclude->head) 2057 if (exclude && exclude->head_ () != exclude)
2069 { 2058 {
2070 exclude = exclude->head; 2059 exclude = exclude->head;
2071 move_type = exclude->move_type; 2060 move_type = exclude->move_type;
2072 } 2061 }
2073 else 2062 else
2096 max = maxfree[i]; 2085 max = maxfree[i];
2097 else if (mflags & P_IS_ALIVE) 2086 else if (mflags & P_IS_ALIVE)
2098 { 2087 {
2099 for (tmp = ms.bot; tmp; tmp = tmp->above) 2088 for (tmp = ms.bot; tmp; tmp = tmp->above)
2100 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2089 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2101 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2090 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2102 break; 2091 break;
2103 2092
2104 if (tmp) 2093 if (tmp)
2105 return freedir[i]; 2094 return freedir[i];
2106 } 2095 }
2161 2150
2162 return 3; 2151 return 3;
2163} 2152}
2164 2153
2165/* 2154/*
2166 * absdir(int): Returns a number between 1 and 8, which represent
2167 * the "absolute" direction of a number (it actually takes care of
2168 * "overflow" in previous calculations of a direction).
2169 */
2170
2171int
2172absdir (int d)
2173{
2174 while (d < 1)
2175 d += 8;
2176
2177 while (d > 8)
2178 d -= 8;
2179
2180 return d;
2181}
2182
2183/*
2184 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2155 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2185 * between two directions (which are expected to be absolute (see absdir()) 2156 * between two directions (which are expected to be absolute (see absdir())
2186 */ 2157 */
2187
2188int 2158int
2189dirdiff (int dir1, int dir2) 2159dirdiff (int dir1, int dir2)
2190{ 2160{
2191 int d; 2161 int d;
2192 2162
2305 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2275 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2306 * core dumps if they do. 2276 * core dumps if they do.
2307 * 2277 *
2308 * Add a check so we can't pick up invisible objects (0.93.8) 2278 * Add a check so we can't pick up invisible objects (0.93.8)
2309 */ 2279 */
2310
2311int 2280int
2312can_pick (const object *who, const object *item) 2281can_pick (const object *who, const object *item)
2313{ 2282{
2314 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2283 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2315 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2284 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2320 * create clone from object to another 2289 * create clone from object to another
2321 */ 2290 */
2322object * 2291object *
2323object_create_clone (object *asrc) 2292object_create_clone (object *asrc)
2324{ 2293{
2325 object *dst = 0, *tmp, *src, *part, *prev, *item; 2294 object *dst = 0, *tmp, *src, *prev, *item;
2326 2295
2327 if (!asrc) 2296 if (!asrc)
2328 return 0; 2297 return 0;
2329 2298
2330 src = asrc;
2331 if (src->head)
2332 src = src->head; 2299 src = asrc->head_ ();
2333 2300
2334 prev = 0; 2301 prev = 0;
2335 for (part = src; part; part = part->more) 2302 for (object *part = src; part; part = part->more)
2336 { 2303 {
2337 tmp = part->clone (); 2304 tmp = part->clone ();
2338 tmp->x -= src->x; 2305 tmp->x -= src->x;
2339 tmp->y -= src->y; 2306 tmp->y -= src->y;
2340 2307
2356 2323
2357 for (item = src->inv; item; item = item->below) 2324 for (item = src->inv; item; item = item->below)
2358 insert_ob_in_ob (object_create_clone (item), dst); 2325 insert_ob_in_ob (object_create_clone (item), dst);
2359 2326
2360 return dst; 2327 return dst;
2361}
2362
2363/* GROS - Creates an object using a string representing its content. */
2364/* Basically, we save the content of the string to a temp file, then call */
2365/* load_object on it. I admit it is a highly inefficient way to make things, */
2366/* but it was simple to make and allows reusing the load_object function. */
2367/* Remember not to use load_object_str in a time-critical situation. */
2368/* Also remember that multiparts objects are not supported for now. */
2369object *
2370load_object_str (const char *obstr)
2371{
2372 object *op;
2373 char filename[MAX_BUF];
2374
2375 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2376
2377 FILE *tempfile = fopen (filename, "w");
2378
2379 if (tempfile == NULL)
2380 {
2381 LOG (llevError, "Error - Unable to access load object temp file\n");
2382 return NULL;
2383 }
2384
2385 fprintf (tempfile, obstr);
2386 fclose (tempfile);
2387
2388 op = object::create ();
2389
2390 object_thawer thawer (filename);
2391
2392 if (thawer)
2393 load_object (thawer, op, 0);
2394
2395 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2396 CLEAR_FLAG (op, FLAG_REMOVED);
2397
2398 return op;
2399} 2328}
2400 2329
2401/* This returns the first object in who's inventory that 2330/* This returns the first object in who's inventory that
2402 * has the same type and subtype match. 2331 * has the same type and subtype match.
2403 * returns NULL if no match. 2332 * returns NULL if no match.
2458 if (link->key == canonical_key) 2387 if (link->key == canonical_key)
2459 return link->value; 2388 return link->value;
2460 2389
2461 return 0; 2390 return 0;
2462} 2391}
2463
2464 2392
2465/* 2393/*
2466 * Updates the canonical_key in op to value. 2394 * Updates the canonical_key in op to value.
2467 * 2395 *
2468 * canonical_key is a shared string (value doesn't have to be). 2396 * canonical_key is a shared string (value doesn't have to be).
2492 /* Basically, if the archetype has this key set, 2420 /* Basically, if the archetype has this key set,
2493 * we need to store the null value so when we save 2421 * we need to store the null value so when we save
2494 * it, we save the empty value so that when we load, 2422 * it, we save the empty value so that when we load,
2495 * we get this value back again. 2423 * we get this value back again.
2496 */ 2424 */
2497 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2425 if (get_ob_key_link (op->arch, canonical_key))
2498 field->value = 0; 2426 field->value = 0;
2499 else 2427 else
2500 { 2428 {
2501 if (last) 2429 if (last)
2502 last->next = field->next; 2430 last->next = field->next;
2571 } 2499 }
2572 else 2500 else
2573 item = item->env; 2501 item = item->env;
2574} 2502}
2575 2503
2576
2577const char * 2504const char *
2578object::flag_desc (char *desc, int len) const 2505object::flag_desc (char *desc, int len) const
2579{ 2506{
2580 char *p = desc; 2507 char *p = desc;
2581 bool first = true; 2508 bool first = true;
2608{ 2535{
2609 char flagdesc[512]; 2536 char flagdesc[512];
2610 char info2[256 * 4]; 2537 char info2[256 * 4];
2611 char *p = info; 2538 char *p = info;
2612 2539
2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2540 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2614 count, uuid.seq, 2541 count,
2542 uuid.c_str (),
2615 &name, 2543 &name,
2616 title ? "\",title:" : "", 2544 title ? "\",title:\"" : "",
2617 title ? (const char *)title : "", 2545 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type); 2546 flag_desc (flagdesc, 512), type);
2619 2547
2620 if (env) 2548 if (!this->flag[FLAG_REMOVED] && env)
2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2549 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2622 2550
2623 if (map) 2551 if (map)
2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2552 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2625 2553
2627} 2555}
2628 2556
2629const char * 2557const char *
2630object::debug_desc () const 2558object::debug_desc () const
2631{ 2559{
2632 static char info[256 * 4]; 2560 static char info[3][256 * 4];
2561 static int info_idx;
2562
2633 return debug_desc (info); 2563 return debug_desc (info [++info_idx % 3]);
2634} 2564}
2635 2565
2566struct region *
2567object::region () const
2568{
2569 return map ? map->region (x, y)
2570 : region::default_region ();
2571}
2572
2573const materialtype_t *
2574object::dominant_material () const
2575{
2576 if (materialtype_t *mt = name_to_material (materialname))
2577 return mt;
2578
2579 return name_to_material (shstr_unknown);
2580}
2581
2582void
2583object::open_container (object *new_container)
2584{
2585 if (container == new_container)
2586 return;
2587
2588 if (object *old_container = container)
2589 {
2590 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2591 return;
2592
2593#if 0
2594 // remove the "Close old_container" object.
2595 if (object *closer = old_container->inv)
2596 if (closer->type == CLOSE_CON)
2597 closer->destroy ();
2598#endif
2599
2600 old_container->flag [FLAG_APPLIED] = 0;
2601 container = 0;
2602
2603 esrv_update_item (UPD_FLAGS, this, old_container);
2604 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2605 play_sound (sound_find ("chest_close"));
2606 }
2607
2608 if (new_container)
2609 {
2610 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2611 return;
2612
2613 // TODO: this does not seem to serve any purpose anymore?
2614#if 0
2615 // insert the "Close Container" object.
2616 if (archetype *closer = new_container->other_arch)
2617 {
2618 object *closer = arch_to_object (new_container->other_arch);
2619 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2620 new_container->insert (closer);
2621 }
2622#endif
2623
2624 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2625
2626 new_container->flag [FLAG_APPLIED] = 1;
2627 container = new_container;
2628
2629 esrv_update_item (UPD_FLAGS, this, new_container);
2630 esrv_send_inventory (this, new_container);
2631 play_sound (sound_find ("chest_open"));
2632 }
2633}
2634
2635object *
2636object::force_find (const shstr name)
2637{
2638 /* cycle through his inventory to look for the MARK we want to
2639 * place
2640 */
2641 for (object *tmp = inv; tmp; tmp = tmp->below)
2642 if (tmp->type == FORCE && tmp->slaying == name)
2643 return splay (tmp);
2644
2645 return 0;
2646}
2647
2648void
2649object::force_add (const shstr name, int duration)
2650{
2651 if (object *force = force_find (name))
2652 force->destroy ();
2653
2654 object *force = get_archetype (FORCE_NAME);
2655
2656 force->slaying = name;
2657 force->stats.food = 1;
2658 force->speed_left = -1.f;
2659
2660 force->set_speed (duration ? 1.f / duration : 0.f);
2661 force->flag [FLAG_IS_USED_UP] = true;
2662 force->flag [FLAG_APPLIED] = true;
2663
2664 insert (force);
2665}
2666
2667void
2668object::play_sound (faceidx sound)
2669{
2670 if (!sound)
2671 return;
2672
2673 if (flag [FLAG_REMOVED])
2674 return;
2675
2676 if (env)
2677 {
2678 if (object *pl = in_player ())
2679 pl->contr->play_sound (sound);
2680 }
2681 else
2682 map->play_sound (sound, x, y);
2683}
2684

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines