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.113 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines