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.131 by root, Sat Feb 10 15:20:23 2007 UTC vs.
Revision 1.235 by root, Tue May 6 20:00:12 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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 <sproto.h>
34#include <loader.h> 30#include <loader.h>
35 31
36#include <bitset> 32#include <bitset>
37 33
38int nrofallocobjects = 0; 34UUID UUID::cur;
39static UUID uuid; 35static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
41 37
42objectvec objects; 38objectvec objects;
43activevec actives; 39activevec actives;
44 40
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, 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,
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 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
47}; 46};
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, 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,
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 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
50}; 52};
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, 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,
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 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
53}; 58};
54int freedir[SIZEOFFREE] = { 59int 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, 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,
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 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
57}; 64};
58 65
59static void 66static void
60write_uuid (void) 67write_uuid (uval64 skip, bool sync)
61{ 68{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
63 70 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 73 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} 74}
79 75
80static void 76static void
81read_uuid (void) 77read_uuid (void)
82{ 78{
83 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
84 80
85 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 seq_next_save = 0;
86 84
87 FILE *fp; 85 FILE *fp;
88 86
89 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
90 { 88 {
91 if (errno == ENOENT) 89 if (errno == ENOENT)
92 { 90 {
93 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 92 UUID::cur.seq = 0;
95 write_uuid (); 93 write_uuid (UUID_GAP, true);
96 return; 94 return;
97 } 95 }
98 96
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 98 _exit (1);
101 } 99 }
102 100
103 int version; 101 UUID::BUF buf;
104 unsigned long long uid; 102 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
106 { 106 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 108 _exit (1);
109 } 109 }
110 110
111 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 112
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
114 fclose (fp); 114 fclose (fp);
115} 115}
116 116
117UUID 117UUID
118gen_uuid () 118UUID::gen ()
119{ 119{
120 UUID uid; 120 UUID uid;
121 121
122 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
123 123
124 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
126 130
127 return uid; 131 return uid;
128} 132}
129 133
130void 134void
131init_uuid () 135UUID::init ()
132{ 136{
133 read_uuid (); 137 read_uuid ();
134} 138}
135 139
136/* 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. */
137static int 141static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
139{ 143{
140 key_value *wants_field;
141
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 144 /* n-squared behaviour (see kv_get), but I'm hoping both
143 * objects with lists are rare, and lists stay short. If not, use a 145 * objects with lists are rare, and lists stay short. If not, use a
144 * different structure or at least keep the lists sorted... 146 * different structure or at least keep the lists sorted...
145 */ 147 */
146 148
147 /* For each field in wants, */ 149 /* For each field in wants, */
148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) 150 for (key_value *kv = wants->key_values; kv; kv = kv->next)
149 { 151 if (has->kv_get (kv->key) != kv->value)
150 key_value *has_field; 152 return false;
151
152 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key);
154
155 if (has_field == NULL)
156 {
157 /* No field with that name. */
158 return FALSE;
159 }
160
161 /* Found the matching field. */
162 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167
168 /* If we get here, we found a match. Now for the next field in wants. */
169 }
170 153
171 /* If we get here, every field in wants has a matching field in has. */ 154 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 155 return true;
173} 156}
174 157
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 158/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 159static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 161{
179 /* However, there may be fields in has which aren't partnered in wants, 162 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 163 * so we need to run the comparison *twice*. :(
181 */ 164 */
182 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 165 return compare_ob_value_lists_one (ob1, ob2)
166 && compare_ob_value_lists_one (ob2, ob1);
183} 167}
184 168
185/* Function examines the 2 objects given to it, and returns true if 169/* Function examines the 2 objects given to it, and returns true if
186 * they can be merged together. 170 * they can be merged together.
187 * 171 *
202 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 187 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
205 return 0; 189 return 0;
206 190
207 //TODO: this ain't working well, use nicer and correct overflow check 191 /* 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 192 * for unsigned overflow (2c), second part checks whether the result
209 * value could not be stored in a sint32 (which unfortunately sometimes is 193 * would fit into a 32 bit signed int, which is often used to hold
210 * used to store nrof). 194 * nrof values.
211 */ 195 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 196 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 197 return 0;
214 198
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 199 /* 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 200 * 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 201 * 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 202 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 203 * flags lose any meaning.
220 */ 204 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 205 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223 207
224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 209 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226 210
227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 211 if (ob1->arch->name != ob2->arch->name
228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 212 || ob1->name != ob2->name
230 || ob1->title != ob2->title 213 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 214 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 215 || 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 216 || ob1->attacktype != ob2->attacktype
236 || ob1->magic != ob2->magic 217 || ob1->magic != ob2->magic
237 || ob1->slaying != ob2->slaying 218 || ob1->slaying != ob2->slaying
238 || ob1->skill != ob2->skill 219 || ob1->skill != ob2->skill
239 || ob1->value != ob2->value 220 || ob1->value != ob2->value
246 || ob1->move_block != ob2->move_block 227 || ob1->move_block != ob2->move_block
247 || ob1->move_allow != ob2->move_allow 228 || ob1->move_allow != ob2->move_allow
248 || ob1->move_on != ob2->move_on 229 || ob1->move_on != ob2->move_on
249 || ob1->move_off != ob2->move_off 230 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 231 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 232 || ob1->move_slow_penalty != ob2->move_slow_penalty
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252 return 0; 235 return 0;
253 236
237 if ((ob1->flag ^ ob2->flag)
238 .reset (FLAG_INV_LOCKED)
239 .reset (FLAG_CLIENT_SENT)
240 .reset (FLAG_REMOVED)
241 .any ())
242 return 0;
243
254 /* This is really a spellbook check - really, we should 244 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 245 * not merge objects with real inventories, as splitting them
246 * is hard.
256 */ 247 */
257 if (ob1->inv || ob2->inv) 248 if (ob1->inv || ob2->inv)
258 { 249 {
259 /* if one object has inventory but the other doesn't, not equiv */ 250 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 251 return 0; /* inventories differ in length */
261 return 0;
262 252
263 /* Now check to see if the two inventory objects could merge */ 253 if (ob1->inv->below || ob2->inv->below)
254 return 0; /* more than one object in inv */
255
264 if (!object::can_merge (ob1->inv, ob2->inv)) 256 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 257 return 0; /* inventory objects differ */
266 258
267 /* inventory ok - still need to check rest of this object to see 259 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 260 * if it is valid.
269 */ 261 */
270 } 262 }
289 if (ob1->level != ob2->level) 281 if (ob1->level != ob2->level)
290 return 0; 282 return 0;
291 break; 283 break;
292 } 284 }
293 285
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 286 if (ob1->key_values || ob2->key_values)
295 { 287 {
296 /* At least one of these has key_values. */ 288 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 289 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 290 return 0; /* One has fields, but the other one doesn't. */
291
292 if (!compare_ob_value_lists (ob1, ob2))
299 return 0; 293 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0;
302 } 294 }
303 295
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 296 if (ob1->self || ob2->self)
306 { 297 {
307 ob1->optimise (); 298 ob1->optimise ();
308 ob2->optimise (); 299 ob2->optimise ();
309 300
310 if (ob1->self || ob2->self) 301 if (ob1->self || ob2->self)
302 {
303 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
304 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
305
306 if (k1 != k2)
311 return 0; 307 return 0;
308
309 if (k1 == 0)
310 return 1;
311
312 if (!cfperl_can_merge (ob1, ob2))
313 return 0;
314 }
312 } 315 }
313 316
314 /* Everything passes, must be OK. */ 317 /* Everything passes, must be OK. */
315 return 1; 318 return 1;
316} 319}
317 320
321// find player who can see this object
322object *
323object::visible_to () const
324{
325 if (client_visible () && !flag [FLAG_REMOVED])
326 {
327 // see if we are in a container of sorts
328 if (env)
329 {
330 // the player inventory itself is always visible
331 if (env->type == PLAYER)
332 return env;
333
334 // else a player could have our env open
335 object *envest = env->outer_env ();
336
337 // the player itself is always on a map, so we will find him here
338 // even if our inv is in a player.
339 if (envest->is_on_map ())
340 if (object *pl = envest->ms ().player ())
341 if (pl->container == env)
342 return pl;
343 }
344 else
345 {
346 // maybe there is a player standing on the same mapspace
347 // this will catch the case where "this" is a player
348 if (object *pl = ms ().player ())
349 if (!pl->container || this == pl->container)
350 return pl;
351 }
352 }
353
354 return 0;
355}
356
357// adjust weight per container type ("of holding")
358static sint32
359weight_adjust_for (object *op, sint32 weight)
360{
361 return op->type == CONTAINER
362 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363 : weight;
364}
365
318/* 366/*
367 * adjust_weight(object, weight) adds the specified weight to an object,
368 * and also updates how much the environment(s) is/are carrying.
369 */
370static void
371adjust_weight (object *op, sint32 weight)
372{
373 while (op)
374 {
375 // adjust by actual difference to account for rounding errors
376 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
377 weight = weight_adjust_for (op, op->carrying)
378 - weight_adjust_for (op, op->carrying - weight);
379
380 if (!weight)
381 return;
382
383 op->carrying += weight;
384
385 if (object *pl = op->visible_to ())
386 if (pl != op) // player is handled lazily
387 esrv_update_item (UPD_WEIGHT, pl, op);
388
389 op = op->env;
390 }
391}
392
393/*
319 * sum_weight() is a recursive function which calculates the weight 394 * this is a recursive function which calculates the weight
320 * an object is carrying. It goes through in figures out how much 395 * an object is carrying. It goes through op and figures out how much
321 * containers are carrying, and sums it up. 396 * containers are carrying, and sums it up.
322 */ 397 */
323long 398void
324sum_weight (object *op) 399object::update_weight ()
325{ 400{
326 long sum; 401 sint32 sum = 0;
327 object *inv;
328 402
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 403 for (object *op = inv; op; op = op->below)
330 { 404 {
331 if (inv->inv) 405 if (op->inv)
332 sum_weight (inv); 406 op->update_weight ();
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 407
408 sum += op->total_weight ();
409 }
410
411 sum = weight_adjust_for (this, sum);
412
413 if (sum != carrying)
334 } 414 {
335
336 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100;
338
339 if (op->carrying != sum)
340 op->carrying = sum; 415 carrying = sum;
341 416
342 return sum; 417 if (object *pl = visible_to ())
418 if (pl != this) // player is handled lazily
419 esrv_update_item (UPD_WEIGHT, pl, this);
420 }
343} 421}
344 422
345/** 423/*
346 * Return the outermost environment object for a given object. 424 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
347 */ 425 */
348
349object *
350object_get_env_recursive (object *op)
351{
352 while (op->env != NULL)
353 op = op->env;
354 return op;
355}
356
357/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array.
361 */
362
363char * 426char *
364dump_object (object *op) 427dump_object (object *op)
365{ 428{
366 if (!op) 429 if (!op)
367 return strdup ("[NULLOBJ]"); 430 return strdup ("[NULLOBJ]");
368 431
369 object_freezer freezer; 432 object_freezer freezer;
370 save_object (freezer, op, 1); 433 op->write (freezer);
371 return freezer.as_string (); 434 return freezer.as_string ();
372} 435}
373 436
374/* 437/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 438 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 439 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 440 * If it's not a multi-object, it is returned.
378 */ 441 */
379
380object * 442object *
381get_nearest_part (object *op, const object *pl) 443get_nearest_part (object *op, const object *pl)
382{ 444{
383 object *tmp, *closest; 445 object *tmp, *closest;
384 int last_dist, i; 446 int last_dist, i;
385 447
386 if (op->more == NULL) 448 if (!op->more)
387 return op; 449 return op;
450
388 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 451 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
452 tmp;
453 tmp = tmp->more)
389 if ((i = distance (tmp, pl)) < last_dist) 454 if ((i = distance (tmp, pl)) < last_dist)
390 closest = tmp, last_dist = i; 455 closest = tmp, last_dist = i;
456
391 return closest; 457 return closest;
392} 458}
393 459
394/* 460/*
395 * Returns the object which has the count-variable equal to the argument. 461 * Returns the object which has the count-variable equal to the argument.
462 * VERRRY slow.
396 */ 463 */
397object * 464object *
398find_object (tag_t i) 465find_object (tag_t i)
399{ 466{
400 for_all_objects (op) 467 for_all_objects (op)
420 break; 487 break;
421 488
422 return op; 489 return op;
423} 490}
424 491
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 492/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 493 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 494 * skill and experience objects.
495 * ACTUALLY NO! investigate! TODO
434 */ 496 */
435void 497void
436object::set_owner (object *owner) 498object::set_owner (object *owner)
437{ 499{
500 // allow objects which own objects
438 if (!owner) 501 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 502 while (owner->owner)
449 owner = owner->owner; 503 owner = owner->owner;
504
505 if (flag [FLAG_FREED])
506 {
507 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
508 return;
509 }
450 510
451 this->owner = owner; 511 this->owner = owner;
512}
513
514int
515object::slottype () const
516{
517 if (type == SKILL)
518 {
519 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
520 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
521 }
522 else
523 {
524 if (slot [body_combat].info) return slot_combat;
525 if (slot [body_range ].info) return slot_ranged;
526 }
527
528 return slot_none;
529}
530
531bool
532object::change_weapon (object *ob)
533{
534 if (current_weapon == ob)
535 return true;
536
537 if (chosen_skill)
538 chosen_skill->flag [FLAG_APPLIED] = false;
539
540 current_weapon = ob;
541 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
542
543 if (chosen_skill)
544 chosen_skill->flag [FLAG_APPLIED] = true;
545
546 update_stats ();
547
548 if (ob)
549 {
550 // now check wether any body locations became invalid, in which case
551 // we cannot apply the weapon at the moment.
552 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
553 if (slot[i].used < 0)
554 {
555 current_weapon = chosen_skill = 0;
556 update_stats ();
557
558 new_draw_info_format (NDI_UNIQUE, 0, this,
559 "You try to balance all your items at once, "
560 "but the %s is just too much for your body. "
561 "[You need to unapply some items first.]", &ob->name);
562 return false;
563 }
564
565 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
566 }
567 else
568 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
569
570 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
571 {
572 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
573 &name, ob->debug_desc ());
574 return false;
575 }
576
577 return true;
452} 578}
453 579
454/* Zero the key_values on op, decrementing the shared-string 580/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 581 * refcounts and freeing the links.
456 */ 582 */
457static void 583static void
458free_key_values (object *op) 584free_key_values (object *op)
459{ 585{
460 for (key_value *i = op->key_values; i != 0;) 586 for (key_value *i = op->key_values; i; )
461 { 587 {
462 key_value *next = i->next; 588 key_value *next = i->next;
463 delete i; 589 delete i;
464 590
465 i = next; 591 i = next;
477 * will point at garbage. 603 * will point at garbage.
478 */ 604 */
479void 605void
480object::copy_to (object *dst) 606object::copy_to (object *dst)
481{ 607{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 608 dst->remove ();
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
484
485 *(object_copy *)dst = *this; 609 *(object_copy *)dst = *this;
486 610 dst->flag [FLAG_REMOVED] = true;
487 if (is_freed)
488 SET_FLAG (dst, FLAG_FREED);
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - rndm ();
495 611
496 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
497 if (key_values) 613 if (key_values)
498 { 614 {
499 key_value *tail = 0; 615 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 616 dst->key_values = 0;
503 617
504 for (i = key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
505 { 619 {
506 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
507 621
508 new_link->next = 0; 622 new_link->next = 0;
509 new_link->key = i->key; 623 new_link->key = i->key;
510 new_link->value = i->value; 624 new_link->value = i->value;
511 625
512 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
513 if (!dst->key_values) 627 if (!dst->key_values)
514 { 628 {
521 tail = new_link; 635 tail = new_link;
522 } 636 }
523 } 637 }
524 } 638 }
525 639
640 if (speed < 0)
641 dst->speed_left -= rndm ();
642
526 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
644}
645
646void
647object::instantiate ()
648{
649 if (!uuid.seq) // HACK
650 uuid = UUID::gen ();
651
652 speed_left = -0.1f;
653 /* copy the body_info to the body_used - this is only really
654 * need for monsters, but doesn't hurt to do it for everything.
655 * by doing so, when a monster is created, it has good starting
656 * values for the body_used info, so when items are created
657 * for it, they can be properly equipped.
658 */
659 for (int i = NUM_BODY_LOCATIONS; i--; )
660 slot[i].used = slot[i].info;
661
662 attachable::instantiate ();
527} 663}
528 664
529object * 665object *
530object::clone () 666object::clone ()
531{ 667{
532 object *neu = create (); 668 object *neu = create ();
533 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
534 return neu; 671 return neu;
535} 672}
536 673
537/* 674/*
538 * If an object with the IS_TURNABLE() flag needs to be turned due 675 * If an object with the IS_TURNABLE() flag needs to be turned due
589 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
590 */ 727 */
591void 728void
592update_object (object *op, int action) 729update_object (object *op, int action)
593{ 730{
594 MoveType move_on, move_off, move_block, move_slow; 731 if (!op)
595
596 if (op == NULL)
597 { 732 {
598 /* this should never happen */ 733 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
600 return; 735 return;
601 } 736 }
602 737
603 if (op->env) 738 if (!op->is_on_map ())
604 { 739 {
605 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
606 * to do in this case. 741 * to do in this case.
607 */ 742 */
608 return; 743 return;
609 } 744 }
610
611 /* If the map is saving, don't do anything as everything is
612 * going to get freed anyways.
613 */
614 if (!op->map || op->map->in_memory == MAP_SAVING)
615 return;
616 745
617 /* make sure the object is within map boundaries */ 746 /* make sure the object is within map boundaries */
618 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 747 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
619 { 748 {
620 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
680static int object_count; 809static int object_count;
681 810
682void object::link () 811void object::link ()
683{ 812{
684 assert (!index);//D 813 assert (!index);//D
685 uuid = gen_uuid (); 814 uuid = UUID::gen ();
686 count = ++object_count; 815 count = ++object_count;
687 816
688 refcnt_inc (); 817 refcnt_inc ();
689 objects.insert (this); 818 objects.insert (this);
690} 819}
763object::destroy_inv (bool drop_to_ground) 892object::destroy_inv (bool drop_to_ground)
764{ 893{
765 // need to check first, because the checks below might segfault 894 // need to check first, because the checks below might segfault
766 // as we might be on an invalid mapspace and crossfire code 895 // as we might be on an invalid mapspace and crossfire code
767 // is too buggy to ensure that the inventory is empty. 896 // is too buggy to ensure that the inventory is empty.
768 // corollary: if you create arrows etc. with stuff in tis inventory, 897 // corollary: if you create arrows etc. with stuff in its inventory,
769 // cf will crash below with off-map x and y 898 // cf will crash below with off-map x and y
770 if (!inv) 899 if (!inv)
771 return; 900 return;
772 901
773 /* Only if the space blocks everything do we not process - 902 /* Only if the space blocks everything do we not process -
774 * if some form of movement is allowed, let objects 903 * if some form of movement is allowed, let objects
775 * drop on that space. 904 * drop on that space.
776 */ 905 */
777 if (!drop_to_ground 906 if (!drop_to_ground
778 || !map 907 || !map
779 || map->in_memory != MAP_IN_MEMORY 908 || map->in_memory != MAP_ACTIVE
780 || map->nodrop 909 || map->nodrop
781 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
782 { 911 {
783 while (inv) 912 while (inv)
784 { 913 {
785 inv->destroy_inv (drop_to_ground); 914 inv->destroy_inv (false);
786 inv->destroy (); 915 inv->destroy ();
787 } 916 }
788 } 917 }
789 else 918 else
790 { /* Put objects in inventory onto this space */ 919 { /* Put objects in inventory onto this space */
796 || op->flag [FLAG_NO_DROP] 925 || op->flag [FLAG_NO_DROP]
797 || op->type == RUNE 926 || op->type == RUNE
798 || op->type == TRAP 927 || op->type == TRAP
799 || op->flag [FLAG_IS_A_TEMPLATE] 928 || op->flag [FLAG_IS_A_TEMPLATE]
800 || op->flag [FLAG_DESTROY_ON_DEATH]) 929 || op->flag [FLAG_DESTROY_ON_DEATH])
801 op->destroy (); 930 op->destroy (true);
802 else 931 else
803 map->insert (op, x, y); 932 map->insert (op, x, y);
804 } 933 }
805 } 934 }
806} 935}
810 object *op = new object; 939 object *op = new object;
811 op->link (); 940 op->link ();
812 return op; 941 return op;
813} 942}
814 943
944static struct freed_map : maptile
945{
946 freed_map ()
947 {
948 path = "<freed objects map>";
949 name = "/internal/freed_objects_map";
950 width = 3;
951 height = 3;
952 nodrop = 1;
953
954 alloc ();
955 in_memory = MAP_ACTIVE;
956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
962} freed_map; // freed objects are moved here to avoid crashes
963
815void 964void
816object::do_destroy () 965object::do_destroy ()
817{ 966{
818 attachable::do_destroy ();
819
820 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
821 remove_button_link (this); 968 remove_button_link (this);
822 969
823 if (flag [FLAG_FRIENDLY]) 970 if (flag [FLAG_FRIENDLY])
824 {
825 remove_friendly_object (this); 971 remove_friendly_object (this);
826 972
827 if (type == GOLEM
828 && owner
829 && owner->type == PLAYER
830 && owner->contr->ranges[range_golem] == this)
831 owner->contr->ranges[range_golem] = 0;
832 }
833
834 if (!flag [FLAG_REMOVED])
835 remove (); 973 remove ();
836 974
837 destroy_inv (true); 975 attachable::do_destroy ();
838 976
839 deactivate (); 977 deactivate ();
840 unlink (); 978 unlink ();
841 979
842 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
843 981
844 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
845 {
846 static maptile *freed_map; // freed objects are moved here to avoid crashes
847
848 if (!freed_map)
849 {
850 freed_map = new maptile;
851
852 freed_map->name = "/internal/freed_objects_map";
853 freed_map->width = 3;
854 freed_map->height = 3;
855
856 freed_map->alloc ();
857 freed_map->in_memory = MAP_IN_MEMORY;
858 }
859
860 map = freed_map; 983 map = &freed_map;
861 x = 1; 984 x = 1;
862 y = 1; 985 y = 1;
863 }
864
865 head = 0;
866 986
867 if (more) 987 if (more)
868 { 988 {
869 more->destroy (); 989 more->destroy ();
870 more = 0; 990 more = 0;
871 } 991 }
872 992
993 head = 0;
994
873 // clear those pointers that likely might have circular references to us 995 // clear those pointers that likely might cause circular references
874 owner = 0; 996 owner = 0;
875 enemy = 0; 997 enemy = 0;
876 attacked_by = 0; 998 attacked_by = 0;
999 current_weapon = 0;
877} 1000}
878 1001
879void 1002void
880object::destroy (bool destroy_inventory) 1003object::destroy (bool destroy_inventory)
881{ 1004{
882 if (destroyed ()) 1005 if (destroyed ())
883 return; 1006 return;
884 1007
1008 if (!is_head () && !head->destroyed ())
1009 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory);
1012 return;
1013 }
1014
885 if (destroy_inventory) 1015 destroy_inv (!destroy_inventory);
886 destroy_inv (false); 1016
1017 if (is_head ())
1018 if (sound_destroy)
1019 play_sound (sound_destroy);
1020 else if (flag [FLAG_MONSTER])
1021 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
887 1022
888 attachable::destroy (); 1023 attachable::destroy ();
889}
890
891/*
892 * sub_weight() recursively (outwards) subtracts a number from the
893 * weight of an object (and what is carried by it's environment(s)).
894 */
895void
896sub_weight (object *op, signed long weight)
897{
898 while (op != NULL)
899 {
900 if (op->type == CONTAINER)
901 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
902
903 op->carrying -= weight;
904 op = op->env;
905 }
906} 1024}
907 1025
908/* op->remove (): 1026/* op->remove ():
909 * This function removes the object op from the linked list of objects 1027 * This function removes the object op from the linked list of objects
910 * which it is currently tied to. When this function is done, the 1028 * which it is currently tied to. When this function is done, the
916object::do_remove () 1034object::do_remove ()
917{ 1035{
918 object *tmp, *last = 0; 1036 object *tmp, *last = 0;
919 object *otmp; 1037 object *otmp;
920 1038
921 if (QUERY_FLAG (this, FLAG_REMOVED)) 1039 if (flag [FLAG_REMOVED])
922 return; 1040 return;
923 1041
924 SET_FLAG (this, FLAG_REMOVED);
925 INVOKE_OBJECT (REMOVE, this); 1042 INVOKE_OBJECT (REMOVE, this);
1043
1044 flag [FLAG_REMOVED] = true;
926 1045
927 if (more) 1046 if (more)
928 more->remove (); 1047 more->remove ();
929 1048
930 /* 1049 /*
931 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
932 * inventory. 1051 * inventory.
933 */ 1052 */
934 if (env) 1053 if (env)
935 { 1054 {
1055 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1056 if (object *pl = visible_to ())
1057 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059
1060 adjust_weight (env, -total_weight ());
1061
1062 *(above ? &above->below : &env->inv) = below;
1063
936 if (nrof) 1064 if (below)
937 sub_weight (env, weight * nrof); 1065 below->above = above;
938 else 1066
939 sub_weight (env, weight + carrying); 1067 /* we set up values so that it could be inserted into
1068 * the map, but we don't actually do that - it is up
1069 * to the caller to decide what we want to do.
1070 */
1071 map = env->map;
1072 x = env->x;
1073 y = env->y;
1074 above = 0;
1075 below = 0;
1076 env = 0;
940 1077
941 /* NO_FIX_PLAYER is set when a great many changes are being 1078 /* NO_FIX_PLAYER is set when a great many changes are being
942 * made to players inventory. If set, avoiding the call 1079 * made to players inventory. If set, avoiding the call
943 * to save cpu time. 1080 * to save cpu time.
944 */ 1081 */
945 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1082 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
946 otmp->update_stats (); 1083 otmp->update_stats ();
947
948 if (above)
949 above->below = below;
950 else
951 env->inv = below;
952
953 if (below)
954 below->above = above;
955
956 /* we set up values so that it could be inserted into
957 * the map, but we don't actually do that - it is up
958 * to the caller to decide what we want to do.
959 */
960 x = env->x, y = env->y;
961 map = env->map;
962 above = 0, below = 0;
963 env = 0;
964 } 1084 }
965 else if (map) 1085 else if (map)
966 { 1086 {
967 if (type == PLAYER)
968 {
969 // leaving a spot always closes any open container on the ground
970 if (container && !container->env)
971 // this causes spurious floorbox updates, but it ensures
972 // that the CLOSE event is being sent.
973 close_container ();
974
975 --map->players;
976 map->touch ();
977 }
978
979 map->dirty = true; 1087 map->dirty = true;
980 mapspace &ms = this->ms (); 1088 mapspace &ms = this->ms ();
1089
1090 if (object *pl = ms.player ())
1091 {
1092 if (type == PLAYER) // this == pl(!)
1093 {
1094 // leaving a spot always closes any open container on the ground
1095 if (container && !container->env)
1096 // this causes spurious floorbox updates, but it ensures
1097 // that the CLOSE event is being sent.
1098 close_container ();
1099
1100 --map->players;
1101 map->touch ();
1102 }
1103 else if (pl->container == this)
1104 {
1105 // removing a container should close it
1106 close_container ();
1107 }
1108
1109 esrv_del_item (pl->contr, count);
1110 }
981 1111
982 /* link the object above us */ 1112 /* link the object above us */
983 if (above) 1113 if (above)
984 above->below = below; 1114 above->below = below;
985 else 1115 else
987 1117
988 /* Relink the object below us, if there is one */ 1118 /* Relink the object below us, if there is one */
989 if (below) 1119 if (below)
990 below->above = above; 1120 below->above = above;
991 else 1121 else
992 { 1122 ms.bot = above;
993 /* Nothing below, which means we need to relink map object for this space
994 * use translated coordinates in case some oddness with map tiling is
995 * evident
996 */
997 if (GET_MAP_OB (map, x, y) != this)
998 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
999
1000 ms.bot = above; /* goes on above it. */
1001 }
1002 1123
1003 above = 0; 1124 above = 0;
1004 below = 0; 1125 below = 0;
1005 1126
1006 if (map->in_memory == MAP_SAVING) 1127 if (map->in_memory == MAP_SAVING)
1007 return; 1128 return;
1008 1129
1009 int check_walk_off = !flag [FLAG_NO_APPLY]; 1130 int check_walk_off = !flag [FLAG_NO_APPLY];
1131
1132 if (object *pl = ms.player ())
1133 {
1134 if (pl->container == this)
1135 /* If a container that the player is currently using somehow gets
1136 * removed (most likely destroyed), update the player view
1137 * appropriately.
1138 */
1139 pl->close_container ();
1140
1141 //TODO: the floorbox prev/next might need updating
1142 //esrv_del_item (pl->contr, count);
1143 //TODO: update floorbox to preserve ordering
1144 if (pl->contr->ns)
1145 pl->contr->ns->floorbox_update ();
1146 }
1010 1147
1011 for (tmp = ms.bot; tmp; tmp = tmp->above) 1148 for (tmp = ms.bot; tmp; tmp = tmp->above)
1012 { 1149 {
1013 /* No point updating the players look faces if he is the object 1150 /* No point updating the players look faces if he is the object
1014 * being removed. 1151 * being removed.
1015 */ 1152 */
1016
1017 if (tmp->type == PLAYER && tmp != this)
1018 {
1019 /* If a container that the player is currently using somehow gets
1020 * removed (most likely destroyed), update the player view
1021 * appropriately.
1022 */
1023 if (tmp->container == this)
1024 {
1025 flag [FLAG_APPLIED] = 0;
1026 tmp->container = 0;
1027 }
1028
1029 if (tmp->contr->ns)
1030 tmp->contr->ns->floorbox_update ();
1031 }
1032 1153
1033 /* See if object moving off should effect something */ 1154 /* See if object moving off should effect something */
1034 if (check_walk_off 1155 if (check_walk_off
1035 && ((move_type & tmp->move_off) 1156 && ((move_type & tmp->move_off)
1036 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1157 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1039 1160
1040 if (destroyed ()) 1161 if (destroyed ())
1041 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1162 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1042 } 1163 }
1043 1164
1044 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1045 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1046 if (tmp->above == tmp)
1047 tmp->above = 0;
1048
1049 last = tmp; 1165 last = tmp;
1050 } 1166 }
1051 1167
1052 /* last == NULL if there are no objects on this space */ 1168 /* last == NULL if there are no objects on this space */
1053 //TODO: this makes little sense, why only update the topmost object? 1169 //TODO: this makes little sense, why only update the topmost object?
1073merge_ob (object *op, object *top) 1189merge_ob (object *op, object *top)
1074{ 1190{
1075 if (!op->nrof) 1191 if (!op->nrof)
1076 return 0; 1192 return 0;
1077 1193
1078 if (top) 1194 if (!top)
1079 for (top = op; top && top->above; top = top->above) 1195 for (top = op; top && top->above; top = top->above)
1080 ; 1196 ;
1081 1197
1082 for (; top; top = top->below) 1198 for (; top; top = top->below)
1083 {
1084 if (top == op)
1085 continue;
1086
1087 if (object::can_merge (op, top)) 1199 if (object::can_merge (op, top))
1088 { 1200 {
1089 top->nrof += op->nrof; 1201 top->nrof += op->nrof;
1090 1202
1091/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1203 if (object *pl = top->visible_to ())
1092 op->weight = 0; /* Don't want any adjustements now */ 1204 esrv_update_item (UPD_NROF, pl, top);
1205
1206 op->weight = 0; // cancel the addition above
1207 op->carrying = 0; // must be 0 already
1208
1093 op->destroy (); 1209 op->destroy (1);
1210
1094 return top; 1211 return top;
1095 } 1212 }
1096 }
1097 1213
1098 return 0; 1214 return 0;
1215}
1216
1217void
1218object::expand_tail ()
1219{
1220 if (more)
1221 return;
1222
1223 object *prev = this;
1224
1225 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1226 {
1227 object *op = arch_to_object (at);
1228
1229 op->name = name;
1230 op->name_pl = name_pl;
1231 op->title = title;
1232
1233 op->head = this;
1234 prev->more = op;
1235
1236 prev = op;
1237 }
1099} 1238}
1100 1239
1101/* 1240/*
1102 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1241 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1103 * job preparing multi-part monsters. 1242 * job preparing multi-part monsters.
1105object * 1244object *
1106insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1245insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1107{ 1246{
1108 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1247 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1109 { 1248 {
1110 tmp->x = x + tmp->arch->clone.x; 1249 tmp->x = x + tmp->arch->x;
1111 tmp->y = y + tmp->arch->clone.y; 1250 tmp->y = y + tmp->arch->y;
1112 } 1251 }
1113 1252
1114 return insert_ob_in_map (op, m, originator, flag); 1253 return insert_ob_in_map (op, m, originator, flag);
1115} 1254}
1116 1255
1135 * just 'op' otherwise 1274 * just 'op' otherwise
1136 */ 1275 */
1137object * 1276object *
1138insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1277insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1139{ 1278{
1140 object *tmp, *top, *floor = NULL; 1279 assert (!op->flag [FLAG_FREED]);
1141
1142 if (QUERY_FLAG (op, FLAG_FREED))
1143 {
1144 LOG (llevError, "Trying to insert freed object!\n");
1145 return NULL;
1146 }
1147
1148 if (!QUERY_FLAG (op, FLAG_REMOVED))
1149 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1150 1280
1151 op->remove (); 1281 op->remove ();
1152
1153 if (!m)
1154 {
1155 char *dump = dump_object (op);
1156 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1157 free (dump);
1158 return op;
1159 }
1160
1161 if (out_of_map (m, op->x, op->y))
1162 {
1163 char *dump = dump_object (op);
1164 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1165#ifdef MANY_CORES
1166 /* Better to catch this here, as otherwise the next use of this object
1167 * is likely to cause a crash. Better to find out where it is getting
1168 * improperly inserted.
1169 */
1170 abort ();
1171#endif
1172 free (dump);
1173 return op;
1174 }
1175
1176 if (object *more = op->more)
1177 {
1178 if (!insert_ob_in_map (more, m, originator, flag))
1179 {
1180 if (!op->head)
1181 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1182
1183 return 0;
1184 }
1185 }
1186
1187 CLEAR_FLAG (op, FLAG_REMOVED);
1188 1282
1189 /* Ideally, the caller figures this out. However, it complicates a lot 1283 /* Ideally, the caller figures this out. However, it complicates a lot
1190 * of areas of callers (eg, anything that uses find_free_spot would now 1284 * of areas of callers (eg, anything that uses find_free_spot would now
1191 * need extra work 1285 * need extra work
1192 */ 1286 */
1193 if (!xy_normalise (m, op->x, op->y)) 1287 if (!xy_normalise (m, op->x, op->y))
1288 {
1289 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1194 return 0; 1290 return 0;
1291 }
1292
1293 if (object *more = op->more)
1294 if (!insert_ob_in_map (more, m, originator, flag))
1295 return 0;
1296
1297 CLEAR_FLAG (op, FLAG_REMOVED);
1195 1298
1196 op->map = m; 1299 op->map = m;
1197 mapspace &ms = op->ms (); 1300 mapspace &ms = op->ms ();
1198 1301
1199 /* this has to be done after we translate the coordinates. 1302 /* this has to be done after we translate the coordinates.
1200 */ 1303 */
1201 if (op->nrof && !(flag & INS_NO_MERGE)) 1304 if (op->nrof && !(flag & INS_NO_MERGE))
1202 for (tmp = ms.bot; tmp; tmp = tmp->above) 1305 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1203 if (object::can_merge (op, tmp)) 1306 if (object::can_merge (op, tmp))
1204 { 1307 {
1308 // TODO: we atcually want to update tmp, not op,
1309 // but some caller surely breaks when we return tmp
1310 // from here :/
1205 op->nrof += tmp->nrof; 1311 op->nrof += tmp->nrof;
1206 tmp->destroy (); 1312 tmp->destroy (1);
1207 } 1313 }
1208 1314
1209 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1315 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1210 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1316 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1211 1317
1231 /* since *below* originator, no need to update top */ 1337 /* since *below* originator, no need to update top */
1232 originator->below = op; 1338 originator->below = op;
1233 } 1339 }
1234 else 1340 else
1235 { 1341 {
1342 object *top, *floor = NULL;
1343
1236 top = ms.bot; 1344 top = ms.bot;
1237 1345
1238 /* If there are other objects, then */ 1346 /* If there are other objects, then */
1239 if ((!(flag & INS_MAP_LOAD)) && top) 1347 if (top)
1240 { 1348 {
1241 object *last = 0; 1349 object *last = 0;
1242 1350
1243 /* 1351 /*
1244 * If there are multiple objects on this space, we do some trickier handling. 1352 * If there are multiple objects on this space, we do some trickier handling.
1274 * looks like instead of lots of conditions here. 1382 * looks like instead of lots of conditions here.
1275 * makes things faster, and effectively the same result. 1383 * makes things faster, and effectively the same result.
1276 */ 1384 */
1277 1385
1278 /* Have object 'fall below' other objects that block view. 1386 /* Have object 'fall below' other objects that block view.
1279 * Unless those objects are exits, type 66 1387 * Unless those objects are exits.
1280 * If INS_ON_TOP is used, don't do this processing 1388 * If INS_ON_TOP is used, don't do this processing
1281 * Need to find the object that in fact blocks view, otherwise 1389 * Need to find the object that in fact blocks view, otherwise
1282 * stacking is a bit odd. 1390 * stacking is a bit odd.
1283 */ 1391 */
1284 if (!(flag & INS_ON_TOP) 1392 if (!(flag & INS_ON_TOP)
1285 && ms.flags () & P_BLOCKSVIEW 1393 && ms.flags () & P_BLOCKSVIEW
1286 && (op->face && !op->face->visibility)) 1394 && (op->face && !faces [op->face].visibility))
1287 { 1395 {
1288 for (last = top; last != floor; last = last->below) 1396 for (last = top; last != floor; last = last->below)
1289 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1397 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1290 break; 1398 break;
1291 1399
1297 if (last && last->below && last != floor) 1405 if (last && last->below && last != floor)
1298 top = last->below; 1406 top = last->below;
1299 } 1407 }
1300 } /* If objects on this space */ 1408 } /* If objects on this space */
1301 1409
1302 if (flag & INS_MAP_LOAD)
1303 top = ms.top;
1304
1305 if (flag & INS_ABOVE_FLOOR_ONLY) 1410 if (flag & INS_ABOVE_FLOOR_ONLY)
1306 top = floor; 1411 top = floor;
1307 1412
1308 /* Top is the object that our object (op) is going to get inserted above. 1413 /* Top is the object that our object (op) is going to get inserted above.
1309 */ 1414 */
1341 op->map->touch (); 1446 op->map->touch ();
1342 } 1447 }
1343 1448
1344 op->map->dirty = true; 1449 op->map->dirty = true;
1345 1450
1346 /* If we have a floor, we know the player, if any, will be above
1347 * it, so save a few ticks and start from there.
1348 */
1349 if (!(flag & INS_MAP_LOAD))
1350 if (object *pl = ms.player ()) 1451 if (object *pl = ms.player ())
1452 //TODO: the floorbox prev/next might need updating
1453 //esrv_send_item (pl, op);
1454 //TODO: update floorbox to preserve ordering
1351 if (pl->contr->ns) 1455 if (pl->contr->ns)
1352 pl->contr->ns->floorbox_update (); 1456 pl->contr->ns->floorbox_update ();
1353 1457
1354 /* If this object glows, it may affect lighting conditions that are 1458 /* If this object glows, it may affect lighting conditions that are
1355 * visible to others on this map. But update_all_los is really 1459 * visible to others on this map. But update_all_los is really
1356 * an inefficient way to do this, as it means los for all players 1460 * an inefficient way to do this, as it means los for all players
1357 * on the map will get recalculated. The players could very well 1461 * on the map will get recalculated. The players could very well
1376 * blocked() and wall() work properly), and these flags are updated by 1480 * blocked() and wall() work properly), and these flags are updated by
1377 * update_object(). 1481 * update_object().
1378 */ 1482 */
1379 1483
1380 /* if this is not the head or flag has been passed, don't check walk on status */ 1484 /* if this is not the head or flag has been passed, don't check walk on status */
1381 if (!(flag & INS_NO_WALK_ON) && !op->head) 1485 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1382 { 1486 {
1383 if (check_move_on (op, originator)) 1487 if (check_move_on (op, originator))
1384 return 0; 1488 return 0;
1385 1489
1386 /* If we are a multi part object, lets work our way through the check 1490 /* If we are a multi part object, lets work our way through the check
1387 * walk on's. 1491 * walk on's.
1388 */ 1492 */
1389 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1493 for (object *tmp = op->more; tmp; tmp = tmp->more)
1390 if (check_move_on (tmp, originator)) 1494 if (check_move_on (tmp, originator))
1391 return 0; 1495 return 0;
1392 } 1496 }
1393 1497
1394 return op; 1498 return op;
1399 * op is the object to insert it under: supplies x and the map. 1503 * op is the object to insert it under: supplies x and the map.
1400 */ 1504 */
1401void 1505void
1402replace_insert_ob_in_map (const char *arch_string, object *op) 1506replace_insert_ob_in_map (const char *arch_string, object *op)
1403{ 1507{
1404 object *tmp, *tmp1;
1405
1406 /* first search for itself and remove any old instances */ 1508 /* first search for itself and remove any old instances */
1407 1509
1408 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1510 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1409 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1511 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1410 tmp->destroy (); 1512 tmp->destroy (1);
1411 1513
1412 tmp1 = arch_to_object (archetype::find (arch_string)); 1514 object *tmp = arch_to_object (archetype::find (arch_string));
1413 1515
1414 tmp1->x = op->x; 1516 tmp->x = op->x;
1415 tmp1->y = op->y; 1517 tmp->y = op->y;
1518
1416 insert_ob_in_map (tmp1, op->map, op, 0); 1519 insert_ob_in_map (tmp, op->map, op, 0);
1417} 1520}
1418 1521
1419object * 1522object *
1420object::insert_at (object *where, object *originator, int flags) 1523object::insert_at (object *where, object *originator, int flags)
1421{ 1524{
1525 if (where->env)
1526 return where->env->insert (this);
1527 else
1422 where->map->insert (this, where->x, where->y, originator, flags); 1528 return where->map->insert (this, where->x, where->y, originator, flags);
1423} 1529}
1424 1530
1425/* 1531/*
1426 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1427 * is returned contains nr objects, and the remaining parts contains
1428 * the rest (or is removed and freed if that number is 0).
1429 * On failure, NULL is returned, and the reason put into the
1430 * global static errmsg array.
1431 */
1432object *
1433get_split_ob (object *orig_ob, uint32 nr)
1434{
1435 object *newob;
1436 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1437
1438 if (orig_ob->nrof < nr)
1439 {
1440 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1441 return NULL;
1442 }
1443
1444 newob = object_create_clone (orig_ob);
1445
1446 if ((orig_ob->nrof -= nr) < 1)
1447 orig_ob->destroy (1);
1448 else if (!is_removed)
1449 {
1450 if (orig_ob->env != NULL)
1451 sub_weight (orig_ob->env, orig_ob->weight * nr);
1452 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1453 {
1454 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1455 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1456 return NULL;
1457 }
1458 }
1459
1460 newob->nrof = nr;
1461
1462 return newob;
1463}
1464
1465/*
1466 * decrease_ob_nr(object, number) decreases a specified number from 1532 * decrease(object, number) decreases a specified number from
1467 * the amount of an object. If the amount reaches 0, the object 1533 * the amount of an object. If the amount reaches 0, the object
1468 * is subsequently removed and freed. 1534 * is subsequently removed and freed.
1469 * 1535 *
1470 * Return value: 'op' if something is left, NULL if the amount reached 0 1536 * Return value: 'op' if something is left, NULL if the amount reached 0
1471 */ 1537 */
1538bool
1539object::decrease (sint32 nr)
1540{
1541 if (!nr)
1542 return true;
1472 1543
1544 nr = min (nr, nrof);
1545
1546 nrof -= nr;
1547
1548 if (nrof)
1549 {
1550 adjust_weight (env, -weight * nr); // carrying == 0
1551
1552 if (object *pl = visible_to ())
1553 esrv_update_item (UPD_NROF, pl, this);
1554
1555 return true;
1556 }
1557 else
1558 {
1559 destroy (1);
1560 return false;
1561 }
1562}
1563
1564/*
1565 * split(ob,nr) splits up ob into two parts. The part which
1566 * is returned contains nr objects, and the remaining parts contains
1567 * the rest (or is removed and returned if that number is 0).
1568 * On failure, NULL is returned.
1569 */
1473object * 1570object *
1474decrease_ob_nr (object *op, uint32 i) 1571object::split (sint32 nr)
1475{ 1572{
1476 object *tmp; 1573 int have = number_of ();
1477 1574
1478 if (i == 0) /* objects with op->nrof require this check */ 1575 if (have < nr)
1479 return op; 1576 return 0;
1480 1577 else if (have == nr)
1481 if (i > op->nrof)
1482 i = op->nrof;
1483
1484 if (QUERY_FLAG (op, FLAG_REMOVED))
1485 op->nrof -= i;
1486 else if (op->env)
1487 { 1578 {
1488 /* is this object in the players inventory, or sub container
1489 * therein?
1490 */
1491 tmp = op->in_player ();
1492 /* nope. Is this a container the player has opened?
1493 * If so, set tmp to that player.
1494 * IMO, searching through all the players will mostly
1495 * likely be quicker than following op->env to the map,
1496 * and then searching the map for a player.
1497 */
1498 if (!tmp)
1499 for_all_players (pl)
1500 if (pl->ob->container == op->env)
1501 {
1502 tmp = pl->ob;
1503 break;
1504 }
1505
1506 if (i < op->nrof)
1507 {
1508 sub_weight (op->env, op->weight * i);
1509 op->nrof -= i;
1510 if (tmp)
1511 esrv_send_item (tmp, op);
1512 }
1513 else
1514 {
1515 op->remove (); 1579 remove ();
1516 op->nrof = 0; 1580 return this;
1517 if (tmp)
1518 esrv_del_item (tmp->contr, op->count);
1519 }
1520 } 1581 }
1521 else 1582 else
1522 { 1583 {
1523 object *above = op->above; 1584 decrease (nr);
1524 1585
1525 if (i < op->nrof) 1586 object *op = deep_clone ();
1526 op->nrof -= i; 1587 op->nrof = nr;
1527 else
1528 {
1529 op->remove ();
1530 op->nrof = 0;
1531 }
1532
1533 /* Since we just removed op, op->above is null */
1534 for (tmp = above; tmp; tmp = tmp->above)
1535 if (tmp->type == PLAYER)
1536 {
1537 if (op->nrof)
1538 esrv_send_item (tmp, op);
1539 else
1540 esrv_del_item (tmp->contr, op->count);
1541 }
1542 }
1543
1544 if (op->nrof)
1545 return op; 1588 return op;
1546 else
1547 {
1548 op->destroy ();
1549 return 0;
1550 }
1551}
1552
1553/*
1554 * add_weight(object, weight) adds the specified weight to an object,
1555 * and also updates how much the environment(s) is/are carrying.
1556 */
1557
1558void
1559add_weight (object *op, signed long weight)
1560{
1561 while (op != NULL)
1562 {
1563 if (op->type == CONTAINER)
1564 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1565
1566 op->carrying += weight;
1567 op = op->env;
1568 } 1589 }
1569} 1590}
1570 1591
1571object * 1592object *
1572insert_ob_in_ob (object *op, object *where) 1593insert_ob_in_ob (object *op, object *where)
1577 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1598 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1578 free (dump); 1599 free (dump);
1579 return op; 1600 return op;
1580 } 1601 }
1581 1602
1582 if (where->head) 1603 if (where->head_ () != where)
1583 { 1604 {
1584 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1605 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1585 where = where->head; 1606 where = where->head;
1586 } 1607 }
1587 1608
1588 return where->insert (op); 1609 return where->insert (op);
1589} 1610}
1594 * inside the object environment. 1615 * inside the object environment.
1595 * 1616 *
1596 * The function returns now pointer to inserted item, and return value can 1617 * The function returns now pointer to inserted item, and return value can
1597 * be != op, if items are merged. -Tero 1618 * be != op, if items are merged. -Tero
1598 */ 1619 */
1599
1600object * 1620object *
1601object::insert (object *op) 1621object::insert (object *op)
1602{ 1622{
1603 object *tmp, *otmp;
1604
1605 if (!QUERY_FLAG (op, FLAG_REMOVED))
1606 op->remove ();
1607
1608 if (op->more) 1623 if (op->more)
1609 { 1624 {
1610 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1625 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1611 return op; 1626 return op;
1612 } 1627 }
1613 1628
1614 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1629 op->remove ();
1615 CLEAR_FLAG (op, FLAG_REMOVED); 1630
1631 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1632
1616 if (op->nrof) 1633 if (op->nrof)
1617 {
1618 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1634 for (object *tmp = inv; tmp; tmp = tmp->below)
1619 if (object::can_merge (tmp, op)) 1635 if (object::can_merge (tmp, op))
1620 { 1636 {
1621 /* return the original object and remove inserted object 1637 /* return the original object and remove inserted object
1622 (client needs the original object) */ 1638 (client needs the original object) */
1623 tmp->nrof += op->nrof; 1639 tmp->nrof += op->nrof;
1624 /* Weight handling gets pretty funky. Since we are adding to 1640
1625 * tmp->nrof, we need to increase the weight. 1641 if (object *pl = tmp->visible_to ())
1626 */ 1642 esrv_update_item (UPD_NROF, pl, tmp);
1643
1627 add_weight (this, op->weight * op->nrof); 1644 adjust_weight (this, op->total_weight ());
1628 SET_FLAG (op, FLAG_REMOVED); 1645
1629 op->destroy (); /* free the inserted object */ 1646 op->destroy (1);
1630 op = tmp; 1647 op = tmp;
1631 op->remove (); /* and fix old object's links */ 1648 goto inserted;
1632 CLEAR_FLAG (op, FLAG_REMOVED);
1633 break;
1634 } 1649 }
1635 1650
1636 /* I assume combined objects have no inventory 1651 op->owner = 0; // it's his/hers now. period.
1637 * We add the weight - this object could have just been removed
1638 * (if it was possible to merge). calling remove_ob will subtract
1639 * the weight, so we need to add it in again, since we actually do
1640 * the linking below
1641 */
1642 add_weight (this, op->weight * op->nrof);
1643 }
1644 else
1645 add_weight (this, (op->weight + op->carrying));
1646
1647 otmp = this->in_player ();
1648 if (otmp && otmp->contr)
1649 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1650 otmp->update_stats ();
1651
1652 op->map = 0; 1652 op->map = 0;
1653 op->env = this; 1653 op->x = 0;
1654 op->y = 0;
1655
1654 op->above = 0; 1656 op->above = 0;
1655 op->below = 0; 1657 op->below = inv;
1656 op->x = 0, op->y = 0; 1658 op->env = this;
1657 1659
1660 if (inv)
1661 inv->above = op;
1662
1663 inv = op;
1664
1665 op->flag [FLAG_REMOVED] = 0;
1666
1667 if (object *pl = op->visible_to ())
1668 esrv_send_item (pl, op);
1669
1670 adjust_weight (this, op->total_weight ());
1671
1672inserted:
1658 /* reset the light list and los of the players on the map */ 1673 /* reset the light list and los of the players on the map */
1659 if ((op->glow_radius != 0) && map) 1674 if (op->glow_radius && map && map->darkness)
1660 {
1661#ifdef DEBUG_LIGHTS
1662 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1663#endif /* DEBUG_LIGHTS */
1664 if (map->darkness)
1665 update_all_los (map, x, y); 1675 update_all_los (map, x, y);
1666 }
1667 1676
1668 /* Client has no idea of ordering so lets not bother ordering it here. 1677 // if this is a player's inventory, update stats
1669 * It sure simplifies this function... 1678 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1670 */ 1679 update_stats ();
1671 if (!inv)
1672 inv = op;
1673 else
1674 {
1675 op->below = inv;
1676 op->below->above = op;
1677 inv = op;
1678 }
1679 1680
1680 INVOKE_OBJECT (INSERT, this); 1681 INVOKE_OBJECT (INSERT, this);
1681 1682
1682 return op; 1683 return op;
1683} 1684}
1811 LOG (llevError, "Present_arch called outside map.\n"); 1812 LOG (llevError, "Present_arch called outside map.\n");
1812 return NULL; 1813 return NULL;
1813 } 1814 }
1814 1815
1815 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1816 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1816 if (tmp->arch == at) 1817 if (tmp->arch->archname == at->archname)
1817 return tmp; 1818 return tmp;
1818 1819
1819 return NULL; 1820 return NULL;
1820} 1821}
1821 1822
1885 * The first matching object is returned, or NULL if none. 1886 * The first matching object is returned, or NULL if none.
1886 */ 1887 */
1887object * 1888object *
1888present_arch_in_ob (const archetype *at, const object *op) 1889present_arch_in_ob (const archetype *at, const object *op)
1889{ 1890{
1890 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1891 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1891 if (tmp->arch == at) 1892 if (tmp->arch->archname == at->archname)
1892 return tmp; 1893 return tmp;
1893 1894
1894 return NULL; 1895 return NULL;
1895} 1896}
1896 1897
1898 * activate recursively a flag on an object inventory 1899 * activate recursively a flag on an object inventory
1899 */ 1900 */
1900void 1901void
1901flag_inv (object *op, int flag) 1902flag_inv (object *op, int flag)
1902{ 1903{
1903 if (op->inv)
1904 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1904 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1905 { 1905 {
1906 SET_FLAG (tmp, flag); 1906 SET_FLAG (tmp, flag);
1907 flag_inv (tmp, flag); 1907 flag_inv (tmp, flag);
1908 } 1908 }
1909} 1909}
1910 1910
1911/* 1911/*
1912 * deactivate recursively a flag on an object inventory 1912 * deactivate recursively a flag on an object inventory
1913 */ 1913 */
1914void 1914void
1915unflag_inv (object *op, int flag) 1915unflag_inv (object *op, int flag)
1916{ 1916{
1917 if (op->inv)
1918 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1917 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1919 { 1918 {
1920 CLEAR_FLAG (tmp, flag); 1919 CLEAR_FLAG (tmp, flag);
1921 unflag_inv (tmp, flag); 1920 unflag_inv (tmp, flag);
1922 } 1921 }
1923}
1924
1925/*
1926 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1927 * all it's inventory (recursively).
1928 * If checksums are used, a player will get set_cheat called for
1929 * him/her-self and all object carried by a call to this function.
1930 */
1931void
1932set_cheat (object *op)
1933{
1934 SET_FLAG (op, FLAG_WAS_WIZ);
1935 flag_inv (op, FLAG_WAS_WIZ);
1936} 1922}
1937 1923
1938/* 1924/*
1939 * find_free_spot(object, map, x, y, start, stop) will search for 1925 * find_free_spot(object, map, x, y, start, stop) will search for
1940 * a spot at the given map and coordinates which will be able to contain 1926 * a spot at the given map and coordinates which will be able to contain
1942 * to search (see the freearr_x/y[] definition). 1928 * to search (see the freearr_x/y[] definition).
1943 * It returns a random choice among the alternatives found. 1929 * It returns a random choice among the alternatives found.
1944 * start and stop are where to start relative to the free_arr array (1,9 1930 * start and stop are where to start relative to the free_arr array (1,9
1945 * does all 4 immediate directions). This returns the index into the 1931 * does all 4 immediate directions). This returns the index into the
1946 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1932 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1947 * Note - this only checks to see if there is space for the head of the
1948 * object - if it is a multispace object, this should be called for all
1949 * pieces.
1950 * Note2: This function does correctly handle tiled maps, but does not 1933 * Note: This function does correctly handle tiled maps, but does not
1951 * inform the caller. However, insert_ob_in_map will update as 1934 * inform the caller. However, insert_ob_in_map will update as
1952 * necessary, so the caller shouldn't need to do any special work. 1935 * necessary, so the caller shouldn't need to do any special work.
1953 * Note - updated to take an object instead of archetype - this is necessary 1936 * Note - updated to take an object instead of archetype - this is necessary
1954 * because arch_blocked (now ob_blocked) needs to know the movement type 1937 * because arch_blocked (now ob_blocked) needs to know the movement type
1955 * to know if the space in question will block the object. We can't use 1938 * to know if the space in question will block the object. We can't use
1957 * customized, changed states, etc. 1940 * customized, changed states, etc.
1958 */ 1941 */
1959int 1942int
1960find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1943find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1961{ 1944{
1945 int altern[SIZEOFFREE];
1962 int index = 0, flag; 1946 int index = 0, flag;
1963 int altern[SIZEOFFREE];
1964 1947
1965 for (int i = start; i < stop; i++) 1948 for (int i = start; i < stop; i++)
1966 { 1949 {
1967 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1950 mapxy pos (m, x, y); pos.move (i);
1968 if (!flag) 1951
1952 if (!pos.normalise ())
1953 continue;
1954
1955 mapspace &ms = *pos;
1956
1957 if (ms.flags () & P_IS_ALIVE)
1958 continue;
1959
1960 /* However, often
1961 * ob doesn't have any move type (when used to place exits)
1962 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1963 */
1964 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1965 {
1969 altern [index++] = i; 1966 altern [index++] = i;
1967 continue;
1968 }
1970 1969
1971 /* Basically, if we find a wall on a space, we cut down the search size. 1970 /* Basically, if we find a wall on a space, we cut down the search size.
1972 * In this way, we won't return spaces that are on another side of a wall. 1971 * In this way, we won't return spaces that are on another side of a wall.
1973 * This mostly work, but it cuts down the search size in all directions - 1972 * This mostly work, but it cuts down the search size in all directions -
1974 * if the space being examined only has a wall to the north and empty 1973 * if the space being examined only has a wall to the north and empty
1975 * spaces in all the other directions, this will reduce the search space 1974 * spaces in all the other directions, this will reduce the search space
1976 * to only the spaces immediately surrounding the target area, and 1975 * to only the spaces immediately surrounding the target area, and
1977 * won't look 2 spaces south of the target space. 1976 * won't look 2 spaces south of the target space.
1978 */ 1977 */
1979 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1978 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1979 {
1980 stop = maxfree[i]; 1980 stop = maxfree[i];
1981 continue;
1982 }
1983
1984 /* Note it is intentional that we check ob - the movement type of the
1985 * head of the object should correspond for the entire object.
1986 */
1987 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1988 continue;
1989
1990 if (ob->blocked (m, pos.x, pos.y))
1991 continue;
1992
1993 altern [index++] = i;
1981 } 1994 }
1982 1995
1983 if (!index) 1996 if (!index)
1984 return -1; 1997 return -1;
1985 1998
1994 */ 2007 */
1995int 2008int
1996find_first_free_spot (const object *ob, maptile *m, int x, int y) 2009find_first_free_spot (const object *ob, maptile *m, int x, int y)
1997{ 2010{
1998 for (int i = 0; i < SIZEOFFREE; i++) 2011 for (int i = 0; i < SIZEOFFREE; i++)
1999 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2012 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2000 return i; 2013 return i;
2001 2014
2002 return -1; 2015 return -1;
2003} 2016}
2004 2017
2058 object *tmp; 2071 object *tmp;
2059 maptile *mp; 2072 maptile *mp;
2060 2073
2061 MoveType blocked, move_type; 2074 MoveType blocked, move_type;
2062 2075
2063 if (exclude && exclude->head) 2076 if (exclude && exclude->head_ () != exclude)
2064 { 2077 {
2065 exclude = exclude->head; 2078 exclude = exclude->head;
2066 move_type = exclude->move_type; 2079 move_type = exclude->move_type;
2067 } 2080 }
2068 else 2081 else
2091 max = maxfree[i]; 2104 max = maxfree[i];
2092 else if (mflags & P_IS_ALIVE) 2105 else if (mflags & P_IS_ALIVE)
2093 { 2106 {
2094 for (tmp = ms.bot; tmp; tmp = tmp->above) 2107 for (tmp = ms.bot; tmp; tmp = tmp->above)
2095 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2108 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2096 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2109 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2097 break; 2110 break;
2098 2111
2099 if (tmp) 2112 if (tmp)
2100 return freedir[i]; 2113 return freedir[i];
2101 } 2114 }
2281 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2294 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2282 * core dumps if they do. 2295 * core dumps if they do.
2283 * 2296 *
2284 * Add a check so we can't pick up invisible objects (0.93.8) 2297 * Add a check so we can't pick up invisible objects (0.93.8)
2285 */ 2298 */
2286
2287int 2299int
2288can_pick (const object *who, const object *item) 2300can_pick (const object *who, const object *item)
2289{ 2301{
2290 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2302 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2291 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2303 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2294 2306
2295/* 2307/*
2296 * create clone from object to another 2308 * create clone from object to another
2297 */ 2309 */
2298object * 2310object *
2299object_create_clone (object *asrc) 2311object::deep_clone ()
2300{ 2312{
2301 object *dst = 0, *tmp, *src, *part, *prev, *item; 2313 assert (("deep_clone called on non-head object", is_head ()));
2302 2314
2303 if (!asrc) 2315 object *dst = clone ();
2304 return 0;
2305 2316
2306 src = asrc; 2317 object *prev = dst;
2307 if (src->head)
2308 src = src->head;
2309
2310 prev = 0;
2311 for (part = src; part; part = part->more) 2318 for (object *part = this->more; part; part = part->more)
2312 { 2319 {
2313 tmp = part->clone (); 2320 object *tmp = part->clone ();
2314 tmp->x -= src->x;
2315 tmp->y -= src->y;
2316
2317 if (!part->head)
2318 {
2319 dst = tmp;
2320 tmp->head = 0;
2321 }
2322 else
2323 tmp->head = dst; 2321 tmp->head = dst;
2324
2325 tmp->more = 0;
2326
2327 if (prev)
2328 prev->more = tmp; 2322 prev->more = tmp;
2329
2330 prev = tmp; 2323 prev = tmp;
2331 } 2324 }
2332 2325
2333 for (item = src->inv; item; item = item->below) 2326 for (object *item = inv; item; item = item->below)
2334 insert_ob_in_ob (object_create_clone (item), dst); 2327 insert_ob_in_ob (item->deep_clone (), dst);
2335 2328
2336 return dst; 2329 return dst;
2337}
2338
2339/* GROS - Creates an object using a string representing its content. */
2340/* Basically, we save the content of the string to a temp file, then call */
2341/* load_object on it. I admit it is a highly inefficient way to make things, */
2342/* but it was simple to make and allows reusing the load_object function. */
2343/* Remember not to use load_object_str in a time-critical situation. */
2344/* Also remember that multiparts objects are not supported for now. */
2345object *
2346load_object_str (const char *obstr)
2347{
2348 object *op;
2349 char filename[MAX_BUF];
2350
2351 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2352
2353 FILE *tempfile = fopen (filename, "w");
2354
2355 if (tempfile == NULL)
2356 {
2357 LOG (llevError, "Error - Unable to access load object temp file\n");
2358 return NULL;
2359 }
2360
2361 fprintf (tempfile, obstr);
2362 fclose (tempfile);
2363
2364 op = object::create ();
2365
2366 object_thawer thawer (filename);
2367
2368 if (thawer)
2369 load_object (thawer, op, 0);
2370
2371 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2372 CLEAR_FLAG (op, FLAG_REMOVED);
2373
2374 return op;
2375} 2330}
2376 2331
2377/* This returns the first object in who's inventory that 2332/* This returns the first object in who's inventory that
2378 * has the same type and subtype match. 2333 * has the same type and subtype match.
2379 * returns NULL if no match. 2334 * returns NULL if no match.
2386 return tmp; 2341 return tmp;
2387 2342
2388 return 0; 2343 return 0;
2389} 2344}
2390 2345
2391/* If ob has a field named key, return the link from the list, 2346const shstr &
2392 * otherwise return NULL. 2347object::kv_get (const shstr &key) const
2393 *
2394 * key must be a passed in shared string - otherwise, this won't
2395 * do the desired thing.
2396 */
2397key_value *
2398get_ob_key_link (const object *ob, const char *key)
2399{ 2348{
2400 for (key_value *link = ob->key_values; link; link = link->next) 2349 for (key_value *kv = key_values; kv; kv = kv->next)
2401 if (link->key == key) 2350 if (kv->key == key)
2402 return link;
2403
2404 return 0;
2405}
2406
2407/*
2408 * Returns the value of op has an extra_field for key, or NULL.
2409 *
2410 * The argument doesn't need to be a shared string.
2411 *
2412 * The returned string is shared.
2413 */
2414const char *
2415get_ob_key_value (const object *op, const char *const key)
2416{
2417 key_value *link;
2418 shstr_cmp canonical_key (key);
2419
2420 if (!canonical_key)
2421 {
2422 /* 1. There being a field named key on any object
2423 * implies there'd be a shared string to find.
2424 * 2. Since there isn't, no object has this field.
2425 * 3. Therefore, *this* object doesn't have this field.
2426 */
2427 return 0;
2428 }
2429
2430 /* This is copied from get_ob_key_link() above -
2431 * only 4 lines, and saves the function call overhead.
2432 */
2433 for (link = op->key_values; link; link = link->next)
2434 if (link->key == canonical_key)
2435 return link->value; 2351 return kv->value;
2436 2352
2437 return 0; 2353 return shstr_null;
2438} 2354}
2439 2355
2440 2356void
2441/* 2357object::kv_set (const shstr &key, const shstr &value)
2442 * Updates the canonical_key in op to value.
2443 *
2444 * canonical_key is a shared string (value doesn't have to be).
2445 *
2446 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2447 * keys.
2448 *
2449 * Returns TRUE on success.
2450 */
2451int
2452set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2453{ 2358{
2454 key_value *field = NULL, *last = NULL; 2359 for (key_value *kv = key_values; kv; kv = kv->next)
2455 2360 if (kv->key == key)
2456 for (field = op->key_values; field != NULL; field = field->next)
2457 {
2458 if (field->key != canonical_key)
2459 { 2361 {
2460 last = field; 2362 kv->value = value;
2461 continue; 2363 return;
2462 } 2364 }
2463 2365
2464 if (value) 2366 key_value *kv = new key_value;
2465 field->value = value; 2367
2466 else 2368 kv->next = key_values;
2369 kv->key = key;
2370 kv->value = value;
2371
2372 key_values = kv;
2373}
2374
2375void
2376object::kv_del (const shstr &key)
2377{
2378 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2379 if ((*kvp)->key == key)
2467 { 2380 {
2468 /* Basically, if the archetype has this key set, 2381 key_value *kv = *kvp;
2469 * we need to store the null value so when we save 2382 *kvp = (*kvp)->next;
2470 * it, we save the empty value so that when we load, 2383 delete kv;
2471 * we get this value back again. 2384 return;
2472 */
2473 if (get_ob_key_link (&op->arch->clone, canonical_key))
2474 field->value = 0;
2475 else
2476 {
2477 if (last)
2478 last->next = field->next;
2479 else
2480 op->key_values = field->next;
2481
2482 delete field;
2483 }
2484 } 2385 }
2485 return TRUE;
2486 }
2487 /* IF we get here, key doesn't exist */
2488
2489 /* No field, we'll have to add it. */
2490
2491 if (!add_key)
2492 return FALSE;
2493
2494 /* There isn't any good reason to store a null
2495 * value in the key/value list. If the archetype has
2496 * this key, then we should also have it, so shouldn't
2497 * be here. If user wants to store empty strings,
2498 * should pass in ""
2499 */
2500 if (value == NULL)
2501 return TRUE;
2502
2503 field = new key_value;
2504
2505 field->key = canonical_key;
2506 field->value = value;
2507 /* Usual prepend-addition. */
2508 field->next = op->key_values;
2509 op->key_values = field;
2510
2511 return TRUE;
2512}
2513
2514/*
2515 * Updates the key in op to value.
2516 *
2517 * If add_key is FALSE, this will only update existing keys,
2518 * and not add new ones.
2519 * In general, should be little reason FALSE is ever passed in for add_key
2520 *
2521 * Returns TRUE on success.
2522 */
2523int
2524set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2525{
2526 shstr key_ (key);
2527
2528 return set_ob_key_value_s (op, key_, value, add_key);
2529} 2386}
2530 2387
2531object::depth_iterator::depth_iterator (object *container) 2388object::depth_iterator::depth_iterator (object *container)
2532: iterator_base (container) 2389: iterator_base (container)
2533{ 2390{
2546 item = item->inv; 2403 item = item->inv;
2547 } 2404 }
2548 else 2405 else
2549 item = item->env; 2406 item = item->env;
2550} 2407}
2551
2552 2408
2553const char * 2409const char *
2554object::flag_desc (char *desc, int len) const 2410object::flag_desc (char *desc, int len) const
2555{ 2411{
2556 char *p = desc; 2412 char *p = desc;
2584{ 2440{
2585 char flagdesc[512]; 2441 char flagdesc[512];
2586 char info2[256 * 4]; 2442 char info2[256 * 4];
2587 char *p = info; 2443 char *p = info;
2588 2444
2589 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2445 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2590 count, uuid.seq, 2446 count,
2447 uuid.c_str (),
2591 &name, 2448 &name,
2592 title ? "\",title:\"" : "", 2449 title ? "\",title:\"" : "",
2593 title ? (const char *)title : "", 2450 title ? (const char *)title : "",
2594 flag_desc (flagdesc, 512), type); 2451 flag_desc (flagdesc, 512), type);
2595 2452
2596 if (env) 2453 if (!flag[FLAG_REMOVED] && env)
2597 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2454 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2598 2455
2599 if (map) 2456 if (map)
2600 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2457 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2601 2458
2603} 2460}
2604 2461
2605const char * 2462const char *
2606object::debug_desc () const 2463object::debug_desc () const
2607{ 2464{
2608 static char info[256 * 4]; 2465 static char info[3][256 * 4];
2466 static int info_idx;
2467
2609 return debug_desc (info); 2468 return debug_desc (info [++info_idx % 3]);
2610}
2611
2612const char *
2613object::debug_desc2 () const
2614{
2615 static char info[256 * 4];
2616 return debug_desc (info);
2617} 2469}
2618 2470
2619struct region * 2471struct region *
2620object::region () const 2472object::region () const
2621{ 2473{
2624} 2476}
2625 2477
2626const materialtype_t * 2478const materialtype_t *
2627object::dominant_material () const 2479object::dominant_material () const
2628{ 2480{
2629 if (materialtype_t *mat = name_to_material (materialname)) 2481 if (materialtype_t *mt = name_to_material (materialname))
2630 return mat; 2482 return mt;
2631 2483
2632 // omfg this is slow, this has to be temporary :)
2633 shstr unknown ("unknown");
2634
2635 return name_to_material (unknown); 2484 return name_to_material (shstr_unknown);
2636} 2485}
2637 2486
2638void 2487void
2639object::open_container (object *new_container) 2488object::open_container (object *new_container)
2640{ 2489{
2641 if (container == new_container) 2490 if (container == new_container)
2642 return; 2491 return;
2643 2492
2644 if (contr && contr->ns)
2645 contr->ns->floorbox_reset ();
2646
2647 if (object *old_container = container) 2493 object *old_container = container;
2494
2495 if (old_container)
2648 { 2496 {
2649 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2497 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2650 return; 2498 return;
2651 2499
2652#if 0 2500#if 0
2654 if (object *closer = old_container->inv) 2502 if (object *closer = old_container->inv)
2655 if (closer->type == CLOSE_CON) 2503 if (closer->type == CLOSE_CON)
2656 closer->destroy (); 2504 closer->destroy ();
2657#endif 2505#endif
2658 2506
2507 // make sure the container is available
2508 esrv_send_item (this, old_container);
2509
2659 old_container->flag [FLAG_APPLIED] = 0; 2510 old_container->flag [FLAG_APPLIED] = false;
2660 container = 0; 2511 container = 0;
2661 2512
2513 // client needs item update to make it work, client bug requires this to be separate
2662 esrv_update_item (UPD_FLAGS, this, old_container); 2514 esrv_update_item (UPD_FLAGS, this, old_container);
2515
2663 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2516 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2517 play_sound (sound_find ("chest_close"));
2664 } 2518 }
2665 2519
2666 if (new_container) 2520 if (new_container)
2667 { 2521 {
2668 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2522 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2677 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2531 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2678 new_container->insert (closer); 2532 new_container->insert (closer);
2679 } 2533 }
2680#endif 2534#endif
2681 2535
2536 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2537
2538 // make sure the container is available, client bug requires this to be separate
2539 esrv_send_item (this, new_container);
2540
2682 new_container->flag [FLAG_APPLIED] = 1; 2541 new_container->flag [FLAG_APPLIED] = true;
2683 container = new_container; 2542 container = new_container;
2684 2543
2544 // client needs flag change
2685 esrv_update_item (UPD_FLAGS, this, new_container); 2545 esrv_update_item (UPD_FLAGS, this, new_container);
2686 esrv_send_inventory (this, new_container); 2546 esrv_send_inventory (this, new_container);
2687 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2547 play_sound (sound_find ("chest_open"));
2548 }
2549// else if (!old_container->env && contr && contr->ns)
2550// contr->ns->floorbox_reset ();
2551}
2552
2553object *
2554object::force_find (const shstr name)
2555{
2556 /* cycle through his inventory to look for the MARK we want to
2557 * place
2558 */
2559 for (object *tmp = inv; tmp; tmp = tmp->below)
2560 if (tmp->type == FORCE && tmp->slaying == name)
2561 return splay (tmp);
2562
2563 return 0;
2564}
2565
2566void
2567object::force_add (const shstr name, int duration)
2568{
2569 if (object *force = force_find (name))
2570 force->destroy ();
2571
2572 object *force = get_archetype (FORCE_NAME);
2573
2574 force->slaying = name;
2575 force->stats.food = 1;
2576 force->speed_left = -1.f;
2577
2578 force->set_speed (duration ? 1.f / duration : 0.f);
2579 force->flag [FLAG_IS_USED_UP] = true;
2580 force->flag [FLAG_APPLIED] = true;
2581
2582 insert (force);
2583}
2584
2585void
2586object::play_sound (faceidx sound)
2587{
2588 if (!sound)
2589 return;
2590
2591 if (flag [FLAG_REMOVED])
2592 return;
2593
2594 if (env)
2688 } 2595 {
2596 if (object *pl = in_player ())
2597 pl->contr->play_sound (sound);
2598 }
2599 else
2600 map->play_sound (sound, x, y);
2689} 2601}
2690 2602
2691

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines