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.141 by root, Sun Apr 29 21:44:34 2007 UTC vs.
Revision 1.210 by root, Mon Apr 21 07:01:40 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,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.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
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
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/*
362 * this is a recursive function which calculates the weight
363 * an object is carrying. It goes through op and figures out how much
364 * containers are carrying, and sums it up.
365 */
318void 366void
319player::set_range (rangetype r) 367object::update_weight ()
320{ 368{
321 shoottype = r; 369 sint32 sum = 0;
322}
323 370
324/* 371 for (object *op = inv; op; op = op->below)
325 * sum_weight() is a recursive function which calculates the weight
326 * an object is carrying. It goes through in figures out how much
327 * containers are carrying, and sums it up.
328 */
329long
330sum_weight (object *op)
331{
332 long sum;
333 object *inv;
334
335 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
336 { 372 {
337 if (inv->inv) 373 if (op->inv)
338 sum_weight (inv); 374 op->update_weight ();
339 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
340 }
341 375
342 if (op->type == CONTAINER && op->stats.Str) 376 sum += op->total_weight ();
343 sum = (sum * (100 - op->stats.Str)) / 100; 377 }
344 378
345 if (op->carrying != sum) 379 carrying = weight_adjust (this, sum);
346 op->carrying = sum;
347
348 return sum;
349} 380}
350 381
351/** 382/*
352 * Return the outermost environment object for a given object. 383 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
353 */
354
355object *
356object_get_env_recursive (object *op)
357{
358 while (op->env != NULL)
359 op = op->env;
360 return op;
361}
362
363/*
364 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
365 * Some error messages.
366 * The result of the dump is stored in the static global errmsg array.
367 */ 384 */
368char * 385char *
369dump_object (object *op) 386dump_object (object *op)
370{ 387{
371 if (!op) 388 if (!op)
379/* 396/*
380 * 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
381 * multi-object 1 which is closest to the second object. 398 * multi-object 1 which is closest to the second object.
382 * If it's not a multi-object, it is returned. 399 * If it's not a multi-object, it is returned.
383 */ 400 */
384
385object * 401object *
386get_nearest_part (object *op, const object *pl) 402get_nearest_part (object *op, const object *pl)
387{ 403{
388 object *tmp, *closest; 404 object *tmp, *closest;
389 int last_dist, i; 405 int last_dist, i;
390 406
391 if (op->more == NULL) 407 if (!op->more)
392 return op; 408 return op;
409
393 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)
394 if ((i = distance (tmp, pl)) < last_dist) 413 if ((i = distance (tmp, pl)) < last_dist)
395 closest = tmp, last_dist = i; 414 closest = tmp, last_dist = i;
415
396 return closest; 416 return closest;
397} 417}
398 418
399/* 419/*
400 * 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.
401 */ 422 */
402object * 423object *
403find_object (tag_t i) 424find_object (tag_t i)
404{ 425{
405 for_all_objects (op) 426 for_all_objects (op)
425 break; 446 break;
426 447
427 return op; 448 return op;
428} 449}
429 450
430void
431free_all_object_data ()
432{
433 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
434}
435
436/* 451/*
437 * 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
438 * skill and experience objects. 453 * skill and experience objects.
454 * ACTUALLY NO! investigate! TODO
439 */ 455 */
440void 456void
441object::set_owner (object *owner) 457object::set_owner (object *owner)
442{ 458{
459 // allow objects which own objects
443 if (!owner) 460 if (owner)
444 return;
445
446 /* next line added to allow objects which own objects */
447 /* Add a check for ownercounts in here, as I got into an endless loop
448 * with the fireball owning a poison cloud which then owned the
449 * fireball. I believe that was caused by one of the objects getting
450 * freed and then another object replacing it. Since the ownercounts
451 * didn't match, this check is valid and I believe that cause is valid.
452 */
453 while (owner->owner) 461 while (owner->owner)
454 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 }
455 469
456 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;
457} 537}
458 538
459/* Zero the key_values on op, decrementing the shared-string 539/* Zero the key_values on op, decrementing the shared-string
460 * refcounts and freeing the links. 540 * refcounts and freeing the links.
461 */ 541 */
525object::copy_to (object *dst) 605object::copy_to (object *dst)
526{ 606{
527 *dst = *this; 607 *dst = *this;
528 608
529 if (speed < 0) 609 if (speed < 0)
530 dst->speed_left = speed_left - rndm (); 610 dst->speed_left -= rndm ();
531 611
532 dst->set_speed (dst->speed); 612 dst->set_speed (dst->speed);
533} 613}
534 614
535void 615void
536object::instantiate () 616object::instantiate ()
537{ 617{
538 if (!uuid.seq) // HACK 618 if (!uuid.seq) // HACK
539 uuid = gen_uuid (); 619 uuid = UUID::gen ();
540 620
541 speed_left = -0.1f; 621 speed_left = -0.1f;
542 /* 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
543 * 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.
544 * 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
545 * values for the body_used info, so when items are created 625 * values for the body_used info, so when items are created
546 * for it, they can be properly equipped. 626 * for it, they can be properly equipped.
547 */ 627 */
548 memcpy (body_used, body_info, sizeof (body_used)); 628 for (int i = NUM_BODY_LOCATIONS; i--; )
629 slot[i].used = slot[i].info;
549 630
550 attachable::instantiate (); 631 attachable::instantiate ();
551} 632}
552 633
553object * 634object *
702static int object_count; 783static int object_count;
703 784
704void object::link () 785void object::link ()
705{ 786{
706 assert (!index);//D 787 assert (!index);//D
707 uuid = gen_uuid (); 788 uuid = UUID::gen ();
708 count = ++object_count; 789 count = ++object_count;
709 790
710 refcnt_inc (); 791 refcnt_inc ();
711 objects.insert (this); 792 objects.insert (this);
712} 793}
796 * if some form of movement is allowed, let objects 877 * if some form of movement is allowed, let objects
797 * drop on that space. 878 * drop on that space.
798 */ 879 */
799 if (!drop_to_ground 880 if (!drop_to_ground
800 || !map 881 || !map
801 || map->in_memory != MAP_IN_MEMORY 882 || map->in_memory != MAP_ACTIVE
802 || map->nodrop 883 || map->nodrop
803 || ms ().move_block == MOVE_ALL) 884 || ms ().move_block == MOVE_ALL)
804 { 885 {
805 while (inv) 886 while (inv)
806 { 887 {
861 942
862 if (!freed_map) 943 if (!freed_map)
863 { 944 {
864 freed_map = new maptile; 945 freed_map = new maptile;
865 946
947 freed_map->path = "<freed objects map>";
866 freed_map->name = "/internal/freed_objects_map"; 948 freed_map->name = "/internal/freed_objects_map";
867 freed_map->width = 3; 949 freed_map->width = 3;
868 freed_map->height = 3; 950 freed_map->height = 3;
951 freed_map->nodrop = 1;
869 952
870 freed_map->alloc (); 953 freed_map->alloc ();
871 freed_map->in_memory = MAP_IN_MEMORY; 954 freed_map->in_memory = MAP_ACTIVE;
872 } 955 }
873 956
874 map = freed_map; 957 map = freed_map;
875 x = 1; 958 x = 1;
876 y = 1; 959 y = 1;
877 } 960 }
878 961
879 head = 0;
880
881 if (more) 962 if (more)
882 { 963 {
883 more->destroy (); 964 more->destroy ();
884 more = 0; 965 more = 0;
885 } 966 }
886 967
968 head = 0;
969
887 // clear those pointers that likely might have circular references to us 970 // clear those pointers that likely might cause circular references
888 owner = 0; 971 owner = 0;
889 enemy = 0; 972 enemy = 0;
890 attacked_by = 0; 973 attacked_by = 0;
974 current_weapon = 0;
891} 975}
892 976
893void 977void
894object::destroy (bool destroy_inventory) 978object::destroy (bool destroy_inventory)
895{ 979{
897 return; 981 return;
898 982
899 if (destroy_inventory) 983 if (destroy_inventory)
900 destroy_inv (false); 984 destroy_inv (false);
901 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
902 attachable::destroy (); 992 attachable::destroy ();
903}
904
905/*
906 * sub_weight() recursively (outwards) subtracts a number from the
907 * weight of an object (and what is carried by it's environment(s)).
908 */
909void
910sub_weight (object *op, signed long weight)
911{
912 while (op != NULL)
913 {
914 if (op->type == CONTAINER)
915 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
916
917 op->carrying -= weight;
918 op = op->env;
919 }
920} 993}
921 994
922/* op->remove (): 995/* op->remove ():
923 * 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
924 * 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
945 * In this case, the object to be removed is in someones 1018 * In this case, the object to be removed is in someones
946 * inventory. 1019 * inventory.
947 */ 1020 */
948 if (env) 1021 if (env)
949 { 1022 {
1023 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
950 if (nrof) 1027 if (below)
951 sub_weight (env, weight * nrof); 1028 below->above = above;
952 else 1029
953 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;
954 1040
955 /* 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
956 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
957 * to save cpu time. 1043 * to save cpu time.
958 */ 1044 */
959 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))
960 otmp->update_stats (); 1046 otmp->update_stats ();
961
962 if (above)
963 above->below = below;
964 else
965 env->inv = below;
966
967 if (below)
968 below->above = above;
969
970 /* we set up values so that it could be inserted into
971 * the map, but we don't actually do that - it is up
972 * to the caller to decide what we want to do.
973 */
974 x = env->x, y = env->y;
975 map = env->map;
976 above = 0, below = 0;
977 env = 0;
978 } 1047 }
979 else if (map) 1048 else if (map)
980 { 1049 {
981 if (type == PLAYER) 1050 if (type == PLAYER)
982 { 1051 {
1020 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
1021 return; 1090 return;
1022 1091
1023 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
1024 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
1025 for (tmp = ms.bot; tmp; tmp = tmp->above) 1106 for (tmp = ms.bot; tmp; tmp = tmp->above)
1026 { 1107 {
1027 /* 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
1028 * being removed. 1109 * being removed.
1029 */ 1110 */
1030
1031 if (tmp->type == PLAYER && tmp != this)
1032 {
1033 /* If a container that the player is currently using somehow gets
1034 * removed (most likely destroyed), update the player view
1035 * appropriately.
1036 */
1037 if (tmp->container == this)
1038 {
1039 flag [FLAG_APPLIED] = 0;
1040 tmp->container = 0;
1041 }
1042
1043 if (tmp->contr->ns)
1044 tmp->contr->ns->floorbox_update ();
1045 }
1046 1111
1047 /* See if object moving off should effect something */ 1112 /* See if object moving off should effect something */
1048 if (check_walk_off 1113 if (check_walk_off
1049 && ((move_type & tmp->move_off) 1114 && ((move_type & tmp->move_off)
1050 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1053 1118
1054 if (destroyed ()) 1119 if (destroyed ())
1055 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 ());
1056 } 1121 }
1057 1122
1058 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1059 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1060 if (tmp->above == tmp)
1061 tmp->above = 0;
1062
1063 last = tmp; 1123 last = tmp;
1064 } 1124 }
1065 1125
1066 /* last == NULL if there are no objects on this space */ 1126 /* last == NULL if there are no objects on this space */
1067 //TODO: this makes little sense, why only update the topmost object? 1127 //TODO: this makes little sense, why only update the topmost object?
1087merge_ob (object *op, object *top) 1147merge_ob (object *op, object *top)
1088{ 1148{
1089 if (!op->nrof) 1149 if (!op->nrof)
1090 return 0; 1150 return 0;
1091 1151
1092 if (top) 1152 if (!top)
1093 for (top = op; top && top->above; top = top->above) 1153 for (top = op; top && top->above; top = top->above)
1094 ; 1154 ;
1095 1155
1096 for (; top; top = top->below) 1156 for (; top; top = top->below)
1097 { 1157 {
1118 if (more) 1178 if (more)
1119 return; 1179 return;
1120 1180
1121 object *prev = this; 1181 object *prev = this;
1122 1182
1123 for (archetype *at = arch->more; at; at = at->more) 1183 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1124 { 1184 {
1125 object *op = arch_to_object (at); 1185 object *op = arch_to_object (at);
1126 1186
1127 op->name = name; 1187 op->name = name;
1128 op->name_pl = name_pl; 1188 op->name_pl = name_pl;
1142object * 1202object *
1143insert_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)
1144{ 1204{
1145 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1146 { 1206 {
1147 tmp->x = x + tmp->arch->clone.x; 1207 tmp->x = x + tmp->arch->x;
1148 tmp->y = y + tmp->arch->clone.y; 1208 tmp->y = y + tmp->arch->y;
1149 } 1209 }
1150 1210
1151 return insert_ob_in_map (op, m, originator, flag); 1211 return insert_ob_in_map (op, m, originator, flag);
1152} 1212}
1153 1213
1174object * 1234object *
1175insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1176{ 1236{
1177 assert (!op->flag [FLAG_FREED]); 1237 assert (!op->flag [FLAG_FREED]);
1178 1238
1179 object *tmp, *top, *floor = NULL; 1239 object *top, *floor = NULL;
1180 1240
1181 op->remove (); 1241 op->remove ();
1182
1183#if 0
1184 if (!m->active != !op->active)
1185 if (m->active)
1186 op->activate_recursive ();
1187 else
1188 op->deactivate_recursive ();
1189#endif
1190
1191 if (out_of_map (m, op->x, op->y))
1192 {
1193 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1194#ifdef MANY_CORES
1195 /* Better to catch this here, as otherwise the next use of this object
1196 * is likely to cause a crash. Better to find out where it is getting
1197 * improperly inserted.
1198 */
1199 abort ();
1200#endif
1201 return op;
1202 }
1203
1204 if (object *more = op->more)
1205 {
1206 if (!insert_ob_in_map (more, m, originator, flag))
1207 {
1208 if (!op->head)
1209 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1210
1211 return 0;
1212 }
1213 }
1214
1215 CLEAR_FLAG (op, FLAG_REMOVED);
1216 1242
1217 /* Ideally, the caller figures this out. However, it complicates a lot 1243 /* Ideally, the caller figures this out. However, it complicates a lot
1218 * 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
1219 * need extra work 1245 * need extra work
1220 */ 1246 */
1221 if (!xy_normalise (m, op->x, op->y)) 1247 if (!xy_normalise (m, op->x, op->y))
1248 {
1249 op->destroy ();
1222 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);
1223 1258
1224 op->map = m; 1259 op->map = m;
1225 mapspace &ms = op->ms (); 1260 mapspace &ms = op->ms ();
1226 1261
1227 /* this has to be done after we translate the coordinates. 1262 /* this has to be done after we translate the coordinates.
1228 */ 1263 */
1229 if (op->nrof && !(flag & INS_NO_MERGE)) 1264 if (op->nrof && !(flag & INS_NO_MERGE))
1230 for (tmp = ms.bot; tmp; tmp = tmp->above) 1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1231 if (object::can_merge (op, tmp)) 1266 if (object::can_merge (op, tmp))
1232 { 1267 {
1233 op->nrof += tmp->nrof; 1268 op->nrof += tmp->nrof;
1234 tmp->destroy (); 1269 tmp->destroy (1);
1235 } 1270 }
1236 1271
1237 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 */
1238 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1273 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1239 1274
1262 else 1297 else
1263 { 1298 {
1264 top = ms.bot; 1299 top = ms.bot;
1265 1300
1266 /* If there are other objects, then */ 1301 /* If there are other objects, then */
1267 if ((!(flag & INS_MAP_LOAD)) && top) 1302 if (top)
1268 { 1303 {
1269 object *last = 0; 1304 object *last = 0;
1270 1305
1271 /* 1306 /*
1272 * 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.
1325 if (last && last->below && last != floor) 1360 if (last && last->below && last != floor)
1326 top = last->below; 1361 top = last->below;
1327 } 1362 }
1328 } /* If objects on this space */ 1363 } /* If objects on this space */
1329 1364
1330 if (flag & INS_MAP_LOAD)
1331 top = ms.top;
1332
1333 if (flag & INS_ABOVE_FLOOR_ONLY) 1365 if (flag & INS_ABOVE_FLOOR_ONLY)
1334 top = floor; 1366 top = floor;
1335 1367
1336 /* 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.
1337 */ 1369 */
1369 op->map->touch (); 1401 op->map->touch ();
1370 } 1402 }
1371 1403
1372 op->map->dirty = true; 1404 op->map->dirty = true;
1373 1405
1374 /* If we have a floor, we know the player, if any, will be above
1375 * it, so save a few ticks and start from there.
1376 */
1377 if (!(flag & INS_MAP_LOAD))
1378 if (object *pl = ms.player ()) 1406 if (object *pl = ms.player ())
1379 if (pl->contr->ns)
1380 pl->contr->ns->floorbox_update (); 1407 pl->contr->ns->floorbox_update ();
1381 1408
1382 /* If this object glows, it may affect lighting conditions that are 1409 /* If this object glows, it may affect lighting conditions that are
1383 * 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
1384 * 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
1385 * on the map will get recalculated. The players could very well 1412 * on the map will get recalculated. The players could very well
1404 * blocked() and wall() work properly), and these flags are updated by 1431 * blocked() and wall() work properly), and these flags are updated by
1405 * update_object(). 1432 * update_object().
1406 */ 1433 */
1407 1434
1408 /* 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 */
1409 if (!(flag & INS_NO_WALK_ON) && !op->head) 1436 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1410 { 1437 {
1411 if (check_move_on (op, originator)) 1438 if (check_move_on (op, originator))
1412 return 0; 1439 return 0;
1413 1440
1414 /* 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
1415 * walk on's. 1442 * walk on's.
1416 */ 1443 */
1417 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1444 for (object *tmp = op->more; tmp; tmp = tmp->more)
1418 if (check_move_on (tmp, originator)) 1445 if (check_move_on (tmp, originator))
1419 return 0; 1446 return 0;
1420 } 1447 }
1421 1448
1422 return op; 1449 return op;
1427 * 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.
1428 */ 1455 */
1429void 1456void
1430replace_insert_ob_in_map (const char *arch_string, object *op) 1457replace_insert_ob_in_map (const char *arch_string, object *op)
1431{ 1458{
1432 object *tmp, *tmp1;
1433
1434 /* first search for itself and remove any old instances */ 1459 /* first search for itself and remove any old instances */
1435 1460
1436 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1461 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1437 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1462 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1438 tmp->destroy (); 1463 tmp->destroy (1);
1439 1464
1440 tmp1 = arch_to_object (archetype::find (arch_string)); 1465 object *tmp = arch_to_object (archetype::find (arch_string));
1441 1466
1442 tmp1->x = op->x; 1467 tmp->x = op->x;
1443 tmp1->y = op->y; 1468 tmp->y = op->y;
1469
1444 insert_ob_in_map (tmp1, op->map, op, 0); 1470 insert_ob_in_map (tmp, op->map, op, 0);
1445} 1471}
1446 1472
1447object * 1473object *
1448object::insert_at (object *where, object *originator, int flags) 1474object::insert_at (object *where, object *originator, int flags)
1449{ 1475{
1476 if (where->env)
1477 return where->env->insert (this);
1478 else
1450 return where->map->insert (this, where->x, where->y, originator, flags); 1479 return where->map->insert (this, where->x, where->y, originator, flags);
1451} 1480}
1452 1481
1453/* 1482// find player who can see this object
1454 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1483static object *
1455 * is returned contains nr objects, and the remaining parts contains 1484visible_to (object *op)
1456 * the rest (or is removed and freed if that number is 0).
1457 * On failure, NULL is returned, and the reason put into the
1458 * global static errmsg array.
1459 */
1460object *
1461get_split_ob (object *orig_ob, uint32 nr)
1462{ 1485{
1463 object *newob; 1486 if (!op->flag [FLAG_REMOVED])
1464 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1465
1466 if (orig_ob->nrof < nr)
1467 {
1468 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1469 return NULL;
1470 } 1487 {
1471 1488 // see if we are in a container of sorts
1472 newob = object_create_clone (orig_ob); 1489 if (object *env = op->env)
1473
1474 if ((orig_ob->nrof -= nr) < 1)
1475 orig_ob->destroy (1);
1476 else if (!is_removed)
1477 {
1478 if (orig_ob->env != NULL)
1479 sub_weight (orig_ob->env, orig_ob->weight * nr);
1480 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1481 {
1482 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1483 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1484 return NULL;
1485 } 1490 {
1486 } 1491 // the player inventory itself is always visible
1492 if (env->type == PLAYER)
1493 return env;
1487 1494
1488 newob->nrof = nr; 1495 // else a player could have our env open
1496 env = env->outer_env ();
1489 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
1490 return newob; 1513 return 0;
1491} 1514}
1492 1515
1493/* 1516/*
1494 * decrease_ob_nr(object, number) decreases a specified number from 1517 * decrease(object, number) decreases a specified number from
1495 * 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
1496 * is subsequently removed and freed. 1519 * is subsequently removed and freed.
1497 * 1520 *
1498 * 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
1499 */ 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 }
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 */
1500object * 1560object *
1501decrease_ob_nr (object *op, uint32 i) 1561object::split (sint32 nr)
1502{ 1562{
1503 object *tmp; 1563 if (nrof < nr)
1504
1505 if (i == 0) /* objects with op->nrof require this check */
1506 return op; 1564 return 0;
1507 1565 else if (nrof == nr)
1508 if (i > op->nrof)
1509 i = op->nrof;
1510
1511 if (QUERY_FLAG (op, FLAG_REMOVED))
1512 op->nrof -= i;
1513 else if (op->env)
1514 { 1566 {
1515 /* is this object in the players inventory, or sub container
1516 * therein?
1517 */
1518 tmp = op->in_player ();
1519 /* nope. Is this a container the player has opened?
1520 * If so, set tmp to that player.
1521 * IMO, searching through all the players will mostly
1522 * likely be quicker than following op->env to the map,
1523 * and then searching the map for a player.
1524 */
1525 if (!tmp)
1526 for_all_players (pl)
1527 if (pl->ob->container == op->env)
1528 {
1529 tmp = pl->ob;
1530 break;
1531 }
1532
1533 if (i < op->nrof)
1534 {
1535 sub_weight (op->env, op->weight * i);
1536 op->nrof -= i;
1537 if (tmp)
1538 esrv_send_item (tmp, op);
1539 }
1540 else
1541 {
1542 op->remove (); 1567 remove ();
1543 op->nrof = 0; 1568 return this;
1544 if (tmp)
1545 esrv_del_item (tmp->contr, op->count);
1546 }
1547 } 1569 }
1548 else 1570 else
1549 { 1571 {
1550 object *above = op->above; 1572 decrease (nr);
1551 1573
1552 if (i < op->nrof) 1574 object *op = object_create_clone (this);
1553 op->nrof -= i; 1575 op->nrof = nr;
1554 else
1555 {
1556 op->remove ();
1557 op->nrof = 0;
1558 }
1559
1560 /* Since we just removed op, op->above is null */
1561 for (tmp = above; tmp; tmp = tmp->above)
1562 if (tmp->type == PLAYER)
1563 {
1564 if (op->nrof)
1565 esrv_send_item (tmp, op);
1566 else
1567 esrv_del_item (tmp->contr, op->count);
1568 }
1569 }
1570
1571 if (op->nrof)
1572 return op; 1576 return op;
1573 else
1574 {
1575 op->destroy ();
1576 return 0;
1577 }
1578}
1579
1580/*
1581 * add_weight(object, weight) adds the specified weight to an object,
1582 * and also updates how much the environment(s) is/are carrying.
1583 */
1584void
1585add_weight (object *op, signed long weight)
1586{
1587 while (op != NULL)
1588 {
1589 if (op->type == CONTAINER)
1590 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1591
1592 op->carrying += weight;
1593 op = op->env;
1594 } 1577 }
1595} 1578}
1596 1579
1597object * 1580object *
1598insert_ob_in_ob (object *op, object *where) 1581insert_ob_in_ob (object *op, object *where)
1603 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);
1604 free (dump); 1587 free (dump);
1605 return op; 1588 return op;
1606 } 1589 }
1607 1590
1608 if (where->head) 1591 if (where->head_ () != where)
1609 { 1592 {
1610 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");
1611 where = where->head; 1594 where = where->head;
1612 } 1595 }
1613 1596
1614 return where->insert (op); 1597 return where->insert (op);
1615} 1598}
1623 * be != op, if items are merged. -Tero 1606 * be != op, if items are merged. -Tero
1624 */ 1607 */
1625object * 1608object *
1626object::insert (object *op) 1609object::insert (object *op)
1627{ 1610{
1628 object *tmp, *otmp;
1629
1630 if (!QUERY_FLAG (op, FLAG_REMOVED))
1631 op->remove ();
1632
1633 if (op->more) 1611 if (op->more)
1634 { 1612 {
1635 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);
1636 return op; 1614 return op;
1637 } 1615 }
1638 1616
1639 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1617 op->remove ();
1640 CLEAR_FLAG (op, FLAG_REMOVED); 1618
1619 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1620
1641 if (op->nrof) 1621 if (op->nrof)
1642 {
1643 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1622 for (object *tmp = inv; tmp; tmp = tmp->below)
1644 if (object::can_merge (tmp, op)) 1623 if (object::can_merge (tmp, op))
1645 { 1624 {
1646 /* return the original object and remove inserted object 1625 /* return the original object and remove inserted object
1647 (client needs the original object) */ 1626 (client needs the original object) */
1648 tmp->nrof += op->nrof; 1627 tmp->nrof += op->nrof;
1649 /* Weight handling gets pretty funky. Since we are adding to
1650 * tmp->nrof, we need to increase the weight.
1651 */
1652 add_weight (this, op->weight * op->nrof); 1628 adjust_weight (this, op->total_weight ());
1653 SET_FLAG (op, FLAG_REMOVED); 1629
1654 op->destroy (); /* free the inserted object */ 1630 op->destroy (1);
1655 op = tmp; 1631 op = tmp;
1656 op->remove (); /* and fix old object's links */ 1632 goto inserted;
1657 CLEAR_FLAG (op, FLAG_REMOVED);
1658 break;
1659 } 1633 }
1660 1634
1661 /* I assume combined objects have no inventory 1635 op->owner = 0; // it's his/hers now. period.
1662 * We add the weight - this object could have just been removed 1636 op->map = 0;
1663 * (if it was possible to merge). calling remove_ob will subtract 1637 op->x = 0;
1664 * the weight, so we need to add it in again, since we actually do 1638 op->y = 0;
1665 * the linking below
1666 */
1667 add_weight (this, op->weight * op->nrof);
1668 }
1669 else
1670 add_weight (this, (op->weight + op->carrying));
1671 1639
1672 otmp = this->in_player (); 1640 op->above = 0;
1673 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 ())
1674 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1659 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1675 otmp->update_stats (); 1660 otmp->update_stats ();
1676
1677 op->map = 0;
1678 op->env = this;
1679 op->above = 0;
1680 op->below = 0;
1681 op->x = 0, op->y = 0;
1682
1683 /* reset the light list and los of the players on the map */
1684 if ((op->glow_radius != 0) && map)
1685 {
1686#ifdef DEBUG_LIGHTS
1687 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1688#endif /* DEBUG_LIGHTS */
1689 if (map->darkness)
1690 update_all_los (map, x, y);
1691 }
1692
1693 /* Client has no idea of ordering so lets not bother ordering it here.
1694 * It sure simplifies this function...
1695 */
1696 if (!inv)
1697 inv = op;
1698 else
1699 {
1700 op->below = inv;
1701 op->below->above = op;
1702 inv = op;
1703 }
1704 1661
1705 INVOKE_OBJECT (INSERT, this); 1662 INVOKE_OBJECT (INSERT, this);
1706 1663
1707 return op; 1664 return op;
1708} 1665}
1923 * activate recursively a flag on an object inventory 1880 * activate recursively a flag on an object inventory
1924 */ 1881 */
1925void 1882void
1926flag_inv (object *op, int flag) 1883flag_inv (object *op, int flag)
1927{ 1884{
1928 if (op->inv)
1929 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1885 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930 { 1886 {
1931 SET_FLAG (tmp, flag); 1887 SET_FLAG (tmp, flag);
1932 flag_inv (tmp, flag); 1888 flag_inv (tmp, flag);
1933 } 1889 }
1934} 1890}
1935 1891
1936/* 1892/*
1937 * deactivate recursively a flag on an object inventory 1893 * deactivate recursively a flag on an object inventory
1938 */ 1894 */
1939void 1895void
1940unflag_inv (object *op, int flag) 1896unflag_inv (object *op, int flag)
1941{ 1897{
1942 if (op->inv)
1943 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1898 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1944 { 1899 {
1945 CLEAR_FLAG (tmp, flag); 1900 CLEAR_FLAG (tmp, flag);
1946 unflag_inv (tmp, flag); 1901 unflag_inv (tmp, flag);
1947 } 1902 }
1948}
1949
1950/*
1951 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1952 * all it's inventory (recursively).
1953 * If checksums are used, a player will get set_cheat called for
1954 * him/her-self and all object carried by a call to this function.
1955 */
1956void
1957set_cheat (object *op)
1958{
1959 SET_FLAG (op, FLAG_WAS_WIZ);
1960 flag_inv (op, FLAG_WAS_WIZ);
1961} 1903}
1962 1904
1963/* 1905/*
1964 * 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
1965 * 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
1967 * to search (see the freearr_x/y[] definition). 1909 * to search (see the freearr_x/y[] definition).
1968 * It returns a random choice among the alternatives found. 1910 * It returns a random choice among the alternatives found.
1969 * 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
1970 * does all 4 immediate directions). This returns the index into the 1912 * does all 4 immediate directions). This returns the index into the
1971 * 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)
1972 * Note - this only checks to see if there is space for the head of the
1973 * object - if it is a multispace object, this should be called for all
1974 * pieces.
1975 * Note2: This function does correctly handle tiled maps, but does not 1914 * Note: This function does correctly handle tiled maps, but does not
1976 * inform the caller. However, insert_ob_in_map will update as 1915 * inform the caller. However, insert_ob_in_map will update as
1977 * 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.
1978 * 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
1979 * 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
1980 * 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
1982 * customized, changed states, etc. 1921 * customized, changed states, etc.
1983 */ 1922 */
1984int 1923int
1985find_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)
1986{ 1925{
1926 int altern[SIZEOFFREE];
1987 int index = 0, flag; 1927 int index = 0, flag;
1988 int altern[SIZEOFFREE];
1989 1928
1990 for (int i = start; i < stop; i++) 1929 for (int i = start; i < stop; i++)
1991 { 1930 {
1992 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1931 mapxy pos (m, x, y); pos.move (i);
1993 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 {
1994 altern [index++] = i; 1947 altern [index++] = i;
1948 continue;
1949 }
1995 1950
1996 /* 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.
1997 * 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.
1998 * 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 -
1999 * 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
2000 * 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
2001 * to only the spaces immediately surrounding the target area, and 1956 * to only the spaces immediately surrounding the target area, and
2002 * won't look 2 spaces south of the target space. 1957 * won't look 2 spaces south of the target space.
2003 */ 1958 */
2004 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1959 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1960 {
2005 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;
2006 } 1975 }
2007 1976
2008 if (!index) 1977 if (!index)
2009 return -1; 1978 return -1;
2010 1979
2019 */ 1988 */
2020int 1989int
2021find_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)
2022{ 1991{
2023 for (int i = 0; i < SIZEOFFREE; i++) 1992 for (int i = 0; i < SIZEOFFREE; i++)
2024 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]))
2025 return i; 1994 return i;
2026 1995
2027 return -1; 1996 return -1;
2028} 1997}
2029 1998
2083 object *tmp; 2052 object *tmp;
2084 maptile *mp; 2053 maptile *mp;
2085 2054
2086 MoveType blocked, move_type; 2055 MoveType blocked, move_type;
2087 2056
2088 if (exclude && exclude->head) 2057 if (exclude && exclude->head_ () != exclude)
2089 { 2058 {
2090 exclude = exclude->head; 2059 exclude = exclude->head;
2091 move_type = exclude->move_type; 2060 move_type = exclude->move_type;
2092 } 2061 }
2093 else 2062 else
2116 max = maxfree[i]; 2085 max = maxfree[i];
2117 else if (mflags & P_IS_ALIVE) 2086 else if (mflags & P_IS_ALIVE)
2118 { 2087 {
2119 for (tmp = ms.bot; tmp; tmp = tmp->above) 2088 for (tmp = ms.bot; tmp; tmp = tmp->above)
2120 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2089 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2121 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2090 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2122 break; 2091 break;
2123 2092
2124 if (tmp) 2093 if (tmp)
2125 return freedir[i]; 2094 return freedir[i];
2126 } 2095 }
2306 * 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
2307 * core dumps if they do. 2276 * core dumps if they do.
2308 * 2277 *
2309 * 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)
2310 */ 2279 */
2311
2312int 2280int
2313can_pick (const object *who, const object *item) 2281can_pick (const object *who, const object *item)
2314{ 2282{
2315 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2283 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2316 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2284 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2321 * create clone from object to another 2289 * create clone from object to another
2322 */ 2290 */
2323object * 2291object *
2324object_create_clone (object *asrc) 2292object_create_clone (object *asrc)
2325{ 2293{
2326 object *dst = 0, *tmp, *src, *part, *prev, *item; 2294 object *dst = 0, *tmp, *src, *prev, *item;
2327 2295
2328 if (!asrc) 2296 if (!asrc)
2329 return 0; 2297 return 0;
2330 2298
2331 src = asrc;
2332 if (src->head)
2333 src = src->head; 2299 src = asrc->head_ ();
2334 2300
2335 prev = 0; 2301 prev = 0;
2336 for (part = src; part; part = part->more) 2302 for (object *part = src; part; part = part->more)
2337 { 2303 {
2338 tmp = part->clone (); 2304 tmp = part->clone ();
2339 tmp->x -= src->x; 2305 tmp->x -= src->x;
2340 tmp->y -= src->y; 2306 tmp->y -= src->y;
2341 2307
2454 /* Basically, if the archetype has this key set, 2420 /* Basically, if the archetype has this key set,
2455 * we need to store the null value so when we save 2421 * we need to store the null value so when we save
2456 * it, we save the empty value so that when we load, 2422 * it, we save the empty value so that when we load,
2457 * we get this value back again. 2423 * we get this value back again.
2458 */ 2424 */
2459 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2425 if (get_ob_key_link (op->arch, canonical_key))
2460 field->value = 0; 2426 field->value = 0;
2461 else 2427 else
2462 { 2428 {
2463 if (last) 2429 if (last)
2464 last->next = field->next; 2430 last->next = field->next;
2533 } 2499 }
2534 else 2500 else
2535 item = item->env; 2501 item = item->env;
2536} 2502}
2537 2503
2538
2539const char * 2504const char *
2540object::flag_desc (char *desc, int len) const 2505object::flag_desc (char *desc, int len) const
2541{ 2506{
2542 char *p = desc; 2507 char *p = desc;
2543 bool first = true; 2508 bool first = true;
2570{ 2535{
2571 char flagdesc[512]; 2536 char flagdesc[512];
2572 char info2[256 * 4]; 2537 char info2[256 * 4];
2573 char *p = info; 2538 char *p = info;
2574 2539
2575 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}",
2576 count, uuid.seq, 2541 count,
2542 uuid.c_str (),
2577 &name, 2543 &name,
2578 title ? "\",title:\"" : "", 2544 title ? "\",title:\"" : "",
2579 title ? (const char *)title : "", 2545 title ? (const char *)title : "",
2580 flag_desc (flagdesc, 512), type); 2546 flag_desc (flagdesc, 512), type);
2581 2547
2582 if (env) 2548 if (!this->flag[FLAG_REMOVED] && env)
2583 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2549 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2584 2550
2585 if (map) 2551 if (map)
2586 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);
2587 2553
2589} 2555}
2590 2556
2591const char * 2557const char *
2592object::debug_desc () const 2558object::debug_desc () const
2593{ 2559{
2594 static char info[256 * 4]; 2560 static char info[3][256 * 4];
2561 static int info_idx;
2562
2595 return debug_desc (info); 2563 return debug_desc (info [++info_idx % 3]);
2596}
2597
2598const char *
2599object::debug_desc2 () const
2600{
2601 static char info[256 * 4];
2602 return debug_desc (info);
2603} 2564}
2604 2565
2605struct region * 2566struct region *
2606object::region () const 2567object::region () const
2607{ 2568{
2610} 2571}
2611 2572
2612const materialtype_t * 2573const materialtype_t *
2613object::dominant_material () const 2574object::dominant_material () const
2614{ 2575{
2615 if (materialtype_t *mat = name_to_material (materialname)) 2576 if (materialtype_t *mt = name_to_material (materialname))
2616 return mat; 2577 return mt;
2617 2578
2618 // omfg this is slow, this has to be temporary :)
2619 shstr unknown ("unknown");
2620
2621 return name_to_material (unknown); 2579 return name_to_material (shstr_unknown);
2622} 2580}
2623 2581
2624void 2582void
2625object::open_container (object *new_container) 2583object::open_container (object *new_container)
2626{ 2584{
2642 old_container->flag [FLAG_APPLIED] = 0; 2600 old_container->flag [FLAG_APPLIED] = 0;
2643 container = 0; 2601 container = 0;
2644 2602
2645 esrv_update_item (UPD_FLAGS, this, old_container); 2603 esrv_update_item (UPD_FLAGS, this, old_container);
2646 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (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"));
2647 } 2606 }
2648 2607
2649 if (new_container) 2608 if (new_container)
2650 { 2609 {
2651 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2610 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2667 new_container->flag [FLAG_APPLIED] = 1; 2626 new_container->flag [FLAG_APPLIED] = 1;
2668 container = new_container; 2627 container = new_container;
2669 2628
2670 esrv_update_item (UPD_FLAGS, this, new_container); 2629 esrv_update_item (UPD_FLAGS, this, new_container);
2671 esrv_send_inventory (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)
2672 } 2677 {
2678 if (object *pl = in_player ())
2679 pl->contr->play_sound (sound);
2680 }
2681 else
2682 map->play_sound (sound, x, y);
2673} 2683}
2674 2684
2675

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines