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.162 by root, Sat Jun 16 00:12:20 2007 UTC vs.
Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28#include <global.h> 24#include <global.h>
29#include <stdio.h> 25#include <stdio.h>
30#include <sys/types.h> 26#include <sys/types.h>
31#include <sys/uio.h> 27#include <sys/uio.h>
32#include <object.h> 28#include <object.h>
33#include <funcpoint.h>
34#include <sproto.h> 29#include <sproto.h>
35#include <loader.h> 30#include <loader.h>
36 31
37#include <bitset> 32#include <bitset>
38 33
39int nrofallocobjects = 0; 34UUID UUID::cur;
40static UUID uuid; 35static uint64_t seq_next_save;
41const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
42 37
43objectvec objects; 38objectvec objects;
44activevec actives; 39activevec actives;
45 40
46short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = {
42 0,
43 0, 1, 1, 1, 0, -1, -1, -1,
44 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 45 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
48}; 46};
49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 47short freearr_y[SIZEOFFREE] = {
48 0,
49 -1, -1, 0, 1, 1, 1, 0, -1,
50 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
50 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 51 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
51}; 52};
52int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 53int maxfree[SIZEOFFREE] = {
54 0,
55 9, 10, 13, 14, 17, 18, 21, 22,
56 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
53 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 57 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
54}; 58};
55int freedir[SIZEOFFREE] = { 59int freedir[SIZEOFFREE] = {
56 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 0,
61 1, 2, 3, 4, 5, 6, 7, 8,
62 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
57 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 63 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
58}; 64};
59 65
60static void 66static void
61write_uuid (void) 67write_uuid (uval64 skip, bool sync)
62{ 68{
63 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
64 70 CALL_ARG_SV (newSVval64 (skip));
65 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
66 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
67 73 CALL_END;
68 FILE *fp;
69
70 if (!(fp = fopen (filename2, "w")))
71 {
72 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73 return;
74 }
75
76 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77 fclose (fp);
78 rename (filename2, filename1);
79} 74}
80 75
81static void 76static void
82read_uuid (void) 77read_uuid (void)
83{ 78{
84 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
85 80
86 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 seq_next_save = 0;
87 84
88 FILE *fp; 85 FILE *fp;
89 86
90 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
91 { 88 {
92 if (errno == ENOENT) 89 if (errno == ENOENT)
93 { 90 {
94 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
95 uuid.seq = 0; 92 UUID::cur.seq = 0;
96 write_uuid (); 93 write_uuid (UUID_GAP, true);
97 return; 94 return;
98 } 95 }
99 96
100 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101 _exit (1); 98 _exit (1);
102 } 99 }
103 100
104 int version; 101 UUID::BUF buf;
105 unsigned long long uid; 102 buf[0] = 0;
106 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
107 { 106 {
108 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109 _exit (1); 108 _exit (1);
110 } 109 }
111 110
112 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113 write_uuid (); 112
114 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
115 fclose (fp); 114 fclose (fp);
116} 115}
117 116
118UUID 117UUID
119gen_uuid () 118UUID::gen ()
120{ 119{
121 UUID uid; 120 UUID uid;
122 121
123 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
124 123
125 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
126 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
127 130
128 return uid; 131 return uid;
129} 132}
130 133
131void 134void
132init_uuid () 135UUID::init ()
133{ 136{
134 read_uuid (); 137 read_uuid ();
135} 138}
136 139
137/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138static int 141static bool
139compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
140{ 143{
141 key_value *wants_field;
142
143 /* 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
144 * 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
145 * different structure or at least keep the lists sorted... 146 * different structure or at least keep the lists sorted...
146 */ 147 */
147 148
148 /* For each field in wants, */ 149 /* For each field in wants, */
149 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)
150 { 151 if (has->kv_get (kv->key) != kv->value)
151 key_value *has_field; 152 return false;
152
153 /* Look for a field in has with the same key. */
154 has_field = get_ob_key_link (has, wants_field->key);
155
156 if (has_field == NULL)
157 {
158 /* No field with that name. */
159 return FALSE;
160 }
161
162 /* Found the matching field. */
163 if (has_field->value != wants_field->value)
164 {
165 /* Values don't match, so this half of the comparison is false. */
166 return FALSE;
167 }
168
169 /* If we get here, we found a match. Now for the next field in wants. */
170 }
171 153
172 /* 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. */
173 return TRUE; 155 return true;
174} 156}
175 157
176/* Returns TRUE if ob1 has the same key_values as ob2. */ 158/* Returns TRUE if ob1 has the same key_values as ob2. */
177static int 159static bool
178compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_ob_value_lists (const object *ob1, const object *ob2)
179{ 161{
180 /* 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,
181 * so we need to run the comparison *twice*. :( 163 * so we need to run the comparison *twice*. :(
182 */ 164 */
183 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);
184} 167}
185 168
186/* 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
187 * they can be merged together. 170 * they can be merged together.
188 * 171 *
203 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
204 || ob1->value != ob2->value 187 || ob1->value != ob2->value
205 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
206 return 0; 189 return 0;
207 190
208 //TODO: this ain't working well, use nicer and correct overflow check 191 /* Do not merge objects if nrof would overflow. First part checks
209 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 192 * for unsigned overflow (2c), second part checks whether the result
210 * 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
211 * used to store nrof). 194 * nrof values.
212 */ 195 */
213 if (ob1->nrof + ob2->nrof >= 1UL << 31) 196 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214 return 0; 197 return 0;
215 198
216 /* If the objects have been identified, set the BEEN_APPLIED flag. 199 /* If the objects have been identified, set the BEEN_APPLIED flag.
217 * This is to the comparison of the flags below will be OK. We 200 * This is to the comparison of the flags below will be OK. We
218 * just can't ignore the been applied or identified flags, as they 201 * just can't ignore the been applied or identified flags, as they
219 * are not equal - just if it has been identified, the been_applied 202 * are not equal - just if it has been identified, the been_applied
220 * flags lose any meaning. 203 * flags lose any meaning.
221 */ 204 */
222 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 205 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224 207
225 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 209 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227 210
228 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 211 if (ob1->arch->name != ob2->arch->name
229 || ob1->arch != ob2->arch
230 || ob1->name != ob2->name 212 || ob1->name != ob2->name
231 || ob1->title != ob2->title 213 || ob1->title != ob2->title
232 || ob1->msg != ob2->msg 214 || ob1->msg != ob2->msg
233 || ob1->weight != ob2->weight 215 || ob1->weight != ob2->weight
234 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236 || ob1->attacktype != ob2->attacktype 216 || ob1->attacktype != ob2->attacktype
237 || ob1->magic != ob2->magic 217 || ob1->magic != ob2->magic
238 || ob1->slaying != ob2->slaying 218 || ob1->slaying != ob2->slaying
239 || ob1->skill != ob2->skill 219 || ob1->skill != ob2->skill
240 || ob1->value != ob2->value 220 || ob1->value != ob2->value
247 || ob1->move_block != ob2->move_block 227 || ob1->move_block != ob2->move_block
248 || ob1->move_allow != ob2->move_allow 228 || ob1->move_allow != ob2->move_allow
249 || ob1->move_on != ob2->move_on 229 || ob1->move_on != ob2->move_on
250 || ob1->move_off != ob2->move_off 230 || ob1->move_off != ob2->move_off
251 || ob1->move_slow != ob2->move_slow 231 || ob1->move_slow != ob2->move_slow
252 || 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)))
253 return 0; 235 return 0;
254 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
255 /* This is really a spellbook check - really, we should 244 /* This is really a spellbook check - we should in general
256 * check all objects in the inventory. 245 * not merge objects with real inventories, as splitting them
246 * is hard.
257 */ 247 */
258 if (ob1->inv || ob2->inv) 248 if (ob1->inv || ob2->inv)
259 { 249 {
260 /* if one object has inventory but the other doesn't, not equiv */ 250 if (!(ob1->inv && ob2->inv))
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 251 return 0; /* inventories differ in length */
262 return 0;
263 252
264 /* 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
265 if (!object::can_merge (ob1->inv, ob2->inv)) 256 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 257 return 0; /* inventory objects differ */
267 258
268 /* 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
269 * if it is valid. 260 * if it is valid.
270 */ 261 */
271 } 262 }
290 if (ob1->level != ob2->level) 281 if (ob1->level != ob2->level)
291 return 0; 282 return 0;
292 break; 283 break;
293 } 284 }
294 285
295 if (ob1->key_values != NULL || ob2->key_values != NULL) 286 if (ob1->key_values || ob2->key_values)
296 { 287 {
297 /* At least one of these has key_values. */ 288 /* At least one of these has key_values. */
298 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 289 if ((!ob1->key_values) != (!ob2->key_values))
299 /* One has fields, but the other one doesn't. */ 290 return 0; /* One has fields, but the other one doesn't. */
291
292 if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 293 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0;
303 } 294 }
304 295
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 296 if (ob1->self || ob2->self)
307 { 297 {
308 ob1->optimise (); 298 ob1->optimise ();
309 ob2->optimise (); 299 ob2->optimise ();
310 300
311 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)
312 return 0; 307 return 0;
308
309 if (k1 == 0)
310 return 1;
311
312 if (!cfperl_can_merge (ob1, ob2))
313 return 0;
314 }
313 } 315 }
314 316
315 /* Everything passes, must be OK. */ 317 /* Everything passes, must be OK. */
316 return 1; 318 return 1;
317} 319}
318 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
319/* 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/*
320 * sum_weight() is a recursive function which calculates the weight 394 * this is a recursive function which calculates the weight
321 * 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
322 * containers are carrying, and sums it up. 396 * containers are carrying, and sums it up.
323 */ 397 */
324long 398void
325sum_weight (object *op) 399object::update_weight ()
326{ 400{
327 long sum; 401 sint32 sum = 0;
328 object *inv;
329 402
330 for (sum = 0, inv = op->inv; inv; inv = inv->below) 403 for (object *op = inv; op; op = op->below)
331 { 404 {
332 if (inv->inv) 405 if (op->inv)
333 sum_weight (inv); 406 op->update_weight ();
334 407
335 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)
336 } 414 {
337
338 if (op->type == CONTAINER && op->stats.Str)
339 sum = (sum * (100 - op->stats.Str)) / 100;
340
341 if (op->carrying != sum)
342 op->carrying = sum; 415 carrying = sum;
343 416
344 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 }
345} 421}
346 422
347/** 423/*
348 * Return the outermost environment object for a given object. 424 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
349 */
350
351object *
352object_get_env_recursive (object *op)
353{
354 while (op->env != NULL)
355 op = op->env;
356 return op;
357}
358
359/*
360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361 * Some error messages.
362 * The result of the dump is stored in the static global errmsg array.
363 */ 425 */
364char * 426char *
365dump_object (object *op) 427dump_object (object *op)
366{ 428{
367 if (!op) 429 if (!op)
375/* 437/*
376 * 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
377 * multi-object 1 which is closest to the second object. 439 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 440 * If it's not a multi-object, it is returned.
379 */ 441 */
380
381object * 442object *
382get_nearest_part (object *op, const object *pl) 443get_nearest_part (object *op, const object *pl)
383{ 444{
384 object *tmp, *closest; 445 object *tmp, *closest;
385 int last_dist, i; 446 int last_dist, i;
386 447
387 if (op->more == NULL) 448 if (!op->more)
388 return op; 449 return op;
450
389 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)
390 if ((i = distance (tmp, pl)) < last_dist) 454 if ((i = distance (tmp, pl)) < last_dist)
391 closest = tmp, last_dist = i; 455 closest = tmp, last_dist = i;
456
392 return closest; 457 return closest;
393} 458}
394 459
395/* 460/*
396 * 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.
397 */ 463 */
398object * 464object *
399find_object (tag_t i) 465find_object (tag_t i)
400{ 466{
401 for_all_objects (op) 467 for_all_objects (op)
421 break; 487 break;
422 488
423 return op; 489 return op;
424} 490}
425 491
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 492/*
433 * 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
434 * skill and experience objects. 494 * skill and experience objects.
495 * ACTUALLY NO! investigate! TODO
435 */ 496 */
436void 497void
437object::set_owner (object *owner) 498object::set_owner (object *owner)
438{ 499{
500 // allow objects which own objects
439 if (!owner) 501 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 502 while (owner->owner)
450 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 }
451 510
452 this->owner = owner; 511 this->owner = owner;
453} 512}
454 513
455int 514int
533 } 592 }
534 593
535 op->key_values = 0; 594 op->key_values = 0;
536} 595}
537 596
538object & 597/*
539object::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)
540{ 607{
541 bool is_freed = flag [FLAG_FREED]; 608 dst->remove ();
542 bool is_removed = flag [FLAG_REMOVED];
543
544 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
545
546 flag [FLAG_FREED] = is_freed;
547 flag [FLAG_REMOVED] = is_removed; 610 dst->flag [FLAG_REMOVED] = true;
548 611
549 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
550 if (src.key_values) 613 if (key_values)
551 { 614 {
552 key_value *tail = 0; 615 key_value *tail = 0;
553 key_values = 0; 616 dst->key_values = 0;
554 617
555 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
556 { 619 {
557 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
558 621
559 new_link->next = 0; 622 new_link->next = 0;
560 new_link->key = i->key; 623 new_link->key = i->key;
561 new_link->value = i->value; 624 new_link->value = i->value;
562 625
563 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
564 if (!key_values) 627 if (!dst->key_values)
565 { 628 {
566 key_values = new_link; 629 dst->key_values = new_link;
567 tail = new_link; 630 tail = new_link;
568 } 631 }
569 else 632 else
570 { 633 {
571 tail->next = new_link; 634 tail->next = new_link;
572 tail = new_link; 635 tail = new_link;
573 } 636 }
574 } 637 }
575 } 638 }
576}
577
578/*
579 * copy_to first frees everything allocated by the dst object,
580 * and then copies the contents of itself into the second
581 * object, allocating what needs to be allocated. Basically, any
582 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
583 * if the first object is freed, the pointers in the new object
584 * will point at garbage.
585 */
586void
587object::copy_to (object *dst)
588{
589 *dst = *this;
590 639
591 if (speed < 0) 640 if (speed < 0)
592 dst->speed_left = speed_left - rndm (); 641 dst->speed_left -= rndm ();
593 642
594 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
595} 644}
596 645
597void 646void
598object::instantiate () 647object::instantiate ()
599{ 648{
600 if (!uuid.seq) // HACK 649 if (!uuid.seq) // HACK
601 uuid = gen_uuid (); 650 uuid = UUID::gen ();
602 651
603 speed_left = -0.1f; 652 speed_left = -0.1f;
604 /* 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
605 * 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.
606 * 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
616object * 665object *
617object::clone () 666object::clone ()
618{ 667{
619 object *neu = create (); 668 object *neu = create ();
620 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
621 return neu; 671 return neu;
622} 672}
623 673
624/* 674/*
625 * 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
676 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
677 */ 727 */
678void 728void
679update_object (object *op, int action) 729update_object (object *op, int action)
680{ 730{
681 if (op == NULL) 731 if (!op)
682 { 732 {
683 /* this should never happen */ 733 /* this should never happen */
684 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
685 return; 735 return;
686 } 736 }
687 737
688 if (op->env) 738 if (!op->is_on_map ())
689 { 739 {
690 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
691 * to do in this case. 741 * to do in this case.
692 */ 742 */
693 return; 743 return;
694 } 744 }
695
696 /* If the map is saving, don't do anything as everything is
697 * going to get freed anyways.
698 */
699 if (!op->map || op->map->in_memory == MAP_SAVING)
700 return;
701 745
702 /* make sure the object is within map boundaries */ 746 /* make sure the object is within map boundaries */
703 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)
704 { 748 {
705 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
765static int object_count; 809static int object_count;
766 810
767void object::link () 811void object::link ()
768{ 812{
769 assert (!index);//D 813 assert (!index);//D
770 uuid = gen_uuid (); 814 uuid = UUID::gen ();
771 count = ++object_count; 815 count = ++object_count;
772 816
773 refcnt_inc (); 817 refcnt_inc ();
774 objects.insert (this); 818 objects.insert (this);
775} 819}
848object::destroy_inv (bool drop_to_ground) 892object::destroy_inv (bool drop_to_ground)
849{ 893{
850 // need to check first, because the checks below might segfault 894 // need to check first, because the checks below might segfault
851 // as we might be on an invalid mapspace and crossfire code 895 // as we might be on an invalid mapspace and crossfire code
852 // is too buggy to ensure that the inventory is empty. 896 // is too buggy to ensure that the inventory is empty.
853 // corollary: if you create arrows etc. with stuff in tis inventory, 897 // corollary: if you create arrows etc. with stuff in its inventory,
854 // cf will crash below with off-map x and y 898 // cf will crash below with off-map x and y
855 if (!inv) 899 if (!inv)
856 return; 900 return;
857 901
858 /* Only if the space blocks everything do we not process - 902 /* Only if the space blocks everything do we not process -
859 * if some form of movement is allowed, let objects 903 * if some form of movement is allowed, let objects
860 * drop on that space. 904 * drop on that space.
861 */ 905 */
862 if (!drop_to_ground 906 if (!drop_to_ground
863 || !map 907 || !map
864 || map->in_memory != MAP_IN_MEMORY 908 || map->in_memory != MAP_ACTIVE
865 || map->nodrop 909 || map->nodrop
866 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
867 { 911 {
868 while (inv) 912 while (inv)
869 { 913 {
870 inv->destroy_inv (drop_to_ground); 914 inv->destroy_inv (false);
871 inv->destroy (); 915 inv->destroy ();
872 } 916 }
873 } 917 }
874 else 918 else
875 { /* Put objects in inventory onto this space */ 919 { /* Put objects in inventory onto this space */
881 || op->flag [FLAG_NO_DROP] 925 || op->flag [FLAG_NO_DROP]
882 || op->type == RUNE 926 || op->type == RUNE
883 || op->type == TRAP 927 || op->type == TRAP
884 || op->flag [FLAG_IS_A_TEMPLATE] 928 || op->flag [FLAG_IS_A_TEMPLATE]
885 || op->flag [FLAG_DESTROY_ON_DEATH]) 929 || op->flag [FLAG_DESTROY_ON_DEATH])
886 op->destroy (); 930 op->destroy (true);
887 else 931 else
888 map->insert (op, x, y); 932 map->insert (op, x, y);
889 } 933 }
890 } 934 }
891} 935}
895 object *op = new object; 939 object *op = new object;
896 op->link (); 940 op->link ();
897 return op; 941 return op;
898} 942}
899 943
944static struct freed_map : maptile
945{
946 freed_map ()
947 {
948 path = "<freed objects map>";
949 name = "/internal/freed_objects_map";
950 width = 3;
951 height = 3;
952 nodrop = 1;
953
954 alloc ();
955 in_memory = MAP_ACTIVE;
956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
962} freed_map; // freed objects are moved here to avoid crashes
963
900void 964void
901object::do_destroy () 965object::do_destroy ()
902{ 966{
903 attachable::do_destroy ();
904
905 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
906 remove_button_link (this); 968 remove_button_link (this);
907 969
908 if (flag [FLAG_FRIENDLY]) 970 if (flag [FLAG_FRIENDLY])
909 remove_friendly_object (this); 971 remove_friendly_object (this);
910 972
911 if (!flag [FLAG_REMOVED])
912 remove (); 973 remove ();
913 974
914 destroy_inv (true); 975 attachable::do_destroy ();
915 976
916 deactivate (); 977 deactivate ();
917 unlink (); 978 unlink ();
918 979
919 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
920 981
921 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
922 {
923 static maptile *freed_map; // freed objects are moved here to avoid crashes
924
925 if (!freed_map)
926 {
927 freed_map = new maptile;
928
929 freed_map->name = "/internal/freed_objects_map";
930 freed_map->width = 3;
931 freed_map->height = 3;
932
933 freed_map->alloc ();
934 freed_map->in_memory = MAP_IN_MEMORY;
935 }
936
937 map = freed_map; 983 map = &freed_map;
938 x = 1; 984 x = 1;
939 y = 1; 985 y = 1;
940 }
941 986
942 if (more) 987 if (more)
943 { 988 {
944 more->destroy (); 989 more->destroy ();
945 more = 0; 990 more = 0;
958object::destroy (bool destroy_inventory) 1003object::destroy (bool destroy_inventory)
959{ 1004{
960 if (destroyed ()) 1005 if (destroyed ())
961 return; 1006 return;
962 1007
1008 if (!is_head () && !head->destroyed ())
1009 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory);
1012 return;
1013 }
1014
963 if (destroy_inventory) 1015 destroy_inv (!destroy_inventory);
964 destroy_inv (false); 1016
1017 if (is_head ())
1018 if (sound_destroy)
1019 play_sound (sound_destroy);
1020 else if (flag [FLAG_MONSTER])
1021 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
965 1022
966 attachable::destroy (); 1023 attachable::destroy ();
967}
968
969/*
970 * sub_weight() recursively (outwards) subtracts a number from the
971 * weight of an object (and what is carried by it's environment(s)).
972 */
973void
974sub_weight (object *op, signed long weight)
975{
976 while (op != NULL)
977 {
978 if (op->type == CONTAINER)
979 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
980
981 op->carrying -= weight;
982 op = op->env;
983 }
984} 1024}
985 1025
986/* op->remove (): 1026/* op->remove ():
987 * This function removes the object op from the linked list of objects 1027 * This function removes the object op from the linked list of objects
988 * which it is currently tied to. When this function is done, the 1028 * which it is currently tied to. When this function is done, the
994object::do_remove () 1034object::do_remove ()
995{ 1035{
996 object *tmp, *last = 0; 1036 object *tmp, *last = 0;
997 object *otmp; 1037 object *otmp;
998 1038
999 if (QUERY_FLAG (this, FLAG_REMOVED)) 1039 if (flag [FLAG_REMOVED])
1000 return; 1040 return;
1001 1041
1002 SET_FLAG (this, FLAG_REMOVED);
1003 INVOKE_OBJECT (REMOVE, this); 1042 INVOKE_OBJECT (REMOVE, this);
1043
1044 flag [FLAG_REMOVED] = true;
1004 1045
1005 if (more) 1046 if (more)
1006 more->remove (); 1047 more->remove ();
1007 1048
1008 /* 1049 /*
1009 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1010 * inventory. 1051 * inventory.
1011 */ 1052 */
1012 if (env) 1053 if (env)
1013 { 1054 {
1014 if (nrof) 1055 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1015 sub_weight (env, weight * nrof); 1056 if (object *pl = visible_to ())
1016 else 1057 esrv_del_item (pl->contr, count);
1017 sub_weight (env, weight + carrying); 1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059
1060 adjust_weight (env, -total_weight ());
1061
1062 // make sure cmov optimisation is applicable
1063 *(above ? &above->below : &env->inv) = below;
1064 *(below ? &below->above : &above ) = above; // &above is just a dummy
1065
1066 above = 0;
1067 below = 0;
1068 env = 0;
1069
1070 /* we set up values so that it could be inserted into
1071 * the map, but we don't actually do that - it is up
1072 * to the caller to decide what we want to do.
1073 */
1074 map = env->map;
1075 x = env->x;
1076 y = env->y;
1018 1077
1019 /* NO_FIX_PLAYER is set when a great many changes are being 1078 /* NO_FIX_PLAYER is set when a great many changes are being
1020 * made to players inventory. If set, avoiding the call 1079 * made to players inventory. If set, avoiding the call
1021 * to save cpu time. 1080 * to save cpu time.
1022 */ 1081 */
1023 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1082 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1024 otmp->update_stats (); 1083 otmp->update_stats ();
1025
1026 if (above)
1027 above->below = below;
1028 else
1029 env->inv = below;
1030
1031 if (below)
1032 below->above = above;
1033
1034 /* we set up values so that it could be inserted into
1035 * the map, but we don't actually do that - it is up
1036 * to the caller to decide what we want to do.
1037 */
1038 x = env->x, y = env->y;
1039 map = env->map;
1040 above = 0, below = 0;
1041 env = 0;
1042 } 1084 }
1043 else if (map) 1085 else if (map)
1044 { 1086 {
1045 if (type == PLAYER)
1046 {
1047 // leaving a spot always closes any open container on the ground
1048 if (container && !container->env)
1049 // this causes spurious floorbox updates, but it ensures
1050 // that the CLOSE event is being sent.
1051 close_container ();
1052
1053 --map->players;
1054 map->touch ();
1055 }
1056
1057 map->dirty = true; 1087 map->dirty = true;
1058 mapspace &ms = this->ms (); 1088 mapspace &ms = this->ms ();
1059 1089
1090 if (object *pl = ms.player ())
1091 {
1092 if (type == PLAYER) // this == pl(!)
1093 {
1094 // leaving a spot always closes any open container on the ground
1095 if (container && !container->env)
1096 // this causes spurious floorbox updates, but it ensures
1097 // that the CLOSE event is being sent.
1098 close_container ();
1099
1100 --map->players;
1101 map->touch ();
1102 }
1103 else if (pl->container == this)
1104 {
1105 // removing a container should close it
1106 close_container ();
1107 }
1108
1109 esrv_del_item (pl->contr, count);
1110 }
1111
1060 /* link the object above us */ 1112 /* link the object above us */
1061 if (above) 1113 // re-link, make sure compiler can easily use cmove
1062 above->below = below; 1114 *(above ? &above->below : &ms.top) = below;
1063 else 1115 *(below ? &below->above : &ms.bot) = above;
1064 ms.top = below; /* we were top, set new top */
1065
1066 /* Relink the object below us, if there is one */
1067 if (below)
1068 below->above = above;
1069 else
1070 {
1071 /* Nothing below, which means we need to relink map object for this space
1072 * use translated coordinates in case some oddness with map tiling is
1073 * evident
1074 */
1075 if (GET_MAP_OB (map, x, y) != this)
1076 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 ());
1077
1078 ms.bot = above; /* goes on above it. */
1079 }
1080 1116
1081 above = 0; 1117 above = 0;
1082 below = 0; 1118 below = 0;
1083 1119
1084 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
1085 return; 1121 return;
1086 1122
1087 int check_walk_off = !flag [FLAG_NO_APPLY]; 1123 int check_walk_off = !flag [FLAG_NO_APPLY];
1124
1125 if (object *pl = ms.player ())
1126 {
1127 if (pl->container == this)
1128 /* If a container that the player is currently using somehow gets
1129 * removed (most likely destroyed), update the player view
1130 * appropriately.
1131 */
1132 pl->close_container ();
1133
1134 //TODO: the floorbox prev/next might need updating
1135 //esrv_del_item (pl->contr, count);
1136 //TODO: update floorbox to preserve ordering
1137 if (pl->contr->ns)
1138 pl->contr->ns->floorbox_update ();
1139 }
1088 1140
1089 for (tmp = ms.bot; tmp; tmp = tmp->above) 1141 for (tmp = ms.bot; tmp; tmp = tmp->above)
1090 { 1142 {
1091 /* No point updating the players look faces if he is the object 1143 /* No point updating the players look faces if he is the object
1092 * being removed. 1144 * being removed.
1093 */ 1145 */
1094
1095 if (tmp->type == PLAYER && tmp != this)
1096 {
1097 /* If a container that the player is currently using somehow gets
1098 * removed (most likely destroyed), update the player view
1099 * appropriately.
1100 */
1101 if (tmp->container == this)
1102 {
1103 flag [FLAG_APPLIED] = 0;
1104 tmp->container = 0;
1105 }
1106
1107 if (tmp->contr->ns)
1108 tmp->contr->ns->floorbox_update ();
1109 }
1110 1146
1111 /* See if object moving off should effect something */ 1147 /* See if object moving off should effect something */
1112 if (check_walk_off 1148 if (check_walk_off
1113 && ((move_type & tmp->move_off) 1149 && ((move_type & tmp->move_off)
1114 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1150 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1146merge_ob (object *op, object *top) 1182merge_ob (object *op, object *top)
1147{ 1183{
1148 if (!op->nrof) 1184 if (!op->nrof)
1149 return 0; 1185 return 0;
1150 1186
1151 if (top) 1187 if (!top)
1152 for (top = op; top && top->above; top = top->above) 1188 for (top = op; top && top->above; top = top->above)
1153 ; 1189 ;
1154 1190
1155 for (; top; top = top->below) 1191 for (; top; top = top->below)
1156 {
1157 if (top == op)
1158 continue;
1159
1160 if (object::can_merge (op, top)) 1192 if (object::can_merge (op, top))
1161 { 1193 {
1162 top->nrof += op->nrof; 1194 top->nrof += op->nrof;
1163 1195
1164/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1196 if (object *pl = top->visible_to ())
1165 op->weight = 0; /* Don't want any adjustements now */ 1197 esrv_update_item (UPD_NROF, pl, top);
1198
1199 op->weight = 0; // cancel the addition above
1200 op->carrying = 0; // must be 0 already
1201
1166 op->destroy (); 1202 op->destroy (1);
1203
1167 return top; 1204 return top;
1168 } 1205 }
1169 }
1170 1206
1171 return 0; 1207 return 0;
1172} 1208}
1173 1209
1174void 1210void
1233object * 1269object *
1234insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1235{ 1271{
1236 assert (!op->flag [FLAG_FREED]); 1272 assert (!op->flag [FLAG_FREED]);
1237 1273
1238 object *top, *floor = NULL;
1239
1240 op->remove (); 1274 op->remove ();
1241
1242#if 0
1243 if (!m->active != !op->active)
1244 if (m->active)
1245 op->activate_recursive ();
1246 else
1247 op->deactivate_recursive ();
1248#endif
1249
1250 if (out_of_map (m, op->x, op->y))
1251 {
1252 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1253#ifdef MANY_CORES
1254 /* Better to catch this here, as otherwise the next use of this object
1255 * is likely to cause a crash. Better to find out where it is getting
1256 * improperly inserted.
1257 */
1258 abort ();
1259#endif
1260 return op;
1261 }
1262
1263 if (object *more = op->more)
1264 if (!insert_ob_in_map (more, m, originator, flag))
1265 return 0;
1266
1267 CLEAR_FLAG (op, FLAG_REMOVED);
1268 1275
1269 /* Ideally, the caller figures this out. However, it complicates a lot 1276 /* Ideally, the caller figures this out. However, it complicates a lot
1270 * of areas of callers (eg, anything that uses find_free_spot would now 1277 * of areas of callers (eg, anything that uses find_free_spot would now
1271 * need extra work 1278 * need extra work
1272 */ 1279 */
1273 if (!xy_normalise (m, op->x, op->y)) 1280 if (!xy_normalise (m, op->x, op->y))
1281 {
1282 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1274 return 0; 1283 return 0;
1284 }
1285
1286 if (object *more = op->more)
1287 if (!insert_ob_in_map (more, m, originator, flag))
1288 return 0;
1289
1290 CLEAR_FLAG (op, FLAG_REMOVED);
1275 1291
1276 op->map = m; 1292 op->map = m;
1277 mapspace &ms = op->ms (); 1293 mapspace &ms = op->ms ();
1278 1294
1279 /* this has to be done after we translate the coordinates. 1295 /* this has to be done after we translate the coordinates.
1280 */ 1296 */
1281 if (op->nrof && !(flag & INS_NO_MERGE)) 1297 if (op->nrof && !(flag & INS_NO_MERGE))
1282 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1298 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1283 if (object::can_merge (op, tmp)) 1299 if (object::can_merge (op, tmp))
1284 { 1300 {
1301 // TODO: we atcually want to update tmp, not op,
1302 // but some caller surely breaks when we return tmp
1303 // from here :/
1285 op->nrof += tmp->nrof; 1304 op->nrof += tmp->nrof;
1286 tmp->destroy (); 1305 tmp->destroy (1);
1287 } 1306 }
1288 1307
1289 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1308 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1290 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1309 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1291 1310
1311 /* since *below* originator, no need to update top */ 1330 /* since *below* originator, no need to update top */
1312 originator->below = op; 1331 originator->below = op;
1313 } 1332 }
1314 else 1333 else
1315 { 1334 {
1335 object *top, *floor = NULL;
1336
1316 top = ms.bot; 1337 top = ms.bot;
1317 1338
1318 /* If there are other objects, then */ 1339 /* If there are other objects, then */
1319 if ((!(flag & INS_MAP_LOAD)) && top) 1340 if (top)
1320 { 1341 {
1321 object *last = 0; 1342 object *last = 0;
1322 1343
1323 /* 1344 /*
1324 * If there are multiple objects on this space, we do some trickier handling. 1345 * If there are multiple objects on this space, we do some trickier handling.
1377 if (last && last->below && last != floor) 1398 if (last && last->below && last != floor)
1378 top = last->below; 1399 top = last->below;
1379 } 1400 }
1380 } /* If objects on this space */ 1401 } /* If objects on this space */
1381 1402
1382 if (flag & INS_MAP_LOAD)
1383 top = ms.top;
1384
1385 if (flag & INS_ABOVE_FLOOR_ONLY) 1403 if (flag & INS_ABOVE_FLOOR_ONLY)
1386 top = floor; 1404 top = floor;
1387 1405
1388 /* Top is the object that our object (op) is going to get inserted above. 1406 /* Top is the object that our object (op) is going to get inserted above.
1389 */ 1407 */
1421 op->map->touch (); 1439 op->map->touch ();
1422 } 1440 }
1423 1441
1424 op->map->dirty = true; 1442 op->map->dirty = true;
1425 1443
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 ()) 1444 if (object *pl = ms.player ())
1445 //TODO: the floorbox prev/next might need updating
1446 //esrv_send_item (pl, op);
1447 //TODO: update floorbox to preserve ordering
1431 if (pl->contr->ns) 1448 if (pl->contr->ns)
1432 pl->contr->ns->floorbox_update (); 1449 pl->contr->ns->floorbox_update ();
1433 1450
1434 /* If this object glows, it may affect lighting conditions that are 1451 /* If this object glows, it may affect lighting conditions that are
1435 * visible to others on this map. But update_all_los is really 1452 * 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 1453 * 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 1454 * 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. 1496 * op is the object to insert it under: supplies x and the map.
1480 */ 1497 */
1481void 1498void
1482replace_insert_ob_in_map (const char *arch_string, object *op) 1499replace_insert_ob_in_map (const char *arch_string, object *op)
1483{ 1500{
1484 object *tmp, *tmp1;
1485
1486 /* first search for itself and remove any old instances */ 1501 /* first search for itself and remove any old instances */
1487 1502
1488 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1503 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1489 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1504 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1490 tmp->destroy (); 1505 tmp->destroy (1);
1491 1506
1492 tmp1 = arch_to_object (archetype::find (arch_string)); 1507 object *tmp = arch_to_object (archetype::find (arch_string));
1493 1508
1494 tmp1->x = op->x; 1509 tmp->x = op->x;
1495 tmp1->y = op->y; 1510 tmp->y = op->y;
1511
1496 insert_ob_in_map (tmp1, op->map, op, 0); 1512 insert_ob_in_map (tmp, op->map, op, 0);
1497} 1513}
1498 1514
1499object * 1515object *
1500object::insert_at (object *where, object *originator, int flags) 1516object::insert_at (object *where, object *originator, int flags)
1501{ 1517{
1518 if (where->env)
1519 return where->env->insert (this);
1520 else
1502 return where->map->insert (this, where->x, where->y, originator, flags); 1521 return where->map->insert (this, where->x, where->y, originator, flags);
1503} 1522}
1504 1523
1505/* 1524/*
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 1525 * decrease(object, number) decreases a specified number from
1547 * the amount of an object. If the amount reaches 0, the object 1526 * the amount of an object. If the amount reaches 0, the object
1548 * is subsequently removed and freed. 1527 * is subsequently removed and freed.
1549 * 1528 *
1550 * Return value: 'op' if something is left, NULL if the amount reached 0 1529 * Return value: 'op' if something is left, NULL if the amount reached 0
1551 */ 1530 */
1531bool
1532object::decrease (sint32 nr)
1533{
1534 if (!nr)
1535 return true;
1536
1537 nr = min (nr, nrof);
1538
1539 nrof -= nr;
1540
1541 if (nrof)
1542 {
1543 adjust_weight (env, -weight * nr); // carrying == 0
1544
1545 if (object *pl = visible_to ())
1546 esrv_update_item (UPD_NROF, pl, this);
1547
1548 return true;
1549 }
1550 else
1551 {
1552 destroy (1);
1553 return false;
1554 }
1555}
1556
1557/*
1558 * split(ob,nr) splits up ob into two parts. The part which
1559 * is returned contains nr objects, and the remaining parts contains
1560 * the rest (or is removed and returned if that number is 0).
1561 * On failure, NULL is returned.
1562 */
1552object * 1563object *
1553decrease_ob_nr (object *op, uint32 i) 1564object::split (sint32 nr)
1554{ 1565{
1555 object *tmp; 1566 int have = number_of ();
1556 1567
1557 if (i == 0) /* objects with op->nrof require this check */ 1568 if (have < nr)
1558 return op; 1569 return 0;
1559 1570 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 { 1571 {
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 (); 1572 remove ();
1595 op->nrof = 0; 1573 return this;
1596 if (tmp)
1597 esrv_del_item (tmp->contr, op->count);
1598 }
1599 } 1574 }
1600 else 1575 else
1601 { 1576 {
1602 object *above = op->above; 1577 decrease (nr);
1603 1578
1604 if (i < op->nrof) 1579 object *op = deep_clone ();
1605 op->nrof -= i; 1580 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; 1581 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 } 1582 }
1647} 1583}
1648 1584
1649object * 1585object *
1650insert_ob_in_ob (object *op, object *where) 1586insert_ob_in_ob (object *op, object *where)
1675 * be != op, if items are merged. -Tero 1611 * be != op, if items are merged. -Tero
1676 */ 1612 */
1677object * 1613object *
1678object::insert (object *op) 1614object::insert (object *op)
1679{ 1615{
1680 object *tmp, *otmp;
1681
1682 if (!QUERY_FLAG (op, FLAG_REMOVED))
1683 op->remove ();
1684
1685 if (op->more) 1616 if (op->more)
1686 { 1617 {
1687 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1618 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1688 return op; 1619 return op;
1689 } 1620 }
1690 1621
1691 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1622 op->remove ();
1692 CLEAR_FLAG (op, FLAG_REMOVED); 1623
1624 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1625
1693 if (op->nrof) 1626 if (op->nrof)
1694 {
1695 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1627 for (object *tmp = inv; tmp; tmp = tmp->below)
1696 if (object::can_merge (tmp, op)) 1628 if (object::can_merge (tmp, op))
1697 { 1629 {
1698 /* return the original object and remove inserted object 1630 /* return the original object and remove inserted object
1699 (client needs the original object) */ 1631 (client needs the original object) */
1700 tmp->nrof += op->nrof; 1632 tmp->nrof += op->nrof;
1701 /* Weight handling gets pretty funky. Since we are adding to 1633
1702 * tmp->nrof, we need to increase the weight. 1634 if (object *pl = tmp->visible_to ())
1703 */ 1635 esrv_update_item (UPD_NROF, pl, tmp);
1636
1704 add_weight (this, op->weight * op->nrof); 1637 adjust_weight (this, op->total_weight ());
1705 SET_FLAG (op, FLAG_REMOVED); 1638
1706 op->destroy (); /* free the inserted object */ 1639 op->destroy (1);
1707 op = tmp; 1640 op = tmp;
1708 op->remove (); /* and fix old object's links */ 1641 goto inserted;
1709 CLEAR_FLAG (op, FLAG_REMOVED);
1710 break;
1711 } 1642 }
1712 1643
1713 /* I assume combined objects have no inventory 1644 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; 1645 op->map = 0;
1730 op->env = this; 1646 op->x = 0;
1647 op->y = 0;
1648
1731 op->above = 0; 1649 op->above = 0;
1732 op->below = 0; 1650 op->below = inv;
1733 op->x = 0, op->y = 0; 1651 op->env = this;
1734 1652
1653 if (inv)
1654 inv->above = op;
1655
1656 inv = op;
1657
1658 op->flag [FLAG_REMOVED] = 0;
1659
1660 if (object *pl = op->visible_to ())
1661 esrv_send_item (pl, op);
1662
1663 adjust_weight (this, op->total_weight ());
1664
1665inserted:
1735 /* reset the light list and los of the players on the map */ 1666 /* reset the light list and los of the players on the map */
1736 if ((op->glow_radius != 0) && map) 1667 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); 1668 update_all_los (map, x, y);
1743 }
1744 1669
1745 /* Client has no idea of ordering so lets not bother ordering it here. 1670 // if this is a player's inventory, update stats
1746 * It sure simplifies this function... 1671 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1747 */ 1672 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 1673
1757 INVOKE_OBJECT (INSERT, this); 1674 INVOKE_OBJECT (INSERT, this);
1758 1675
1759 return op; 1676 return op;
1760} 1677}
1888 LOG (llevError, "Present_arch called outside map.\n"); 1805 LOG (llevError, "Present_arch called outside map.\n");
1889 return NULL; 1806 return NULL;
1890 } 1807 }
1891 1808
1892 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1809 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1893 if (tmp->arch == at) 1810 if (tmp->arch->archname == at->archname)
1894 return tmp; 1811 return tmp;
1895 1812
1896 return NULL; 1813 return NULL;
1897} 1814}
1898 1815
1962 * The first matching object is returned, or NULL if none. 1879 * The first matching object is returned, or NULL if none.
1963 */ 1880 */
1964object * 1881object *
1965present_arch_in_ob (const archetype *at, const object *op) 1882present_arch_in_ob (const archetype *at, const object *op)
1966{ 1883{
1967 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1884 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1968 if (tmp->arch == at) 1885 if (tmp->arch->archname == at->archname)
1969 return tmp; 1886 return tmp;
1970 1887
1971 return NULL; 1888 return NULL;
1972} 1889}
1973 1890
1975 * activate recursively a flag on an object inventory 1892 * activate recursively a flag on an object inventory
1976 */ 1893 */
1977void 1894void
1978flag_inv (object *op, int flag) 1895flag_inv (object *op, int flag)
1979{ 1896{
1980 if (op->inv)
1981 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1897 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1982 { 1898 {
1983 SET_FLAG (tmp, flag); 1899 SET_FLAG (tmp, flag);
1984 flag_inv (tmp, flag); 1900 flag_inv (tmp, flag);
1985 } 1901 }
1986} 1902}
1987 1903
1988/* 1904/*
1989 * deactivate recursively a flag on an object inventory 1905 * deactivate recursively a flag on an object inventory
1990 */ 1906 */
1991void 1907void
1992unflag_inv (object *op, int flag) 1908unflag_inv (object *op, int flag)
1993{ 1909{
1994 if (op->inv)
1995 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1910 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1996 { 1911 {
1997 CLEAR_FLAG (tmp, flag); 1912 CLEAR_FLAG (tmp, flag);
1998 unflag_inv (tmp, flag); 1913 unflag_inv (tmp, flag);
1999 } 1914 }
2000} 1915}
2001 1916
2002/* 1917/*
2003 * find_free_spot(object, map, x, y, start, stop) will search for 1918 * find_free_spot(object, map, x, y, start, stop) will search for
2004 * a spot at the given map and coordinates which will be able to contain 1919 * a spot at the given map and coordinates which will be able to contain
2006 * to search (see the freearr_x/y[] definition). 1921 * to search (see the freearr_x/y[] definition).
2007 * It returns a random choice among the alternatives found. 1922 * 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 1923 * 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 1924 * 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) 1925 * 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 1926 * Note: This function does correctly handle tiled maps, but does not
2015 * inform the caller. However, insert_ob_in_map will update as 1927 * inform the caller. However, insert_ob_in_map will update as
2016 * necessary, so the caller shouldn't need to do any special work. 1928 * necessary, so the caller shouldn't need to do any special work.
2017 * Note - updated to take an object instead of archetype - this is necessary 1929 * Note - updated to take an object instead of archetype - this is necessary
2018 * because arch_blocked (now ob_blocked) needs to know the movement type 1930 * because arch_blocked (now ob_blocked) needs to know the movement type
2019 * to know if the space in question will block the object. We can't use 1931 * to know if the space in question will block the object. We can't use
2021 * customized, changed states, etc. 1933 * customized, changed states, etc.
2022 */ 1934 */
2023int 1935int
2024find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1936find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2025{ 1937{
1938 int altern[SIZEOFFREE];
2026 int index = 0, flag; 1939 int index = 0, flag;
2027 int altern[SIZEOFFREE];
2028 1940
2029 for (int i = start; i < stop; i++) 1941 for (int i = start; i < stop; i++)
2030 { 1942 {
2031 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1943 mapxy pos (m, x, y); pos.move (i);
2032 if (!flag) 1944
1945 if (!pos.normalise ())
1946 continue;
1947
1948 mapspace &ms = *pos;
1949
1950 if (ms.flags () & P_IS_ALIVE)
1951 continue;
1952
1953 /* However, often
1954 * ob doesn't have any move type (when used to place exits)
1955 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1956 */
1957 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1958 {
2033 altern [index++] = i; 1959 altern [index++] = i;
1960 continue;
1961 }
2034 1962
2035 /* Basically, if we find a wall on a space, we cut down the search size. 1963 /* Basically, if we find a wall on a space, we cut down the search size.
2036 * In this way, we won't return spaces that are on another side of a wall. 1964 * In this way, we won't return spaces that are on another side of a wall.
2037 * This mostly work, but it cuts down the search size in all directions - 1965 * This mostly work, but it cuts down the search size in all directions -
2038 * if the space being examined only has a wall to the north and empty 1966 * if the space being examined only has a wall to the north and empty
2039 * spaces in all the other directions, this will reduce the search space 1967 * spaces in all the other directions, this will reduce the search space
2040 * to only the spaces immediately surrounding the target area, and 1968 * to only the spaces immediately surrounding the target area, and
2041 * won't look 2 spaces south of the target space. 1969 * won't look 2 spaces south of the target space.
2042 */ 1970 */
2043 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1971 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1972 {
2044 stop = maxfree[i]; 1973 stop = maxfree[i];
1974 continue;
1975 }
1976
1977 /* Note it is intentional that we check ob - the movement type of the
1978 * head of the object should correspond for the entire object.
1979 */
1980 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1981 continue;
1982
1983 if (ob->blocked (m, pos.x, pos.y))
1984 continue;
1985
1986 altern [index++] = i;
2045 } 1987 }
2046 1988
2047 if (!index) 1989 if (!index)
2048 return -1; 1990 return -1;
2049 1991
2058 */ 2000 */
2059int 2001int
2060find_first_free_spot (const object *ob, maptile *m, int x, int y) 2002find_first_free_spot (const object *ob, maptile *m, int x, int y)
2061{ 2003{
2062 for (int i = 0; i < SIZEOFFREE; i++) 2004 for (int i = 0; i < SIZEOFFREE; i++)
2063 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2005 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2064 return i; 2006 return i;
2065 2007
2066 return -1; 2008 return -1;
2067} 2009}
2068 2010
2345 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2287 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2346 * core dumps if they do. 2288 * core dumps if they do.
2347 * 2289 *
2348 * Add a check so we can't pick up invisible objects (0.93.8) 2290 * Add a check so we can't pick up invisible objects (0.93.8)
2349 */ 2291 */
2350
2351int 2292int
2352can_pick (const object *who, const object *item) 2293can_pick (const object *who, const object *item)
2353{ 2294{
2354 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2295 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2355 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2296 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2358 2299
2359/* 2300/*
2360 * create clone from object to another 2301 * create clone from object to another
2361 */ 2302 */
2362object * 2303object *
2363object_create_clone (object *asrc) 2304object::deep_clone ()
2364{ 2305{
2365 object *dst = 0, *tmp, *src, *prev, *item; 2306 assert (("deep_clone called on non-head object", is_head ()));
2366 2307
2367 if (!asrc) 2308 object *dst = clone ();
2368 return 0;
2369 2309
2370 src = asrc->head_ (); 2310 object *prev = dst;
2371
2372 prev = 0;
2373 for (object *part = src; part; part = part->more) 2311 for (object *part = this->more; part; part = part->more)
2374 { 2312 {
2375 tmp = part->clone (); 2313 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; 2314 tmp->head = dst;
2386
2387 tmp->more = 0;
2388
2389 if (prev)
2390 prev->more = tmp; 2315 prev->more = tmp;
2391
2392 prev = tmp; 2316 prev = tmp;
2393 } 2317 }
2394 2318
2395 for (item = src->inv; item; item = item->below) 2319 for (object *item = inv; item; item = item->below)
2396 insert_ob_in_ob (object_create_clone (item), dst); 2320 insert_ob_in_ob (item->deep_clone (), dst);
2397 2321
2398 return dst; 2322 return dst;
2399} 2323}
2400 2324
2401/* This returns the first object in who's inventory that 2325/* This returns the first object in who's inventory that
2410 return tmp; 2334 return tmp;
2411 2335
2412 return 0; 2336 return 0;
2413} 2337}
2414 2338
2415/* If ob has a field named key, return the link from the list, 2339const shstr &
2416 * otherwise return NULL. 2340object::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{ 2341{
2424 for (key_value *link = ob->key_values; link; link = link->next) 2342 for (key_value *kv = key_values; kv; kv = kv->next)
2425 if (link->key == key) 2343 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; 2344 return kv->value;
2460 2345
2461 return 0; 2346 return shstr_null;
2462} 2347}
2463 2348
2464/* 2349void
2465 * Updates the canonical_key in op to value. 2350object::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{ 2351{
2477 key_value *field = NULL, *last = NULL; 2352 for (key_value *kv = key_values; kv; kv = kv->next)
2478 2353 if (kv->key == key)
2479 for (field = op->key_values; field != NULL; field = field->next)
2480 {
2481 if (field->key != canonical_key)
2482 { 2354 {
2483 last = field; 2355 kv->value = value;
2484 continue; 2356 return;
2485 } 2357 }
2486 2358
2487 if (value) 2359 key_value *kv = new key_value;
2488 field->value = value; 2360
2489 else 2361 kv->next = key_values;
2362 kv->key = key;
2363 kv->value = value;
2364
2365 key_values = kv;
2366}
2367
2368void
2369object::kv_del (const shstr &key)
2370{
2371 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2372 if ((*kvp)->key == key)
2490 { 2373 {
2491 /* Basically, if the archetype has this key set, 2374 key_value *kv = *kvp;
2492 * we need to store the null value so when we save 2375 *kvp = (*kvp)->next;
2493 * it, we save the empty value so that when we load, 2376 delete kv;
2494 * we get this value back again. 2377 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 } 2378 }
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} 2379}
2553 2380
2554object::depth_iterator::depth_iterator (object *container) 2381object::depth_iterator::depth_iterator (object *container)
2555: iterator_base (container) 2382: iterator_base (container)
2556{ 2383{
2606{ 2433{
2607 char flagdesc[512]; 2434 char flagdesc[512];
2608 char info2[256 * 4]; 2435 char info2[256 * 4];
2609 char *p = info; 2436 char *p = info;
2610 2437
2611 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2438 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2612 count, uuid.seq, 2439 count,
2440 uuid.c_str (),
2613 &name, 2441 &name,
2614 title ? "\",title:\"" : "", 2442 title ? "\",title:\"" : "",
2615 title ? (const char *)title : "", 2443 title ? (const char *)title : "",
2616 flag_desc (flagdesc, 512), type); 2444 flag_desc (flagdesc, 512), type);
2617 2445
2618 if (env) 2446 if (!flag[FLAG_REMOVED] && env)
2619 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2447 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2620 2448
2621 if (map) 2449 if (map)
2622 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2450 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2623 2451
2641} 2469}
2642 2470
2643const materialtype_t * 2471const materialtype_t *
2644object::dominant_material () const 2472object::dominant_material () const
2645{ 2473{
2646 if (materialtype_t *mat = name_to_material (materialname)) 2474 if (materialtype_t *mt = name_to_material (materialname))
2647 return mat; 2475 return mt;
2648 2476
2649 // omfg this is slow, this has to be temporary :)
2650 shstr unknown ("unknown");
2651
2652 return name_to_material (unknown); 2477 return name_to_material (shstr_unknown);
2653} 2478}
2654 2479
2655void 2480void
2656object::open_container (object *new_container) 2481object::open_container (object *new_container)
2657{ 2482{
2658 if (container == new_container) 2483 if (container == new_container)
2659 return; 2484 return;
2660 2485
2661 if (object *old_container = container) 2486 object *old_container = container;
2487
2488 if (old_container)
2662 { 2489 {
2663 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2490 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2664 return; 2491 return;
2665 2492
2666#if 0 2493#if 0
2668 if (object *closer = old_container->inv) 2495 if (object *closer = old_container->inv)
2669 if (closer->type == CLOSE_CON) 2496 if (closer->type == CLOSE_CON)
2670 closer->destroy (); 2497 closer->destroy ();
2671#endif 2498#endif
2672 2499
2500 // make sure the container is available
2501 esrv_send_item (this, old_container);
2502
2673 old_container->flag [FLAG_APPLIED] = 0; 2503 old_container->flag [FLAG_APPLIED] = false;
2674 container = 0; 2504 container = 0;
2675 2505
2506 // client needs item update to make it work, client bug requires this to be separate
2676 esrv_update_item (UPD_FLAGS, this, old_container); 2507 esrv_update_item (UPD_FLAGS, this, old_container);
2508
2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2509 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2510 play_sound (sound_find ("chest_close"));
2678 } 2511 }
2679 2512
2680 if (new_container) 2513 if (new_container)
2681 { 2514 {
2682 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2515 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2693 } 2526 }
2694#endif 2527#endif
2695 2528
2696 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2529 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2697 2530
2531 // make sure the container is available, client bug requires this to be separate
2532 esrv_send_item (this, new_container);
2533
2698 new_container->flag [FLAG_APPLIED] = 1; 2534 new_container->flag [FLAG_APPLIED] = true;
2699 container = new_container; 2535 container = new_container;
2700 2536
2537 // client needs flag change
2701 esrv_update_item (UPD_FLAGS, this, new_container); 2538 esrv_update_item (UPD_FLAGS, this, new_container);
2702 esrv_send_inventory (this, new_container); 2539 esrv_send_inventory (this, new_container);
2540 play_sound (sound_find ("chest_open"));
2541 }
2542// else if (!old_container->env && contr && contr->ns)
2543// contr->ns->floorbox_reset ();
2544}
2545
2546object *
2547object::force_find (const shstr name)
2548{
2549 /* cycle through his inventory to look for the MARK we want to
2550 * place
2551 */
2552 for (object *tmp = inv; tmp; tmp = tmp->below)
2553 if (tmp->type == FORCE && tmp->slaying == name)
2554 return splay (tmp);
2555
2556 return 0;
2557}
2558
2559void
2560object::force_add (const shstr name, int duration)
2561{
2562 if (object *force = force_find (name))
2563 force->destroy ();
2564
2565 object *force = get_archetype (FORCE_NAME);
2566
2567 force->slaying = name;
2568 force->stats.food = 1;
2569 force->speed_left = -1.f;
2570
2571 force->set_speed (duration ? 1.f / duration : 0.f);
2572 force->flag [FLAG_IS_USED_UP] = true;
2573 force->flag [FLAG_APPLIED] = true;
2574
2575 insert (force);
2576}
2577
2578void
2579object::play_sound (faceidx sound)
2580{
2581 if (!sound)
2582 return;
2583
2584 if (flag [FLAG_REMOVED])
2585 return;
2586
2587 if (env)
2703 } 2588 {
2589 if (object *pl = in_player ())
2590 pl->contr->play_sound (sound);
2591 }
2592 else
2593 map->play_sound (sound, x, y);
2704} 2594}
2705 2595
2706

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines