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.170 by root, Wed Aug 1 01:53:13 2007 UTC vs.
Revision 1.230 by root, Sun May 4 08:25:32 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27#include <global.h> 24#include <global.h>
28#include <stdio.h> 25#include <stdio.h>
29#include <sys/types.h> 26#include <sys/types.h>
30#include <sys/uio.h> 27#include <sys/uio.h>
31#include <object.h> 28#include <object.h>
32#include <funcpoint.h>
33#include <sproto.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. */
299 return 0; 291
300 else if (!compare_ob_value_lists (ob1, ob2)) 292 if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 293 return 0;
302 } 294 }
303 295
304 if (ob1->self || ob2->self) 296 if (ob1->self || ob2->self)
305 { 297 {
306 ob1->optimise (); 298 ob1->optimise ();
307 ob2->optimise (); 299 ob2->optimise ();
308 300
309 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)
307 return 0;
308
309 if (k1 == 0)
310 return 1;
311
310 if (!cfperl_can_merge (ob1, ob2)) 312 if (!cfperl_can_merge (ob1, ob2))
311 return 0; 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 (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 weight = weight_adjust (op, weight);
376
377 if (!weight)
378 return;
379
380 op->carrying += weight;
381
382 if (object *pl = op->visible_to ())
383 if (pl != op) // player is handled lazily
384 esrv_update_item (UPD_WEIGHT, pl, op);
385
386 op = op->env;
387 }
388}
389
390/*
319 * sum_weight() is a recursive function which calculates the weight 391 * this is a recursive function which calculates the weight
320 * an object is carrying. It goes through in figures out how much 392 * an object is carrying. It goes through op and figures out how much
321 * containers are carrying, and sums it up. 393 * containers are carrying, and sums it up.
322 */ 394 */
323long 395void
324sum_weight (object *op) 396object::update_weight ()
325{ 397{
326 long sum; 398 sint32 sum = 0;
327 object *inv;
328 399
329 for (sum = 0, inv = op->inv; inv; inv = inv->below) 400 for (object *op = inv; op; op = op->below)
330 { 401 {
331 if (inv->inv) 402 if (op->inv)
332 sum_weight (inv); 403 op->update_weight ();
333 404
334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 405 sum += op->total_weight ();
406 }
407
408 sum = weight_adjust (this, sum);
409
410 if (sum != carrying)
335 } 411 {
336
337 if (op->type == CONTAINER && op->stats.Str)
338 sum = (sum * (100 - op->stats.Str)) / 100;
339
340 if (op->carrying != sum)
341 op->carrying = sum; 412 carrying = sum;
342 413
343 return sum; 414 if (object *pl = visible_to ())
415 if (pl != this) // player is handled lazily
416 esrv_update_item (UPD_WEIGHT, pl, this);
417 }
344} 418}
345 419
346/** 420/*
347 * Return the outermost environment object for a given object. 421 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
348 */
349
350object *
351object_get_env_recursive (object *op)
352{
353 while (op->env != NULL)
354 op = op->env;
355 return op;
356}
357
358/*
359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360 * Some error messages.
361 * The result of the dump is stored in the static global errmsg array.
362 */ 422 */
363char * 423char *
364dump_object (object *op) 424dump_object (object *op)
365{ 425{
366 if (!op) 426 if (!op)
374/* 434/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 435 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 436 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 437 * If it's not a multi-object, it is returned.
378 */ 438 */
379
380object * 439object *
381get_nearest_part (object *op, const object *pl) 440get_nearest_part (object *op, const object *pl)
382{ 441{
383 object *tmp, *closest; 442 object *tmp, *closest;
384 int last_dist, i; 443 int last_dist, i;
385 444
386 if (op->more == NULL) 445 if (!op->more)
387 return op; 446 return op;
447
388 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 448 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
449 tmp;
450 tmp = tmp->more)
389 if ((i = distance (tmp, pl)) < last_dist) 451 if ((i = distance (tmp, pl)) < last_dist)
390 closest = tmp, last_dist = i; 452 closest = tmp, last_dist = i;
453
391 return closest; 454 return closest;
392} 455}
393 456
394/* 457/*
395 * Returns the object which has the count-variable equal to the argument. 458 * Returns the object which has the count-variable equal to the argument.
459 * VERRRY slow.
396 */ 460 */
397object * 461object *
398find_object (tag_t i) 462find_object (tag_t i)
399{ 463{
400 for_all_objects (op) 464 for_all_objects (op)
420 break; 484 break;
421 485
422 return op; 486 return op;
423} 487}
424 488
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 489/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 490 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 491 * skill and experience objects.
492 * ACTUALLY NO! investigate! TODO
434 */ 493 */
435void 494void
436object::set_owner (object *owner) 495object::set_owner (object *owner)
437{ 496{
497 // allow objects which own objects
438 if (!owner) 498 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) 499 while (owner->owner)
449 owner = owner->owner; 500 owner = owner->owner;
501
502 if (flag [FLAG_FREED])
503 {
504 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
505 return;
506 }
450 507
451 this->owner = owner; 508 this->owner = owner;
452} 509}
453 510
454int 511int
532 } 589 }
533 590
534 op->key_values = 0; 591 op->key_values = 0;
535} 592}
536 593
537object & 594/*
538object::operator =(const object &src) 595 * copy_to first frees everything allocated by the dst object,
596 * and then copies the contents of itself into the second
597 * object, allocating what needs to be allocated. Basically, any
598 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
599 * if the first object is freed, the pointers in the new object
600 * will point at garbage.
601 */
602void
603object::copy_to (object *dst)
539{ 604{
540 bool is_freed = flag [FLAG_FREED]; 605 dst->remove ();
541 bool is_removed = flag [FLAG_REMOVED];
542
543 *(object_copy *)this = src; 606 *(object_copy *)dst = *this;
544
545 flag [FLAG_FREED] = is_freed;
546 flag [FLAG_REMOVED] = is_removed; 607 dst->flag [FLAG_REMOVED] = true;
547 608
548 /* Copy over key_values, if any. */ 609 /* Copy over key_values, if any. */
549 if (src.key_values) 610 if (key_values)
550 { 611 {
551 key_value *tail = 0; 612 key_value *tail = 0;
552 key_values = 0; 613 dst->key_values = 0;
553 614
554 for (key_value *i = src.key_values; i; i = i->next) 615 for (key_value *i = key_values; i; i = i->next)
555 { 616 {
556 key_value *new_link = new key_value; 617 key_value *new_link = new key_value;
557 618
558 new_link->next = 0; 619 new_link->next = 0;
559 new_link->key = i->key; 620 new_link->key = i->key;
560 new_link->value = i->value; 621 new_link->value = i->value;
561 622
562 /* Try and be clever here, too. */ 623 /* Try and be clever here, too. */
563 if (!key_values) 624 if (!dst->key_values)
564 { 625 {
565 key_values = new_link; 626 dst->key_values = new_link;
566 tail = new_link; 627 tail = new_link;
567 } 628 }
568 else 629 else
569 { 630 {
570 tail->next = new_link; 631 tail->next = new_link;
571 tail = new_link; 632 tail = new_link;
572 } 633 }
573 } 634 }
574 } 635 }
575}
576
577/*
578 * copy_to first frees everything allocated by the dst object,
579 * and then copies the contents of itself into the second
580 * object, allocating what needs to be allocated. Basically, any
581 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
582 * if the first object is freed, the pointers in the new object
583 * will point at garbage.
584 */
585void
586object::copy_to (object *dst)
587{
588 *dst = *this;
589 636
590 if (speed < 0) 637 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 638 dst->speed_left -= rndm ();
592 639
593 dst->set_speed (dst->speed); 640 dst->set_speed (dst->speed);
594} 641}
595 642
596void 643void
597object::instantiate () 644object::instantiate ()
598{ 645{
599 if (!uuid.seq) // HACK 646 if (!uuid.seq) // HACK
600 uuid = gen_uuid (); 647 uuid = UUID::gen ();
601 648
602 speed_left = -0.1f; 649 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really 650 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything. 651 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting 652 * by doing so, when a monster is created, it has good starting
615object * 662object *
616object::clone () 663object::clone ()
617{ 664{
618 object *neu = create (); 665 object *neu = create ();
619 copy_to (neu); 666 copy_to (neu);
667 neu->map = map; // not copied by copy_to
620 return neu; 668 return neu;
621} 669}
622 670
623/* 671/*
624 * If an object with the IS_TURNABLE() flag needs to be turned due 672 * If an object with the IS_TURNABLE() flag needs to be turned due
675 * UP_OBJ_FACE: only the objects face has changed. 723 * UP_OBJ_FACE: only the objects face has changed.
676 */ 724 */
677void 725void
678update_object (object *op, int action) 726update_object (object *op, int action)
679{ 727{
680 if (op == NULL) 728 if (!op)
681 { 729 {
682 /* this should never happen */ 730 /* this should never happen */
683 LOG (llevDebug, "update_object() called for NULL object.\n"); 731 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
684 return; 732 return;
685 } 733 }
686 734
687 if (op->env) 735 if (!op->is_on_map ())
688 { 736 {
689 /* Animation is currently handled by client, so nothing 737 /* Animation is currently handled by client, so nothing
690 * to do in this case. 738 * to do in this case.
691 */ 739 */
692 return; 740 return;
693 } 741 }
694
695 /* If the map is saving, don't do anything as everything is
696 * going to get freed anyways.
697 */
698 if (!op->map || op->map->in_memory == MAP_SAVING)
699 return;
700 742
701 /* make sure the object is within map boundaries */ 743 /* make sure the object is within map boundaries */
702 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 744 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
703 { 745 {
704 LOG (llevError, "update_object() called for object out of map!\n"); 746 LOG (llevError, "update_object() called for object out of map!\n");
764static int object_count; 806static int object_count;
765 807
766void object::link () 808void object::link ()
767{ 809{
768 assert (!index);//D 810 assert (!index);//D
769 uuid = gen_uuid (); 811 uuid = UUID::gen ();
770 count = ++object_count; 812 count = ++object_count;
771 813
772 refcnt_inc (); 814 refcnt_inc ();
773 objects.insert (this); 815 objects.insert (this);
774} 816}
847object::destroy_inv (bool drop_to_ground) 889object::destroy_inv (bool drop_to_ground)
848{ 890{
849 // need to check first, because the checks below might segfault 891 // need to check first, because the checks below might segfault
850 // as we might be on an invalid mapspace and crossfire code 892 // as we might be on an invalid mapspace and crossfire code
851 // is too buggy to ensure that the inventory is empty. 893 // is too buggy to ensure that the inventory is empty.
852 // corollary: if you create arrows etc. with stuff in tis inventory, 894 // corollary: if you create arrows etc. with stuff in its inventory,
853 // cf will crash below with off-map x and y 895 // cf will crash below with off-map x and y
854 if (!inv) 896 if (!inv)
855 return; 897 return;
856 898
857 /* Only if the space blocks everything do we not process - 899 /* Only if the space blocks everything do we not process -
858 * if some form of movement is allowed, let objects 900 * if some form of movement is allowed, let objects
859 * drop on that space. 901 * drop on that space.
860 */ 902 */
861 if (!drop_to_ground 903 if (!drop_to_ground
862 || !map 904 || !map
863 || map->in_memory != MAP_IN_MEMORY 905 || map->in_memory != MAP_ACTIVE
864 || map->nodrop 906 || map->nodrop
865 || ms ().move_block == MOVE_ALL) 907 || ms ().move_block == MOVE_ALL)
866 { 908 {
867 while (inv) 909 while (inv)
868 { 910 {
869 inv->destroy_inv (drop_to_ground); 911 inv->destroy_inv (false);
870 inv->destroy (); 912 inv->destroy ();
871 } 913 }
872 } 914 }
873 else 915 else
874 { /* Put objects in inventory onto this space */ 916 { /* Put objects in inventory onto this space */
880 || op->flag [FLAG_NO_DROP] 922 || op->flag [FLAG_NO_DROP]
881 || op->type == RUNE 923 || op->type == RUNE
882 || op->type == TRAP 924 || op->type == TRAP
883 || op->flag [FLAG_IS_A_TEMPLATE] 925 || op->flag [FLAG_IS_A_TEMPLATE]
884 || op->flag [FLAG_DESTROY_ON_DEATH]) 926 || op->flag [FLAG_DESTROY_ON_DEATH])
885 op->destroy (); 927 op->destroy (true);
886 else 928 else
887 map->insert (op, x, y); 929 map->insert (op, x, y);
888 } 930 }
889 } 931 }
890} 932}
894 object *op = new object; 936 object *op = new object;
895 op->link (); 937 op->link ();
896 return op; 938 return op;
897} 939}
898 940
941static struct freed_map : maptile
942{
943 freed_map ()
944 {
945 path = "<freed objects map>";
946 name = "/internal/freed_objects_map";
947 width = 3;
948 height = 3;
949 nodrop = 1;
950
951 alloc ();
952 in_memory = MAP_ACTIVE;
953 }
954
955 ~freed_map ()
956 {
957 destroy ();
958 }
959} freed_map; // freed objects are moved here to avoid crashes
960
899void 961void
900object::do_destroy () 962object::do_destroy ()
901{ 963{
902 attachable::do_destroy ();
903
904 if (flag [FLAG_IS_LINKED]) 964 if (flag [FLAG_IS_LINKED])
905 remove_button_link (this); 965 remove_button_link (this);
906 966
907 if (flag [FLAG_FRIENDLY]) 967 if (flag [FLAG_FRIENDLY])
908 remove_friendly_object (this); 968 remove_friendly_object (this);
909 969
910 if (!flag [FLAG_REMOVED])
911 remove (); 970 remove ();
912 971
913 destroy_inv (true); 972 attachable::do_destroy ();
914 973
915 deactivate (); 974 deactivate ();
916 unlink (); 975 unlink ();
917 976
918 flag [FLAG_FREED] = 1; 977 flag [FLAG_FREED] = 1;
919 978
920 // hack to ensure that freed objects still have a valid map 979 // hack to ensure that freed objects still have a valid map
921 {
922 static maptile *freed_map; // freed objects are moved here to avoid crashes
923
924 if (!freed_map)
925 {
926 freed_map = new maptile;
927
928 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3;
930 freed_map->height = 3;
931
932 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY;
934 }
935
936 map = freed_map; 980 map = &freed_map;
937 x = 1; 981 x = 1;
938 y = 1; 982 y = 1;
939 }
940 983
941 if (more) 984 if (more)
942 { 985 {
943 more->destroy (); 986 more->destroy ();
944 more = 0; 987 more = 0;
957object::destroy (bool destroy_inventory) 1000object::destroy (bool destroy_inventory)
958{ 1001{
959 if (destroyed ()) 1002 if (destroyed ())
960 return; 1003 return;
961 1004
1005 if (!is_head () && !head->destroyed ())
1006 {
1007 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1008 head->destroy (destroy_inventory);
1009 return;
1010 }
1011
962 if (destroy_inventory) 1012 destroy_inv (!destroy_inventory);
963 destroy_inv (false);
964 1013
1014 if (is_head ())
1015 if (sound_destroy)
965 play_sound (sound_die); 1016 play_sound (sound_destroy);
1017 else if (flag [FLAG_MONSTER])
1018 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
966 1019
967 attachable::destroy (); 1020 attachable::destroy ();
968}
969
970/*
971 * sub_weight() recursively (outwards) subtracts a number from the
972 * weight of an object (and what is carried by it's environment(s)).
973 */
974void
975sub_weight (object *op, signed long weight)
976{
977 while (op != NULL)
978 {
979 if (op->type == CONTAINER)
980 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
981
982 op->carrying -= weight;
983 op = op->env;
984 }
985} 1021}
986 1022
987/* op->remove (): 1023/* op->remove ():
988 * This function removes the object op from the linked list of objects 1024 * This function removes the object op from the linked list of objects
989 * which it is currently tied to. When this function is done, the 1025 * which it is currently tied to. When this function is done, the
995object::do_remove () 1031object::do_remove ()
996{ 1032{
997 object *tmp, *last = 0; 1033 object *tmp, *last = 0;
998 object *otmp; 1034 object *otmp;
999 1035
1000 if (QUERY_FLAG (this, FLAG_REMOVED)) 1036 if (flag [FLAG_REMOVED])
1001 return; 1037 return;
1002 1038
1003 SET_FLAG (this, FLAG_REMOVED);
1004 INVOKE_OBJECT (REMOVE, this); 1039 INVOKE_OBJECT (REMOVE, this);
1040
1041 flag [FLAG_REMOVED] = true;
1005 1042
1006 if (more) 1043 if (more)
1007 more->remove (); 1044 more->remove ();
1008 1045
1009 /* 1046 /*
1010 * In this case, the object to be removed is in someones 1047 * In this case, the object to be removed is in someones
1011 * inventory. 1048 * inventory.
1012 */ 1049 */
1013 if (env) 1050 if (env)
1014 { 1051 {
1052 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1053 if (object *pl = visible_to ())
1054 esrv_del_item (pl->contr, count);
1055 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056
1057 adjust_weight (env, -total_weight ());
1058
1059 *(above ? &above->below : &env->inv) = below;
1060
1015 if (nrof) 1061 if (below)
1016 sub_weight (env, weight * nrof); 1062 below->above = above;
1017 else 1063
1018 sub_weight (env, weight + carrying); 1064 /* we set up values so that it could be inserted into
1065 * the map, but we don't actually do that - it is up
1066 * to the caller to decide what we want to do.
1067 */
1068 map = env->map;
1069 x = env->x;
1070 y = env->y;
1071 above = 0;
1072 below = 0;
1073 env = 0;
1019 1074
1020 /* NO_FIX_PLAYER is set when a great many changes are being 1075 /* NO_FIX_PLAYER is set when a great many changes are being
1021 * made to players inventory. If set, avoiding the call 1076 * made to players inventory. If set, avoiding the call
1022 * to save cpu time. 1077 * to save cpu time.
1023 */ 1078 */
1024 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1079 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1025 otmp->update_stats (); 1080 otmp->update_stats ();
1026
1027 if (above)
1028 above->below = below;
1029 else
1030 env->inv = below;
1031
1032 if (below)
1033 below->above = above;
1034
1035 /* we set up values so that it could be inserted into
1036 * the map, but we don't actually do that - it is up
1037 * to the caller to decide what we want to do.
1038 */
1039 x = env->x, y = env->y;
1040 map = env->map;
1041 above = 0, below = 0;
1042 env = 0;
1043 } 1081 }
1044 else if (map) 1082 else if (map)
1045 { 1083 {
1046 if (type == PLAYER)
1047 {
1048 // leaving a spot always closes any open container on the ground
1049 if (container && !container->env)
1050 // this causes spurious floorbox updates, but it ensures
1051 // that the CLOSE event is being sent.
1052 close_container ();
1053
1054 --map->players;
1055 map->touch ();
1056 }
1057
1058 map->dirty = true; 1084 map->dirty = true;
1059 mapspace &ms = this->ms (); 1085 mapspace &ms = this->ms ();
1086
1087 if (object *pl = ms.player ())
1088 {
1089 if (type == PLAYER) // this == pl(!)
1090 {
1091 // leaving a spot always closes any open container on the ground
1092 if (container && !container->env)
1093 // this causes spurious floorbox updates, but it ensures
1094 // that the CLOSE event is being sent.
1095 close_container ();
1096
1097 --map->players;
1098 map->touch ();
1099 }
1100 else if (pl->container == this)
1101 {
1102 // removing a container should close it
1103 close_container ();
1104 }
1105
1106 esrv_del_item (pl->contr, count);
1107 }
1060 1108
1061 /* link the object above us */ 1109 /* link the object above us */
1062 if (above) 1110 if (above)
1063 above->below = below; 1111 above->below = below;
1064 else 1112 else
1085 if (map->in_memory == MAP_SAVING) 1133 if (map->in_memory == MAP_SAVING)
1086 return; 1134 return;
1087 1135
1088 int check_walk_off = !flag [FLAG_NO_APPLY]; 1136 int check_walk_off = !flag [FLAG_NO_APPLY];
1089 1137
1138 if (object *pl = ms.player ())
1139 {
1140 if (pl->container == this)
1141 /* If a container that the player is currently using somehow gets
1142 * removed (most likely destroyed), update the player view
1143 * appropriately.
1144 */
1145 pl->close_container ();
1146
1147 //TODO: the floorbox prev/next might need updating
1148 //esrv_del_item (pl->contr, count);
1149 //TODO: update floorbox to preserve ordering
1150 if (pl->contr->ns)
1151 pl->contr->ns->floorbox_update ();
1152 }
1153
1090 for (tmp = ms.bot; tmp; tmp = tmp->above) 1154 for (tmp = ms.bot; tmp; tmp = tmp->above)
1091 { 1155 {
1092 /* No point updating the players look faces if he is the object 1156 /* No point updating the players look faces if he is the object
1093 * being removed. 1157 * being removed.
1094 */ 1158 */
1095
1096 if (tmp->type == PLAYER && tmp != this)
1097 {
1098 /* If a container that the player is currently using somehow gets
1099 * removed (most likely destroyed), update the player view
1100 * appropriately.
1101 */
1102 if (tmp->container == this)
1103 {
1104 flag [FLAG_APPLIED] = 0;
1105 tmp->container = 0;
1106 }
1107
1108 if (tmp->contr->ns)
1109 tmp->contr->ns->floorbox_update ();
1110 }
1111 1159
1112 /* See if object moving off should effect something */ 1160 /* See if object moving off should effect something */
1113 if (check_walk_off 1161 if (check_walk_off
1114 && ((move_type & tmp->move_off) 1162 && ((move_type & tmp->move_off)
1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1163 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1147merge_ob (object *op, object *top) 1195merge_ob (object *op, object *top)
1148{ 1196{
1149 if (!op->nrof) 1197 if (!op->nrof)
1150 return 0; 1198 return 0;
1151 1199
1152 if (top) 1200 if (!top)
1153 for (top = op; top && top->above; top = top->above) 1201 for (top = op; top && top->above; top = top->above)
1154 ; 1202 ;
1155 1203
1156 for (; top; top = top->below) 1204 for (; top; top = top->below)
1157 {
1158 if (top == op)
1159 continue;
1160
1161 if (object::can_merge (op, top)) 1205 if (object::can_merge (op, top))
1162 { 1206 {
1163 top->nrof += op->nrof; 1207 top->nrof += op->nrof;
1164 1208
1165/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1209 if (object *pl = top->visible_to ())
1166 op->weight = 0; /* Don't want any adjustements now */ 1210 esrv_update_item (UPD_NROF, pl, top);
1211
1212 op->weight = 0; // cancel the addition above
1213 op->carrying = 0; // must be 0 already
1214
1167 op->destroy (); 1215 op->destroy (1);
1216
1168 return top; 1217 return top;
1169 } 1218 }
1170 }
1171 1219
1172 return 0; 1220 return 0;
1173} 1221}
1174 1222
1175void 1223void
1234object * 1282object *
1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1283insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236{ 1284{
1237 assert (!op->flag [FLAG_FREED]); 1285 assert (!op->flag [FLAG_FREED]);
1238 1286
1239 object *top, *floor = NULL;
1240
1241 op->remove (); 1287 op->remove ();
1242
1243#if 0
1244 if (!m->active != !op->active)
1245 if (m->active)
1246 op->activate_recursive ();
1247 else
1248 op->deactivate_recursive ();
1249#endif
1250
1251 if (out_of_map (m, op->x, op->y))
1252 {
1253 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1254#ifdef MANY_CORES
1255 /* Better to catch this here, as otherwise the next use of this object
1256 * is likely to cause a crash. Better to find out where it is getting
1257 * improperly inserted.
1258 */
1259 abort ();
1260#endif
1261 return op;
1262 }
1263
1264 if (object *more = op->more)
1265 if (!insert_ob_in_map (more, m, originator, flag))
1266 return 0;
1267
1268 CLEAR_FLAG (op, FLAG_REMOVED);
1269 1288
1270 /* Ideally, the caller figures this out. However, it complicates a lot 1289 /* Ideally, the caller figures this out. However, it complicates a lot
1271 * of areas of callers (eg, anything that uses find_free_spot would now 1290 * of areas of callers (eg, anything that uses find_free_spot would now
1272 * need extra work 1291 * need extra work
1273 */ 1292 */
1274 if (!xy_normalise (m, op->x, op->y)) 1293 if (!xy_normalise (m, op->x, op->y))
1294 {
1295 op->destroy (1);
1275 return 0; 1296 return 0;
1297 }
1298
1299 if (object *more = op->more)
1300 if (!insert_ob_in_map (more, m, originator, flag))
1301 return 0;
1302
1303 CLEAR_FLAG (op, FLAG_REMOVED);
1276 1304
1277 op->map = m; 1305 op->map = m;
1278 mapspace &ms = op->ms (); 1306 mapspace &ms = op->ms ();
1279 1307
1280 /* this has to be done after we translate the coordinates. 1308 /* this has to be done after we translate the coordinates.
1281 */ 1309 */
1282 if (op->nrof && !(flag & INS_NO_MERGE)) 1310 if (op->nrof && !(flag & INS_NO_MERGE))
1283 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1311 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1284 if (object::can_merge (op, tmp)) 1312 if (object::can_merge (op, tmp))
1285 { 1313 {
1314 // TODO: we atcually want to update tmp, not op,
1315 // but some caller surely breaks when we return tmp
1316 // from here :/
1286 op->nrof += tmp->nrof; 1317 op->nrof += tmp->nrof;
1287 tmp->destroy (); 1318 tmp->destroy (1);
1288 } 1319 }
1289 1320
1290 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1321 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1291 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1322 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1292 1323
1312 /* since *below* originator, no need to update top */ 1343 /* since *below* originator, no need to update top */
1313 originator->below = op; 1344 originator->below = op;
1314 } 1345 }
1315 else 1346 else
1316 { 1347 {
1348 object *top, *floor = NULL;
1349
1317 top = ms.bot; 1350 top = ms.bot;
1318 1351
1319 /* If there are other objects, then */ 1352 /* If there are other objects, then */
1320 if ((!(flag & INS_MAP_LOAD)) && top) 1353 if (top)
1321 { 1354 {
1322 object *last = 0; 1355 object *last = 0;
1323 1356
1324 /* 1357 /*
1325 * If there are multiple objects on this space, we do some trickier handling. 1358 * If there are multiple objects on this space, we do some trickier handling.
1377 */ 1410 */
1378 if (last && last->below && last != floor) 1411 if (last && last->below && last != floor)
1379 top = last->below; 1412 top = last->below;
1380 } 1413 }
1381 } /* If objects on this space */ 1414 } /* If objects on this space */
1382 if (flag & INS_MAP_LOAD)
1383 top = ms.top;
1384 1415
1385 if (flag & INS_ABOVE_FLOOR_ONLY) 1416 if (flag & INS_ABOVE_FLOOR_ONLY)
1386 top = floor; 1417 top = floor;
1387 1418
1388 /* Top is the object that our object (op) is going to get inserted above. 1419 /* Top is the object that our object (op) is going to get inserted above.
1421 op->map->touch (); 1452 op->map->touch ();
1422 } 1453 }
1423 1454
1424 op->map->dirty = true; 1455 op->map->dirty = true;
1425 1456
1426 /* If we have a floor, we know the player, if any, will be above
1427 * it, so save a few ticks and start from there.
1428 */
1429 if (!(flag & INS_MAP_LOAD))
1430 if (object *pl = ms.player ()) 1457 if (object *pl = ms.player ())
1458 //TODO: the floorbox prev/next might need updating
1459 //esrv_send_item (pl, op);
1460 //TODO: update floorbox to preserve ordering
1431 if (pl->contr->ns) 1461 if (pl->contr->ns)
1432 pl->contr->ns->floorbox_update (); 1462 pl->contr->ns->floorbox_update ();
1433 1463
1434 /* If this object glows, it may affect lighting conditions that are 1464 /* If this object glows, it may affect lighting conditions that are
1435 * visible to others on this map. But update_all_los is really 1465 * visible to others on this map. But update_all_los is really
1436 * an inefficient way to do this, as it means los for all players 1466 * an inefficient way to do this, as it means los for all players
1437 * on the map will get recalculated. The players could very well 1467 * on the map will get recalculated. The players could very well
1479 * op is the object to insert it under: supplies x and the map. 1509 * op is the object to insert it under: supplies x and the map.
1480 */ 1510 */
1481void 1511void
1482replace_insert_ob_in_map (const char *arch_string, object *op) 1512replace_insert_ob_in_map (const char *arch_string, object *op)
1483{ 1513{
1484 object *tmp, *tmp1;
1485
1486 /* first search for itself and remove any old instances */ 1514 /* first search for itself and remove any old instances */
1487 1515
1488 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1516 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1489 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1517 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1490 tmp->destroy (); 1518 tmp->destroy (1);
1491 1519
1492 tmp1 = arch_to_object (archetype::find (arch_string)); 1520 object *tmp = arch_to_object (archetype::find (arch_string));
1493 1521
1494 tmp1->x = op->x; 1522 tmp->x = op->x;
1495 tmp1->y = op->y; 1523 tmp->y = op->y;
1524
1496 insert_ob_in_map (tmp1, op->map, op, 0); 1525 insert_ob_in_map (tmp, op->map, op, 0);
1497} 1526}
1498 1527
1499object * 1528object *
1500object::insert_at (object *where, object *originator, int flags) 1529object::insert_at (object *where, object *originator, int flags)
1501{ 1530{
1531 if (where->env)
1532 return where->env->insert (this);
1533 else
1502 return where->map->insert (this, where->x, where->y, originator, flags); 1534 return where->map->insert (this, where->x, where->y, originator, flags);
1503} 1535}
1504 1536
1505/* 1537/*
1506 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1507 * is returned contains nr objects, and the remaining parts contains
1508 * the rest (or is removed and freed if that number is 0).
1509 * On failure, NULL is returned, and the reason put into the
1510 * global static errmsg array.
1511 */
1512object *
1513get_split_ob (object *orig_ob, uint32 nr)
1514{
1515 object *newob;
1516 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1517
1518 if (orig_ob->nrof < nr)
1519 {
1520 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1521 return NULL;
1522 }
1523
1524 newob = object_create_clone (orig_ob);
1525
1526 if ((orig_ob->nrof -= nr) < 1)
1527 orig_ob->destroy (1);
1528 else if (!is_removed)
1529 {
1530 if (orig_ob->env != NULL)
1531 sub_weight (orig_ob->env, orig_ob->weight * nr);
1532 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1533 {
1534 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1535 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1536 return NULL;
1537 }
1538 }
1539
1540 newob->nrof = nr;
1541
1542 return newob;
1543}
1544
1545/*
1546 * decrease_ob_nr(object, number) decreases a specified number from 1538 * decrease(object, number) decreases a specified number from
1547 * the amount of an object. If the amount reaches 0, the object 1539 * the amount of an object. If the amount reaches 0, the object
1548 * is subsequently removed and freed. 1540 * is subsequently removed and freed.
1549 * 1541 *
1550 * Return value: 'op' if something is left, NULL if the amount reached 0 1542 * Return value: 'op' if something is left, NULL if the amount reached 0
1551 */ 1543 */
1544bool
1545object::decrease (sint32 nr)
1546{
1547 if (!nr)
1548 return true;
1549
1550 nr = min (nr, nrof);
1551
1552 nrof -= nr;
1553
1554 if (nrof)
1555 {
1556 adjust_weight (env, -weight * nr); // carrying == 0
1557
1558 if (object *pl = visible_to ())
1559 esrv_update_item (UPD_NROF, pl, this);
1560
1561 return true;
1562 }
1563 else
1564 {
1565 destroy (1);
1566 return false;
1567 }
1568}
1569
1570/*
1571 * split(ob,nr) splits up ob into two parts. The part which
1572 * is returned contains nr objects, and the remaining parts contains
1573 * the rest (or is removed and returned if that number is 0).
1574 * On failure, NULL is returned.
1575 */
1552object * 1576object *
1553decrease_ob_nr (object *op, uint32 i) 1577object::split (sint32 nr)
1554{ 1578{
1555 object *tmp; 1579 int have = number_of ();
1556 1580
1557 if (i == 0) /* objects with op->nrof require this check */ 1581 if (have < nr)
1558 return op; 1582 return 0;
1559 1583 else if (have == nr)
1560 if (i > op->nrof)
1561 i = op->nrof;
1562
1563 if (QUERY_FLAG (op, FLAG_REMOVED))
1564 op->nrof -= i;
1565 else if (op->env)
1566 { 1584 {
1567 /* is this object in the players inventory, or sub container
1568 * therein?
1569 */
1570 tmp = op->in_player ();
1571 /* nope. Is this a container the player has opened?
1572 * If so, set tmp to that player.
1573 * IMO, searching through all the players will mostly
1574 * likely be quicker than following op->env to the map,
1575 * and then searching the map for a player.
1576 */
1577 if (!tmp)
1578 for_all_players (pl)
1579 if (pl->ob->container == op->env)
1580 {
1581 tmp = pl->ob;
1582 break;
1583 }
1584
1585 if (i < op->nrof)
1586 {
1587 sub_weight (op->env, op->weight * i);
1588 op->nrof -= i;
1589 if (tmp)
1590 esrv_send_item (tmp, op);
1591 }
1592 else
1593 {
1594 op->remove (); 1585 remove ();
1595 op->nrof = 0; 1586 return this;
1596 if (tmp)
1597 esrv_del_item (tmp->contr, op->count);
1598 }
1599 } 1587 }
1600 else 1588 else
1601 { 1589 {
1602 object *above = op->above; 1590 decrease (nr);
1603 1591
1604 if (i < op->nrof) 1592 object *op = deep_clone ();
1605 op->nrof -= i; 1593 op->nrof = nr;
1606 else
1607 {
1608 op->remove ();
1609 op->nrof = 0;
1610 }
1611
1612 /* Since we just removed op, op->above is null */
1613 for (tmp = above; tmp; tmp = tmp->above)
1614 if (tmp->type == PLAYER)
1615 {
1616 if (op->nrof)
1617 esrv_send_item (tmp, op);
1618 else
1619 esrv_del_item (tmp->contr, op->count);
1620 }
1621 }
1622
1623 if (op->nrof)
1624 return op; 1594 return op;
1625 else
1626 {
1627 op->destroy ();
1628 return 0;
1629 }
1630}
1631
1632/*
1633 * add_weight(object, weight) adds the specified weight to an object,
1634 * and also updates how much the environment(s) is/are carrying.
1635 */
1636void
1637add_weight (object *op, signed long weight)
1638{
1639 while (op != NULL)
1640 {
1641 if (op->type == CONTAINER)
1642 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1643
1644 op->carrying += weight;
1645 op = op->env;
1646 } 1595 }
1647} 1596}
1648 1597
1649object * 1598object *
1650insert_ob_in_ob (object *op, object *where) 1599insert_ob_in_ob (object *op, object *where)
1675 * be != op, if items are merged. -Tero 1624 * be != op, if items are merged. -Tero
1676 */ 1625 */
1677object * 1626object *
1678object::insert (object *op) 1627object::insert (object *op)
1679{ 1628{
1680 object *tmp, *otmp;
1681
1682 if (!QUERY_FLAG (op, FLAG_REMOVED))
1683 op->remove ();
1684
1685 if (op->more) 1629 if (op->more)
1686 { 1630 {
1687 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1631 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1688 return op; 1632 return op;
1689 } 1633 }
1690 1634
1691 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1635 op->remove ();
1692 CLEAR_FLAG (op, FLAG_REMOVED); 1636
1637 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1638
1693 if (op->nrof) 1639 if (op->nrof)
1694 {
1695 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1640 for (object *tmp = inv; tmp; tmp = tmp->below)
1696 if (object::can_merge (tmp, op)) 1641 if (object::can_merge (tmp, op))
1697 { 1642 {
1698 /* return the original object and remove inserted object 1643 /* return the original object and remove inserted object
1699 (client needs the original object) */ 1644 (client needs the original object) */
1700 tmp->nrof += op->nrof; 1645 tmp->nrof += op->nrof;
1701 /* Weight handling gets pretty funky. Since we are adding to 1646
1702 * tmp->nrof, we need to increase the weight. 1647 if (object *pl = tmp->visible_to ())
1703 */ 1648 esrv_update_item (UPD_NROF, pl, tmp);
1649
1704 add_weight (this, op->weight * op->nrof); 1650 adjust_weight (this, op->total_weight ());
1705 SET_FLAG (op, FLAG_REMOVED); 1651
1706 op->destroy (); /* free the inserted object */ 1652 op->destroy (1);
1707 op = tmp; 1653 op = tmp;
1708 op->remove (); /* and fix old object's links */ 1654 goto inserted;
1709 CLEAR_FLAG (op, FLAG_REMOVED);
1710 break;
1711 } 1655 }
1712 1656
1713 /* I assume combined objects have no inventory 1657 op->owner = 0; // it's his/hers now. period.
1714 * We add the weight - this object could have just been removed
1715 * (if it was possible to merge). calling remove_ob will subtract
1716 * the weight, so we need to add it in again, since we actually do
1717 * the linking below
1718 */
1719 add_weight (this, op->weight * op->nrof);
1720 }
1721 else
1722 add_weight (this, (op->weight + op->carrying));
1723
1724 otmp = this->in_player ();
1725 if (otmp && otmp->contr)
1726 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1727 otmp->update_stats ();
1728
1729 op->map = 0; 1658 op->map = 0;
1730 op->env = this; 1659 op->x = 0;
1660 op->y = 0;
1661
1731 op->above = 0; 1662 op->above = 0;
1732 op->below = 0; 1663 op->below = inv;
1733 op->x = 0, op->y = 0; 1664 op->env = this;
1734 1665
1666 if (inv)
1667 inv->above = op;
1668
1669 inv = op;
1670
1671 op->flag [FLAG_REMOVED] = 0;
1672
1673 if (object *pl = op->visible_to ())
1674 esrv_send_item (pl, op);
1675
1676 adjust_weight (this, op->total_weight ());
1677
1678inserted:
1735 /* reset the light list and los of the players on the map */ 1679 /* reset the light list and los of the players on the map */
1736 if ((op->glow_radius != 0) && map) 1680 if (op->glow_radius && map && map->darkness)
1737 {
1738#ifdef DEBUG_LIGHTS
1739 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1740#endif /* DEBUG_LIGHTS */
1741 if (map->darkness)
1742 update_all_los (map, x, y); 1681 update_all_los (map, x, y);
1743 }
1744 1682
1745 /* Client has no idea of ordering so lets not bother ordering it here. 1683 // if this is a player's inventory, update stats
1746 * It sure simplifies this function... 1684 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1747 */ 1685 update_stats ();
1748 if (!inv)
1749 inv = op;
1750 else
1751 {
1752 op->below = inv;
1753 op->below->above = op;
1754 inv = op;
1755 }
1756 1686
1757 INVOKE_OBJECT (INSERT, this); 1687 INVOKE_OBJECT (INSERT, this);
1758 1688
1759 return op; 1689 return op;
1760} 1690}
1975 * activate recursively a flag on an object inventory 1905 * activate recursively a flag on an object inventory
1976 */ 1906 */
1977void 1907void
1978flag_inv (object *op, int flag) 1908flag_inv (object *op, int flag)
1979{ 1909{
1980 if (op->inv)
1981 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1910 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1982 { 1911 {
1983 SET_FLAG (tmp, flag); 1912 SET_FLAG (tmp, flag);
1984 flag_inv (tmp, flag); 1913 flag_inv (tmp, flag);
1985 } 1914 }
1986} 1915}
1987 1916
1988/* 1917/*
1989 * deactivate recursively a flag on an object inventory 1918 * deactivate recursively a flag on an object inventory
1990 */ 1919 */
1991void 1920void
1992unflag_inv (object *op, int flag) 1921unflag_inv (object *op, int flag)
1993{ 1922{
1994 if (op->inv)
1995 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1923 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1996 { 1924 {
1997 CLEAR_FLAG (tmp, flag); 1925 CLEAR_FLAG (tmp, flag);
1998 unflag_inv (tmp, flag); 1926 unflag_inv (tmp, flag);
1999 } 1927 }
2000} 1928}
2001 1929
2002/* 1930/*
2003 * find_free_spot(object, map, x, y, start, stop) will search for 1931 * find_free_spot(object, map, x, y, start, stop) will search for
2004 * a spot at the given map and coordinates which will be able to contain 1932 * a spot at the given map and coordinates which will be able to contain
2006 * to search (see the freearr_x/y[] definition). 1934 * to search (see the freearr_x/y[] definition).
2007 * It returns a random choice among the alternatives found. 1935 * It returns a random choice among the alternatives found.
2008 * start and stop are where to start relative to the free_arr array (1,9 1936 * start and stop are where to start relative to the free_arr array (1,9
2009 * does all 4 immediate directions). This returns the index into the 1937 * does all 4 immediate directions). This returns the index into the
2010 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1938 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2011 * Note - this only checks to see if there is space for the head of the
2012 * object - if it is a multispace object, this should be called for all
2013 * pieces.
2014 * Note2: This function does correctly handle tiled maps, but does not 1939 * Note: This function does correctly handle tiled maps, but does not
2015 * inform the caller. However, insert_ob_in_map will update as 1940 * inform the caller. However, insert_ob_in_map will update as
2016 * necessary, so the caller shouldn't need to do any special work. 1941 * necessary, so the caller shouldn't need to do any special work.
2017 * Note - updated to take an object instead of archetype - this is necessary 1942 * Note - updated to take an object instead of archetype - this is necessary
2018 * because arch_blocked (now ob_blocked) needs to know the movement type 1943 * because arch_blocked (now ob_blocked) needs to know the movement type
2019 * to know if the space in question will block the object. We can't use 1944 * to know if the space in question will block the object. We can't use
2021 * customized, changed states, etc. 1946 * customized, changed states, etc.
2022 */ 1947 */
2023int 1948int
2024find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1949find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2025{ 1950{
1951 int altern[SIZEOFFREE];
2026 int index = 0, flag; 1952 int index = 0, flag;
2027 int altern[SIZEOFFREE];
2028 1953
2029 for (int i = start; i < stop; i++) 1954 for (int i = start; i < stop; i++)
2030 { 1955 {
2031 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1956 mapxy pos (m, x, y); pos.move (i);
2032 if (!flag) 1957
1958 if (!pos.normalise ())
1959 continue;
1960
1961 mapspace &ms = *pos;
1962
1963 if (ms.flags () & P_IS_ALIVE)
1964 continue;
1965
1966 /* However, often
1967 * ob doesn't have any move type (when used to place exits)
1968 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1969 */
1970 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1971 {
2033 altern [index++] = i; 1972 altern [index++] = i;
1973 continue;
1974 }
2034 1975
2035 /* Basically, if we find a wall on a space, we cut down the search size. 1976 /* Basically, if we find a wall on a space, we cut down the search size.
2036 * In this way, we won't return spaces that are on another side of a wall. 1977 * In this way, we won't return spaces that are on another side of a wall.
2037 * This mostly work, but it cuts down the search size in all directions - 1978 * This mostly work, but it cuts down the search size in all directions -
2038 * if the space being examined only has a wall to the north and empty 1979 * if the space being examined only has a wall to the north and empty
2039 * spaces in all the other directions, this will reduce the search space 1980 * spaces in all the other directions, this will reduce the search space
2040 * to only the spaces immediately surrounding the target area, and 1981 * to only the spaces immediately surrounding the target area, and
2041 * won't look 2 spaces south of the target space. 1982 * won't look 2 spaces south of the target space.
2042 */ 1983 */
2043 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1984 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1985 {
2044 stop = maxfree[i]; 1986 stop = maxfree[i];
1987 continue;
1988 }
1989
1990 /* Note it is intentional that we check ob - the movement type of the
1991 * head of the object should correspond for the entire object.
1992 */
1993 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1994 continue;
1995
1996 if (ob->blocked (m, pos.x, pos.y))
1997 continue;
1998
1999 altern [index++] = i;
2045 } 2000 }
2046 2001
2047 if (!index) 2002 if (!index)
2048 return -1; 2003 return -1;
2049 2004
2058 */ 2013 */
2059int 2014int
2060find_first_free_spot (const object *ob, maptile *m, int x, int y) 2015find_first_free_spot (const object *ob, maptile *m, int x, int y)
2061{ 2016{
2062 for (int i = 0; i < SIZEOFFREE; i++) 2017 for (int i = 0; i < SIZEOFFREE; i++)
2063 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2018 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2064 return i; 2019 return i;
2065 2020
2066 return -1; 2021 return -1;
2067} 2022}
2068 2023
2345 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2300 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2346 * core dumps if they do. 2301 * core dumps if they do.
2347 * 2302 *
2348 * Add a check so we can't pick up invisible objects (0.93.8) 2303 * Add a check so we can't pick up invisible objects (0.93.8)
2349 */ 2304 */
2350
2351int 2305int
2352can_pick (const object *who, const object *item) 2306can_pick (const object *who, const object *item)
2353{ 2307{
2354 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2308 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2355 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2309 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2358 2312
2359/* 2313/*
2360 * create clone from object to another 2314 * create clone from object to another
2361 */ 2315 */
2362object * 2316object *
2363object_create_clone (object *asrc) 2317object::deep_clone ()
2364{ 2318{
2365 object *dst = 0, *tmp, *src, *prev, *item; 2319 assert (("deep_clone called on non-head object", is_head ()));
2366 2320
2367 if (!asrc) 2321 object *dst = clone ();
2368 return 0;
2369 2322
2370 src = asrc->head_ (); 2323 object *prev = dst;
2371
2372 prev = 0;
2373 for (object *part = src; part; part = part->more) 2324 for (object *part = this->more; part; part = part->more)
2374 { 2325 {
2375 tmp = part->clone (); 2326 object *tmp = part->clone ();
2376 tmp->x -= src->x;
2377 tmp->y -= src->y;
2378
2379 if (!part->head)
2380 {
2381 dst = tmp;
2382 tmp->head = 0;
2383 }
2384 else
2385 tmp->head = dst; 2327 tmp->head = dst;
2386
2387 tmp->more = 0;
2388
2389 if (prev)
2390 prev->more = tmp; 2328 prev->more = tmp;
2391
2392 prev = tmp; 2329 prev = tmp;
2393 } 2330 }
2394 2331
2395 for (item = src->inv; item; item = item->below) 2332 for (object *item = inv; item; item = item->below)
2396 insert_ob_in_ob (object_create_clone (item), dst); 2333 insert_ob_in_ob (item->deep_clone (), dst);
2397 2334
2398 return dst; 2335 return dst;
2399} 2336}
2400 2337
2401/* This returns the first object in who's inventory that 2338/* This returns the first object in who's inventory that
2410 return tmp; 2347 return tmp;
2411 2348
2412 return 0; 2349 return 0;
2413} 2350}
2414 2351
2415/* If ob has a field named key, return the link from the list, 2352const shstr &
2416 * otherwise return NULL. 2353object::kv_get (const shstr &key) const
2417 *
2418 * key must be a passed in shared string - otherwise, this won't
2419 * do the desired thing.
2420 */
2421key_value *
2422get_ob_key_link (const object *ob, const char *key)
2423{ 2354{
2424 for (key_value *link = ob->key_values; link; link = link->next) 2355 for (key_value *kv = key_values; kv; kv = kv->next)
2425 if (link->key == key) 2356 if (kv->key == key)
2426 return link;
2427
2428 return 0;
2429}
2430
2431/*
2432 * Returns the value of op has an extra_field for key, or NULL.
2433 *
2434 * The argument doesn't need to be a shared string.
2435 *
2436 * The returned string is shared.
2437 */
2438const char *
2439get_ob_key_value (const object *op, const char *const key)
2440{
2441 key_value *link;
2442 shstr_cmp canonical_key (key);
2443
2444 if (!canonical_key)
2445 {
2446 /* 1. There being a field named key on any object
2447 * implies there'd be a shared string to find.
2448 * 2. Since there isn't, no object has this field.
2449 * 3. Therefore, *this* object doesn't have this field.
2450 */
2451 return 0;
2452 }
2453
2454 /* This is copied from get_ob_key_link() above -
2455 * only 4 lines, and saves the function call overhead.
2456 */
2457 for (link = op->key_values; link; link = link->next)
2458 if (link->key == canonical_key)
2459 return link->value; 2357 return kv->value;
2460 2358
2461 return 0; 2359 return shstr_null;
2462} 2360}
2463 2361
2464/* 2362void
2465 * Updates the canonical_key in op to value. 2363object::kv_set (const shstr &key, const shstr &value)
2466 *
2467 * canonical_key is a shared string (value doesn't have to be).
2468 *
2469 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2470 * keys.
2471 *
2472 * Returns TRUE on success.
2473 */
2474int
2475set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2476{ 2364{
2477 key_value *field = NULL, *last = NULL; 2365 for (key_value *kv = key_values; kv; kv = kv->next)
2478 2366 if (kv->key == key)
2479 for (field = op->key_values; field != NULL; field = field->next)
2480 {
2481 if (field->key != canonical_key)
2482 { 2367 {
2483 last = field; 2368 kv->value = value;
2484 continue; 2369 return;
2485 } 2370 }
2486 2371
2487 if (value) 2372 key_value *kv = new key_value;
2488 field->value = value; 2373
2489 else 2374 kv->next = key_values;
2375 kv->key = key;
2376 kv->value = value;
2377
2378 key_values = kv;
2379}
2380
2381void
2382object::kv_del (const shstr &key)
2383{
2384 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2385 if ((*kvp)->key == key)
2490 { 2386 {
2491 /* Basically, if the archetype has this key set, 2387 key_value *kv = *kvp;
2492 * we need to store the null value so when we save 2388 *kvp = (*kvp)->next;
2493 * it, we save the empty value so that when we load, 2389 delete kv;
2494 * we get this value back again. 2390 return;
2495 */
2496 if (get_ob_key_link (op->arch, canonical_key))
2497 field->value = 0;
2498 else
2499 {
2500 if (last)
2501 last->next = field->next;
2502 else
2503 op->key_values = field->next;
2504
2505 delete field;
2506 }
2507 } 2391 }
2508 return TRUE;
2509 }
2510 /* IF we get here, key doesn't exist */
2511
2512 /* No field, we'll have to add it. */
2513
2514 if (!add_key)
2515 return FALSE;
2516
2517 /* There isn't any good reason to store a null
2518 * value in the key/value list. If the archetype has
2519 * this key, then we should also have it, so shouldn't
2520 * be here. If user wants to store empty strings,
2521 * should pass in ""
2522 */
2523 if (value == NULL)
2524 return TRUE;
2525
2526 field = new key_value;
2527
2528 field->key = canonical_key;
2529 field->value = value;
2530 /* Usual prepend-addition. */
2531 field->next = op->key_values;
2532 op->key_values = field;
2533
2534 return TRUE;
2535}
2536
2537/*
2538 * Updates the key in op to value.
2539 *
2540 * If add_key is FALSE, this will only update existing keys,
2541 * and not add new ones.
2542 * In general, should be little reason FALSE is ever passed in for add_key
2543 *
2544 * Returns TRUE on success.
2545 */
2546int
2547set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2548{
2549 shstr key_ (key);
2550
2551 return set_ob_key_value_s (op, key_, value, add_key);
2552} 2392}
2553 2393
2554object::depth_iterator::depth_iterator (object *container) 2394object::depth_iterator::depth_iterator (object *container)
2555: iterator_base (container) 2395: iterator_base (container)
2556{ 2396{
2606{ 2446{
2607 char flagdesc[512]; 2447 char flagdesc[512];
2608 char info2[256 * 4]; 2448 char info2[256 * 4];
2609 char *p = info; 2449 char *p = info;
2610 2450
2611 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2451 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2612 count, uuid.seq, 2452 count,
2453 uuid.c_str (),
2613 &name, 2454 &name,
2614 title ? "\",title:\"" : "", 2455 title ? "\",title:\"" : "",
2615 title ? (const char *)title : "", 2456 title ? (const char *)title : "",
2616 flag_desc (flagdesc, 512), type); 2457 flag_desc (flagdesc, 512), type);
2617 2458
2618 if (env) 2459 if (!flag[FLAG_REMOVED] && env)
2619 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2460 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2620 2461
2621 if (map) 2462 if (map)
2622 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2463 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2623 2464
2653object::open_container (object *new_container) 2494object::open_container (object *new_container)
2654{ 2495{
2655 if (container == new_container) 2496 if (container == new_container)
2656 return; 2497 return;
2657 2498
2658 if (object *old_container = container) 2499 object *old_container = container;
2500
2501 if (old_container)
2659 { 2502 {
2660 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2503 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2661 return; 2504 return;
2662 2505
2663#if 0 2506#if 0
2665 if (object *closer = old_container->inv) 2508 if (object *closer = old_container->inv)
2666 if (closer->type == CLOSE_CON) 2509 if (closer->type == CLOSE_CON)
2667 closer->destroy (); 2510 closer->destroy ();
2668#endif 2511#endif
2669 2512
2513 // make sure the container is available
2514 esrv_send_item (this, old_container);
2515
2670 old_container->flag [FLAG_APPLIED] = 0; 2516 old_container->flag [FLAG_APPLIED] = false;
2671 container = 0; 2517 container = 0;
2672 2518
2519 // client needs item update to make it work, client bug requires this to be separate
2673 esrv_update_item (UPD_FLAGS, this, old_container); 2520 esrv_update_item (UPD_FLAGS, this, old_container);
2521
2674 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2522 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2523 play_sound (sound_find ("chest_close"));
2675 } 2524 }
2676 2525
2677 if (new_container) 2526 if (new_container)
2678 { 2527 {
2679 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2528 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2690 } 2539 }
2691#endif 2540#endif
2692 2541
2693 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2542 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2694 2543
2544 // make sure the container is available, client bug requires this to be separate
2545 esrv_send_item (this, new_container);
2546
2695 new_container->flag [FLAG_APPLIED] = 1; 2547 new_container->flag [FLAG_APPLIED] = true;
2696 container = new_container; 2548 container = new_container;
2697 2549
2550 // client needs flag change
2698 esrv_update_item (UPD_FLAGS, this, new_container); 2551 esrv_update_item (UPD_FLAGS, this, new_container);
2699 esrv_send_inventory (this, new_container); 2552 esrv_send_inventory (this, new_container);
2553 play_sound (sound_find ("chest_open"));
2700 } 2554 }
2555// else if (!old_container->env && contr && contr->ns)
2556// contr->ns->floorbox_reset ();
2701} 2557}
2702 2558
2703object * 2559object *
2704object::force_find (const shstr name) 2560object::force_find (const shstr name)
2705{ 2561{
2730 force->flag [FLAG_APPLIED] = true; 2586 force->flag [FLAG_APPLIED] = true;
2731 2587
2732 insert (force); 2588 insert (force);
2733} 2589}
2734 2590
2591void
2592object::play_sound (faceidx sound)
2593{
2594 if (!sound)
2595 return;
2596
2597 if (flag [FLAG_REMOVED])
2598 return;
2599
2600 if (env)
2601 {
2602 if (object *pl = in_player ())
2603 pl->contr->play_sound (sound);
2604 }
2605 else
2606 map->play_sound (sound, x, y);
2607}
2608

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines