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.149 by root, Mon May 14 19:56:45 2007 UTC vs.
Revision 1.214 by root, Tue Apr 22 07:01:46 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>
34#include <sproto.h> 29#include <sproto.h>
35#include <loader.h> 30#include <loader.h>
36 31
37#include <bitset> 32#include <bitset>
38 33
39int nrofallocobjects = 0; 34UUID UUID::cur;
40static UUID uuid; 35static uint64_t seq_next_save;
41const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
42 37
43objectvec objects; 38objectvec objects;
44activevec actives; 39activevec actives;
45 40
46short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = {
42 0,
43 0, 1, 1, 1, 0, -1, -1, -1,
44 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 45 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
48}; 46};
49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 47short freearr_y[SIZEOFFREE] = {
48 0,
49 -1, -1, 0, 1, 1, 1, 0, -1,
50 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
50 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 51 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
51}; 52};
52int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 53int maxfree[SIZEOFFREE] = {
54 0,
55 9, 10, 13, 14, 17, 18, 21, 22,
56 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
53 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 57 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
54}; 58};
55int freedir[SIZEOFFREE] = { 59int freedir[SIZEOFFREE] = {
56 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 0,
61 1, 2, 3, 4, 5, 6, 7, 8,
62 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
57 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 63 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
58}; 64};
59 65
60static void 66static void
61write_uuid (void) 67write_uuid (uval64 skip, bool sync)
62{ 68{
63 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
64 70 CALL_ARG_SV (newSVval64 (skip));
65 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
66 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
67 73 CALL_END;
68 FILE *fp;
69
70 if (!(fp = fopen (filename2, "w")))
71 {
72 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73 return;
74 }
75
76 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77 fclose (fp);
78 rename (filename2, filename1);
79} 74}
80 75
81static void 76static void
82read_uuid (void) 77read_uuid (void)
83{ 78{
84 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
85 80
86 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 seq_next_save = 0;
87 84
88 FILE *fp; 85 FILE *fp;
89 86
90 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
91 { 88 {
92 if (errno == ENOENT) 89 if (errno == ENOENT)
93 { 90 {
94 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
95 uuid.seq = 0; 92 UUID::cur.seq = 0;
96 write_uuid (); 93 write_uuid (UUID_GAP, true);
97 return; 94 return;
98 } 95 }
99 96
100 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101 _exit (1); 98 _exit (1);
102 } 99 }
103 100
104 int version; 101 UUID::BUF buf;
105 unsigned long long uid; 102 buf[0] = 0;
106 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
107 { 106 {
108 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109 _exit (1); 108 _exit (1);
110 } 109 }
111 110
112 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113 write_uuid (); 112
114 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
115 fclose (fp); 114 fclose (fp);
116} 115}
117 116
118UUID 117UUID
119gen_uuid () 118UUID::gen ()
120{ 119{
121 UUID uid; 120 UUID uid;
122 121
123 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
124 123
125 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
126 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
127 130
128 return uid; 131 return uid;
129} 132}
130 133
131void 134void
132init_uuid () 135UUID::init ()
133{ 136{
134 read_uuid (); 137 read_uuid ();
135} 138}
136 139
137/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138static int 141static bool
139compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
140{ 143{
141 key_value *wants_field; 144 key_value *wants_field;
142 145
143 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 146 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
151 key_value *has_field; 154 key_value *has_field;
152 155
153 /* Look for a field in has with the same key. */ 156 /* Look for a field in has with the same key. */
154 has_field = get_ob_key_link (has, wants_field->key); 157 has_field = get_ob_key_link (has, wants_field->key);
155 158
156 if (has_field == NULL) 159 if (!has_field)
157 {
158 /* No field with that name. */ 160 return 0; /* No field with that name. */
159 return FALSE;
160 }
161 161
162 /* Found the matching field. */ 162 /* Found the matching field. */
163 if (has_field->value != wants_field->value) 163 if (has_field->value != wants_field->value)
164 {
165 /* Values don't match, so this half of the comparison is false. */ 164 return 0; /* Values don't match, so this half of the comparison is false. */
166 return FALSE;
167 }
168 165
169 /* If we get here, we found a match. Now for the next field in wants. */ 166 /* If we get here, we found a match. Now for the next field in wants. */
170 } 167 }
171 168
172 /* If we get here, every field in wants has a matching field in has. */ 169 /* If we get here, every field in wants has a matching field in has. */
173 return TRUE; 170 return 1;
174} 171}
175 172
176/* Returns TRUE if ob1 has the same key_values as ob2. */ 173/* Returns TRUE if ob1 has the same key_values as ob2. */
177static int 174static bool
178compare_ob_value_lists (const object *ob1, const object *ob2) 175compare_ob_value_lists (const object *ob1, const object *ob2)
179{ 176{
180 /* However, there may be fields in has which aren't partnered in wants, 177 /* However, there may be fields in has which aren't partnered in wants,
181 * so we need to run the comparison *twice*. :( 178 * so we need to run the comparison *twice*. :(
182 */ 179 */
203 || ob1->speed != ob2->speed 200 || ob1->speed != ob2->speed
204 || ob1->value != ob2->value 201 || ob1->value != ob2->value
205 || ob1->name != ob2->name) 202 || ob1->name != ob2->name)
206 return 0; 203 return 0;
207 204
208 //TODO: this ain't working well, use nicer and correct overflow check 205 /* Do not merge objects if nrof would overflow. First part checks
209 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 206 * for unsigned overflow (2c), second part checks whether the result
210 * value could not be stored in a sint32 (which unfortunately sometimes is 207 * would fit into a 32 bit signed int, which is often used to hold
211 * used to store nrof). 208 * nrof values.
212 */ 209 */
213 if (ob1->nrof + ob2->nrof >= 1UL << 31) 210 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214 return 0; 211 return 0;
215 212
216 /* If the objects have been identified, set the BEEN_APPLIED flag. 213 /* If the objects have been identified, set the BEEN_APPLIED flag.
217 * This is to the comparison of the flags below will be OK. We 214 * This is to the comparison of the flags below will be OK. We
218 * just can't ignore the been applied or identified flags, as they 215 * just can't ignore the been applied or identified flags, as they
219 * are not equal - just if it has been identified, the been_applied 216 * are not equal - just if it has been identified, the been_applied
220 * flags lose any meaning. 217 * flags lose any meaning.
221 */ 218 */
222 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 219 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 220 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224 221
225 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 223 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227 224
228 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 225 if (ob1->arch->name != ob2->arch->name
229 || ob1->arch != ob2->arch
230 || ob1->name != ob2->name 226 || ob1->name != ob2->name
231 || ob1->title != ob2->title 227 || ob1->title != ob2->title
232 || ob1->msg != ob2->msg 228 || ob1->msg != ob2->msg
233 || ob1->weight != ob2->weight 229 || ob1->weight != ob2->weight
234 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236 || ob1->attacktype != ob2->attacktype 230 || ob1->attacktype != ob2->attacktype
237 || ob1->magic != ob2->magic 231 || ob1->magic != ob2->magic
238 || ob1->slaying != ob2->slaying 232 || ob1->slaying != ob2->slaying
239 || ob1->skill != ob2->skill 233 || ob1->skill != ob2->skill
240 || ob1->value != ob2->value 234 || ob1->value != ob2->value
247 || ob1->move_block != ob2->move_block 241 || ob1->move_block != ob2->move_block
248 || ob1->move_allow != ob2->move_allow 242 || ob1->move_allow != ob2->move_allow
249 || ob1->move_on != ob2->move_on 243 || ob1->move_on != ob2->move_on
250 || ob1->move_off != ob2->move_off 244 || ob1->move_off != ob2->move_off
251 || ob1->move_slow != ob2->move_slow 245 || ob1->move_slow != ob2->move_slow
252 || ob1->move_slow_penalty != ob2->move_slow_penalty) 246 || ob1->move_slow_penalty != ob2->move_slow_penalty
247 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
248 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253 return 0; 249 return 0;
254 250
251 if ((ob1->flag ^ ob2->flag)
252 .reset (FLAG_INV_LOCKED)
253 .reset (FLAG_CLIENT_SENT)
254 .reset (FLAG_REMOVED)
255 .any ())
256 return 0;
257
255 /* This is really a spellbook check - really, we should 258 /* This is really a spellbook check - we should in general
256 * check all objects in the inventory. 259 * not merge objects with real inventories, as splitting them
260 * is hard.
257 */ 261 */
258 if (ob1->inv || ob2->inv) 262 if (ob1->inv || ob2->inv)
259 { 263 {
260 /* if one object has inventory but the other doesn't, not equiv */ 264 if (!(ob1->inv && ob2->inv))
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 265 return 0; /* inventories differ in length */
262 return 0;
263 266
264 /* Now check to see if the two inventory objects could merge */ 267 if (ob1->inv->below || ob2->inv->below)
268 return 0; /* more than one object in inv */
269
265 if (!object::can_merge (ob1->inv, ob2->inv)) 270 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 271 return 0; /* inventory objects differ */
267 272
268 /* inventory ok - still need to check rest of this object to see 273 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 274 * if it is valid.
270 */ 275 */
271 } 276 }
290 if (ob1->level != ob2->level) 295 if (ob1->level != ob2->level)
291 return 0; 296 return 0;
292 break; 297 break;
293 } 298 }
294 299
295 if (ob1->key_values != NULL || ob2->key_values != NULL) 300 if (ob1->key_values || ob2->key_values)
296 { 301 {
297 /* At least one of these has key_values. */ 302 /* At least one of these has key_values. */
298 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 303 if ((!ob1->key_values) != (!ob2->key_values))
299 /* One has fields, but the other one doesn't. */ 304 return 0; /* One has fields, but the other one doesn't. */
305
306 if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 307 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0;
303 } 308 }
304 309
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
307 { 311 {
308 ob1->optimise (); 312 ob1->optimise ();
309 ob2->optimise (); 313 ob2->optimise ();
310 314
311 if (ob1->self || ob2->self) 315 if (ob1->self || ob2->self)
316 {
317 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
318 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
319
320 if (k1 != k2)
312 return 0; 321 return 0;
322
323 if (k1 == 0)
324 return 1;
325
326 if (!cfperl_can_merge (ob1, ob2))
327 return 0;
328 }
313 } 329 }
314 330
315 /* Everything passes, must be OK. */ 331 /* Everything passes, must be OK. */
316 return 1; 332 return 1;
317} 333}
318 334
335// find player who can see this object
336object *
337object::visible_to () const
338{
339 if (!flag [FLAG_REMOVED])
340 {
341 // see if we are in a container of sorts
342 if (env)
343 {
344 // the player inventory itself is always visible
345 if (env->type == PLAYER)
346 return env;
347
348 // else a player could have our env open
349 object *envest = env->outer_env ();
350
351 // the player itself is always on a map, so we will find him here
352 // even if our inv is in a player.
353 if (envest->is_on_map ())
354 if (object *pl = envest->ms ().player ())
355 if (pl->container == env)
356 return pl;
357 }
358 else
359 {
360 // maybe there is a player standing on the same mapspace
361 // this will catch the case where "this" is a player
362 if (object *pl = ms ().player ())
363 return pl;
364 }
365 }
366
367 return 0;
368}
369
370// adjust weight per container type ("of holding")
371static sint32
372weight_adjust (object *op, sint32 weight)
373{
374 return op->type == CONTAINER
375 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376 : weight;
377}
378
319/* 379/*
380 * adjust_weight(object, weight) adds the specified weight to an object,
381 * and also updates how much the environment(s) is/are carrying.
382 */
383static void
384adjust_weight (object *op, sint32 weight)
385{
386 while (op)
387 {
388 weight = weight_adjust (op, weight);
389
390 if (!weight)
391 return;
392
393 op->carrying += weight;
394
395 if (object *pl = op->visible_to ())
396 esrv_update_item (UPD_WEIGHT, pl, op);
397
398 op = op->env;
399 }
400}
401
402/*
320 * sum_weight() is a recursive function which calculates the weight 403 * this is a recursive function which calculates the weight
321 * an object is carrying. It goes through in figures out how much 404 * an object is carrying. It goes through op and figures out how much
322 * containers are carrying, and sums it up. 405 * containers are carrying, and sums it up.
323 */ 406 */
324long 407void
325sum_weight (object *op) 408object::update_weight ()
326{ 409{
327 long sum; 410 sint32 sum = 0;
328 object *inv;
329 411
330 for (sum = 0, inv = op->inv; inv; inv = inv->below) 412 for (object *op = inv; op; op = op->below)
331 { 413 {
332 if (inv->inv) 414 if (op->inv)
333 sum_weight (inv); 415 op->update_weight ();
334 416
335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 417 sum += op->total_weight ();
418 }
419
420 sum = weight_adjust (this, sum);
421
422 if (sum != carrying)
336 } 423 {
337
338 if (op->type == CONTAINER && op->stats.Str)
339 sum = (sum * (100 - op->stats.Str)) / 100;
340
341 if (op->carrying != sum)
342 op->carrying = sum; 424 carrying = sum;
343 425
344 return sum; 426 if (object *pl = visible_to ())
427 esrv_update_item (UPD_WEIGHT, pl, this);
428 }
345} 429}
346 430
347/** 431/*
348 * Return the outermost environment object for a given object. 432 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
349 */
350
351object *
352object_get_env_recursive (object *op)
353{
354 while (op->env != NULL)
355 op = op->env;
356 return op;
357}
358
359/*
360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361 * Some error messages.
362 * The result of the dump is stored in the static global errmsg array.
363 */ 433 */
364char * 434char *
365dump_object (object *op) 435dump_object (object *op)
366{ 436{
367 if (!op) 437 if (!op)
375/* 445/*
376 * get_nearest_part(multi-object, object 2) returns the part of the 446 * get_nearest_part(multi-object, object 2) returns the part of the
377 * multi-object 1 which is closest to the second object. 447 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 448 * If it's not a multi-object, it is returned.
379 */ 449 */
380
381object * 450object *
382get_nearest_part (object *op, const object *pl) 451get_nearest_part (object *op, const object *pl)
383{ 452{
384 object *tmp, *closest; 453 object *tmp, *closest;
385 int last_dist, i; 454 int last_dist, i;
386 455
387 if (op->more == NULL) 456 if (!op->more)
388 return op; 457 return op;
458
389 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 459 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
460 tmp;
461 tmp = tmp->more)
390 if ((i = distance (tmp, pl)) < last_dist) 462 if ((i = distance (tmp, pl)) < last_dist)
391 closest = tmp, last_dist = i; 463 closest = tmp, last_dist = i;
464
392 return closest; 465 return closest;
393} 466}
394 467
395/* 468/*
396 * Returns the object which has the count-variable equal to the argument. 469 * Returns the object which has the count-variable equal to the argument.
470 * VERRRY slow.
397 */ 471 */
398object * 472object *
399find_object (tag_t i) 473find_object (tag_t i)
400{ 474{
401 for_all_objects (op) 475 for_all_objects (op)
421 break; 495 break;
422 496
423 return op; 497 return op;
424} 498}
425 499
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 500/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 501 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 502 * skill and experience objects.
503 * ACTUALLY NO! investigate! TODO
435 */ 504 */
436void 505void
437object::set_owner (object *owner) 506object::set_owner (object *owner)
438{ 507{
508 // allow objects which own objects
439 if (!owner) 509 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 510 while (owner->owner)
450 owner = owner->owner; 511 owner = owner->owner;
512
513 if (flag [FLAG_FREED])
514 {
515 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
516 return;
517 }
451 518
452 this->owner = owner; 519 this->owner = owner;
453} 520}
454 521
455int 522int
473object::change_weapon (object *ob) 540object::change_weapon (object *ob)
474{ 541{
475 if (current_weapon == ob) 542 if (current_weapon == ob)
476 return true; 543 return true;
477 544
545 if (chosen_skill)
546 chosen_skill->flag [FLAG_APPLIED] = false;
547
478 current_weapon = ob; 548 current_weapon = ob;
479 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); 549 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
550
551 if (chosen_skill)
552 chosen_skill->flag [FLAG_APPLIED] = true;
480 553
481 update_stats (); 554 update_stats ();
482 555
483 if (ob) 556 if (ob)
484 { 557 {
489 { 562 {
490 current_weapon = chosen_skill = 0; 563 current_weapon = chosen_skill = 0;
491 update_stats (); 564 update_stats ();
492 565
493 new_draw_info_format (NDI_UNIQUE, 0, this, 566 new_draw_info_format (NDI_UNIQUE, 0, this,
494 "You try to balance your applied items all at once, but the %s is too much. " 567 "You try to balance all your items at once, "
568 "but the %s is just too much for your body. "
495 "You need to unapply some items first.", &ob->name); 569 "[You need to unapply some items first.]", &ob->name);
496 return false; 570 return false;
497 } 571 }
498 572
499 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 573 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
500 } 574 }
501 else 575 else
502 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); 576 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
577
578 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
579 {
580 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
581 &name, ob->debug_desc ());
582 return false;
583 }
503 584
504 return true; 585 return true;
505} 586}
506 587
507/* Zero the key_values on op, decrementing the shared-string 588/* Zero the key_values on op, decrementing the shared-string
573object::copy_to (object *dst) 654object::copy_to (object *dst)
574{ 655{
575 *dst = *this; 656 *dst = *this;
576 657
577 if (speed < 0) 658 if (speed < 0)
578 dst->speed_left = speed_left - rndm (); 659 dst->speed_left -= rndm ();
579 660
580 dst->set_speed (dst->speed); 661 dst->set_speed (dst->speed);
581} 662}
582 663
583void 664void
584object::instantiate () 665object::instantiate ()
585{ 666{
586 if (!uuid.seq) // HACK 667 if (!uuid.seq) // HACK
587 uuid = gen_uuid (); 668 uuid = UUID::gen ();
588 669
589 speed_left = -0.1f; 670 speed_left = -0.1f;
590 /* copy the body_info to the body_used - this is only really 671 /* copy the body_info to the body_used - this is only really
591 * need for monsters, but doesn't hurt to do it for everything. 672 * need for monsters, but doesn't hurt to do it for everything.
592 * by doing so, when a monster is created, it has good starting 673 * by doing so, when a monster is created, it has good starting
751static int object_count; 832static int object_count;
752 833
753void object::link () 834void object::link ()
754{ 835{
755 assert (!index);//D 836 assert (!index);//D
756 uuid = gen_uuid (); 837 uuid = UUID::gen ();
757 count = ++object_count; 838 count = ++object_count;
758 839
759 refcnt_inc (); 840 refcnt_inc ();
760 objects.insert (this); 841 objects.insert (this);
761} 842}
845 * if some form of movement is allowed, let objects 926 * if some form of movement is allowed, let objects
846 * drop on that space. 927 * drop on that space.
847 */ 928 */
848 if (!drop_to_ground 929 if (!drop_to_ground
849 || !map 930 || !map
850 || map->in_memory != MAP_IN_MEMORY 931 || map->in_memory != MAP_ACTIVE
851 || map->nodrop 932 || map->nodrop
852 || ms ().move_block == MOVE_ALL) 933 || ms ().move_block == MOVE_ALL)
853 { 934 {
854 while (inv) 935 while (inv)
855 { 936 {
884} 965}
885 966
886void 967void
887object::do_destroy () 968object::do_destroy ()
888{ 969{
889 attachable::do_destroy ();
890
891 if (flag [FLAG_IS_LINKED]) 970 if (flag [FLAG_IS_LINKED])
892 remove_button_link (this); 971 remove_button_link (this);
893 972
894 if (flag [FLAG_FRIENDLY]) 973 if (flag [FLAG_FRIENDLY])
895 remove_friendly_object (this); 974 remove_friendly_object (this);
896 975
897 if (!flag [FLAG_REMOVED])
898 remove (); 976 remove ();
977
978 attachable::do_destroy ();
899 979
900 destroy_inv (true); 980 destroy_inv (true);
901 981
902 deactivate (); 982 deactivate ();
903 unlink (); 983 unlink ();
910 990
911 if (!freed_map) 991 if (!freed_map)
912 { 992 {
913 freed_map = new maptile; 993 freed_map = new maptile;
914 994
995 freed_map->path = "<freed objects map>";
915 freed_map->name = "/internal/freed_objects_map"; 996 freed_map->name = "/internal/freed_objects_map";
916 freed_map->width = 3; 997 freed_map->width = 3;
917 freed_map->height = 3; 998 freed_map->height = 3;
999 freed_map->nodrop = 1;
918 1000
919 freed_map->alloc (); 1001 freed_map->alloc ();
920 freed_map->in_memory = MAP_IN_MEMORY; 1002 freed_map->in_memory = MAP_ACTIVE;
921 } 1003 }
922 1004
923 map = freed_map; 1005 map = freed_map;
924 x = 1; 1006 x = 1;
925 y = 1; 1007 y = 1;
926 } 1008 }
927 1009
928 head = 0;
929
930 if (more) 1010 if (more)
931 { 1011 {
932 more->destroy (); 1012 more->destroy ();
933 more = 0; 1013 more = 0;
934 } 1014 }
935 1015
1016 head = 0;
1017
936 // clear those pointers that likely might have circular references to us 1018 // clear those pointers that likely might cause circular references
937 owner = 0; 1019 owner = 0;
938 enemy = 0; 1020 enemy = 0;
939 attacked_by = 0; 1021 attacked_by = 0;
1022 current_weapon = 0;
940} 1023}
941 1024
942void 1025void
943object::destroy (bool destroy_inventory) 1026object::destroy (bool destroy_inventory)
944{ 1027{
946 return; 1029 return;
947 1030
948 if (destroy_inventory) 1031 if (destroy_inventory)
949 destroy_inv (false); 1032 destroy_inv (false);
950 1033
1034 if (is_head ())
1035 if (sound_destroy)
1036 play_sound (sound_destroy);
1037 else if (flag [FLAG_MONSTER])
1038 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
1039
951 attachable::destroy (); 1040 attachable::destroy ();
952}
953
954/*
955 * sub_weight() recursively (outwards) subtracts a number from the
956 * weight of an object (and what is carried by it's environment(s)).
957 */
958void
959sub_weight (object *op, signed long weight)
960{
961 while (op != NULL)
962 {
963 if (op->type == CONTAINER)
964 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
965
966 op->carrying -= weight;
967 op = op->env;
968 }
969} 1041}
970 1042
971/* op->remove (): 1043/* op->remove ():
972 * This function removes the object op from the linked list of objects 1044 * This function removes the object op from the linked list of objects
973 * which it is currently tied to. When this function is done, the 1045 * which it is currently tied to. When this function is done, the
979object::do_remove () 1051object::do_remove ()
980{ 1052{
981 object *tmp, *last = 0; 1053 object *tmp, *last = 0;
982 object *otmp; 1054 object *otmp;
983 1055
984 if (QUERY_FLAG (this, FLAG_REMOVED)) 1056 if (flag [FLAG_REMOVED])
985 return; 1057 return;
986 1058
987 SET_FLAG (this, FLAG_REMOVED);
988 INVOKE_OBJECT (REMOVE, this); 1059 INVOKE_OBJECT (REMOVE, this);
1060
1061 if (object *pl = visible_to ())
1062 esrv_del_item (pl->contr, count);
1063
1064 flag [FLAG_REMOVED] = true;
989 1065
990 if (more) 1066 if (more)
991 more->remove (); 1067 more->remove ();
992 1068
993 /* 1069 /*
994 * In this case, the object to be removed is in someones 1070 * In this case, the object to be removed is in someones
995 * inventory. 1071 * inventory.
996 */ 1072 */
997 if (env) 1073 if (env)
998 { 1074 {
1075 adjust_weight (env, -total_weight ());
1076
1077 *(above ? &above->below : &env->inv) = below;
1078
999 if (nrof) 1079 if (below)
1000 sub_weight (env, weight * nrof); 1080 below->above = above;
1001 else 1081
1002 sub_weight (env, weight + carrying); 1082 /* we set up values so that it could be inserted into
1083 * the map, but we don't actually do that - it is up
1084 * to the caller to decide what we want to do.
1085 */
1086 map = env->map;
1087 x = env->x;
1088 y = env->y;
1089 above = 0;
1090 below = 0;
1091 env = 0;
1003 1092
1004 /* NO_FIX_PLAYER is set when a great many changes are being 1093 /* NO_FIX_PLAYER is set when a great many changes are being
1005 * made to players inventory. If set, avoiding the call 1094 * made to players inventory. If set, avoiding the call
1006 * to save cpu time. 1095 * to save cpu time.
1007 */ 1096 */
1008 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1097 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1009 otmp->update_stats (); 1098 otmp->update_stats ();
1010
1011 if (above)
1012 above->below = below;
1013 else
1014 env->inv = below;
1015
1016 if (below)
1017 below->above = above;
1018
1019 /* we set up values so that it could be inserted into
1020 * the map, but we don't actually do that - it is up
1021 * to the caller to decide what we want to do.
1022 */
1023 x = env->x, y = env->y;
1024 map = env->map;
1025 above = 0, below = 0;
1026 env = 0;
1027 } 1099 }
1028 else if (map) 1100 else if (map)
1029 { 1101 {
1030 if (type == PLAYER) 1102 if (type == PLAYER)
1031 { 1103 {
1069 if (map->in_memory == MAP_SAVING) 1141 if (map->in_memory == MAP_SAVING)
1070 return; 1142 return;
1071 1143
1072 int check_walk_off = !flag [FLAG_NO_APPLY]; 1144 int check_walk_off = !flag [FLAG_NO_APPLY];
1073 1145
1146 if (object *pl = ms.player ())
1147 {
1148 if (pl->container == this)
1149 /* If a container that the player is currently using somehow gets
1150 * removed (most likely destroyed), update the player view
1151 * appropriately.
1152 */
1153 pl->close_container ();
1154
1155 pl->contr->ns->floorbox_update ();
1156 }
1157
1074 for (tmp = ms.bot; tmp; tmp = tmp->above) 1158 for (tmp = ms.bot; tmp; tmp = tmp->above)
1075 { 1159 {
1076 /* No point updating the players look faces if he is the object 1160 /* No point updating the players look faces if he is the object
1077 * being removed. 1161 * being removed.
1078 */ 1162 */
1079
1080 if (tmp->type == PLAYER && tmp != this)
1081 {
1082 /* If a container that the player is currently using somehow gets
1083 * removed (most likely destroyed), update the player view
1084 * appropriately.
1085 */
1086 if (tmp->container == this)
1087 {
1088 flag [FLAG_APPLIED] = 0;
1089 tmp->container = 0;
1090 }
1091
1092 if (tmp->contr->ns)
1093 tmp->contr->ns->floorbox_update ();
1094 }
1095 1163
1096 /* See if object moving off should effect something */ 1164 /* See if object moving off should effect something */
1097 if (check_walk_off 1165 if (check_walk_off
1098 && ((move_type & tmp->move_off) 1166 && ((move_type & tmp->move_off)
1099 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1167 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1102 1170
1103 if (destroyed ()) 1171 if (destroyed ())
1104 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1172 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1105 } 1173 }
1106 1174
1107 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1108 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1109 if (tmp->above == tmp)
1110 tmp->above = 0;
1111
1112 last = tmp; 1175 last = tmp;
1113 } 1176 }
1114 1177
1115 /* last == NULL if there are no objects on this space */ 1178 /* last == NULL if there are no objects on this space */
1116 //TODO: this makes little sense, why only update the topmost object? 1179 //TODO: this makes little sense, why only update the topmost object?
1136merge_ob (object *op, object *top) 1199merge_ob (object *op, object *top)
1137{ 1200{
1138 if (!op->nrof) 1201 if (!op->nrof)
1139 return 0; 1202 return 0;
1140 1203
1141 if (top) 1204 if (!top)
1142 for (top = op; top && top->above; top = top->above) 1205 for (top = op; top && top->above; top = top->above)
1143 ; 1206 ;
1144 1207
1145 for (; top; top = top->below) 1208 for (; top; top = top->below)
1146 {
1147 if (top == op)
1148 continue;
1149
1150 if (object::can_merge (op, top)) 1209 if (object::can_merge (op, top))
1151 { 1210 {
1152 top->nrof += op->nrof; 1211 top->nrof += op->nrof;
1153 1212
1154/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1213 if (object *pl = top->visible_to ())
1155 op->weight = 0; /* Don't want any adjustements now */ 1214 esrv_update_item (UPD_NROF, pl, top);
1215
1216 op->weight = 0; // cancel the addition above
1217 op->carrying = 0; // must be 0 already
1218
1156 op->destroy (); 1219 op->destroy (1);
1220
1157 return top; 1221 return top;
1158 } 1222 }
1159 }
1160 1223
1161 return 0; 1224 return 0;
1162} 1225}
1163 1226
1164void 1227void
1167 if (more) 1230 if (more)
1168 return; 1231 return;
1169 1232
1170 object *prev = this; 1233 object *prev = this;
1171 1234
1172 for (archetype *at = arch->more; at; at = at->more) 1235 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1173 { 1236 {
1174 object *op = arch_to_object (at); 1237 object *op = arch_to_object (at);
1175 1238
1176 op->name = name; 1239 op->name = name;
1177 op->name_pl = name_pl; 1240 op->name_pl = name_pl;
1191object * 1254object *
1192insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1255insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1193{ 1256{
1194 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1257 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1195 { 1258 {
1196 tmp->x = x + tmp->arch->clone.x; 1259 tmp->x = x + tmp->arch->x;
1197 tmp->y = y + tmp->arch->clone.y; 1260 tmp->y = y + tmp->arch->y;
1198 } 1261 }
1199 1262
1200 return insert_ob_in_map (op, m, originator, flag); 1263 return insert_ob_in_map (op, m, originator, flag);
1201} 1264}
1202 1265
1223object * 1286object *
1224insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1287insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1225{ 1288{
1226 assert (!op->flag [FLAG_FREED]); 1289 assert (!op->flag [FLAG_FREED]);
1227 1290
1228 object *tmp, *top, *floor = NULL; 1291 object *top, *floor = NULL;
1229 1292
1230 op->remove (); 1293 op->remove ();
1231
1232#if 0
1233 if (!m->active != !op->active)
1234 if (m->active)
1235 op->activate_recursive ();
1236 else
1237 op->deactivate_recursive ();
1238#endif
1239
1240 if (out_of_map (m, op->x, op->y))
1241 {
1242 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1243#ifdef MANY_CORES
1244 /* Better to catch this here, as otherwise the next use of this object
1245 * is likely to cause a crash. Better to find out where it is getting
1246 * improperly inserted.
1247 */
1248 abort ();
1249#endif
1250 return op;
1251 }
1252
1253 if (object *more = op->more)
1254 {
1255 if (!insert_ob_in_map (more, m, originator, flag))
1256 {
1257 if (!op->head)
1258 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1259
1260 return 0;
1261 }
1262 }
1263
1264 CLEAR_FLAG (op, FLAG_REMOVED);
1265 1294
1266 /* Ideally, the caller figures this out. However, it complicates a lot 1295 /* Ideally, the caller figures this out. However, it complicates a lot
1267 * of areas of callers (eg, anything that uses find_free_spot would now 1296 * of areas of callers (eg, anything that uses find_free_spot would now
1268 * need extra work 1297 * need extra work
1269 */ 1298 */
1270 if (!xy_normalise (m, op->x, op->y)) 1299 if (!xy_normalise (m, op->x, op->y))
1300 {
1301 op->destroy ();
1271 return 0; 1302 return 0;
1303 }
1304
1305 if (object *more = op->more)
1306 if (!insert_ob_in_map (more, m, originator, flag))
1307 return 0;
1308
1309 CLEAR_FLAG (op, FLAG_REMOVED);
1272 1310
1273 op->map = m; 1311 op->map = m;
1274 mapspace &ms = op->ms (); 1312 mapspace &ms = op->ms ();
1275 1313
1276 /* this has to be done after we translate the coordinates. 1314 /* this has to be done after we translate the coordinates.
1277 */ 1315 */
1278 if (op->nrof && !(flag & INS_NO_MERGE)) 1316 if (op->nrof && !(flag & INS_NO_MERGE))
1279 for (tmp = ms.bot; tmp; tmp = tmp->above) 1317 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1280 if (object::can_merge (op, tmp)) 1318 if (object::can_merge (op, tmp))
1281 { 1319 {
1282 op->nrof += tmp->nrof; 1320 op->nrof += tmp->nrof;
1283 tmp->destroy (); 1321 tmp->destroy (1);
1284 } 1322 }
1285 1323
1286 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1324 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1287 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1325 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1288 1326
1311 else 1349 else
1312 { 1350 {
1313 top = ms.bot; 1351 top = ms.bot;
1314 1352
1315 /* If there are other objects, then */ 1353 /* If there are other objects, then */
1316 if ((!(flag & INS_MAP_LOAD)) && top) 1354 if (top)
1317 { 1355 {
1318 object *last = 0; 1356 object *last = 0;
1319 1357
1320 /* 1358 /*
1321 * If there are multiple objects on this space, we do some trickier handling. 1359 * If there are multiple objects on this space, we do some trickier handling.
1374 if (last && last->below && last != floor) 1412 if (last && last->below && last != floor)
1375 top = last->below; 1413 top = last->below;
1376 } 1414 }
1377 } /* If objects on this space */ 1415 } /* If objects on this space */
1378 1416
1379 if (flag & INS_MAP_LOAD)
1380 top = ms.top;
1381
1382 if (flag & INS_ABOVE_FLOOR_ONLY) 1417 if (flag & INS_ABOVE_FLOOR_ONLY)
1383 top = floor; 1418 top = floor;
1384 1419
1385 /* Top is the object that our object (op) is going to get inserted above. 1420 /* Top is the object that our object (op) is going to get inserted above.
1386 */ 1421 */
1418 op->map->touch (); 1453 op->map->touch ();
1419 } 1454 }
1420 1455
1421 op->map->dirty = true; 1456 op->map->dirty = true;
1422 1457
1423 /* If we have a floor, we know the player, if any, will be above
1424 * it, so save a few ticks and start from there.
1425 */
1426 if (!(flag & INS_MAP_LOAD))
1427 if (object *pl = ms.player ()) 1458 if (object *pl = ms.player ())
1428 if (pl->contr->ns)
1429 pl->contr->ns->floorbox_update (); 1459 pl->contr->ns->floorbox_update ();
1430 1460
1431 /* If this object glows, it may affect lighting conditions that are 1461 /* If this object glows, it may affect lighting conditions that are
1432 * visible to others on this map. But update_all_los is really 1462 * visible to others on this map. But update_all_los is really
1433 * an inefficient way to do this, as it means los for all players 1463 * an inefficient way to do this, as it means los for all players
1434 * on the map will get recalculated. The players could very well 1464 * on the map will get recalculated. The players could very well
1453 * blocked() and wall() work properly), and these flags are updated by 1483 * blocked() and wall() work properly), and these flags are updated by
1454 * update_object(). 1484 * update_object().
1455 */ 1485 */
1456 1486
1457 /* if this is not the head or flag has been passed, don't check walk on status */ 1487 /* if this is not the head or flag has been passed, don't check walk on status */
1458 if (!(flag & INS_NO_WALK_ON) && !op->head) 1488 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1459 { 1489 {
1460 if (check_move_on (op, originator)) 1490 if (check_move_on (op, originator))
1461 return 0; 1491 return 0;
1462 1492
1463 /* If we are a multi part object, lets work our way through the check 1493 /* If we are a multi part object, lets work our way through the check
1464 * walk on's. 1494 * walk on's.
1465 */ 1495 */
1466 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1496 for (object *tmp = op->more; tmp; tmp = tmp->more)
1467 if (check_move_on (tmp, originator)) 1497 if (check_move_on (tmp, originator))
1468 return 0; 1498 return 0;
1469 } 1499 }
1470 1500
1471 return op; 1501 return op;
1476 * op is the object to insert it under: supplies x and the map. 1506 * op is the object to insert it under: supplies x and the map.
1477 */ 1507 */
1478void 1508void
1479replace_insert_ob_in_map (const char *arch_string, object *op) 1509replace_insert_ob_in_map (const char *arch_string, object *op)
1480{ 1510{
1481 object *tmp, *tmp1;
1482
1483 /* first search for itself and remove any old instances */ 1511 /* first search for itself and remove any old instances */
1484 1512
1485 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1513 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1486 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1514 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1487 tmp->destroy (); 1515 tmp->destroy (1);
1488 1516
1489 tmp1 = arch_to_object (archetype::find (arch_string)); 1517 object *tmp = arch_to_object (archetype::find (arch_string));
1490 1518
1491 tmp1->x = op->x; 1519 tmp->x = op->x;
1492 tmp1->y = op->y; 1520 tmp->y = op->y;
1521
1493 insert_ob_in_map (tmp1, op->map, op, 0); 1522 insert_ob_in_map (tmp, op->map, op, 0);
1494} 1523}
1495 1524
1496object * 1525object *
1497object::insert_at (object *where, object *originator, int flags) 1526object::insert_at (object *where, object *originator, int flags)
1498{ 1527{
1528 if (where->env)
1529 return where->env->insert (this);
1530 else
1499 return where->map->insert (this, where->x, where->y, originator, flags); 1531 return where->map->insert (this, where->x, where->y, originator, flags);
1500} 1532}
1501 1533
1502/* 1534/*
1503 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1504 * is returned contains nr objects, and the remaining parts contains
1505 * the rest (or is removed and freed if that number is 0).
1506 * On failure, NULL is returned, and the reason put into the
1507 * global static errmsg array.
1508 */
1509object *
1510get_split_ob (object *orig_ob, uint32 nr)
1511{
1512 object *newob;
1513 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1514
1515 if (orig_ob->nrof < nr)
1516 {
1517 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1518 return NULL;
1519 }
1520
1521 newob = object_create_clone (orig_ob);
1522
1523 if ((orig_ob->nrof -= nr) < 1)
1524 orig_ob->destroy (1);
1525 else if (!is_removed)
1526 {
1527 if (orig_ob->env != NULL)
1528 sub_weight (orig_ob->env, orig_ob->weight * nr);
1529 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1530 {
1531 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1532 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1533 return NULL;
1534 }
1535 }
1536
1537 newob->nrof = nr;
1538
1539 return newob;
1540}
1541
1542/*
1543 * decrease_ob_nr(object, number) decreases a specified number from 1535 * decrease(object, number) decreases a specified number from
1544 * the amount of an object. If the amount reaches 0, the object 1536 * the amount of an object. If the amount reaches 0, the object
1545 * is subsequently removed and freed. 1537 * is subsequently removed and freed.
1546 * 1538 *
1547 * Return value: 'op' if something is left, NULL if the amount reached 0 1539 * Return value: 'op' if something is left, NULL if the amount reached 0
1548 */ 1540 */
1541bool
1542object::decrease (sint32 nr)
1543{
1544 if (!nr)
1545 return true;
1546
1547 nr = min (nr, nrof);
1548
1549 nrof -= nr;
1550
1551 if (nrof)
1552 {
1553 adjust_weight (env, -weight * nr); // carrying == 0
1554
1555 if (object *pl = visible_to ())
1556 esrv_update_item (UPD_NROF, pl, this);
1557
1558 return true;
1559 }
1560 else
1561 {
1562 destroy (1);
1563 return false;
1564 }
1565}
1566
1567/*
1568 * split(ob,nr) splits up ob into two parts. The part which
1569 * is returned contains nr objects, and the remaining parts contains
1570 * the rest (or is removed and returned if that number is 0).
1571 * On failure, NULL is returned.
1572 */
1549object * 1573object *
1550decrease_ob_nr (object *op, uint32 i) 1574object::split (sint32 nr)
1551{ 1575{
1552 object *tmp; 1576 int have = number_of ();
1553 1577
1554 if (i == 0) /* objects with op->nrof require this check */ 1578 if (have < nr)
1555 return op; 1579 return 0;
1556 1580 else if (have == nr)
1557 if (i > op->nrof)
1558 i = op->nrof;
1559
1560 if (QUERY_FLAG (op, FLAG_REMOVED))
1561 op->nrof -= i;
1562 else if (op->env)
1563 { 1581 {
1564 /* is this object in the players inventory, or sub container
1565 * therein?
1566 */
1567 tmp = op->in_player ();
1568 /* nope. Is this a container the player has opened?
1569 * If so, set tmp to that player.
1570 * IMO, searching through all the players will mostly
1571 * likely be quicker than following op->env to the map,
1572 * and then searching the map for a player.
1573 */
1574 if (!tmp)
1575 for_all_players (pl)
1576 if (pl->ob->container == op->env)
1577 {
1578 tmp = pl->ob;
1579 break;
1580 }
1581
1582 if (i < op->nrof)
1583 {
1584 sub_weight (op->env, op->weight * i);
1585 op->nrof -= i;
1586 if (tmp)
1587 esrv_send_item (tmp, op);
1588 }
1589 else
1590 {
1591 op->remove (); 1582 remove ();
1592 op->nrof = 0; 1583 return this;
1593 if (tmp)
1594 esrv_del_item (tmp->contr, op->count);
1595 }
1596 } 1584 }
1597 else 1585 else
1598 { 1586 {
1599 object *above = op->above; 1587 decrease (nr);
1600 1588
1601 if (i < op->nrof) 1589 object *op = object_create_clone (this);
1602 op->nrof -= i; 1590 op->nrof = nr;
1603 else
1604 {
1605 op->remove ();
1606 op->nrof = 0;
1607 }
1608
1609 /* Since we just removed op, op->above is null */
1610 for (tmp = above; tmp; tmp = tmp->above)
1611 if (tmp->type == PLAYER)
1612 {
1613 if (op->nrof)
1614 esrv_send_item (tmp, op);
1615 else
1616 esrv_del_item (tmp->contr, op->count);
1617 }
1618 }
1619
1620 if (op->nrof)
1621 return op; 1591 return op;
1622 else
1623 {
1624 op->destroy ();
1625 return 0;
1626 }
1627}
1628
1629/*
1630 * add_weight(object, weight) adds the specified weight to an object,
1631 * and also updates how much the environment(s) is/are carrying.
1632 */
1633void
1634add_weight (object *op, signed long weight)
1635{
1636 while (op != NULL)
1637 {
1638 if (op->type == CONTAINER)
1639 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1640
1641 op->carrying += weight;
1642 op = op->env;
1643 } 1592 }
1644} 1593}
1645 1594
1646object * 1595object *
1647insert_ob_in_ob (object *op, object *where) 1596insert_ob_in_ob (object *op, object *where)
1652 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1601 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1653 free (dump); 1602 free (dump);
1654 return op; 1603 return op;
1655 } 1604 }
1656 1605
1657 if (where->head) 1606 if (where->head_ () != where)
1658 { 1607 {
1659 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1608 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1660 where = where->head; 1609 where = where->head;
1661 } 1610 }
1662 1611
1663 return where->insert (op); 1612 return where->insert (op);
1664} 1613}
1672 * be != op, if items are merged. -Tero 1621 * be != op, if items are merged. -Tero
1673 */ 1622 */
1674object * 1623object *
1675object::insert (object *op) 1624object::insert (object *op)
1676{ 1625{
1677 object *tmp, *otmp;
1678
1679 if (!QUERY_FLAG (op, FLAG_REMOVED))
1680 op->remove ();
1681
1682 if (op->more) 1626 if (op->more)
1683 { 1627 {
1684 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1628 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1685 return op; 1629 return op;
1686 } 1630 }
1687 1631
1688 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1632 op->remove ();
1689 CLEAR_FLAG (op, FLAG_REMOVED); 1633
1634 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1635
1690 if (op->nrof) 1636 if (op->nrof)
1691 {
1692 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1637 for (object *tmp = inv; tmp; tmp = tmp->below)
1693 if (object::can_merge (tmp, op)) 1638 if (object::can_merge (tmp, op))
1694 { 1639 {
1695 /* return the original object and remove inserted object 1640 /* return the original object and remove inserted object
1696 (client needs the original object) */ 1641 (client needs the original object) */
1697 tmp->nrof += op->nrof; 1642 tmp->nrof += op->nrof;
1698 /* Weight handling gets pretty funky. Since we are adding to 1643
1699 * tmp->nrof, we need to increase the weight. 1644 if (object *pl = tmp->visible_to ())
1700 */ 1645 esrv_update_item (UPD_NROF, pl, tmp);
1646
1701 add_weight (this, op->weight * op->nrof); 1647 adjust_weight (this, op->total_weight ());
1702 SET_FLAG (op, FLAG_REMOVED); 1648
1703 op->destroy (); /* free the inserted object */ 1649 op->destroy (1);
1704 op = tmp; 1650 op = tmp;
1705 op->remove (); /* and fix old object's links */ 1651 goto inserted;
1706 CLEAR_FLAG (op, FLAG_REMOVED);
1707 break;
1708 } 1652 }
1709 1653
1710 /* I assume combined objects have no inventory 1654 op->owner = 0; // it's his/hers now. period.
1711 * We add the weight - this object could have just been removed
1712 * (if it was possible to merge). calling remove_ob will subtract
1713 * the weight, so we need to add it in again, since we actually do
1714 * the linking below
1715 */
1716 add_weight (this, op->weight * op->nrof);
1717 }
1718 else
1719 add_weight (this, (op->weight + op->carrying));
1720
1721 otmp = this->in_player ();
1722 if (otmp && otmp->contr)
1723 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1724 otmp->update_stats ();
1725
1726 op->map = 0; 1655 op->map = 0;
1727 op->env = this; 1656 op->x = 0;
1657 op->y = 0;
1658
1728 op->above = 0; 1659 op->above = 0;
1729 op->below = 0; 1660 op->below = inv;
1730 op->x = 0, op->y = 0; 1661 op->env = this;
1731 1662
1663 if (inv)
1664 inv->above = op;
1665
1666 inv = op;
1667
1668 op->flag [FLAG_REMOVED] = 0;
1669
1670 if (object *pl = op->visible_to ())
1671 esrv_send_item (pl, op);
1672
1673 adjust_weight (this, op->total_weight ());
1674
1675inserted:
1732 /* reset the light list and los of the players on the map */ 1676 /* reset the light list and los of the players on the map */
1733 if ((op->glow_radius != 0) && map) 1677 if (op->glow_radius && map && map->darkness)
1734 {
1735#ifdef DEBUG_LIGHTS
1736 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1737#endif /* DEBUG_LIGHTS */
1738 if (map->darkness)
1739 update_all_los (map, x, y); 1678 update_all_los (map, x, y);
1740 }
1741 1679
1742 /* Client has no idea of ordering so lets not bother ordering it here. 1680 // if this is a player's inventory, update stats
1743 * It sure simplifies this function... 1681 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1744 */ 1682 update_stats ();
1745 if (!inv)
1746 inv = op;
1747 else
1748 {
1749 op->below = inv;
1750 op->below->above = op;
1751 inv = op;
1752 }
1753 1683
1754 INVOKE_OBJECT (INSERT, this); 1684 INVOKE_OBJECT (INSERT, this);
1755 1685
1756 return op; 1686 return op;
1757} 1687}
1972 * activate recursively a flag on an object inventory 1902 * activate recursively a flag on an object inventory
1973 */ 1903 */
1974void 1904void
1975flag_inv (object *op, int flag) 1905flag_inv (object *op, int flag)
1976{ 1906{
1977 if (op->inv)
1978 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1907 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1979 { 1908 {
1980 SET_FLAG (tmp, flag); 1909 SET_FLAG (tmp, flag);
1981 flag_inv (tmp, flag); 1910 flag_inv (tmp, flag);
1982 } 1911 }
1983} 1912}
1984 1913
1985/* 1914/*
1986 * deactivate recursively a flag on an object inventory 1915 * deactivate recursively a flag on an object inventory
1987 */ 1916 */
1988void 1917void
1989unflag_inv (object *op, int flag) 1918unflag_inv (object *op, int flag)
1990{ 1919{
1991 if (op->inv)
1992 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1920 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1993 { 1921 {
1994 CLEAR_FLAG (tmp, flag); 1922 CLEAR_FLAG (tmp, flag);
1995 unflag_inv (tmp, flag); 1923 unflag_inv (tmp, flag);
1996 } 1924 }
1997}
1998
1999/*
2000 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2001 * all it's inventory (recursively).
2002 * If checksums are used, a player will get set_cheat called for
2003 * him/her-self and all object carried by a call to this function.
2004 */
2005void
2006set_cheat (object *op)
2007{
2008 SET_FLAG (op, FLAG_WAS_WIZ);
2009 flag_inv (op, FLAG_WAS_WIZ);
2010} 1925}
2011 1926
2012/* 1927/*
2013 * find_free_spot(object, map, x, y, start, stop) will search for 1928 * find_free_spot(object, map, x, y, start, stop) will search for
2014 * a spot at the given map and coordinates which will be able to contain 1929 * a spot at the given map and coordinates which will be able to contain
2016 * to search (see the freearr_x/y[] definition). 1931 * to search (see the freearr_x/y[] definition).
2017 * It returns a random choice among the alternatives found. 1932 * It returns a random choice among the alternatives found.
2018 * start and stop are where to start relative to the free_arr array (1,9 1933 * start and stop are where to start relative to the free_arr array (1,9
2019 * does all 4 immediate directions). This returns the index into the 1934 * does all 4 immediate directions). This returns the index into the
2020 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1935 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2021 * Note - this only checks to see if there is space for the head of the
2022 * object - if it is a multispace object, this should be called for all
2023 * pieces.
2024 * Note2: This function does correctly handle tiled maps, but does not 1936 * Note: This function does correctly handle tiled maps, but does not
2025 * inform the caller. However, insert_ob_in_map will update as 1937 * inform the caller. However, insert_ob_in_map will update as
2026 * necessary, so the caller shouldn't need to do any special work. 1938 * necessary, so the caller shouldn't need to do any special work.
2027 * Note - updated to take an object instead of archetype - this is necessary 1939 * Note - updated to take an object instead of archetype - this is necessary
2028 * because arch_blocked (now ob_blocked) needs to know the movement type 1940 * because arch_blocked (now ob_blocked) needs to know the movement type
2029 * to know if the space in question will block the object. We can't use 1941 * to know if the space in question will block the object. We can't use
2031 * customized, changed states, etc. 1943 * customized, changed states, etc.
2032 */ 1944 */
2033int 1945int
2034find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1946find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2035{ 1947{
1948 int altern[SIZEOFFREE];
2036 int index = 0, flag; 1949 int index = 0, flag;
2037 int altern[SIZEOFFREE];
2038 1950
2039 for (int i = start; i < stop; i++) 1951 for (int i = start; i < stop; i++)
2040 { 1952 {
2041 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1953 mapxy pos (m, x, y); pos.move (i);
2042 if (!flag) 1954
1955 if (!pos.normalise ())
1956 continue;
1957
1958 mapspace &ms = *pos;
1959
1960 if (ms.flags () & P_IS_ALIVE)
1961 continue;
1962
1963 /* However, often
1964 * ob doesn't have any move type (when used to place exits)
1965 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1966 */
1967 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1968 {
2043 altern [index++] = i; 1969 altern [index++] = i;
1970 continue;
1971 }
2044 1972
2045 /* Basically, if we find a wall on a space, we cut down the search size. 1973 /* Basically, if we find a wall on a space, we cut down the search size.
2046 * In this way, we won't return spaces that are on another side of a wall. 1974 * In this way, we won't return spaces that are on another side of a wall.
2047 * This mostly work, but it cuts down the search size in all directions - 1975 * This mostly work, but it cuts down the search size in all directions -
2048 * if the space being examined only has a wall to the north and empty 1976 * if the space being examined only has a wall to the north and empty
2049 * spaces in all the other directions, this will reduce the search space 1977 * spaces in all the other directions, this will reduce the search space
2050 * to only the spaces immediately surrounding the target area, and 1978 * to only the spaces immediately surrounding the target area, and
2051 * won't look 2 spaces south of the target space. 1979 * won't look 2 spaces south of the target space.
2052 */ 1980 */
2053 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1981 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1982 {
2054 stop = maxfree[i]; 1983 stop = maxfree[i];
1984 continue;
1985 }
1986
1987 /* Note it is intentional that we check ob - the movement type of the
1988 * head of the object should correspond for the entire object.
1989 */
1990 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1991 continue;
1992
1993 if (ob->blocked (m, pos.x, pos.y))
1994 continue;
1995
1996 altern [index++] = i;
2055 } 1997 }
2056 1998
2057 if (!index) 1999 if (!index)
2058 return -1; 2000 return -1;
2059 2001
2068 */ 2010 */
2069int 2011int
2070find_first_free_spot (const object *ob, maptile *m, int x, int y) 2012find_first_free_spot (const object *ob, maptile *m, int x, int y)
2071{ 2013{
2072 for (int i = 0; i < SIZEOFFREE; i++) 2014 for (int i = 0; i < SIZEOFFREE; i++)
2073 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2015 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2074 return i; 2016 return i;
2075 2017
2076 return -1; 2018 return -1;
2077} 2019}
2078 2020
2132 object *tmp; 2074 object *tmp;
2133 maptile *mp; 2075 maptile *mp;
2134 2076
2135 MoveType blocked, move_type; 2077 MoveType blocked, move_type;
2136 2078
2137 if (exclude && exclude->head) 2079 if (exclude && exclude->head_ () != exclude)
2138 { 2080 {
2139 exclude = exclude->head; 2081 exclude = exclude->head;
2140 move_type = exclude->move_type; 2082 move_type = exclude->move_type;
2141 } 2083 }
2142 else 2084 else
2165 max = maxfree[i]; 2107 max = maxfree[i];
2166 else if (mflags & P_IS_ALIVE) 2108 else if (mflags & P_IS_ALIVE)
2167 { 2109 {
2168 for (tmp = ms.bot; tmp; tmp = tmp->above) 2110 for (tmp = ms.bot; tmp; tmp = tmp->above)
2169 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2111 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2170 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2112 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2171 break; 2113 break;
2172 2114
2173 if (tmp) 2115 if (tmp)
2174 return freedir[i]; 2116 return freedir[i];
2175 } 2117 }
2355 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2297 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2356 * core dumps if they do. 2298 * core dumps if they do.
2357 * 2299 *
2358 * Add a check so we can't pick up invisible objects (0.93.8) 2300 * Add a check so we can't pick up invisible objects (0.93.8)
2359 */ 2301 */
2360
2361int 2302int
2362can_pick (const object *who, const object *item) 2303can_pick (const object *who, const object *item)
2363{ 2304{
2364 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2305 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2365 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2306 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2370 * create clone from object to another 2311 * create clone from object to another
2371 */ 2312 */
2372object * 2313object *
2373object_create_clone (object *asrc) 2314object_create_clone (object *asrc)
2374{ 2315{
2375 object *dst = 0, *tmp, *src, *part, *prev, *item; 2316 object *dst = 0, *tmp, *src, *prev, *item;
2376 2317
2377 if (!asrc) 2318 if (!asrc)
2378 return 0; 2319 return 0;
2379 2320
2380 src = asrc;
2381 if (src->head)
2382 src = src->head; 2321 src = asrc->head_ ();
2383 2322
2384 prev = 0; 2323 prev = 0;
2385 for (part = src; part; part = part->more) 2324 for (object *part = src; part; part = part->more)
2386 { 2325 {
2387 tmp = part->clone (); 2326 tmp = part->clone ();
2388 tmp->x -= src->x; 2327 tmp->x -= src->x;
2389 tmp->y -= src->y; 2328 tmp->y -= src->y;
2390 2329
2503 /* Basically, if the archetype has this key set, 2442 /* Basically, if the archetype has this key set,
2504 * we need to store the null value so when we save 2443 * we need to store the null value so when we save
2505 * it, we save the empty value so that when we load, 2444 * it, we save the empty value so that when we load,
2506 * we get this value back again. 2445 * we get this value back again.
2507 */ 2446 */
2508 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2447 if (get_ob_key_link (op->arch, canonical_key))
2509 field->value = 0; 2448 field->value = 0;
2510 else 2449 else
2511 { 2450 {
2512 if (last) 2451 if (last)
2513 last->next = field->next; 2452 last->next = field->next;
2582 } 2521 }
2583 else 2522 else
2584 item = item->env; 2523 item = item->env;
2585} 2524}
2586 2525
2587
2588const char * 2526const char *
2589object::flag_desc (char *desc, int len) const 2527object::flag_desc (char *desc, int len) const
2590{ 2528{
2591 char *p = desc; 2529 char *p = desc;
2592 bool first = true; 2530 bool first = true;
2619{ 2557{
2620 char flagdesc[512]; 2558 char flagdesc[512];
2621 char info2[256 * 4]; 2559 char info2[256 * 4];
2622 char *p = info; 2560 char *p = info;
2623 2561
2624 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2562 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2625 count, uuid.seq, 2563 count,
2564 uuid.c_str (),
2626 &name, 2565 &name,
2627 title ? "\",title:\"" : "", 2566 title ? "\",title:\"" : "",
2628 title ? (const char *)title : "", 2567 title ? (const char *)title : "",
2629 flag_desc (flagdesc, 512), type); 2568 flag_desc (flagdesc, 512), type);
2630 2569
2631 if (env) 2570 if (!this->flag[FLAG_REMOVED] && env)
2632 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2571 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2633 2572
2634 if (map) 2573 if (map)
2635 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2574 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2636 2575
2654} 2593}
2655 2594
2656const materialtype_t * 2595const materialtype_t *
2657object::dominant_material () const 2596object::dominant_material () const
2658{ 2597{
2659 if (materialtype_t *mat = name_to_material (materialname)) 2598 if (materialtype_t *mt = name_to_material (materialname))
2660 return mat; 2599 return mt;
2661 2600
2662 // omfg this is slow, this has to be temporary :)
2663 shstr unknown ("unknown");
2664
2665 return name_to_material (unknown); 2601 return name_to_material (shstr_unknown);
2666} 2602}
2667 2603
2668void 2604void
2669object::open_container (object *new_container) 2605object::open_container (object *new_container)
2670{ 2606{
2686 old_container->flag [FLAG_APPLIED] = 0; 2622 old_container->flag [FLAG_APPLIED] = 0;
2687 container = 0; 2623 container = 0;
2688 2624
2689 esrv_update_item (UPD_FLAGS, this, old_container); 2625 esrv_update_item (UPD_FLAGS, this, old_container);
2690 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2626 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627 play_sound (sound_find ("chest_close"));
2691 } 2628 }
2692 2629
2693 if (new_container) 2630 if (new_container)
2694 { 2631 {
2695 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2632 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2711 new_container->flag [FLAG_APPLIED] = 1; 2648 new_container->flag [FLAG_APPLIED] = 1;
2712 container = new_container; 2649 container = new_container;
2713 2650
2714 esrv_update_item (UPD_FLAGS, this, new_container); 2651 esrv_update_item (UPD_FLAGS, this, new_container);
2715 esrv_send_inventory (this, new_container); 2652 esrv_send_inventory (this, new_container);
2653 play_sound (sound_find ("chest_open"));
2654 }
2655}
2656
2657object *
2658object::force_find (const shstr name)
2659{
2660 /* cycle through his inventory to look for the MARK we want to
2661 * place
2662 */
2663 for (object *tmp = inv; tmp; tmp = tmp->below)
2664 if (tmp->type == FORCE && tmp->slaying == name)
2665 return splay (tmp);
2666
2667 return 0;
2668}
2669
2670void
2671object::force_add (const shstr name, int duration)
2672{
2673 if (object *force = force_find (name))
2674 force->destroy ();
2675
2676 object *force = get_archetype (FORCE_NAME);
2677
2678 force->slaying = name;
2679 force->stats.food = 1;
2680 force->speed_left = -1.f;
2681
2682 force->set_speed (duration ? 1.f / duration : 0.f);
2683 force->flag [FLAG_IS_USED_UP] = true;
2684 force->flag [FLAG_APPLIED] = true;
2685
2686 insert (force);
2687}
2688
2689void
2690object::play_sound (faceidx sound)
2691{
2692 if (!sound)
2693 return;
2694
2695 if (flag [FLAG_REMOVED])
2696 return;
2697
2698 if (env)
2716 } 2699 {
2700 if (object *pl = in_player ())
2701 pl->contr->play_sound (sound);
2702 }
2703 else
2704 map->play_sound (sound, x, y);
2717} 2705}
2718 2706
2719

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines