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.140 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.209 by root, Mon Apr 21 06:35:26 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
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 */
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 */ 384 */
362char * 385char *
363dump_object (object *op) 386dump_object (object *op)
364{ 387{
365 if (!op) 388 if (!op)
373/* 396/*
374 * 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
375 * multi-object 1 which is closest to the second object. 398 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 399 * If it's not a multi-object, it is returned.
377 */ 400 */
378
379object * 401object *
380get_nearest_part (object *op, const object *pl) 402get_nearest_part (object *op, const object *pl)
381{ 403{
382 object *tmp, *closest; 404 object *tmp, *closest;
383 int last_dist, i; 405 int last_dist, i;
384 406
385 if (op->more == NULL) 407 if (!op->more)
386 return op; 408 return op;
409
387 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)
388 if ((i = distance (tmp, pl)) < last_dist) 413 if ((i = distance (tmp, pl)) < last_dist)
389 closest = tmp, last_dist = i; 414 closest = tmp, last_dist = i;
415
390 return closest; 416 return closest;
391} 417}
392 418
393/* 419/*
394 * 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.
395 */ 422 */
396object * 423object *
397find_object (tag_t i) 424find_object (tag_t i)
398{ 425{
399 for_all_objects (op) 426 for_all_objects (op)
419 break; 446 break;
420 447
421 return op; 448 return op;
422} 449}
423 450
424void
425free_all_object_data ()
426{
427 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428}
429
430/* 451/*
431 * 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
432 * skill and experience objects. 453 * skill and experience objects.
454 * ACTUALLY NO! investigate! TODO
433 */ 455 */
434void 456void
435object::set_owner (object *owner) 457object::set_owner (object *owner)
436{ 458{
459 // allow objects which own objects
437 if (!owner) 460 if (owner)
438 return;
439
440 /* next line added to allow objects which own objects */
441 /* Add a check for ownercounts in here, as I got into an endless loop
442 * with the fireball owning a poison cloud which then owned the
443 * fireball. I believe that was caused by one of the objects getting
444 * freed and then another object replacing it. Since the ownercounts
445 * didn't match, this check is valid and I believe that cause is valid.
446 */
447 while (owner->owner) 461 while (owner->owner)
448 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 }
449 469
450 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;
451} 537}
452 538
453/* Zero the key_values on op, decrementing the shared-string 539/* Zero the key_values on op, decrementing the shared-string
454 * refcounts and freeing the links. 540 * refcounts and freeing the links.
455 */ 541 */
519object::copy_to (object *dst) 605object::copy_to (object *dst)
520{ 606{
521 *dst = *this; 607 *dst = *this;
522 608
523 if (speed < 0) 609 if (speed < 0)
524 dst->speed_left = speed_left - rndm (); 610 dst->speed_left -= rndm ();
525 611
526 dst->set_speed (dst->speed); 612 dst->set_speed (dst->speed);
527} 613}
528 614
529void 615void
530object::instantiate () 616object::instantiate ()
531{ 617{
532 if (!uuid.seq) // HACK 618 if (!uuid.seq) // HACK
533 uuid = gen_uuid (); 619 uuid = UUID::gen ();
534 620
535 speed_left = -0.1f; 621 speed_left = -0.1f;
536 /* 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
537 * 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.
538 * 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
539 * values for the body_used info, so when items are created 625 * values for the body_used info, so when items are created
540 * for it, they can be properly equipped. 626 * for it, they can be properly equipped.
541 */ 627 */
542 memcpy (body_used, body_info, sizeof (body_used)); 628 for (int i = NUM_BODY_LOCATIONS; i--; )
629 slot[i].used = slot[i].info;
543 630
544 attachable::instantiate (); 631 attachable::instantiate ();
545} 632}
546 633
547object * 634object *
696static int object_count; 783static int object_count;
697 784
698void object::link () 785void object::link ()
699{ 786{
700 assert (!index);//D 787 assert (!index);//D
701 uuid = gen_uuid (); 788 uuid = UUID::gen ();
702 count = ++object_count; 789 count = ++object_count;
703 790
704 refcnt_inc (); 791 refcnt_inc ();
705 objects.insert (this); 792 objects.insert (this);
706} 793}
790 * if some form of movement is allowed, let objects 877 * if some form of movement is allowed, let objects
791 * drop on that space. 878 * drop on that space.
792 */ 879 */
793 if (!drop_to_ground 880 if (!drop_to_ground
794 || !map 881 || !map
795 || map->in_memory != MAP_IN_MEMORY 882 || map->in_memory != MAP_ACTIVE
796 || map->nodrop 883 || map->nodrop
797 || ms ().move_block == MOVE_ALL) 884 || ms ().move_block == MOVE_ALL)
798 { 885 {
799 while (inv) 886 while (inv)
800 { 887 {
855 942
856 if (!freed_map) 943 if (!freed_map)
857 { 944 {
858 freed_map = new maptile; 945 freed_map = new maptile;
859 946
947 freed_map->path = "<freed objects map>";
860 freed_map->name = "/internal/freed_objects_map"; 948 freed_map->name = "/internal/freed_objects_map";
861 freed_map->width = 3; 949 freed_map->width = 3;
862 freed_map->height = 3; 950 freed_map->height = 3;
951 freed_map->nodrop = 1;
863 952
864 freed_map->alloc (); 953 freed_map->alloc ();
865 freed_map->in_memory = MAP_IN_MEMORY; 954 freed_map->in_memory = MAP_ACTIVE;
866 } 955 }
867 956
868 map = freed_map; 957 map = freed_map;
869 x = 1; 958 x = 1;
870 y = 1; 959 y = 1;
871 } 960 }
872 961
873 head = 0;
874
875 if (more) 962 if (more)
876 { 963 {
877 more->destroy (); 964 more->destroy ();
878 more = 0; 965 more = 0;
879 } 966 }
880 967
968 head = 0;
969
881 // clear those pointers that likely might have circular references to us 970 // clear those pointers that likely might cause circular references
882 owner = 0; 971 owner = 0;
883 enemy = 0; 972 enemy = 0;
884 attacked_by = 0; 973 attacked_by = 0;
974 current_weapon = 0;
885} 975}
886 976
887void 977void
888object::destroy (bool destroy_inventory) 978object::destroy (bool destroy_inventory)
889{ 979{
891 return; 981 return;
892 982
893 if (destroy_inventory) 983 if (destroy_inventory)
894 destroy_inv (false); 984 destroy_inv (false);
895 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
896 attachable::destroy (); 992 attachable::destroy ();
897}
898
899/*
900 * sub_weight() recursively (outwards) subtracts a number from the
901 * weight of an object (and what is carried by it's environment(s)).
902 */
903void
904sub_weight (object *op, signed long weight)
905{
906 while (op != NULL)
907 {
908 if (op->type == CONTAINER)
909 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
910
911 op->carrying -= weight;
912 op = op->env;
913 }
914} 993}
915 994
916/* op->remove (): 995/* op->remove ():
917 * 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
918 * 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
939 * In this case, the object to be removed is in someones 1018 * In this case, the object to be removed is in someones
940 * inventory. 1019 * inventory.
941 */ 1020 */
942 if (env) 1021 if (env)
943 { 1022 {
1023 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
944 if (nrof) 1027 if (below)
945 sub_weight (env, weight * nrof); 1028 below->above = above;
946 else 1029
947 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;
948 1040
949 /* 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
950 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
951 * to save cpu time. 1043 * to save cpu time.
952 */ 1044 */
953 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))
954 otmp->update_stats (); 1046 otmp->update_stats ();
955
956 if (above)
957 above->below = below;
958 else
959 env->inv = below;
960
961 if (below)
962 below->above = above;
963
964 /* we set up values so that it could be inserted into
965 * the map, but we don't actually do that - it is up
966 * to the caller to decide what we want to do.
967 */
968 x = env->x, y = env->y;
969 map = env->map;
970 above = 0, below = 0;
971 env = 0;
972 } 1047 }
973 else if (map) 1048 else if (map)
974 { 1049 {
975 if (type == PLAYER) 1050 if (type == PLAYER)
976 { 1051 {
1014 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
1015 return; 1090 return;
1016 1091
1017 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
1018 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
1019 for (tmp = ms.bot; tmp; tmp = tmp->above) 1106 for (tmp = ms.bot; tmp; tmp = tmp->above)
1020 { 1107 {
1021 /* 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
1022 * being removed. 1109 * being removed.
1023 */ 1110 */
1024
1025 if (tmp->type == PLAYER && tmp != this)
1026 {
1027 /* If a container that the player is currently using somehow gets
1028 * removed (most likely destroyed), update the player view
1029 * appropriately.
1030 */
1031 if (tmp->container == this)
1032 {
1033 flag [FLAG_APPLIED] = 0;
1034 tmp->container = 0;
1035 }
1036
1037 if (tmp->contr->ns)
1038 tmp->contr->ns->floorbox_update ();
1039 }
1040 1111
1041 /* See if object moving off should effect something */ 1112 /* See if object moving off should effect something */
1042 if (check_walk_off 1113 if (check_walk_off
1043 && ((move_type & tmp->move_off) 1114 && ((move_type & tmp->move_off)
1044 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1047 1118
1048 if (destroyed ()) 1119 if (destroyed ())
1049 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 ());
1050 } 1121 }
1051 1122
1052 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1053 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1054 if (tmp->above == tmp)
1055 tmp->above = 0;
1056
1057 last = tmp; 1123 last = tmp;
1058 } 1124 }
1059 1125
1060 /* last == NULL if there are no objects on this space */ 1126 /* last == NULL if there are no objects on this space */
1061 //TODO: this makes little sense, why only update the topmost object? 1127 //TODO: this makes little sense, why only update the topmost object?
1081merge_ob (object *op, object *top) 1147merge_ob (object *op, object *top)
1082{ 1148{
1083 if (!op->nrof) 1149 if (!op->nrof)
1084 return 0; 1150 return 0;
1085 1151
1086 if (top) 1152 if (!top)
1087 for (top = op; top && top->above; top = top->above) 1153 for (top = op; top && top->above; top = top->above)
1088 ; 1154 ;
1089 1155
1090 for (; top; top = top->below) 1156 for (; top; top = top->below)
1091 { 1157 {
1112 if (more) 1178 if (more)
1113 return; 1179 return;
1114 1180
1115 object *prev = this; 1181 object *prev = this;
1116 1182
1117 for (archetype *at = arch->more; at; at = at->more) 1183 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1118 { 1184 {
1119 object *op = arch_to_object (at); 1185 object *op = arch_to_object (at);
1120 1186
1121 op->name = name; 1187 op->name = name;
1122 op->name_pl = name_pl; 1188 op->name_pl = name_pl;
1136object * 1202object *
1137insert_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)
1138{ 1204{
1139 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140 { 1206 {
1141 tmp->x = x + tmp->arch->clone.x; 1207 tmp->x = x + tmp->arch->x;
1142 tmp->y = y + tmp->arch->clone.y; 1208 tmp->y = y + tmp->arch->y;
1143 } 1209 }
1144 1210
1145 return insert_ob_in_map (op, m, originator, flag); 1211 return insert_ob_in_map (op, m, originator, flag);
1146} 1212}
1147 1213
1168object * 1234object *
1169insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1170{ 1236{
1171 assert (!op->flag [FLAG_FREED]); 1237 assert (!op->flag [FLAG_FREED]);
1172 1238
1173 object *tmp, *top, *floor = NULL; 1239 object *top, *floor = NULL;
1174 1240
1175 op->remove (); 1241 op->remove ();
1176
1177#if 0
1178 if (!m->active != !op->active)
1179 if (m->active)
1180 op->activate_recursive ();
1181 else
1182 op->deactivate_recursive ();
1183#endif
1184
1185 if (out_of_map (m, op->x, op->y))
1186 {
1187 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1188#ifdef MANY_CORES
1189 /* Better to catch this here, as otherwise the next use of this object
1190 * is likely to cause a crash. Better to find out where it is getting
1191 * improperly inserted.
1192 */
1193 abort ();
1194#endif
1195 return op;
1196 }
1197
1198 if (object *more = op->more)
1199 {
1200 if (!insert_ob_in_map (more, m, originator, flag))
1201 {
1202 if (!op->head)
1203 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1204
1205 return 0;
1206 }
1207 }
1208
1209 CLEAR_FLAG (op, FLAG_REMOVED);
1210 1242
1211 /* Ideally, the caller figures this out. However, it complicates a lot 1243 /* Ideally, the caller figures this out. However, it complicates a lot
1212 * 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
1213 * need extra work 1245 * need extra work
1214 */ 1246 */
1215 if (!xy_normalise (m, op->x, op->y)) 1247 if (!xy_normalise (m, op->x, op->y))
1248 {
1249 op->destroy ();
1216 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);
1217 1258
1218 op->map = m; 1259 op->map = m;
1219 mapspace &ms = op->ms (); 1260 mapspace &ms = op->ms ();
1220 1261
1221 /* this has to be done after we translate the coordinates. 1262 /* this has to be done after we translate the coordinates.
1222 */ 1263 */
1223 if (op->nrof && !(flag & INS_NO_MERGE)) 1264 if (op->nrof && !(flag & INS_NO_MERGE))
1224 for (tmp = ms.bot; tmp; tmp = tmp->above) 1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1225 if (object::can_merge (op, tmp)) 1266 if (object::can_merge (op, tmp))
1226 { 1267 {
1227 op->nrof += tmp->nrof; 1268 op->nrof += tmp->nrof;
1228 tmp->destroy (); 1269 tmp->destroy (1);
1229 } 1270 }
1230 1271
1231 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 */
1232 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1273 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1233 1274
1256 else 1297 else
1257 { 1298 {
1258 top = ms.bot; 1299 top = ms.bot;
1259 1300
1260 /* If there are other objects, then */ 1301 /* If there are other objects, then */
1261 if ((!(flag & INS_MAP_LOAD)) && top) 1302 if (top)
1262 { 1303 {
1263 object *last = 0; 1304 object *last = 0;
1264 1305
1265 /* 1306 /*
1266 * 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.
1319 if (last && last->below && last != floor) 1360 if (last && last->below && last != floor)
1320 top = last->below; 1361 top = last->below;
1321 } 1362 }
1322 } /* If objects on this space */ 1363 } /* If objects on this space */
1323 1364
1324 if (flag & INS_MAP_LOAD)
1325 top = ms.top;
1326
1327 if (flag & INS_ABOVE_FLOOR_ONLY) 1365 if (flag & INS_ABOVE_FLOOR_ONLY)
1328 top = floor; 1366 top = floor;
1329 1367
1330 /* 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.
1331 */ 1369 */
1363 op->map->touch (); 1401 op->map->touch ();
1364 } 1402 }
1365 1403
1366 op->map->dirty = true; 1404 op->map->dirty = true;
1367 1405
1368 /* If we have a floor, we know the player, if any, will be above
1369 * it, so save a few ticks and start from there.
1370 */
1371 if (!(flag & INS_MAP_LOAD))
1372 if (object *pl = ms.player ()) 1406 if (object *pl = ms.player ())
1373 if (pl->contr->ns)
1374 pl->contr->ns->floorbox_update (); 1407 pl->contr->ns->floorbox_update ();
1375 1408
1376 /* If this object glows, it may affect lighting conditions that are 1409 /* If this object glows, it may affect lighting conditions that are
1377 * 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
1378 * 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
1379 * on the map will get recalculated. The players could very well 1412 * on the map will get recalculated. The players could very well
1398 * blocked() and wall() work properly), and these flags are updated by 1431 * blocked() and wall() work properly), and these flags are updated by
1399 * update_object(). 1432 * update_object().
1400 */ 1433 */
1401 1434
1402 /* 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 */
1403 if (!(flag & INS_NO_WALK_ON) && !op->head) 1436 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404 { 1437 {
1405 if (check_move_on (op, originator)) 1438 if (check_move_on (op, originator))
1406 return 0; 1439 return 0;
1407 1440
1408 /* 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
1409 * walk on's. 1442 * walk on's.
1410 */ 1443 */
1411 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1444 for (object *tmp = op->more; tmp; tmp = tmp->more)
1412 if (check_move_on (tmp, originator)) 1445 if (check_move_on (tmp, originator))
1413 return 0; 1446 return 0;
1414 } 1447 }
1415 1448
1416 return op; 1449 return op;
1421 * 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.
1422 */ 1455 */
1423void 1456void
1424replace_insert_ob_in_map (const char *arch_string, object *op) 1457replace_insert_ob_in_map (const char *arch_string, object *op)
1425{ 1458{
1426 object *tmp, *tmp1;
1427
1428 /* first search for itself and remove any old instances */ 1459 /* first search for itself and remove any old instances */
1429 1460
1430 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1461 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1462 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432 tmp->destroy (); 1463 tmp->destroy (1);
1433 1464
1434 tmp1 = arch_to_object (archetype::find (arch_string)); 1465 object *tmp = arch_to_object (archetype::find (arch_string));
1435 1466
1436 tmp1->x = op->x; 1467 tmp->x = op->x;
1437 tmp1->y = op->y; 1468 tmp->y = op->y;
1469
1438 insert_ob_in_map (tmp1, op->map, op, 0); 1470 insert_ob_in_map (tmp, op->map, op, 0);
1439} 1471}
1440 1472
1441object * 1473object *
1442object::insert_at (object *where, object *originator, int flags) 1474object::insert_at (object *where, object *originator, int flags)
1443{ 1475{
1476 if (where->env)
1477 return where->env->insert (this);
1478 else
1444 return where->map->insert (this, where->x, where->y, originator, flags); 1479 return where->map->insert (this, where->x, where->y, originator, flags);
1480}
1481
1482// find player who can see this object
1483static object *
1484visible_to (object *op)
1485{
1486 if (!op->flag [FLAG_REMOVED])
1487 {
1488 // see if we are in a container of sorts
1489 if (object *env = op->env)
1490 {
1491 // the player inventory itself is always visible
1492 if (env->type == PLAYER)
1493 return env;
1494
1495 // else a player could have our env open
1496 env = env->outer_env ();
1497
1498 // the player itself is always on a map, so we will find him here
1499 // even if our inv is in a player.
1500 if (env->is_on_map ())
1501 if (object *pl = env->ms ().player ())
1502 if (pl->container == op->env)
1503 return pl;
1504 }
1505 else
1506 {
1507 // maybe there is a player standing on the same mapspace
1508 if (object *pl = env->ms ().player ())
1509 return pl;
1510 }
1511 }
1512
1513 return 0;
1514}
1515
1516/*
1517 * decrease(object, number) decreases a specified number from
1518 * the amount of an object. If the amount reaches 0, the object
1519 * is subsequently removed and freed.
1520 *
1521 * Return value: 'op' if something is left, NULL if the amount reached 0
1522 */
1523bool
1524object::decrease (sint32 nr)
1525{
1526 nr = min (nr, nrof);
1527
1528 if (!nr)
1529 return 1;
1530
1531 nrof -= nr;
1532
1533 object *visible = visible_to (this);
1534
1535 if (nrof)
1536 {
1537 adjust_weight (env, -weight * nr); // carrying == 0
1538
1539 if (visible)
1540 esrv_send_item (visible, this);
1541
1542 return 1;
1543 }
1544 else
1545 {
1546 if (visible)
1547 esrv_del_item (visible->contr, count);
1548
1549 this->destroy (1);
1550 return 0;
1551 }
1445} 1552}
1446 1553
1447/* 1554/*
1448 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1555 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1449 * is returned contains nr objects, and the remaining parts contains 1556 * is returned contains nr objects, and the remaining parts contains
1450 * the rest (or is removed and freed if that number is 0). 1557 * the rest (or is removed and freed if that number is 0).
1451 * On failure, NULL is returned, and the reason put into the 1558 * On failure, NULL is returned, and the reason put into the
1452 * global static errmsg array. 1559 * global static errmsg array.
1453 */ 1560 */
1454object * 1561object *
1562object::split (sint32 nr)
1563{
1564 if (nrof < nr)
1565 return 0;
1566 else if (nrof == nr)
1567 {
1568 remove ();
1569 return this;
1570 }
1571 else
1572 {
1573 decrease (nr);
1574
1575 object *op = object_create_clone (this);
1576 op->nrof = nr;
1577 return op;
1578 }
1579}
1580
1581//TODO: remove, but semantics differs from split_nr
1582object *
1455get_split_ob (object *orig_ob, uint32 nr) 1583get_split_ob (object *orig_ob, uint32 nr)
1456{ 1584{
1457 object *newob;
1458 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1459
1460 if (orig_ob->nrof < nr) 1585 if (orig_ob->nrof < nr)
1461 { 1586 {
1462 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1587 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1463 return NULL;
1464 }
1465
1466 newob = object_create_clone (orig_ob);
1467
1468 if ((orig_ob->nrof -= nr) < 1)
1469 orig_ob->destroy (1);
1470 else if (!is_removed)
1471 {
1472 if (orig_ob->env != NULL)
1473 sub_weight (orig_ob->env, orig_ob->weight * nr);
1474 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1475 {
1476 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1477 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1478 return NULL;
1479 }
1480 }
1481
1482 newob->nrof = nr;
1483
1484 return newob;
1485}
1486
1487/*
1488 * decrease_ob_nr(object, number) decreases a specified number from
1489 * the amount of an object. If the amount reaches 0, the object
1490 * is subsequently removed and freed.
1491 *
1492 * Return value: 'op' if something is left, NULL if the amount reached 0
1493 */
1494object *
1495decrease_ob_nr (object *op, uint32 i)
1496{
1497 object *tmp;
1498
1499 if (i == 0) /* objects with op->nrof require this check */
1500 return op;
1501
1502 if (i > op->nrof)
1503 i = op->nrof;
1504
1505 if (QUERY_FLAG (op, FLAG_REMOVED))
1506 op->nrof -= i;
1507 else if (op->env)
1508 {
1509 /* is this object in the players inventory, or sub container
1510 * therein?
1511 */
1512 tmp = op->in_player ();
1513 /* nope. Is this a container the player has opened?
1514 * If so, set tmp to that player.
1515 * IMO, searching through all the players will mostly
1516 * likely be quicker than following op->env to the map,
1517 * and then searching the map for a player.
1518 */
1519 if (!tmp)
1520 for_all_players (pl)
1521 if (pl->ob->container == op->env)
1522 {
1523 tmp = pl->ob;
1524 break;
1525 }
1526
1527 if (i < op->nrof)
1528 {
1529 sub_weight (op->env, op->weight * i);
1530 op->nrof -= i;
1531 if (tmp)
1532 esrv_send_item (tmp, op);
1533 }
1534 else
1535 {
1536 op->remove ();
1537 op->nrof = 0;
1538 if (tmp)
1539 esrv_del_item (tmp->contr, op->count);
1540 }
1541 }
1542 else
1543 {
1544 object *above = op->above;
1545
1546 if (i < op->nrof)
1547 op->nrof -= i;
1548 else
1549 {
1550 op->remove ();
1551 op->nrof = 0;
1552 }
1553
1554 /* Since we just removed op, op->above is null */
1555 for (tmp = above; tmp; tmp = tmp->above)
1556 if (tmp->type == PLAYER)
1557 {
1558 if (op->nrof)
1559 esrv_send_item (tmp, op);
1560 else
1561 esrv_del_item (tmp->contr, op->count);
1562 }
1563 }
1564
1565 if (op->nrof)
1566 return op;
1567 else
1568 {
1569 op->destroy ();
1570 return 0; 1588 return 0;
1571 } 1589 }
1572}
1573 1590
1574/* 1591 return orig_ob->split (nr);
1575 * add_weight(object, weight) adds the specified weight to an object,
1576 * and also updates how much the environment(s) is/are carrying.
1577 */
1578void
1579add_weight (object *op, signed long weight)
1580{
1581 while (op != NULL)
1582 {
1583 if (op->type == CONTAINER)
1584 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1585
1586 op->carrying += weight;
1587 op = op->env;
1588 }
1589} 1592}
1590 1593
1591object * 1594object *
1592insert_ob_in_ob (object *op, object *where) 1595insert_ob_in_ob (object *op, object *where)
1593{ 1596{
1597 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1600 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1598 free (dump); 1601 free (dump);
1599 return op; 1602 return op;
1600 } 1603 }
1601 1604
1602 if (where->head) 1605 if (where->head_ () != where)
1603 { 1606 {
1604 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1607 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1605 where = where->head; 1608 where = where->head;
1606 } 1609 }
1607 1610
1608 return where->insert (op); 1611 return where->insert (op);
1609} 1612}
1617 * be != op, if items are merged. -Tero 1620 * be != op, if items are merged. -Tero
1618 */ 1621 */
1619object * 1622object *
1620object::insert (object *op) 1623object::insert (object *op)
1621{ 1624{
1622 object *tmp, *otmp;
1623
1624 if (!QUERY_FLAG (op, FLAG_REMOVED))
1625 op->remove ();
1626
1627 if (op->more) 1625 if (op->more)
1628 { 1626 {
1629 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1627 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1630 return op; 1628 return op;
1631 } 1629 }
1632 1630
1633 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1631 op->remove ();
1634 CLEAR_FLAG (op, FLAG_REMOVED); 1632
1633 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1634
1635 if (op->nrof) 1635 if (op->nrof)
1636 {
1637 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1636 for (object *tmp = inv; tmp; tmp = tmp->below)
1638 if (object::can_merge (tmp, op)) 1637 if (object::can_merge (tmp, op))
1639 { 1638 {
1640 /* return the original object and remove inserted object 1639 /* return the original object and remove inserted object
1641 (client needs the original object) */ 1640 (client needs the original object) */
1642 tmp->nrof += op->nrof; 1641 tmp->nrof += op->nrof;
1643 /* Weight handling gets pretty funky. Since we are adding to 1642 op->destroy (1);
1644 * tmp->nrof, we need to increase the weight.
1645 */
1646 add_weight (this, op->weight * op->nrof);
1647 SET_FLAG (op, FLAG_REMOVED);
1648 op->destroy (); /* free the inserted object */
1649 op = tmp; 1643 op = tmp;
1650 op->remove (); /* and fix old object's links */ 1644 goto inserted;
1651 CLEAR_FLAG (op, FLAG_REMOVED);
1652 break;
1653 } 1645 }
1654 1646
1655 /* I assume combined objects have no inventory 1647 op->owner = 0; // it's his/hers now. period.
1656 * We add the weight - this object could have just been removed 1648 op->map = 0;
1657 * (if it was possible to merge). calling remove_ob will subtract 1649 op->x = 0;
1658 * the weight, so we need to add it in again, since we actually do 1650 op->y = 0;
1659 * the linking below
1660 */
1661 add_weight (this, op->weight * op->nrof);
1662 }
1663 else
1664 add_weight (this, (op->weight + op->carrying));
1665 1651
1666 otmp = this->in_player (); 1652 op->above = 0;
1667 if (otmp && otmp->contr) 1653 op->below = inv;
1654 op->env = this;
1655
1656 if (inv)
1657 inv->above = op;
1658
1659 inv = op;
1660
1661 op->flag [FLAG_REMOVED] = 0;
1662
1663 adjust_weight (this, op->total_weight ());
1664
1665inserted:
1666 /* reset the light list and los of the players on the map */
1667 if (op->glow_radius && map && map->darkness)
1668 update_all_los (map, x, y);
1669
1670 if (object *otmp = in_player ())
1668 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1671 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1669 otmp->update_stats (); 1672 otmp->update_stats ();
1670
1671 op->map = 0;
1672 op->env = this;
1673 op->above = 0;
1674 op->below = 0;
1675 op->x = 0, op->y = 0;
1676
1677 /* reset the light list and los of the players on the map */
1678 if ((op->glow_radius != 0) && map)
1679 {
1680#ifdef DEBUG_LIGHTS
1681 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1682#endif /* DEBUG_LIGHTS */
1683 if (map->darkness)
1684 update_all_los (map, x, y);
1685 }
1686
1687 /* Client has no idea of ordering so lets not bother ordering it here.
1688 * It sure simplifies this function...
1689 */
1690 if (!inv)
1691 inv = op;
1692 else
1693 {
1694 op->below = inv;
1695 op->below->above = op;
1696 inv = op;
1697 }
1698 1673
1699 INVOKE_OBJECT (INSERT, this); 1674 INVOKE_OBJECT (INSERT, this);
1700 1675
1701 return op; 1676 return op;
1702} 1677}
1917 * activate recursively a flag on an object inventory 1892 * activate recursively a flag on an object inventory
1918 */ 1893 */
1919void 1894void
1920flag_inv (object *op, int flag) 1895flag_inv (object *op, int flag)
1921{ 1896{
1922 if (op->inv)
1923 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1897 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1924 { 1898 {
1925 SET_FLAG (tmp, flag); 1899 SET_FLAG (tmp, flag);
1926 flag_inv (tmp, flag); 1900 flag_inv (tmp, flag);
1927 } 1901 }
1928} 1902}
1929 1903
1930/* 1904/*
1931 * deactivate recursively a flag on an object inventory 1905 * deactivate recursively a flag on an object inventory
1932 */ 1906 */
1933void 1907void
1934unflag_inv (object *op, int flag) 1908unflag_inv (object *op, int flag)
1935{ 1909{
1936 if (op->inv)
1937 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1910 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1938 { 1911 {
1939 CLEAR_FLAG (tmp, flag); 1912 CLEAR_FLAG (tmp, flag);
1940 unflag_inv (tmp, flag); 1913 unflag_inv (tmp, flag);
1941 } 1914 }
1942}
1943
1944/*
1945 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1946 * all it's inventory (recursively).
1947 * If checksums are used, a player will get set_cheat called for
1948 * him/her-self and all object carried by a call to this function.
1949 */
1950void
1951set_cheat (object *op)
1952{
1953 SET_FLAG (op, FLAG_WAS_WIZ);
1954 flag_inv (op, FLAG_WAS_WIZ);
1955} 1915}
1956 1916
1957/* 1917/*
1958 * find_free_spot(object, map, x, y, start, stop) will search for 1918 * find_free_spot(object, map, x, y, start, stop) will search for
1959 * a spot at the given map and coordinates which will be able to contain 1919 * a spot at the given map and coordinates which will be able to contain
1961 * to search (see the freearr_x/y[] definition). 1921 * to search (see the freearr_x/y[] definition).
1962 * It returns a random choice among the alternatives found. 1922 * It returns a random choice among the alternatives found.
1963 * start and stop are where to start relative to the free_arr array (1,9 1923 * start and stop are where to start relative to the free_arr array (1,9
1964 * does all 4 immediate directions). This returns the index into the 1924 * does all 4 immediate directions). This returns the index into the
1965 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1925 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1966 * Note - this only checks to see if there is space for the head of the
1967 * object - if it is a multispace object, this should be called for all
1968 * pieces.
1969 * Note2: This function does correctly handle tiled maps, but does not 1926 * Note: This function does correctly handle tiled maps, but does not
1970 * inform the caller. However, insert_ob_in_map will update as 1927 * inform the caller. However, insert_ob_in_map will update as
1971 * necessary, so the caller shouldn't need to do any special work. 1928 * necessary, so the caller shouldn't need to do any special work.
1972 * Note - updated to take an object instead of archetype - this is necessary 1929 * Note - updated to take an object instead of archetype - this is necessary
1973 * because arch_blocked (now ob_blocked) needs to know the movement type 1930 * because arch_blocked (now ob_blocked) needs to know the movement type
1974 * to know if the space in question will block the object. We can't use 1931 * to know if the space in question will block the object. We can't use
1976 * customized, changed states, etc. 1933 * customized, changed states, etc.
1977 */ 1934 */
1978int 1935int
1979find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1936find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1980{ 1937{
1938 int altern[SIZEOFFREE];
1981 int index = 0, flag; 1939 int index = 0, flag;
1982 int altern[SIZEOFFREE];
1983 1940
1984 for (int i = start; i < stop; i++) 1941 for (int i = start; i < stop; i++)
1985 { 1942 {
1986 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1943 mapxy pos (m, x, y); pos.move (i);
1987 if (!flag) 1944
1945 if (!pos.normalise ())
1946 continue;
1947
1948 mapspace &ms = *pos;
1949
1950 if (ms.flags () & P_IS_ALIVE)
1951 continue;
1952
1953 /* However, often
1954 * ob doesn't have any move type (when used to place exits)
1955 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1956 */
1957 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1958 {
1988 altern [index++] = i; 1959 altern [index++] = i;
1960 continue;
1961 }
1989 1962
1990 /* Basically, if we find a wall on a space, we cut down the search size. 1963 /* Basically, if we find a wall on a space, we cut down the search size.
1991 * In this way, we won't return spaces that are on another side of a wall. 1964 * In this way, we won't return spaces that are on another side of a wall.
1992 * This mostly work, but it cuts down the search size in all directions - 1965 * This mostly work, but it cuts down the search size in all directions -
1993 * if the space being examined only has a wall to the north and empty 1966 * if the space being examined only has a wall to the north and empty
1994 * spaces in all the other directions, this will reduce the search space 1967 * spaces in all the other directions, this will reduce the search space
1995 * to only the spaces immediately surrounding the target area, and 1968 * to only the spaces immediately surrounding the target area, and
1996 * won't look 2 spaces south of the target space. 1969 * won't look 2 spaces south of the target space.
1997 */ 1970 */
1998 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1971 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1972 {
1999 stop = maxfree[i]; 1973 stop = maxfree[i];
1974 continue;
1975 }
1976
1977 /* Note it is intentional that we check ob - the movement type of the
1978 * head of the object should correspond for the entire object.
1979 */
1980 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1981 continue;
1982
1983 if (ob->blocked (m, pos.x, pos.y))
1984 continue;
1985
1986 altern [index++] = i;
2000 } 1987 }
2001 1988
2002 if (!index) 1989 if (!index)
2003 return -1; 1990 return -1;
2004 1991
2013 */ 2000 */
2014int 2001int
2015find_first_free_spot (const object *ob, maptile *m, int x, int y) 2002find_first_free_spot (const object *ob, maptile *m, int x, int y)
2016{ 2003{
2017 for (int i = 0; i < SIZEOFFREE; i++) 2004 for (int i = 0; i < SIZEOFFREE; i++)
2018 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2005 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2019 return i; 2006 return i;
2020 2007
2021 return -1; 2008 return -1;
2022} 2009}
2023 2010
2077 object *tmp; 2064 object *tmp;
2078 maptile *mp; 2065 maptile *mp;
2079 2066
2080 MoveType blocked, move_type; 2067 MoveType blocked, move_type;
2081 2068
2082 if (exclude && exclude->head) 2069 if (exclude && exclude->head_ () != exclude)
2083 { 2070 {
2084 exclude = exclude->head; 2071 exclude = exclude->head;
2085 move_type = exclude->move_type; 2072 move_type = exclude->move_type;
2086 } 2073 }
2087 else 2074 else
2110 max = maxfree[i]; 2097 max = maxfree[i];
2111 else if (mflags & P_IS_ALIVE) 2098 else if (mflags & P_IS_ALIVE)
2112 { 2099 {
2113 for (tmp = ms.bot; tmp; tmp = tmp->above) 2100 for (tmp = ms.bot; tmp; tmp = tmp->above)
2114 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2101 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2115 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2102 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2116 break; 2103 break;
2117 2104
2118 if (tmp) 2105 if (tmp)
2119 return freedir[i]; 2106 return freedir[i];
2120 } 2107 }
2300 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2287 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2301 * core dumps if they do. 2288 * core dumps if they do.
2302 * 2289 *
2303 * Add a check so we can't pick up invisible objects (0.93.8) 2290 * Add a check so we can't pick up invisible objects (0.93.8)
2304 */ 2291 */
2305
2306int 2292int
2307can_pick (const object *who, const object *item) 2293can_pick (const object *who, const object *item)
2308{ 2294{
2309 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2295 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2310 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2296 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2315 * create clone from object to another 2301 * create clone from object to another
2316 */ 2302 */
2317object * 2303object *
2318object_create_clone (object *asrc) 2304object_create_clone (object *asrc)
2319{ 2305{
2320 object *dst = 0, *tmp, *src, *part, *prev, *item; 2306 object *dst = 0, *tmp, *src, *prev, *item;
2321 2307
2322 if (!asrc) 2308 if (!asrc)
2323 return 0; 2309 return 0;
2324 2310
2325 src = asrc;
2326 if (src->head)
2327 src = src->head; 2311 src = asrc->head_ ();
2328 2312
2329 prev = 0; 2313 prev = 0;
2330 for (part = src; part; part = part->more) 2314 for (object *part = src; part; part = part->more)
2331 { 2315 {
2332 tmp = part->clone (); 2316 tmp = part->clone ();
2333 tmp->x -= src->x; 2317 tmp->x -= src->x;
2334 tmp->y -= src->y; 2318 tmp->y -= src->y;
2335 2319
2448 /* Basically, if the archetype has this key set, 2432 /* Basically, if the archetype has this key set,
2449 * we need to store the null value so when we save 2433 * we need to store the null value so when we save
2450 * it, we save the empty value so that when we load, 2434 * it, we save the empty value so that when we load,
2451 * we get this value back again. 2435 * we get this value back again.
2452 */ 2436 */
2453 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2437 if (get_ob_key_link (op->arch, canonical_key))
2454 field->value = 0; 2438 field->value = 0;
2455 else 2439 else
2456 { 2440 {
2457 if (last) 2441 if (last)
2458 last->next = field->next; 2442 last->next = field->next;
2527 } 2511 }
2528 else 2512 else
2529 item = item->env; 2513 item = item->env;
2530} 2514}
2531 2515
2532
2533const char * 2516const char *
2534object::flag_desc (char *desc, int len) const 2517object::flag_desc (char *desc, int len) const
2535{ 2518{
2536 char *p = desc; 2519 char *p = desc;
2537 bool first = true; 2520 bool first = true;
2564{ 2547{
2565 char flagdesc[512]; 2548 char flagdesc[512];
2566 char info2[256 * 4]; 2549 char info2[256 * 4];
2567 char *p = info; 2550 char *p = info;
2568 2551
2569 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2552 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2570 count, uuid.seq, 2553 count,
2554 uuid.c_str (),
2571 &name, 2555 &name,
2572 title ? "\",title:\"" : "", 2556 title ? "\",title:\"" : "",
2573 title ? (const char *)title : "", 2557 title ? (const char *)title : "",
2574 flag_desc (flagdesc, 512), type); 2558 flag_desc (flagdesc, 512), type);
2575 2559
2576 if (env) 2560 if (!this->flag[FLAG_REMOVED] && env)
2577 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2561 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2578 2562
2579 if (map) 2563 if (map)
2580 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2564 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2581 2565
2583} 2567}
2584 2568
2585const char * 2569const char *
2586object::debug_desc () const 2570object::debug_desc () const
2587{ 2571{
2588 static char info[256 * 4]; 2572 static char info[3][256 * 4];
2573 static int info_idx;
2574
2589 return debug_desc (info); 2575 return debug_desc (info [++info_idx % 3]);
2590}
2591
2592const char *
2593object::debug_desc2 () const
2594{
2595 static char info[256 * 4];
2596 return debug_desc (info);
2597} 2576}
2598 2577
2599struct region * 2578struct region *
2600object::region () const 2579object::region () const
2601{ 2580{
2604} 2583}
2605 2584
2606const materialtype_t * 2585const materialtype_t *
2607object::dominant_material () const 2586object::dominant_material () const
2608{ 2587{
2609 if (materialtype_t *mat = name_to_material (materialname)) 2588 if (materialtype_t *mt = name_to_material (materialname))
2610 return mat; 2589 return mt;
2611 2590
2612 // omfg this is slow, this has to be temporary :)
2613 shstr unknown ("unknown");
2614
2615 return name_to_material (unknown); 2591 return name_to_material (shstr_unknown);
2616} 2592}
2617 2593
2618void 2594void
2619object::open_container (object *new_container) 2595object::open_container (object *new_container)
2620{ 2596{
2636 old_container->flag [FLAG_APPLIED] = 0; 2612 old_container->flag [FLAG_APPLIED] = 0;
2637 container = 0; 2613 container = 0;
2638 2614
2639 esrv_update_item (UPD_FLAGS, this, old_container); 2615 esrv_update_item (UPD_FLAGS, this, old_container);
2640 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2616 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2617 play_sound (sound_find ("chest_close"));
2641 } 2618 }
2642 2619
2643 if (new_container) 2620 if (new_container)
2644 { 2621 {
2645 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2622 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2661 new_container->flag [FLAG_APPLIED] = 1; 2638 new_container->flag [FLAG_APPLIED] = 1;
2662 container = new_container; 2639 container = new_container;
2663 2640
2664 esrv_update_item (UPD_FLAGS, this, new_container); 2641 esrv_update_item (UPD_FLAGS, this, new_container);
2665 esrv_send_inventory (this, new_container); 2642 esrv_send_inventory (this, new_container);
2643 play_sound (sound_find ("chest_open"));
2644 }
2645}
2646
2647object *
2648object::force_find (const shstr name)
2649{
2650 /* cycle through his inventory to look for the MARK we want to
2651 * place
2652 */
2653 for (object *tmp = inv; tmp; tmp = tmp->below)
2654 if (tmp->type == FORCE && tmp->slaying == name)
2655 return splay (tmp);
2656
2657 return 0;
2658}
2659
2660void
2661object::force_add (const shstr name, int duration)
2662{
2663 if (object *force = force_find (name))
2664 force->destroy ();
2665
2666 object *force = get_archetype (FORCE_NAME);
2667
2668 force->slaying = name;
2669 force->stats.food = 1;
2670 force->speed_left = -1.f;
2671
2672 force->set_speed (duration ? 1.f / duration : 0.f);
2673 force->flag [FLAG_IS_USED_UP] = true;
2674 force->flag [FLAG_APPLIED] = true;
2675
2676 insert (force);
2677}
2678
2679void
2680object::play_sound (faceidx sound)
2681{
2682 if (!sound)
2683 return;
2684
2685 if (flag [FLAG_REMOVED])
2686 return;
2687
2688 if (env)
2666 } 2689 {
2690 if (object *pl = in_player ())
2691 pl->contr->play_sound (sound);
2692 }
2693 else
2694 map->play_sound (sound, x, y);
2667} 2695}
2668 2696
2669

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines