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.175 by root, Fri Aug 10 01:47:52 2007 UTC vs.
Revision 1.240 by root, Wed May 7 13:40:30 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_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; 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 407
334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 408 sum += op->total_weight ();
409 }
410
411 sum = weight_adjust_for (this, sum);
412
413 if (sum != carrying)
335 } 414 {
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; 415 carrying = sum;
342 416
343 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 }
344} 421}
345 422
346/** 423/*
347 * Return the outermost environment object for a given object. 424 * 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 */ 425 */
363char * 426char *
364dump_object (object *op) 427dump_object (object *op)
365{ 428{
366 if (!op) 429 if (!op)
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;
452} 512}
453 513
454int 514int
532 } 592 }
533 593
534 op->key_values = 0; 594 op->key_values = 0;
535} 595}
536 596
537object & 597/*
538object::operator =(const object &src) 598 * copy_to first frees everything allocated by the dst object,
599 * and then copies the contents of itself into the second
600 * object, allocating what needs to be allocated. Basically, any
601 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
602 * if the first object is freed, the pointers in the new object
603 * will point at garbage.
604 */
605void
606object::copy_to (object *dst)
539{ 607{
540 bool is_freed = flag [FLAG_FREED]; 608 dst->remove ();
541 bool is_removed = flag [FLAG_REMOVED];
542
543 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
544
545 flag [FLAG_FREED] = is_freed;
546 flag [FLAG_REMOVED] = is_removed; 610 dst->flag [FLAG_REMOVED] = true;
547 611
548 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
549 if (src.key_values) 613 if (key_values)
550 { 614 {
551 key_value *tail = 0; 615 key_value *tail = 0;
552 key_values = 0; 616 dst->key_values = 0;
553 617
554 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
555 { 619 {
556 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
557 621
558 new_link->next = 0; 622 new_link->next = 0;
559 new_link->key = i->key; 623 new_link->key = i->key;
560 new_link->value = i->value; 624 new_link->value = i->value;
561 625
562 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
563 if (!key_values) 627 if (!dst->key_values)
564 { 628 {
565 key_values = new_link; 629 dst->key_values = new_link;
566 tail = new_link; 630 tail = new_link;
567 } 631 }
568 else 632 else
569 { 633 {
570 tail->next = new_link; 634 tail->next = new_link;
571 tail = new_link; 635 tail = new_link;
572 } 636 }
573 } 637 }
574 } 638 }
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 639
590 if (speed < 0) 640 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 641 dst->speed_left -= rndm ();
592 642
593 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
594} 644}
595 645
596void 646void
597object::instantiate () 647object::instantiate ()
598{ 648{
599 if (!uuid.seq) // HACK 649 if (!uuid.seq) // HACK
600 uuid = gen_uuid (); 650 uuid = UUID::gen ();
601 651
602 speed_left = -0.1f; 652 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really 653 /* 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. 654 * 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 655 * by doing so, when a monster is created, it has good starting
615object * 665object *
616object::clone () 666object::clone ()
617{ 667{
618 object *neu = create (); 668 object *neu = create ();
619 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
620 return neu; 671 return neu;
621} 672}
622 673
623/* 674/*
624 * 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
675 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
676 */ 727 */
677void 728void
678update_object (object *op, int action) 729update_object (object *op, int action)
679{ 730{
680 if (op == NULL) 731 if (!op)
681 { 732 {
682 /* this should never happen */ 733 /* this should never happen */
683 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
684 return; 735 return;
685 } 736 }
686 737
687 if (op->env) 738 if (!op->is_on_map ())
688 { 739 {
689 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
690 * to do in this case. 741 * to do in this case.
691 */ 742 */
692 return; 743 return;
693 } 744 }
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 745
701 /* make sure the object is within map boundaries */ 746 /* 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) 747 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
703 { 748 {
704 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
764static int object_count; 809static int object_count;
765 810
766void object::link () 811void object::link ()
767{ 812{
768 assert (!index);//D 813 assert (!index);//D
769 uuid = gen_uuid (); 814 uuid = UUID::gen ();
770 count = ++object_count; 815 count = ++object_count;
771 816
772 refcnt_inc (); 817 refcnt_inc ();
773 objects.insert (this); 818 objects.insert (this);
774} 819}
847object::destroy_inv (bool drop_to_ground) 892object::destroy_inv (bool drop_to_ground)
848{ 893{
849 // need to check first, because the checks below might segfault 894 // need to check first, because the checks below might segfault
850 // as we might be on an invalid mapspace and crossfire code 895 // as we might be on an invalid mapspace and crossfire code
851 // is too buggy to ensure that the inventory is empty. 896 // is too buggy to ensure that the inventory is empty.
852 // corollary: if you create arrows etc. with stuff in tis inventory, 897 // corollary: if you create arrows etc. with stuff in its inventory,
853 // cf will crash below with off-map x and y 898 // cf will crash below with off-map x and y
854 if (!inv) 899 if (!inv)
855 return; 900 return;
856 901
857 /* Only if the space blocks everything do we not process - 902 /* Only if the space blocks everything do we not process -
858 * if some form of movement is allowed, let objects 903 * if some form of movement is allowed, let objects
859 * drop on that space. 904 * drop on that space.
860 */ 905 */
861 if (!drop_to_ground 906 if (!drop_to_ground
862 || !map 907 || !map
863 || map->in_memory != MAP_IN_MEMORY 908 || map->in_memory != MAP_ACTIVE
864 || map->nodrop 909 || map->no_drop
865 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
866 { 911 {
867 while (inv) 912 while (inv)
868 { 913 {
869 inv->destroy_inv (drop_to_ground); 914 inv->destroy_inv (false);
870 inv->destroy (); 915 inv->destroy ();
871 } 916 }
872 } 917 }
873 else 918 else
874 { /* Put objects in inventory onto this space */ 919 { /* Put objects in inventory onto this space */
880 || op->flag [FLAG_NO_DROP] 925 || op->flag [FLAG_NO_DROP]
881 || op->type == RUNE 926 || op->type == RUNE
882 || op->type == TRAP 927 || op->type == TRAP
883 || op->flag [FLAG_IS_A_TEMPLATE] 928 || op->flag [FLAG_IS_A_TEMPLATE]
884 || op->flag [FLAG_DESTROY_ON_DEATH]) 929 || op->flag [FLAG_DESTROY_ON_DEATH])
885 op->destroy (); 930 op->destroy (true);
886 else 931 else
887 map->insert (op, x, y); 932 map->insert (op, x, y);
888 } 933 }
889 } 934 }
890} 935}
894 object *op = new object; 939 object *op = new object;
895 op->link (); 940 op->link ();
896 return op; 941 return op;
897} 942}
898 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 no_drop = 1;
953 no_reset = 1;
954
955 alloc ();
956 in_memory = MAP_ACTIVE;
957 }
958
959 ~freed_map ()
960 {
961 destroy ();
962 }
963} freed_map; // freed objects are moved here to avoid crashes
964
899void 965void
900object::do_destroy () 966object::do_destroy ()
901{ 967{
902 attachable::do_destroy ();
903
904 if (flag [FLAG_IS_LINKED]) 968 if (flag [FLAG_IS_LINKED])
905 remove_button_link (this); 969 remove_button_link (this);
906 970
907 if (flag [FLAG_FRIENDLY]) 971 if (flag [FLAG_FRIENDLY])
908 remove_friendly_object (this); 972 remove_friendly_object (this);
909 973
910 if (!flag [FLAG_REMOVED])
911 remove (); 974 remove ();
912 975
913 destroy_inv (true); 976 attachable::do_destroy ();
914 977
915 deactivate (); 978 deactivate ();
916 unlink (); 979 unlink ();
917 980
918 flag [FLAG_FREED] = 1; 981 flag [FLAG_FREED] = 1;
919 982
920 // hack to ensure that freed objects still have a valid map 983 // 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; 984 map = &freed_map;
937 x = 1; 985 x = 1;
938 y = 1; 986 y = 1;
939 }
940 987
941 if (more) 988 if (more)
942 { 989 {
943 more->destroy (); 990 more->destroy ();
944 more = 0; 991 more = 0;
957object::destroy (bool destroy_inventory) 1004object::destroy (bool destroy_inventory)
958{ 1005{
959 if (destroyed ()) 1006 if (destroyed ())
960 return; 1007 return;
961 1008
1009 if (!is_head () && !head->destroyed ())
1010 {
1011 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1012 head->destroy (destroy_inventory);
1013 return;
1014 }
1015
962 if (destroy_inventory) 1016 destroy_inv (!destroy_inventory);
963 destroy_inv (false);
964 1017
965 if (is_head ()) 1018 if (is_head ())
966 if (sound_destroy) 1019 if (sound_destroy)
967 play_sound (sound_destroy); 1020 play_sound (sound_destroy);
968 else if (flag [FLAG_MONSTER]) 1021 else if (flag [FLAG_MONSTER])
969 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 1022 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
970 1023
971 attachable::destroy (); 1024 attachable::destroy ();
972}
973
974/*
975 * sub_weight() recursively (outwards) subtracts a number from the
976 * weight of an object (and what is carried by it's environment(s)).
977 */
978void
979sub_weight (object *op, signed long weight)
980{
981 while (op != NULL)
982 {
983 if (op->type == CONTAINER)
984 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
985
986 op->carrying -= weight;
987 op = op->env;
988 }
989} 1025}
990 1026
991/* op->remove (): 1027/* op->remove ():
992 * This function removes the object op from the linked list of objects 1028 * This function removes the object op from the linked list of objects
993 * which it is currently tied to. When this function is done, the 1029 * which it is currently tied to. When this function is done, the
999object::do_remove () 1035object::do_remove ()
1000{ 1036{
1001 object *tmp, *last = 0; 1037 object *tmp, *last = 0;
1002 object *otmp; 1038 object *otmp;
1003 1039
1004 if (QUERY_FLAG (this, FLAG_REMOVED)) 1040 if (flag [FLAG_REMOVED])
1005 return; 1041 return;
1006 1042
1007 SET_FLAG (this, FLAG_REMOVED);
1008 INVOKE_OBJECT (REMOVE, this); 1043 INVOKE_OBJECT (REMOVE, this);
1044
1045 flag [FLAG_REMOVED] = true;
1009 1046
1010 if (more) 1047 if (more)
1011 more->remove (); 1048 more->remove ();
1012 1049
1013 /* 1050 /*
1014 * In this case, the object to be removed is in someones 1051 * In this case, the object to be removed is in someones
1015 * inventory. 1052 * inventory.
1016 */ 1053 */
1017 if (env) 1054 if (env)
1018 { 1055 {
1019 if (nrof) 1056 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1020 sub_weight (env, weight * nrof); 1057 if (object *pl = visible_to ())
1021 else 1058 esrv_del_item (pl->contr, count);
1022 sub_weight (env, weight + carrying); 1059 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1060
1061 adjust_weight (env, -total_weight ());
1062
1063 /* we set up values so that it could be inserted into
1064 * the map, but we don't actually do that - it is up
1065 * to the caller to decide what we want to do.
1066 */
1067 map = env->map;
1068 x = env->x;
1069 y = env->y;
1070
1071 // make sure cmov optimisation is applicable
1072 *(above ? &above->below : &env->inv) = below;
1073 *(below ? &below->above : &above ) = above; // &above is just a dummy
1074
1075 above = 0;
1076 below = 0;
1077 env = 0;
1023 1078
1024 /* NO_FIX_PLAYER is set when a great many changes are being 1079 /* NO_FIX_PLAYER is set when a great many changes are being
1025 * made to players inventory. If set, avoiding the call 1080 * made to players inventory. If set, avoiding the call
1026 * to save cpu time. 1081 * to save cpu time.
1027 */ 1082 */
1028 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1083 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1029 otmp->update_stats (); 1084 otmp->update_stats ();
1030
1031 if (above)
1032 above->below = below;
1033 else
1034 env->inv = below;
1035
1036 if (below)
1037 below->above = above;
1038
1039 /* we set up values so that it could be inserted into
1040 * the map, but we don't actually do that - it is up
1041 * to the caller to decide what we want to do.
1042 */
1043 x = env->x, y = env->y;
1044 map = env->map;
1045 above = 0, below = 0;
1046 env = 0;
1047 } 1085 }
1048 else if (map) 1086 else if (map)
1049 { 1087 {
1050 if (type == PLAYER)
1051 {
1052 // leaving a spot always closes any open container on the ground
1053 if (container && !container->env)
1054 // this causes spurious floorbox updates, but it ensures
1055 // that the CLOSE event is being sent.
1056 close_container ();
1057
1058 --map->players;
1059 map->touch ();
1060 }
1061
1062 map->dirty = true; 1088 map->dirty = true;
1063 mapspace &ms = this->ms (); 1089 mapspace &ms = this->ms ();
1064 1090
1091 if (object *pl = ms.player ())
1092 {
1093 if (type == PLAYER) // this == pl(!)
1094 {
1095 // leaving a spot always closes any open container on the ground
1096 if (container && !container->env)
1097 // this causes spurious floorbox updates, but it ensures
1098 // that the CLOSE event is being sent.
1099 close_container ();
1100
1101 --map->players;
1102 map->touch ();
1103 }
1104 else if (pl->container == this)
1105 {
1106 // removing a container should close it
1107 close_container ();
1108 }
1109
1110 esrv_del_item (pl->contr, count);
1111 }
1112
1065 /* link the object above us */ 1113 /* link the object above us */
1066 if (above) 1114 // re-link, make sure compiler can easily use cmove
1067 above->below = below; 1115 *(above ? &above->below : &ms.top) = below;
1068 else 1116 *(below ? &below->above : &ms.bot) = above;
1069 ms.top = below; /* we were top, set new top */
1070
1071 /* Relink the object below us, if there is one */
1072 if (below)
1073 below->above = above;
1074 else
1075 {
1076 /* Nothing below, which means we need to relink map object for this space
1077 * use translated coordinates in case some oddness with map tiling is
1078 * evident
1079 */
1080 if (GET_MAP_OB (map, x, y) != this)
1081 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 ());
1082
1083 ms.bot = above; /* goes on above it. */
1084 }
1085 1117
1086 above = 0; 1118 above = 0;
1087 below = 0; 1119 below = 0;
1088 1120
1089 if (map->in_memory == MAP_SAVING) 1121 if (map->in_memory == MAP_SAVING)
1098 * removed (most likely destroyed), update the player view 1130 * removed (most likely destroyed), update the player view
1099 * appropriately. 1131 * appropriately.
1100 */ 1132 */
1101 pl->close_container (); 1133 pl->close_container ();
1102 1134
1135 //TODO: the floorbox prev/next might need updating
1136 //esrv_del_item (pl->contr, count);
1137 //TODO: update floorbox to preserve ordering
1138 if (pl->contr->ns)
1103 pl->contr->ns->floorbox_update (); 1139 pl->contr->ns->floorbox_update ();
1104 } 1140 }
1105 1141
1106 for (tmp = ms.bot; tmp; tmp = tmp->above) 1142 for (tmp = ms.bot; tmp; tmp = tmp->above)
1107 { 1143 {
1108 /* No point updating the players look faces if he is the object 1144 /* No point updating the players look faces if he is the object
1147merge_ob (object *op, object *top) 1183merge_ob (object *op, object *top)
1148{ 1184{
1149 if (!op->nrof) 1185 if (!op->nrof)
1150 return 0; 1186 return 0;
1151 1187
1152 if (top) 1188 if (!top)
1153 for (top = op; top && top->above; top = top->above) 1189 for (top = op; top && top->above; top = top->above)
1154 ; 1190 ;
1155 1191
1156 for (; top; top = top->below) 1192 for (; top; top = top->below)
1157 {
1158 if (top == op)
1159 continue;
1160
1161 if (object::can_merge (op, top)) 1193 if (object::can_merge (op, top))
1162 { 1194 {
1163 top->nrof += op->nrof; 1195 top->nrof += op->nrof;
1164 1196
1165/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1197 if (object *pl = top->visible_to ())
1166 op->weight = 0; /* Don't want any adjustements now */ 1198 esrv_update_item (UPD_NROF, pl, top);
1199
1200 op->weight = 0; // cancel the addition above
1201 op->carrying = 0; // must be 0 already
1202
1167 op->destroy (); 1203 op->destroy (1);
1204
1168 return top; 1205 return top;
1169 } 1206 }
1170 }
1171 1207
1172 return 0; 1208 return 0;
1173} 1209}
1174 1210
1175void 1211void
1232 * just 'op' otherwise 1268 * just 'op' otherwise
1233 */ 1269 */
1234object * 1270object *
1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236{ 1272{
1237 assert (!op->flag [FLAG_FREED]);
1238
1239 object *top, *floor = NULL;
1240
1241 op->remove (); 1273 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 1274
1270 /* Ideally, the caller figures this out. However, it complicates a lot 1275 /* 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 1276 * of areas of callers (eg, anything that uses find_free_spot would now
1272 * need extra work 1277 * need extra work
1273 */ 1278 */
1274 if (!xy_normalise (m, op->x, op->y)) 1279 if (!xy_normalise (m, op->x, op->y))
1280 {
1281 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1275 return 0; 1282 return 0;
1283 }
1284
1285 if (object *more = op->more)
1286 if (!insert_ob_in_map (more, m, originator, flag))
1287 return 0;
1288
1289 CLEAR_FLAG (op, FLAG_REMOVED);
1276 1290
1277 op->map = m; 1291 op->map = m;
1278 mapspace &ms = op->ms (); 1292 mapspace &ms = op->ms ();
1279 1293
1280 /* this has to be done after we translate the coordinates. 1294 /* this has to be done after we translate the coordinates.
1281 */ 1295 */
1282 if (op->nrof && !(flag & INS_NO_MERGE)) 1296 if (op->nrof && !(flag & INS_NO_MERGE))
1283 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1284 if (object::can_merge (op, tmp)) 1298 if (object::can_merge (op, tmp))
1285 { 1299 {
1300 // TODO: we actually want to update tmp, not op,
1301 // but some caller surely breaks when we return tmp
1302 // from here :/
1286 op->nrof += tmp->nrof; 1303 op->nrof += tmp->nrof;
1287 tmp->destroy (); 1304 tmp->destroy (1);
1288 } 1305 }
1289 1306
1290 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1307 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1291 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1308 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1292 1309
1293 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1310 if (!QUERY_FLAG (op, FLAG_ALIVE))
1294 CLEAR_FLAG (op, FLAG_NO_STEAL); 1311 CLEAR_FLAG (op, FLAG_NO_STEAL);
1295 1312
1296 if (flag & INS_BELOW_ORIGINATOR) 1313 if (flag & INS_BELOW_ORIGINATOR)
1297 { 1314 {
1298 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1315 if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ())
1299 { 1316 {
1300 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1317 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1301 abort (); 1318 abort ();
1302 } 1319 }
1303 1320
1304 op->above = originator; 1321 op->above = originator;
1305 op->below = originator->below; 1322 op->below = originator->below;
1306
1307 if (op->below)
1308 op->below->above = op;
1309 else
1310 ms.bot = op;
1311
1312 /* since *below* originator, no need to update top */
1313 originator->below = op; 1323 originator->below = op;
1324
1325 *(op->below ? &op->below->above : &ms.bot) = op;
1314 } 1326 }
1315 else 1327 else
1316 { 1328 {
1317 top = ms.bot; 1329 object *floor = 0;
1330 object *top = ms.top;
1318 1331
1319 /* If there are other objects, then */ 1332 /* If there are other objects, then */
1320 if ((!(flag & INS_MAP_LOAD)) && top) 1333 if (top)
1321 { 1334 {
1322 object *last = 0;
1323
1324 /* 1335 /*
1325 * If there are multiple objects on this space, we do some trickier handling. 1336 * If there are multiple objects on this space, we do some trickier handling.
1326 * We've already dealt with merging if appropriate. 1337 * We've already dealt with merging if appropriate.
1327 * Generally, we want to put the new object on top. But if 1338 * Generally, we want to put the new object on top. But if
1328 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1339 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1331 * once we get to them. This reduces the need to traverse over all of 1342 * once we get to them. This reduces the need to traverse over all of
1332 * them when adding another one - this saves quite a bit of cpu time 1343 * them when adding another one - this saves quite a bit of cpu time
1333 * when lots of spells are cast in one area. Currently, it is presumed 1344 * when lots of spells are cast in one area. Currently, it is presumed
1334 * that flying non pickable objects are spell objects. 1345 * that flying non pickable objects are spell objects.
1335 */ 1346 */
1336 for (top = ms.bot; top; top = top->above) 1347 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1337 { 1348 {
1338 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1349 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1339 floor = top; 1350 floor = tmp;
1340 1351
1341 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1352 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1342 { 1353 {
1343 /* We insert above top, so we want this object below this */ 1354 /* We insert above top, so we want this object below this */
1344 top = top->below; 1355 top = tmp->below;
1345 break; 1356 break;
1346 } 1357 }
1347 1358
1348 last = top; 1359 top = tmp;
1349 } 1360 }
1350
1351 /* Don't want top to be NULL, so set it to the last valid object */
1352 top = last;
1353 1361
1354 /* We let update_position deal with figuring out what the space 1362 /* We let update_position deal with figuring out what the space
1355 * looks like instead of lots of conditions here. 1363 * looks like instead of lots of conditions here.
1356 * makes things faster, and effectively the same result. 1364 * makes things faster, and effectively the same result.
1357 */ 1365 */
1364 */ 1372 */
1365 if (!(flag & INS_ON_TOP) 1373 if (!(flag & INS_ON_TOP)
1366 && ms.flags () & P_BLOCKSVIEW 1374 && ms.flags () & P_BLOCKSVIEW
1367 && (op->face && !faces [op->face].visibility)) 1375 && (op->face && !faces [op->face].visibility))
1368 { 1376 {
1377 object *last;
1378
1369 for (last = top; last != floor; last = last->below) 1379 for (last = top; last != floor; last = last->below)
1370 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1380 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1371 break; 1381 break;
1372 1382
1373 /* Check to see if we found the object that blocks view, 1383 /* Check to see if we found the object that blocks view,
1377 */ 1387 */
1378 if (last && last->below && last != floor) 1388 if (last && last->below && last != floor)
1379 top = last->below; 1389 top = last->below;
1380 } 1390 }
1381 } /* If objects on this space */ 1391 } /* If objects on this space */
1382 if (flag & INS_MAP_LOAD)
1383 top = ms.top;
1384 1392
1385 if (flag & INS_ABOVE_FLOOR_ONLY) 1393 if (flag & INS_ABOVE_FLOOR_ONLY)
1386 top = floor; 1394 top = floor;
1387 1395
1388 /* Top is the object that our object (op) is going to get inserted above. 1396 // insert object above top, or bottom-most if top = 0
1389 */
1390
1391 /* First object on this space */
1392 if (!top) 1397 if (!top)
1393 { 1398 {
1399 op->below = 0;
1394 op->above = ms.bot; 1400 op->above = ms.bot;
1395
1396 if (op->above)
1397 op->above->below = op;
1398
1399 op->below = 0;
1400 ms.bot = op; 1401 ms.bot = op;
1402
1403 *(op->above ? &op->above->below : &ms.top) = op;
1401 } 1404 }
1402 else 1405 else
1403 { /* get inserted into the stack above top */ 1406 {
1404 op->above = top->above; 1407 op->above = top->above;
1405
1406 if (op->above)
1407 op->above->below = op; 1408 top->above = op;
1408 1409
1409 op->below = top; 1410 op->below = top;
1410 top->above = op; 1411 *(op->above ? &op->above->below : &ms.top) = op;
1411 } 1412 }
1412 1413 }
1413 if (!op->above)
1414 ms.top = op;
1415 } /* else not INS_BELOW_ORIGINATOR */
1416 1414
1417 if (op->type == PLAYER) 1415 if (op->type == PLAYER)
1418 { 1416 {
1419 op->contr->do_los = 1; 1417 op->contr->do_los = 1;
1420 ++op->map->players; 1418 ++op->map->players;
1421 op->map->touch (); 1419 op->map->touch ();
1422 } 1420 }
1423 1421
1424 op->map->dirty = true; 1422 op->map->dirty = true;
1425 1423
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 ()) 1424 if (object *pl = ms.player ())
1425 //TODO: the floorbox prev/next might need updating
1426 //esrv_send_item (pl, op);
1427 //TODO: update floorbox to preserve ordering
1428 if (pl->contr->ns)
1431 pl->contr->ns->floorbox_update (); 1429 pl->contr->ns->floorbox_update ();
1432 1430
1433 /* If this object glows, it may affect lighting conditions that are 1431 /* If this object glows, it may affect lighting conditions that are
1434 * visible to others on this map. But update_all_los is really 1432 * visible to others on this map. But update_all_los is really
1435 * an inefficient way to do this, as it means los for all players 1433 * an inefficient way to do this, as it means los for all players
1478 * op is the object to insert it under: supplies x and the map. 1476 * op is the object to insert it under: supplies x and the map.
1479 */ 1477 */
1480void 1478void
1481replace_insert_ob_in_map (const char *arch_string, object *op) 1479replace_insert_ob_in_map (const char *arch_string, object *op)
1482{ 1480{
1483 object *tmp, *tmp1;
1484
1485 /* first search for itself and remove any old instances */ 1481 /* first search for itself and remove any old instances */
1486 1482
1487 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1483 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1484 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1489 tmp->destroy (); 1485 tmp->destroy (1);
1490 1486
1491 tmp1 = arch_to_object (archetype::find (arch_string)); 1487 object *tmp = arch_to_object (archetype::find (arch_string));
1492 1488
1493 tmp1->x = op->x; 1489 tmp->x = op->x;
1494 tmp1->y = op->y; 1490 tmp->y = op->y;
1491
1495 insert_ob_in_map (tmp1, op->map, op, 0); 1492 insert_ob_in_map (tmp, op->map, op, 0);
1496} 1493}
1497 1494
1498object * 1495object *
1499object::insert_at (object *where, object *originator, int flags) 1496object::insert_at (object *where, object *originator, int flags)
1500{ 1497{
1498 if (where->env)
1499 return where->env->insert (this);
1500 else
1501 return where->map->insert (this, where->x, where->y, originator, flags); 1501 return where->map->insert (this, where->x, where->y, originator, flags);
1502} 1502}
1503 1503
1504/* 1504/*
1505 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1506 * is returned contains nr objects, and the remaining parts contains
1507 * the rest (or is removed and freed if that number is 0).
1508 * On failure, NULL is returned, and the reason put into the
1509 * global static errmsg array.
1510 */
1511object *
1512get_split_ob (object *orig_ob, uint32 nr)
1513{
1514 object *newob;
1515 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1516
1517 if (orig_ob->nrof < nr)
1518 {
1519 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1520 return NULL;
1521 }
1522
1523 newob = object_create_clone (orig_ob);
1524
1525 if ((orig_ob->nrof -= nr) < 1)
1526 orig_ob->destroy (1);
1527 else if (!is_removed)
1528 {
1529 if (orig_ob->env != NULL)
1530 sub_weight (orig_ob->env, orig_ob->weight * nr);
1531 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1532 {
1533 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1534 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1535 return NULL;
1536 }
1537 }
1538
1539 newob->nrof = nr;
1540
1541 return newob;
1542}
1543
1544/*
1545 * decrease_ob_nr(object, number) decreases a specified number from 1505 * decrease(object, number) decreases a specified number from
1546 * the amount of an object. If the amount reaches 0, the object 1506 * the amount of an object. If the amount reaches 0, the object
1547 * is subsequently removed and freed. 1507 * is subsequently removed and freed.
1548 * 1508 *
1549 * Return value: 'op' if something is left, NULL if the amount reached 0 1509 * Return value: 'op' if something is left, NULL if the amount reached 0
1550 */ 1510 */
1511bool
1512object::decrease (sint32 nr)
1513{
1514 if (!nr)
1515 return true;
1516
1517 nr = min (nr, nrof);
1518
1519 nrof -= nr;
1520
1521 if (nrof)
1522 {
1523 adjust_weight (env, -weight * nr); // carrying == 0
1524
1525 if (object *pl = visible_to ())
1526 esrv_update_item (UPD_NROF, pl, this);
1527
1528 return true;
1529 }
1530 else
1531 {
1532 destroy (1);
1533 return false;
1534 }
1535}
1536
1537/*
1538 * split(ob,nr) splits up ob into two parts. The part which
1539 * is returned contains nr objects, and the remaining parts contains
1540 * the rest (or is removed and returned if that number is 0).
1541 * On failure, NULL is returned.
1542 */
1551object * 1543object *
1552decrease_ob_nr (object *op, uint32 i) 1544object::split (sint32 nr)
1553{ 1545{
1554 object *tmp; 1546 int have = number_of ();
1555 1547
1556 if (i == 0) /* objects with op->nrof require this check */ 1548 if (have < nr)
1557 return op; 1549 return 0;
1558 1550 else if (have == nr)
1559 if (i > op->nrof)
1560 i = op->nrof;
1561
1562 if (QUERY_FLAG (op, FLAG_REMOVED))
1563 op->nrof -= i;
1564 else if (op->env)
1565 { 1551 {
1566 /* is this object in the players inventory, or sub container
1567 * therein?
1568 */
1569 tmp = op->in_player ();
1570 /* nope. Is this a container the player has opened?
1571 * If so, set tmp to that player.
1572 * IMO, searching through all the players will mostly
1573 * likely be quicker than following op->env to the map,
1574 * and then searching the map for a player.
1575 */
1576 if (!tmp)
1577 for_all_players (pl)
1578 if (pl->ob->container == op->env)
1579 {
1580 tmp = pl->ob;
1581 break;
1582 }
1583
1584 if (i < op->nrof)
1585 {
1586 sub_weight (op->env, op->weight * i);
1587 op->nrof -= i;
1588 if (tmp)
1589 esrv_send_item (tmp, op);
1590 }
1591 else
1592 {
1593 op->remove (); 1552 remove ();
1594 op->nrof = 0; 1553 return this;
1595 if (tmp)
1596 esrv_del_item (tmp->contr, op->count);
1597 }
1598 } 1554 }
1599 else 1555 else
1600 { 1556 {
1601 object *above = op->above; 1557 decrease (nr);
1602 1558
1603 if (i < op->nrof) 1559 object *op = deep_clone ();
1604 op->nrof -= i; 1560 op->nrof = nr;
1605 else
1606 {
1607 op->remove ();
1608 op->nrof = 0;
1609 }
1610
1611 /* Since we just removed op, op->above is null */
1612 for (tmp = above; tmp; tmp = tmp->above)
1613 if (tmp->type == PLAYER)
1614 {
1615 if (op->nrof)
1616 esrv_send_item (tmp, op);
1617 else
1618 esrv_del_item (tmp->contr, op->count);
1619 }
1620 }
1621
1622 if (op->nrof)
1623 return op; 1561 return op;
1624 else
1625 {
1626 op->destroy ();
1627 return 0;
1628 }
1629}
1630
1631/*
1632 * add_weight(object, weight) adds the specified weight to an object,
1633 * and also updates how much the environment(s) is/are carrying.
1634 */
1635void
1636add_weight (object *op, signed long weight)
1637{
1638 while (op != NULL)
1639 {
1640 if (op->type == CONTAINER)
1641 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1642
1643 op->carrying += weight;
1644 op = op->env;
1645 } 1562 }
1646} 1563}
1647 1564
1648object * 1565object *
1649insert_ob_in_ob (object *op, object *where) 1566insert_ob_in_ob (object *op, object *where)
1674 * be != op, if items are merged. -Tero 1591 * be != op, if items are merged. -Tero
1675 */ 1592 */
1676object * 1593object *
1677object::insert (object *op) 1594object::insert (object *op)
1678{ 1595{
1679 object *tmp, *otmp;
1680
1681 if (!QUERY_FLAG (op, FLAG_REMOVED))
1682 op->remove ();
1683
1684 if (op->more) 1596 if (op->more)
1685 { 1597 {
1686 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1598 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1687 return op; 1599 return op;
1688 } 1600 }
1689 1601
1690 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1602 op->remove ();
1691 CLEAR_FLAG (op, FLAG_REMOVED); 1603
1604 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1605
1692 if (op->nrof) 1606 if (op->nrof)
1693 {
1694 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1607 for (object *tmp = inv; tmp; tmp = tmp->below)
1695 if (object::can_merge (tmp, op)) 1608 if (object::can_merge (tmp, op))
1696 { 1609 {
1697 /* return the original object and remove inserted object 1610 /* return the original object and remove inserted object
1698 (client needs the original object) */ 1611 (client needs the original object) */
1699 tmp->nrof += op->nrof; 1612 tmp->nrof += op->nrof;
1700 /* Weight handling gets pretty funky. Since we are adding to 1613
1701 * tmp->nrof, we need to increase the weight. 1614 if (object *pl = tmp->visible_to ())
1702 */ 1615 esrv_update_item (UPD_NROF, pl, tmp);
1616
1703 add_weight (this, op->weight * op->nrof); 1617 adjust_weight (this, op->total_weight ());
1704 SET_FLAG (op, FLAG_REMOVED); 1618
1705 op->destroy (); /* free the inserted object */ 1619 op->destroy (1);
1706 op = tmp; 1620 op = tmp;
1707 op->remove (); /* and fix old object's links */ 1621 goto inserted;
1708 CLEAR_FLAG (op, FLAG_REMOVED);
1709 break;
1710 } 1622 }
1711 1623
1712 /* I assume combined objects have no inventory 1624 op->owner = 0; // it's his/hers now. period.
1713 * We add the weight - this object could have just been removed
1714 * (if it was possible to merge). calling remove_ob will subtract
1715 * the weight, so we need to add it in again, since we actually do
1716 * the linking below
1717 */
1718 add_weight (this, op->weight * op->nrof);
1719 }
1720 else
1721 add_weight (this, (op->weight + op->carrying));
1722
1723 otmp = this->in_player ();
1724 if (otmp && otmp->contr)
1725 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1726 otmp->update_stats ();
1727
1728 op->map = 0; 1625 op->map = 0;
1729 op->env = this; 1626 op->x = 0;
1627 op->y = 0;
1628
1730 op->above = 0; 1629 op->above = 0;
1731 op->below = 0; 1630 op->below = inv;
1732 op->x = 0, op->y = 0; 1631 op->env = this;
1733 1632
1633 if (inv)
1634 inv->above = op;
1635
1636 inv = op;
1637
1638 op->flag [FLAG_REMOVED] = 0;
1639
1640 if (object *pl = op->visible_to ())
1641 esrv_send_item (pl, op);
1642
1643 adjust_weight (this, op->total_weight ());
1644
1645inserted:
1734 /* reset the light list and los of the players on the map */ 1646 /* reset the light list and los of the players on the map */
1735 if ((op->glow_radius != 0) && map) 1647 if (op->glow_radius && map && map->darkness)
1736 {
1737#ifdef DEBUG_LIGHTS
1738 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1739#endif /* DEBUG_LIGHTS */
1740 if (map->darkness)
1741 update_all_los (map, x, y); 1648 update_all_los (map, x, y);
1742 }
1743 1649
1744 /* Client has no idea of ordering so lets not bother ordering it here. 1650 // if this is a player's inventory, update stats
1745 * It sure simplifies this function... 1651 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1746 */ 1652 update_stats ();
1747 if (!inv)
1748 inv = op;
1749 else
1750 {
1751 op->below = inv;
1752 op->below->above = op;
1753 inv = op;
1754 }
1755 1653
1756 INVOKE_OBJECT (INSERT, this); 1654 INVOKE_OBJECT (INSERT, this);
1757 1655
1758 return op; 1656 return op;
1759} 1657}
1887 LOG (llevError, "Present_arch called outside map.\n"); 1785 LOG (llevError, "Present_arch called outside map.\n");
1888 return NULL; 1786 return NULL;
1889 } 1787 }
1890 1788
1891 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1789 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1892 if (tmp->arch == at) 1790 if (tmp->arch->archname == at->archname)
1893 return tmp; 1791 return tmp;
1894 1792
1895 return NULL; 1793 return NULL;
1896} 1794}
1897 1795
1961 * The first matching object is returned, or NULL if none. 1859 * The first matching object is returned, or NULL if none.
1962 */ 1860 */
1963object * 1861object *
1964present_arch_in_ob (const archetype *at, const object *op) 1862present_arch_in_ob (const archetype *at, const object *op)
1965{ 1863{
1966 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1864 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1967 if (tmp->arch == at) 1865 if (tmp->arch->archname == at->archname)
1968 return tmp; 1866 return tmp;
1969 1867
1970 return NULL; 1868 return NULL;
1971} 1869}
1972 1870
1974 * activate recursively a flag on an object inventory 1872 * activate recursively a flag on an object inventory
1975 */ 1873 */
1976void 1874void
1977flag_inv (object *op, int flag) 1875flag_inv (object *op, int flag)
1978{ 1876{
1979 if (op->inv)
1980 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1877 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1981 { 1878 {
1982 SET_FLAG (tmp, flag); 1879 SET_FLAG (tmp, flag);
1983 flag_inv (tmp, flag); 1880 flag_inv (tmp, flag);
1984 } 1881 }
1985} 1882}
1986 1883
1987/* 1884/*
1988 * deactivate recursively a flag on an object inventory 1885 * deactivate recursively a flag on an object inventory
1989 */ 1886 */
1990void 1887void
1991unflag_inv (object *op, int flag) 1888unflag_inv (object *op, int flag)
1992{ 1889{
1993 if (op->inv)
1994 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1890 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1995 { 1891 {
1996 CLEAR_FLAG (tmp, flag); 1892 CLEAR_FLAG (tmp, flag);
1997 unflag_inv (tmp, flag); 1893 unflag_inv (tmp, flag);
1998 } 1894 }
1999} 1895}
2000 1896
2001/* 1897/*
2002 * find_free_spot(object, map, x, y, start, stop) will search for 1898 * find_free_spot(object, map, x, y, start, stop) will search for
2003 * a spot at the given map and coordinates which will be able to contain 1899 * a spot at the given map and coordinates which will be able to contain
2005 * to search (see the freearr_x/y[] definition). 1901 * to search (see the freearr_x/y[] definition).
2006 * It returns a random choice among the alternatives found. 1902 * It returns a random choice among the alternatives found.
2007 * start and stop are where to start relative to the free_arr array (1,9 1903 * start and stop are where to start relative to the free_arr array (1,9
2008 * does all 4 immediate directions). This returns the index into the 1904 * does all 4 immediate directions). This returns the index into the
2009 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1905 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2010 * Note - this only checks to see if there is space for the head of the
2011 * object - if it is a multispace object, this should be called for all
2012 * pieces.
2013 * Note2: This function does correctly handle tiled maps, but does not 1906 * Note: This function does correctly handle tiled maps, but does not
2014 * inform the caller. However, insert_ob_in_map will update as 1907 * inform the caller. However, insert_ob_in_map will update as
2015 * necessary, so the caller shouldn't need to do any special work. 1908 * necessary, so the caller shouldn't need to do any special work.
2016 * Note - updated to take an object instead of archetype - this is necessary 1909 * Note - updated to take an object instead of archetype - this is necessary
2017 * because arch_blocked (now ob_blocked) needs to know the movement type 1910 * because arch_blocked (now ob_blocked) needs to know the movement type
2018 * to know if the space in question will block the object. We can't use 1911 * to know if the space in question will block the object. We can't use
2020 * customized, changed states, etc. 1913 * customized, changed states, etc.
2021 */ 1914 */
2022int 1915int
2023find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1916find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2024{ 1917{
1918 int altern[SIZEOFFREE];
2025 int index = 0, flag; 1919 int index = 0, flag;
2026 int altern[SIZEOFFREE];
2027 1920
2028 for (int i = start; i < stop; i++) 1921 for (int i = start; i < stop; i++)
2029 { 1922 {
2030 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1923 mapxy pos (m, x, y); pos.move (i);
2031 if (!flag) 1924
1925 if (!pos.normalise ())
1926 continue;
1927
1928 mapspace &ms = *pos;
1929
1930 if (ms.flags () & P_IS_ALIVE)
1931 continue;
1932
1933 /* However, often
1934 * ob doesn't have any move type (when used to place exits)
1935 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1936 */
1937 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1938 {
2032 altern [index++] = i; 1939 altern [index++] = i;
1940 continue;
1941 }
2033 1942
2034 /* Basically, if we find a wall on a space, we cut down the search size. 1943 /* Basically, if we find a wall on a space, we cut down the search size.
2035 * In this way, we won't return spaces that are on another side of a wall. 1944 * In this way, we won't return spaces that are on another side of a wall.
2036 * This mostly work, but it cuts down the search size in all directions - 1945 * This mostly work, but it cuts down the search size in all directions -
2037 * if the space being examined only has a wall to the north and empty 1946 * if the space being examined only has a wall to the north and empty
2038 * spaces in all the other directions, this will reduce the search space 1947 * spaces in all the other directions, this will reduce the search space
2039 * to only the spaces immediately surrounding the target area, and 1948 * to only the spaces immediately surrounding the target area, and
2040 * won't look 2 spaces south of the target space. 1949 * won't look 2 spaces south of the target space.
2041 */ 1950 */
2042 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1951 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1952 {
2043 stop = maxfree[i]; 1953 stop = maxfree[i];
1954 continue;
1955 }
1956
1957 /* Note it is intentional that we check ob - the movement type of the
1958 * head of the object should correspond for the entire object.
1959 */
1960 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1961 continue;
1962
1963 if (ob->blocked (m, pos.x, pos.y))
1964 continue;
1965
1966 altern [index++] = i;
2044 } 1967 }
2045 1968
2046 if (!index) 1969 if (!index)
2047 return -1; 1970 return -1;
2048 1971
2057 */ 1980 */
2058int 1981int
2059find_first_free_spot (const object *ob, maptile *m, int x, int y) 1982find_first_free_spot (const object *ob, maptile *m, int x, int y)
2060{ 1983{
2061 for (int i = 0; i < SIZEOFFREE; i++) 1984 for (int i = 0; i < SIZEOFFREE; i++)
2062 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 1985 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2063 return i; 1986 return i;
2064 1987
2065 return -1; 1988 return -1;
2066} 1989}
2067 1990
2344 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2267 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2345 * core dumps if they do. 2268 * core dumps if they do.
2346 * 2269 *
2347 * Add a check so we can't pick up invisible objects (0.93.8) 2270 * Add a check so we can't pick up invisible objects (0.93.8)
2348 */ 2271 */
2349
2350int 2272int
2351can_pick (const object *who, const object *item) 2273can_pick (const object *who, const object *item)
2352{ 2274{
2353 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2275 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2354 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2276 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2357 2279
2358/* 2280/*
2359 * create clone from object to another 2281 * create clone from object to another
2360 */ 2282 */
2361object * 2283object *
2362object_create_clone (object *asrc) 2284object::deep_clone ()
2363{ 2285{
2364 object *dst = 0, *tmp, *src, *prev, *item; 2286 assert (("deep_clone called on non-head object", is_head ()));
2365 2287
2366 if (!asrc) 2288 object *dst = clone ();
2367 return 0;
2368 2289
2369 src = asrc->head_ (); 2290 object *prev = dst;
2370
2371 prev = 0;
2372 for (object *part = src; part; part = part->more) 2291 for (object *part = this->more; part; part = part->more)
2373 { 2292 {
2374 tmp = part->clone (); 2293 object *tmp = part->clone ();
2375 tmp->x -= src->x;
2376 tmp->y -= src->y;
2377
2378 if (!part->head)
2379 {
2380 dst = tmp;
2381 tmp->head = 0;
2382 }
2383 else
2384 tmp->head = dst; 2294 tmp->head = dst;
2385
2386 tmp->more = 0;
2387
2388 if (prev)
2389 prev->more = tmp; 2295 prev->more = tmp;
2390
2391 prev = tmp; 2296 prev = tmp;
2392 } 2297 }
2393 2298
2394 for (item = src->inv; item; item = item->below) 2299 for (object *item = inv; item; item = item->below)
2395 insert_ob_in_ob (object_create_clone (item), dst); 2300 insert_ob_in_ob (item->deep_clone (), dst);
2396 2301
2397 return dst; 2302 return dst;
2398} 2303}
2399 2304
2400/* This returns the first object in who's inventory that 2305/* This returns the first object in who's inventory that
2409 return tmp; 2314 return tmp;
2410 2315
2411 return 0; 2316 return 0;
2412} 2317}
2413 2318
2414/* If ob has a field named key, return the link from the list, 2319const shstr &
2415 * otherwise return NULL. 2320object::kv_get (const shstr &key) const
2416 *
2417 * key must be a passed in shared string - otherwise, this won't
2418 * do the desired thing.
2419 */
2420key_value *
2421get_ob_key_link (const object *ob, const char *key)
2422{ 2321{
2423 for (key_value *link = ob->key_values; link; link = link->next) 2322 for (key_value *kv = key_values; kv; kv = kv->next)
2424 if (link->key == key) 2323 if (kv->key == key)
2425 return link;
2426
2427 return 0;
2428}
2429
2430/*
2431 * Returns the value of op has an extra_field for key, or NULL.
2432 *
2433 * The argument doesn't need to be a shared string.
2434 *
2435 * The returned string is shared.
2436 */
2437const char *
2438get_ob_key_value (const object *op, const char *const key)
2439{
2440 key_value *link;
2441 shstr_cmp canonical_key (key);
2442
2443 if (!canonical_key)
2444 {
2445 /* 1. There being a field named key on any object
2446 * implies there'd be a shared string to find.
2447 * 2. Since there isn't, no object has this field.
2448 * 3. Therefore, *this* object doesn't have this field.
2449 */
2450 return 0;
2451 }
2452
2453 /* This is copied from get_ob_key_link() above -
2454 * only 4 lines, and saves the function call overhead.
2455 */
2456 for (link = op->key_values; link; link = link->next)
2457 if (link->key == canonical_key)
2458 return link->value; 2324 return kv->value;
2459 2325
2460 return 0; 2326 return shstr_null;
2461} 2327}
2462 2328
2463/* 2329void
2464 * Updates the canonical_key in op to value. 2330object::kv_set (const shstr &key, const shstr &value)
2465 *
2466 * canonical_key is a shared string (value doesn't have to be).
2467 *
2468 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2469 * keys.
2470 *
2471 * Returns TRUE on success.
2472 */
2473int
2474set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2475{ 2331{
2476 key_value *field = NULL, *last = NULL; 2332 for (key_value *kv = key_values; kv; kv = kv->next)
2477 2333 if (kv->key == key)
2478 for (field = op->key_values; field != NULL; field = field->next)
2479 {
2480 if (field->key != canonical_key)
2481 { 2334 {
2482 last = field; 2335 kv->value = value;
2483 continue; 2336 return;
2484 } 2337 }
2485 2338
2486 if (value) 2339 key_value *kv = new key_value;
2487 field->value = value; 2340
2488 else 2341 kv->next = key_values;
2342 kv->key = key;
2343 kv->value = value;
2344
2345 key_values = kv;
2346}
2347
2348void
2349object::kv_del (const shstr &key)
2350{
2351 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2352 if ((*kvp)->key == key)
2489 { 2353 {
2490 /* Basically, if the archetype has this key set, 2354 key_value *kv = *kvp;
2491 * we need to store the null value so when we save 2355 *kvp = (*kvp)->next;
2492 * it, we save the empty value so that when we load, 2356 delete kv;
2493 * we get this value back again. 2357 return;
2494 */
2495 if (get_ob_key_link (op->arch, canonical_key))
2496 field->value = 0;
2497 else
2498 {
2499 if (last)
2500 last->next = field->next;
2501 else
2502 op->key_values = field->next;
2503
2504 delete field;
2505 }
2506 } 2358 }
2507 return TRUE;
2508 }
2509 /* IF we get here, key doesn't exist */
2510
2511 /* No field, we'll have to add it. */
2512
2513 if (!add_key)
2514 return FALSE;
2515
2516 /* There isn't any good reason to store a null
2517 * value in the key/value list. If the archetype has
2518 * this key, then we should also have it, so shouldn't
2519 * be here. If user wants to store empty strings,
2520 * should pass in ""
2521 */
2522 if (value == NULL)
2523 return TRUE;
2524
2525 field = new key_value;
2526
2527 field->key = canonical_key;
2528 field->value = value;
2529 /* Usual prepend-addition. */
2530 field->next = op->key_values;
2531 op->key_values = field;
2532
2533 return TRUE;
2534}
2535
2536/*
2537 * Updates the key in op to value.
2538 *
2539 * If add_key is FALSE, this will only update existing keys,
2540 * and not add new ones.
2541 * In general, should be little reason FALSE is ever passed in for add_key
2542 *
2543 * Returns TRUE on success.
2544 */
2545int
2546set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2547{
2548 shstr key_ (key);
2549
2550 return set_ob_key_value_s (op, key_, value, add_key);
2551} 2359}
2552 2360
2553object::depth_iterator::depth_iterator (object *container) 2361object::depth_iterator::depth_iterator (object *container)
2554: iterator_base (container) 2362: iterator_base (container)
2555{ 2363{
2605{ 2413{
2606 char flagdesc[512]; 2414 char flagdesc[512];
2607 char info2[256 * 4]; 2415 char info2[256 * 4];
2608 char *p = info; 2416 char *p = info;
2609 2417
2610 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2418 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2611 count, uuid.seq, 2419 count,
2420 uuid.c_str (),
2612 &name, 2421 &name,
2613 title ? "\",title:\"" : "", 2422 title ? "\",title:\"" : "",
2614 title ? (const char *)title : "", 2423 title ? (const char *)title : "",
2615 flag_desc (flagdesc, 512), type); 2424 flag_desc (flagdesc, 512), type);
2616 2425
2617 if (env) 2426 if (!flag[FLAG_REMOVED] && env)
2618 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2427 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2619 2428
2620 if (map) 2429 if (map)
2621 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2430 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2622 2431
2652object::open_container (object *new_container) 2461object::open_container (object *new_container)
2653{ 2462{
2654 if (container == new_container) 2463 if (container == new_container)
2655 return; 2464 return;
2656 2465
2657 if (object *old_container = container) 2466 object *old_container = container;
2467
2468 if (old_container)
2658 { 2469 {
2659 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2470 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2660 return; 2471 return;
2661 2472
2662#if 0 2473#if 0
2664 if (object *closer = old_container->inv) 2475 if (object *closer = old_container->inv)
2665 if (closer->type == CLOSE_CON) 2476 if (closer->type == CLOSE_CON)
2666 closer->destroy (); 2477 closer->destroy ();
2667#endif 2478#endif
2668 2479
2480 // make sure the container is available
2481 esrv_send_item (this, old_container);
2482
2669 old_container->flag [FLAG_APPLIED] = 0; 2483 old_container->flag [FLAG_APPLIED] = false;
2670 container = 0; 2484 container = 0;
2671 2485
2486 // client needs item update to make it work, client bug requires this to be separate
2672 esrv_update_item (UPD_FLAGS, this, old_container); 2487 esrv_update_item (UPD_FLAGS, this, old_container);
2488
2673 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2489 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2490 play_sound (sound_find ("chest_close"));
2674 } 2491 }
2675 2492
2676 if (new_container) 2493 if (new_container)
2677 { 2494 {
2678 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2495 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2689 } 2506 }
2690#endif 2507#endif
2691 2508
2692 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2509 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2693 2510
2511 // make sure the container is available, client bug requires this to be separate
2512 esrv_send_item (this, new_container);
2513
2694 new_container->flag [FLAG_APPLIED] = 1; 2514 new_container->flag [FLAG_APPLIED] = true;
2695 container = new_container; 2515 container = new_container;
2696 2516
2517 // client needs flag change
2697 esrv_update_item (UPD_FLAGS, this, new_container); 2518 esrv_update_item (UPD_FLAGS, this, new_container);
2698 esrv_send_inventory (this, new_container); 2519 esrv_send_inventory (this, new_container);
2520 play_sound (sound_find ("chest_open"));
2699 } 2521 }
2522// else if (!old_container->env && contr && contr->ns)
2523// contr->ns->floorbox_reset ();
2700} 2524}
2701 2525
2702object * 2526object *
2703object::force_find (const shstr name) 2527object::force_find (const shstr name)
2704{ 2528{
2729 force->flag [FLAG_APPLIED] = true; 2553 force->flag [FLAG_APPLIED] = true;
2730 2554
2731 insert (force); 2555 insert (force);
2732} 2556}
2733 2557
2558void
2559object::play_sound (faceidx sound)
2560{
2561 if (!sound)
2562 return;
2563
2564 if (flag [FLAG_REMOVED])
2565 return;
2566
2567 if (env)
2568 {
2569 if (object *pl = in_player ())
2570 pl->contr->play_sound (sound);
2571 }
2572 else
2573 map->play_sound (sound, x, y);
2574}
2575

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines