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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.170 by root, Wed Aug 1 01:53:13 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22 The authors can be reached via e-mail at crossfire-devel@real-time.com
23*/ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
28#include <global.h> 27#include <global.h>
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <skills.h> 33#include <sproto.h>
35#include <loader.h> 34#include <loader.h>
36 35
36#include <bitset>
37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
39static UUID uuid;
40const uint64 UUID_SKIP = 1<<19;
38 41
39object *objects; /* Pointer to the list of used objects */ 42objectvec objects;
40object *active_objects; /* List of active objects that need to be processed */ 43activevec actives;
41 44
42short 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, 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,
43 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -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
44}; 47};
45short 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, 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,
… …
51int freedir[SIZEOFFREE] = { 54int freedir[SIZEOFFREE] = {
52 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, 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,
53 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 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
54}; 57};
55 58
59static void
60write_uuid (void)
61{
62 char filename1[MAX_BUF], filename2[MAX_BUF];
63
64 sprintf (filename1, "%s/uuid", settings.localdir);
65 sprintf (filename2, "%s/uuid~", settings.localdir);
66
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}
79
80static void
81read_uuid (void)
82{
83 char filename[MAX_BUF];
84
85 sprintf (filename, "%s/uuid", settings.localdir);
86
87 FILE *fp;
88
89 if (!(fp = fopen (filename, "r")))
90 {
91 if (errno == ENOENT)
92 {
93 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0;
95 write_uuid ();
96 return;
97 }
98
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1);
101 }
102
103 int version;
104 unsigned long long uid;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
106 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
108 _exit (1);
109 }
110
111 uuid.seq = uid;
112 write_uuid ();
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
114 fclose (fp);
115}
116
117UUID
118gen_uuid ()
119{
120 UUID uid;
121
122 uid.seq = ++uuid.seq;
123
124 if (!(uuid.seq & (UUID_SKIP - 1)))
125 write_uuid ();
126
127 return uid;
128}
129
130void
131init_uuid ()
132{
133 read_uuid ();
134}
135
56/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57static int 137static int
58compare_ob_value_lists_one (const object *wants, const object *has) 138compare_ob_value_lists_one (const object *wants, const object *has)
59{ 139{
60 key_value *wants_field; 140 key_value *wants_field;
… …
63 * objects with lists are rare, and lists stay short. If not, use a 143 * objects with lists are rare, and lists stay short. If not, use a
64 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
65 */ 145 */
66 146
67 /* For each field in wants, */ 147 /* For each field in wants, */
68 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
69 { 149 {
70 key_value *has_field; 150 key_value *has_field;
71 151
72 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
73 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
… …
107 * 187 *
108 * Note that this function appears a lot longer than the macro it 188 * Note that this function appears a lot longer than the macro it
109 * replaces - this is mostly for clarity - a decent compiler should hopefully 189 * replaces - this is mostly for clarity - a decent compiler should hopefully
110 * reduce this to the same efficiency. 190 * reduce this to the same efficiency.
111 * 191 *
112 * Check nrof variable *before* calling CAN_MERGE() 192 * Check nrof variable *before* calling can_merge()
113 * 193 *
114 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
115 * check weight 195 * check weight
116 */ 196 */
117
118bool object::can_merge (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
119{ 198{
120 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
121 if ((ob1 == ob2) || (ob1->type != ob2->type)) 200 if (ob1 == ob2
201 || ob1->type != ob2->type
202 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value
204 || ob1->name != ob2->name)
122 return 0; 205 return 0;
123 206
124 if (ob1->speed != ob2->speed) 207 //TODO: this ain't working well, use nicer and correct overflow check
125 return 0;
126
127 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
128 * value could not be stored in a sint32 (which unfortunately sometimes is 209 * value could not be stored in a sint32 (which unfortunately sometimes is
129 * used to store nrof). 210 * used to store nrof).
130 */ 211 */
131 if (ob1->nrof + ob2->nrof >= 1UL << 31) 212 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
141 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 222 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
142 223
143 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
144 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 225 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
145 226
146 227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
147 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 228 || ob1->arch != ob2->arch
148 * being locked in inventory should prevent merging.
149 * 0x4 in flags3 is CLIENT_SENT
150 */
151 if ((ob1->arch != ob2->arch) ||
152 (ob1->flags[0] != ob2->flags[0]) ||
153 (ob1->flags[1] != ob2->flags[1]) ||
154 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
155 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
156 (ob1->name != ob2->name) || 229 || ob1->name != ob2->name
157 (ob1->title != ob2->title) || 230 || ob1->title != ob2->title
158 (ob1->msg != ob2->msg) || 231 || ob1->msg != ob2->msg
159 (ob1->weight != ob2->weight) || 232 || ob1->weight != ob2->weight
160 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
161 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
162 (ob1->attacktype != ob2->attacktype) || 235 || ob1->attacktype != ob2->attacktype
163 (ob1->magic != ob2->magic) || 236 || ob1->magic != ob2->magic
164 (ob1->slaying != ob2->slaying) || 237 || ob1->slaying != ob2->slaying
165 (ob1->skill != ob2->skill) || 238 || ob1->skill != ob2->skill
166 (ob1->value != ob2->value) || 239 || ob1->value != ob2->value
167 (ob1->animation_id != ob2->animation_id) || 240 || ob1->animation_id != ob2->animation_id
168 (ob1->client_type != ob2->client_type) || 241 || ob1->client_type != ob2->client_type
169 (ob1->materialname != ob2->materialname) || 242 || ob1->materialname != ob2->materialname
170 (ob1->lore != ob2->lore) || 243 || ob1->lore != ob2->lore
171 (ob1->subtype != ob2->subtype) || 244 || ob1->subtype != ob2->subtype
172 (ob1->move_type != ob2->move_type) || 245 || ob1->move_type != ob2->move_type
173 (ob1->move_block != ob2->move_block) || 246 || ob1->move_block != ob2->move_block
174 (ob1->move_allow != ob2->move_allow) || 247 || ob1->move_allow != ob2->move_allow
175 (ob1->move_on != ob2->move_on) || 248 || ob1->move_on != ob2->move_on
176 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 249 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty)
177 return 0; 252 return 0;
178 253
179 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
180 * check all objects in the inventory. 255 * check all objects in the inventory.
181 */ 256 */
… …
184 /* if one object has inventory but the other doesn't, not equiv */ 259 /* if one object has inventory but the other doesn't, not equiv */
185 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186 return 0; 261 return 0;
187 262
188 /* Now check to see if the two inventory objects could merge */ 263 /* Now check to see if the two inventory objects could merge */
189 if (!CAN_MERGE (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
190 return 0; 265 return 0;
191 266
192 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
193 * if it is valid. 268 * if it is valid.
194 */ 269 */
… …
203 278
204 /* Note sure why the following is the case - either the object has to 279 /* Note sure why the following is the case - either the object has to
205 * be animated or have a very low speed. Is this an attempted monster 280 * be animated or have a very low speed. Is this an attempted monster
206 * check? 281 * check?
207 */ 282 */
208 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
209 return 0; 284 return 0;
210 285
211 switch (ob1->type) 286 switch (ob1->type)
212 { 287 {
213 case SCROLL: 288 case SCROLL:
… …
224 return 0; 299 return 0;
225 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
226 return 0; 301 return 0;
227 } 302 }
228 303
229 //TODO: generate an event or call into perl for additional checks
230 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
231 { 305 {
232 ob1->optimise (); 306 ob1->optimise ();
233 ob2->optimise (); 307 ob2->optimise ();
234 308
235 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2))
236 return 0; 311 return 0;
237 } 312 }
238 313
239 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
240 return 1; 315 return 1;
241} 316}
… …
249sum_weight (object *op) 324sum_weight (object *op)
250{ 325{
251 long sum; 326 long sum;
252 object *inv; 327 object *inv;
253 328
254 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
255 { 330 {
256 if (inv->inv) 331 if (inv->inv)
257 sum_weight (inv); 332 sum_weight (inv);
333
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 335 }
336
260 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
339
262 if (op->carrying != sum) 340 if (op->carrying != sum)
263 op->carrying = sum; 341 op->carrying = sum;
342
264 return sum; 343 return sum;
265} 344}
266 345
267/** 346/**
268 * Return the outermost environment object for a given object. 347 * Return the outermost environment object for a given object.
… …
275 op = op->env; 354 op = op->env;
276 return op; 355 return op;
277} 356}
278 357
279/* 358/*
280 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
281 * a better check. We basically keeping traversing up until we can't
282 * or find a player.
283 */
284
285object *
286is_player_inv (object *op)
287{
288 for (; op != NULL && op->type != PLAYER; op = op->env)
289 if (op->env == op)
290 op->env = NULL;
291 return op;
292}
293
294/*
295 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296 * Some error messages. 360 * Some error messages.
297 * The result of the dump is stored in the static global errmsg array. 361 * The result of the dump is stored in the static global errmsg array.
298 */ 362 */
299 363char *
300void
301dump_object2 (object *op)
302{
303 errmsg[0] = 0;
304 return;
305 //TODO//D#d#
306#if 0
307 char *cp;
308
309/* object *tmp;*/
310
311 if (op->arch != NULL)
312 {
313 strcat (errmsg, "arch ");
314 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315 strcat (errmsg, "\n");
316 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317 strcat (errmsg, cp);
318# if 0
319 /* Don't dump player diffs - they are too long, mostly meaningless, and
320 * will overflow the buffer.
321 * Changed so that we don't dump inventory either. This may
322 * also overflow the buffer.
323 */
324 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325 strcat (errmsg, cp);
326 for (tmp = op->inv; tmp; tmp = tmp->below)
327 dump_object2 (tmp);
328# endif
329 strcat (errmsg, "end\n");
330 }
331 else
332 {
333 strcat (errmsg, "Object ");
334 if (op->name == NULL)
335 strcat (errmsg, "(null)");
336 else
337 strcat (errmsg, op->name);
338 strcat (errmsg, "\n");
339# if 0
340 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341 strcat (errmsg, cp);
342 for (tmp = op->inv; tmp; tmp = tmp->below)
343 dump_object2 (tmp);
344# endif
345 strcat (errmsg, "end\n");
346 }
347#endif
348}
349
350/*
351 * Dumps an object. Returns output in the static global errmsg array.
352 */
353
354void
355dump_object (object *op) 364dump_object (object *op)
356{ 365{
357 if (op == NULL) 366 if (!op)
358 { 367 return strdup ("[NULLOBJ]");
359 strcpy (errmsg, "[NULL pointer]");
360 return;
361 }
362 errmsg[0] = '\0';
363 dump_object2 (op);
364}
365 368
366void 369 object_freezer freezer;
367dump_all_objects (void) 370 op->write (freezer);
368{ 371 return freezer.as_string ();
369 object *op;
370
371 for (op = objects; op != NULL; op = op->next)
372 {
373 dump_object (op);
374 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375 }
376} 372}
377 373
378/* 374/*
379 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
380 * multi-object 1 which is closest to the second object. 376 * multi-object 1 which is closest to the second object.
… …
396} 392}
397 393
398/* 394/*
399 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
400 */ 396 */
401
402object * 397object *
403find_object (tag_t i) 398find_object (tag_t i)
404{ 399{
405 object *op; 400 for_all_objects (op)
406
407 for (op = objects; op != NULL; op = op->next)
408 if (op->count == i) 401 if (op->count == i)
409 break;
410 return op; 402 return op;
403
404 return 0;
411} 405}
412 406
413/* 407/*
414 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
415 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
416 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
417 */ 411 */
418
419object * 412object *
420find_object_name (const char *str) 413find_object_name (const char *str)
421{ 414{
422 const char *name = shstr::find (str); 415 shstr_cmp str_ (str);
423 object *op; 416 object *op;
424 417
425 for (op = objects; op != NULL; op = op->next) 418 for_all_objects (op)
426 if (&op->name == name) 419 if (op->name == str_)
427 break; 420 break;
428 421
429 return op; 422 return op;
430} 423}
431 424
… …
434{ 427{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436} 429}
437 430
438/* 431/*
439 * Returns the object which this object marks as being the owner.
440 * A id-scheme is used to avoid pointing to objects which have been
441 * freed and are now reused. If this is detected, the owner is
442 * set to NULL, and NULL is returned.
443 * Changed 2004-02-12 - if the player is setting at the play again
444 * prompt, he is removed, and we don't want to treat him as an owner of
445 * anything, so check removed flag. I don't expect that this should break
446 * anything - once an object is removed, it is basically dead anyways.
447 */
448
449object *
450get_owner (object *op)
451{
452 if (op->owner == NULL)
453 return NULL;
454
455 if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
456 return op->owner;
457
458 op->owner = NULL;
459 op->ownercount = 0;
460 return NULL;
461}
462
463void
464clear_owner (object *op)
465{
466 if (!op)
467 return;
468
469 if (op->owner && op->ownercount == op->owner->count)
470 op->owner->refcount--;
471
472 op->owner = NULL;
473 op->ownercount = 0;
474}
475
476/*
477 * Sets the owner and sets the skill and exp pointers to owner's current 432 * Sets the owner and sets the skill and exp pointers to owner's current
478 * skill and experience objects. 433 * skill and experience objects.
479 */ 434 */
480void 435void
481set_owner (object *op, object *owner) 436object::set_owner (object *owner)
482{ 437{
483 if (owner == NULL || op == NULL) 438 if (!owner)
484 return; 439 return;
485 440
486 /* next line added to allow objects which own objects */ 441 /* next line added to allow objects which own objects */
487 /* Add a check for ownercounts in here, as I got into an endless loop 442 /* Add a check for ownercounts in here, as I got into an endless loop
488 * with the fireball owning a poison cloud which then owned the 443 * with the fireball owning a poison cloud which then owned the
489 * fireball. I believe that was caused by one of the objects getting 444 * fireball. I believe that was caused by one of the objects getting
490 * freed and then another object replacing it. Since the ownercounts 445 * freed and then another object replacing it. Since the ownercounts
491 * didn't match, this check is valid and I believe that cause is valid. 446 * didn't match, this check is valid and I believe that cause is valid.
492 */ 447 */
493 while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) 448 while (owner->owner)
494 owner = owner->owner; 449 owner = owner->owner;
495 450
496 /* IF the owner still has an owner, we did not resolve to a final owner.
497 * so lets not add to that.
498 */
499 if (owner->owner)
500 return;
501
502 op->owner = owner; 451 this->owner = owner;
503
504 op->ownercount = owner->count;
505 owner->refcount++;
506} 452}
507 453
508/* Set the owner to clone's current owner and set the skill and experience 454int
509 * objects to clone's objects (typically those objects that where the owner's 455object::slottype () const
510 * current skill and experience objects at the time when clone's owner was
511 * set - not the owner's current skill and experience objects).
512 *
513 * Use this function if player created an object (e.g. fire bullet, swarm
514 * spell), and this object creates further objects whose kills should be
515 * accounted for the player's original skill, even if player has changed
516 * skills meanwhile.
517 */
518void
519copy_owner (object *op, object *clone)
520{ 456{
521 object *owner = get_owner (clone); 457 if (type == SKILL)
522
523 if (owner == NULL)
524 {
525 /* players don't have owners - they own themselves. Update
526 * as appropriate.
527 */
528 if (clone->type == PLAYER)
529 owner = clone;
530 else
531 return;
532 } 458 {
459 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
460 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
461 }
462 else
463 {
464 if (slot [body_combat].info) return slot_combat;
465 if (slot [body_range ].info) return slot_ranged;
466 }
467
468 return slot_none;
469}
533 470
534 set_owner (op, owner); 471bool
472object::change_weapon (object *ob)
473{
474 if (current_weapon == ob)
475 return true;
476
477 if (chosen_skill)
478 chosen_skill->flag [FLAG_APPLIED] = false;
479
480 current_weapon = ob;
481 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
482
483 if (chosen_skill)
484 chosen_skill->flag [FLAG_APPLIED] = true;
485
486 update_stats ();
487
488 if (ob)
489 {
490 // now check wether any body locations became invalid, in which case
491 // we cannot apply the weapon at the moment.
492 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
493 if (slot[i].used < 0)
494 {
495 current_weapon = chosen_skill = 0;
496 update_stats ();
497
498 new_draw_info_format (NDI_UNIQUE, 0, this,
499 "You try to balance all your items at once, "
500 "but the %s is just too much for your body. "
501 "[You need to unapply some items first.]", &ob->name);
502 return false;
503 }
504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 }
507 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509
510 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
511 {
512 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
513 &name, ob->debug_desc ());
514 return false;
515 }
516
517 return true;
535} 518}
536 519
537/* Zero the key_values on op, decrementing the shared-string 520/* Zero the key_values on op, decrementing the shared-string
538 * refcounts and freeing the links. 521 * refcounts and freeing the links.
539 */ 522 */
540static void 523static void
541free_key_values (object *op) 524free_key_values (object *op)
542{ 525{
543 for (key_value *i = op->key_values; i != 0;) 526 for (key_value *i = op->key_values; i; )
544 { 527 {
545 key_value *next = i->next; 528 key_value *next = i->next;
546 delete i; 529 delete i;
547 530
548 i = next; 531 i = next;
549 } 532 }
550 533
551 op->key_values = 0; 534 op->key_values = 0;
552} 535}
553 536
554void object::clear () 537object &
538object::operator =(const object &src)
555{ 539{
556 attachable_base::clear (); 540 bool is_freed = flag [FLAG_FREED];
541 bool is_removed = flag [FLAG_REMOVED];
557 542
558 free_key_values (this); 543 *(object_copy *)this = src;
559 544
560 clear_owner (this); 545 flag [FLAG_FREED] = is_freed;
561 546 flag [FLAG_REMOVED] = is_removed;
562 name = 0;
563 name_pl = 0;
564 title = 0;
565 race = 0;
566 slaying = 0;
567 skill = 0;
568 msg = 0;
569 lore = 0;
570 custom_name = 0;
571 materialname = 0;
572
573 memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));
574
575 SET_FLAG (this, FLAG_REMOVED);
576}
577
578void object::clone (object *destination)
579{
580 *(object_copy *) destination = *this;
581 *(object_pod *) destination = *this;
582
583 if (self || cb)
584 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
585}
586
587/*
588 * clear_object() frees everything allocated by an object, and also
589 * clears all variables and flags to default settings.
590 */
591
592void
593clear_object (object *op)
594{
595 op->clear ();
596
597 op->contr = NULL;
598 op->below = NULL;
599 op->above = NULL;
600 op->inv = NULL;
601 op->container = NULL;
602 op->env = NULL;
603 op->more = NULL;
604 op->head = NULL;
605 op->map = NULL;
606 op->refcount = 0;
607 op->active_next = NULL;
608 op->active_prev = NULL;
609 /* What is not cleared is next, prev, and count */
610
611 op->expmul = 1.0;
612 op->face = blank_face;
613 op->attacked_by_count = -1;
614
615 if (settings.casting_time)
616 op->casting_time = -1;
617}
618
619/*
620 * copy object first frees everything allocated by the second object,
621 * and then copies the contends of the first object into the second
622 * object, allocating what needs to be allocated. Basically, any
623 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
624 * if the first object is freed, the pointers in the new object
625 * will point at garbage.
626 */
627
628void
629copy_object (object *op2, object *op)
630{
631 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
632 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
633
634 op2->clone (op);
635
636 if (is_freed)
637 SET_FLAG (op, FLAG_FREED);
638 if (is_removed)
639 SET_FLAG (op, FLAG_REMOVED);
640
641 if (op2->speed < 0)
642 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
643 547
644 /* Copy over key_values, if any. */ 548 /* Copy over key_values, if any. */
645 if (op2->key_values) 549 if (src.key_values)
646 { 550 {
647 key_value *tail = 0; 551 key_value *tail = 0;
648 key_value *i;
649
650 op->key_values = 0; 552 key_values = 0;
651 553
652 for (i = op2->key_values; i; i = i->next) 554 for (key_value *i = src.key_values; i; i = i->next)
653 { 555 {
654 key_value *new_link = new key_value; 556 key_value *new_link = new key_value;
655 557
656 new_link->next = 0; 558 new_link->next = 0;
657 new_link->key = i->key; 559 new_link->key = i->key;
658 new_link->value = i->value; 560 new_link->value = i->value;
659 561
660 /* Try and be clever here, too. */ 562 /* Try and be clever here, too. */
661 if (!op->key_values) 563 if (!key_values)
662 { 564 {
663 op->key_values = new_link; 565 key_values = new_link;
664 tail = new_link; 566 tail = new_link;
665 } 567 }
666 else 568 else
667 { 569 {
668 tail->next = new_link; 570 tail->next = new_link;
669 tail = new_link; 571 tail = new_link;
670 } 572 }
671 } 573 }
672 } 574 }
575}
673 576
674 update_ob_speed (op); 577/*
578 * copy_to first frees everything allocated by the dst object,
579 * and then copies the contents of itself into the second
580 * object, allocating what needs to be allocated. Basically, any
581 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
582 * if the first object is freed, the pointers in the new object
583 * will point at garbage.
584 */
585void
586object::copy_to (object *dst)
587{
588 *dst = *this;
589
590 if (speed < 0)
591 dst->speed_left = speed_left - rndm ();
592
593 dst->set_speed (dst->speed);
594}
595
596void
597object::instantiate ()
598{
599 if (!uuid.seq) // HACK
600 uuid = gen_uuid ();
601
602 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting
606 * values for the body_used info, so when items are created
607 * for it, they can be properly equipped.
608 */
609 for (int i = NUM_BODY_LOCATIONS; i--; )
610 slot[i].used = slot[i].info;
611
612 attachable::instantiate ();
613}
614
615object *
616object::clone ()
617{
618 object *neu = create ();
619 copy_to (neu);
620 return neu;
675} 621}
676 622
677/* 623/*
678 * If an object with the IS_TURNABLE() flag needs to be turned due 624 * If an object with the IS_TURNABLE() flag needs to be turned due
679 * to the closest player being on the other side, this function can 625 * to the closest player being on the other side, this function can
680 * be called to update the face variable, _and_ how it looks on the map. 626 * be called to update the face variable, _and_ how it looks on the map.
681 */ 627 */
682
683void 628void
684update_turn_face (object *op) 629update_turn_face (object *op)
685{ 630{
686 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 631 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
687 return; 632 return;
633
688 SET_ANIMATION (op, op->direction); 634 SET_ANIMATION (op, op->direction);
689 update_object (op, UP_OBJ_FACE); 635 update_object (op, UP_OBJ_FACE);
690} 636}
691 637
692/* 638/*
693 * Updates the speed of an object. If the speed changes from 0 to another 639 * Updates the speed of an object. If the speed changes from 0 to another
694 * value, or vice versa, then add/remove the object from the active list. 640 * value, or vice versa, then add/remove the object from the active list.
695 * This function needs to be called whenever the speed of an object changes. 641 * This function needs to be called whenever the speed of an object changes.
696 */ 642 */
697
698void 643void
699update_ob_speed (object *op) 644object::set_speed (float speed)
700{ 645{
701 extern int arch_init; 646 if (flag [FLAG_FREED] && speed)
702
703 /* No reason putting the archetypes objects on the speed list,
704 * since they never really need to be updated.
705 */
706
707 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
708 { 647 {
709 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 648 LOG (llevError, "Object %s is freed but has speed.\n", &name);
710#ifdef MANY_CORES
711 abort ();
712#else
713 op->speed = 0; 649 speed = 0;
714#endif
715 }
716 if (arch_init)
717 { 650 }
718 return;
719 }
720 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721 {
722 /* If already on active list, don't do anything */
723 if (op->active_next || op->active_prev || op == active_objects)
724 return;
725 651
726 /* process_events() expects us to insert the object at the beginning 652 this->speed = speed;
727 * of the list. */ 653
728 op->active_next = active_objects; 654 if (has_active_speed ())
729 if (op->active_next != NULL) 655 activate ();
730 op->active_next->active_prev = op;
731 active_objects = op;
732 }
733 else 656 else
734 { 657 deactivate ();
735 /* If not on the active list, nothing needs to be done */
736 if (!op->active_next && !op->active_prev && op != active_objects)
737 return;
738
739 if (op->active_prev == NULL)
740 {
741 active_objects = op->active_next;
742 if (op->active_next != NULL)
743 op->active_next->active_prev = NULL;
744 }
745 else
746 {
747 op->active_prev->active_next = op->active_next;
748 if (op->active_next)
749 op->active_next->active_prev = op->active_prev;
750 }
751 op->active_next = NULL;
752 op->active_prev = NULL;
753 }
754} 658}
755 659
756/* This function removes object 'op' from the list of active
757 * objects.
758 * This should only be used for style maps or other such
759 * reference maps where you don't want an object that isn't
760 * in play chewing up cpu time getting processed.
761 * The reverse of this is to call update_ob_speed, which
762 * will do the right thing based on the speed of the object.
763 */
764void
765remove_from_active_list (object *op)
766{
767 /* If not on the active list, nothing needs to be done */
768 if (!op->active_next && !op->active_prev && op != active_objects)
769 return;
770
771 if (op->active_prev == NULL)
772 {
773 active_objects = op->active_next;
774 if (op->active_next != NULL)
775 op->active_next->active_prev = NULL;
776 }
777 else
778 {
779 op->active_prev->active_next = op->active_next;
780 if (op->active_next)
781 op->active_next->active_prev = op->active_prev;
782 }
783 op->active_next = NULL;
784 op->active_prev = NULL;
785}
786
787/* 660/*
788 * update_object() updates the array which represents the map. 661 * update_object() updates the the map.
789 * It takes into account invisible objects (and represent squares covered 662 * It takes into account invisible objects (and represent squares covered
790 * by invisible objects by whatever is below them (unless it's another 663 * by invisible objects by whatever is below them (unless it's another
791 * invisible object, etc...) 664 * invisible object, etc...)
792 * If the object being updated is beneath a player, the look-window 665 * If the object being updated is beneath a player, the look-window
793 * of that player is updated (this might be a suboptimal way of 666 * of that player is updated (this might be a suboptimal way of
794 * updating that window, though, since update_object() is called _often_) 667 * updating that window, though, since update_object() is called _often_)
795 * 668 *
796 * action is a hint of what the caller believes need to be done. 669 * action is a hint of what the caller believes need to be done.
797 * For example, if the only thing that has changed is the face (due to
798 * an animation), we don't need to call update_position until that actually
799 * comes into view of a player. OTOH, many other things, like addition/removal
800 * of walls or living creatures may need us to update the flags now.
801 * current action are: 670 * current action are:
802 * UP_OBJ_INSERT: op was inserted 671 * UP_OBJ_INSERT: op was inserted
803 * UP_OBJ_REMOVE: op was removed 672 * UP_OBJ_REMOVE: op was removed
804 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 673 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
805 * as that is easier than trying to look at what may have changed. 674 * as that is easier than trying to look at what may have changed.
806 * UP_OBJ_FACE: only the objects face has changed. 675 * UP_OBJ_FACE: only the objects face has changed.
807 */ 676 */
808
809void 677void
810update_object (object *op, int action) 678update_object (object *op, int action)
811{ 679{
812 int update_now = 0, flags;
813 MoveType move_on, move_off, move_block, move_slow;
814
815 if (op == NULL) 680 if (op == NULL)
816 { 681 {
817 /* this should never happen */ 682 /* this should never happen */
818 LOG (llevDebug, "update_object() called for NULL object.\n"); 683 LOG (llevDebug, "update_object() called for NULL object.\n");
819 return; 684 return;
820 } 685 }
821 686
822 if (op->env != NULL) 687 if (op->env)
823 { 688 {
824 /* Animation is currently handled by client, so nothing 689 /* Animation is currently handled by client, so nothing
825 * to do in this case. 690 * to do in this case.
826 */ 691 */
827 return; 692 return;
… …
832 */ 697 */
833 if (!op->map || op->map->in_memory == MAP_SAVING) 698 if (!op->map || op->map->in_memory == MAP_SAVING)
834 return; 699 return;
835 700
836 /* make sure the object is within map boundaries */ 701 /* make sure the object is within map boundaries */
837 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 702 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
838 { 703 {
839 LOG (llevError, "update_object() called for object out of map!\n"); 704 LOG (llevError, "update_object() called for object out of map!\n");
840#ifdef MANY_CORES 705#ifdef MANY_CORES
841 abort (); 706 abort ();
842#endif 707#endif
843 return; 708 return;
844 } 709 }
845 710
846 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 711 mapspace &m = op->ms ();
847 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
848 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
849 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
850 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
851 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
852 712
713 if (!(m.flags_ & P_UPTODATE))
714 /* nop */;
853 if (action == UP_OBJ_INSERT) 715 else if (action == UP_OBJ_INSERT)
854 { 716 {
717 // this is likely overkill, TODO: revisit (schmorp)
855 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 718 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
856 update_now = 1;
857
858 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 719 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
859 update_now = 1; 720 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
860 721 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
722 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
861 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 723 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
862 update_now = 1;
863
864 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
865 update_now = 1;
866
867 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
868 update_now = 1;
869
870 if ((move_on | op->move_on) != move_on) 724 || (m.move_on | op->move_on ) != m.move_on
871 update_now = 1;
872
873 if ((move_off | op->move_off) != move_off) 725 || (m.move_off | op->move_off ) != m.move_off
874 update_now = 1; 726 || (m.move_slow | op->move_slow) != m.move_slow
875
876 /* This isn't perfect, but I don't expect a lot of objects to 727 /* This isn't perfect, but I don't expect a lot of objects to
877 * to have move_allow right now. 728 * to have move_allow right now.
878 */ 729 */
879 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 730 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
880 update_now = 1; 731 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
881 732 m.flags_ = 0;
882 if ((move_slow | op->move_slow) != move_slow)
883 update_now = 1;
884 } 733 }
885 /* if the object is being removed, we can't make intelligent 734 /* if the object is being removed, we can't make intelligent
886 * decisions, because remove_ob can't really pass the object 735 * decisions, because remove_ob can't really pass the object
887 * that is being removed. 736 * that is being removed.
888 */ 737 */
889 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 738 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
890 update_now = 1; 739 m.flags_ = 0;
891 else if (action == UP_OBJ_FACE) 740 else if (action == UP_OBJ_FACE)
892 /* Nothing to do for that case */ ; 741 /* Nothing to do for that case */ ;
893 else 742 else
894 LOG (llevError, "update_object called with invalid action: %d\n", action); 743 LOG (llevError, "update_object called with invalid action: %d\n", action);
895 744
896 if (update_now)
897 {
898 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
899 update_position (op->map, op->x, op->y);
900 }
901
902 if (op->more != NULL) 745 if (op->more)
903 update_object (op->more, action); 746 update_object (op->more, action);
904}
905
906static unordered_vector < object *>mortals;
907static
908std::vector < object *>
909 freed;
910
911void object::free_mortals ()
912{
913 for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)
914 if (!(*i)->refcount)
915 {
916 freed.push_back (*i);
917 mortals.erase (i);
918 }
919 else
920 ++i;
921} 747}
922 748
923object::object () 749object::object ()
924{ 750{
925 SET_FLAG (this, FLAG_REMOVED); 751 SET_FLAG (this, FLAG_REMOVED);
926 752
927 expmul = 1.0; 753 expmul = 1.0;
928 face = blank_face; 754 face = blank_face;
929 attacked_by_count = -1;
930} 755}
931 756
932object::~object () 757object::~object ()
933{ 758{
759 unlink ();
760
934 free_key_values (this); 761 free_key_values (this);
935} 762}
936 763
764static int object_count;
765
937void object::link () 766void object::link ()
938{ 767{
768 assert (!index);//D
769 uuid = gen_uuid ();
939 count = ++ob_count; 770 count = ++object_count;
940 771
941 prev = 0; 772 refcnt_inc ();
942 next = objects; 773 objects.insert (this);
943
944 if (objects)
945 objects->prev = this;
946
947 objects = this;
948} 774}
949 775
950void object::unlink () 776void object::unlink ()
951{ 777{
952 count = 0;
953
954 /* Remove this object from the list of used objects */
955 if (prev)
956 {
957 prev->next = next;
958 prev = 0;
959 }
960
961 if (next) 778 if (!index)
962 { 779 return;
963 next->prev = prev; 780
964 next = 0; 781 objects.erase (this);
782 refcnt_dec ();
783}
784
785void
786object::activate ()
787{
788 /* If already on active list, don't do anything */
789 if (active)
790 return;
791
792 if (has_active_speed ())
793 actives.insert (this);
794}
795
796void
797object::activate_recursive ()
798{
799 activate ();
800
801 for (object *op = inv; op; op = op->below)
802 op->activate_recursive ();
803}
804
805/* This function removes object 'op' from the list of active
806 * objects.
807 * This should only be used for style maps or other such
808 * reference maps where you don't want an object that isn't
809 * in play chewing up cpu time getting processed.
810 * The reverse of this is to call update_ob_speed, which
811 * will do the right thing based on the speed of the object.
812 */
813void
814object::deactivate ()
815{
816 /* If not on the active list, nothing needs to be done */
817 if (!active)
818 return;
819
820 actives.erase (this);
821}
822
823void
824object::deactivate_recursive ()
825{
826 for (object *op = inv; op; op = op->below)
827 op->deactivate_recursive ();
828
829 deactivate ();
830}
831
832void
833object::set_flag_inv (int flag, int value)
834{
835 for (object *op = inv; op; op = op->below)
965 } 836 {
837 op->flag [flag] = value;
838 op->set_flag_inv (flag, value);
839 }
840}
966 841
967 if (this == objects) 842/*
968 objects = next; 843 * Remove and free all objects in the inventory of the given object.
844 * object.c ?
845 */
846void
847object::destroy_inv (bool drop_to_ground)
848{
849 // need to check first, because the checks below might segfault
850 // as we might be on an invalid mapspace and crossfire code
851 // is too buggy to ensure that the inventory is empty.
852 // corollary: if you create arrows etc. with stuff in tis inventory,
853 // cf will crash below with off-map x and y
854 if (!inv)
855 return;
856
857 /* Only if the space blocks everything do we not process -
858 * if some form of movement is allowed, let objects
859 * drop on that space.
860 */
861 if (!drop_to_ground
862 || !map
863 || map->in_memory != MAP_IN_MEMORY
864 || map->nodrop
865 || ms ().move_block == MOVE_ALL)
866 {
867 while (inv)
868 {
869 inv->destroy_inv (drop_to_ground);
870 inv->destroy ();
871 }
872 }
873 else
874 { /* Put objects in inventory onto this space */
875 while (inv)
876 {
877 object *op = inv;
878
879 if (op->flag [FLAG_STARTEQUIP]
880 || op->flag [FLAG_NO_DROP]
881 || op->type == RUNE
882 || op->type == TRAP
883 || op->flag [FLAG_IS_A_TEMPLATE]
884 || op->flag [FLAG_DESTROY_ON_DEATH])
885 op->destroy ();
886 else
887 map->insert (op, x, y);
888 }
889 }
969} 890}
970 891
971object *object::create () 892object *object::create ()
972{ 893{
973 object *
974 op;
975
976 if (freed.empty ())
977 op = new object; 894 object *op = new object;
978
979 else
980 {
981 // highly annoying, but the only way to get it stable right now
982 op = freed.back ();
983 freed.pop_back ();
984 op->~object ();
985 new ((void *) op) object;
986 }
987
988 op->link (); 895 op->link ();
989 return op; 896 return op;
990} 897}
991 898
992/* 899void
993 * free_object() frees everything allocated by an object, removes 900object::do_destroy ()
994 * it from the list of used objects, and puts it on the list of
995 * free objects. The IS_FREED() flag is set in the object.
996 * The object must have been removed by remove_ob() first for
997 * this function to succeed.
998 *
999 * If free_inventory is set, free inventory as well. Else drop items in
1000 * inventory to the ground.
1001 */
1002void object::free (bool free_inventory)
1003{ 901{
1004 if (QUERY_FLAG (this, FLAG_FREED)) 902 attachable::do_destroy ();
903
904 if (flag [FLAG_IS_LINKED])
905 remove_button_link (this);
906
907 if (flag [FLAG_FRIENDLY])
908 remove_friendly_object (this);
909
910 if (!flag [FLAG_REMOVED])
911 remove ();
912
913 destroy_inv (true);
914
915 deactivate ();
916 unlink ();
917
918 flag [FLAG_FREED] = 1;
919
920 // hack to ensure that freed objects still have a valid map
921 {
922 static maptile *freed_map; // freed objects are moved here to avoid crashes
923
924 if (!freed_map)
925 {
926 freed_map = new maptile;
927
928 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3;
930 freed_map->height = 3;
931
932 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY;
934 }
935
936 map = freed_map;
937 x = 1;
938 y = 1;
939 }
940
941 if (more)
942 {
943 more->destroy ();
944 more = 0;
945 }
946
947 head = 0;
948
949 // clear those pointers that likely might cause circular references
950 owner = 0;
951 enemy = 0;
952 attacked_by = 0;
953 current_weapon = 0;
954}
955
956void
957object::destroy (bool destroy_inventory)
958{
959 if (destroyed ())
1005 return; 960 return;
1006 961
1007 if (!QUERY_FLAG (this, FLAG_REMOVED)) 962 if (destroy_inventory)
1008 remove_ob (this); 963 destroy_inv (false);
1009 964
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 965 play_sound (sound_die);
1011 remove_friendly_object (this);
1012 966
1013 SET_FLAG (this, FLAG_FREED); 967 attachable::destroy ();
1014
1015 if (more)
1016 {
1017 more->free (free_inventory);
1018 more = 0;
1019 }
1020
1021 if (inv)
1022 {
1023 /* Only if the space blocks everything do we not process -
1024 * if some form of movement is allowed, let objects
1025 * drop on that space.
1026 */
1027 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1028 {
1029 object *op = inv;
1030
1031 while (op)
1032 {
1033 object *tmp = op->below;
1034 op->free (free_inventory);
1035 op = tmp;
1036 }
1037 }
1038 else
1039 { /* Put objects in inventory onto this space */
1040 object *op = inv;
1041
1042 while (op)
1043 {
1044 object *tmp = op->below;
1045
1046 remove_ob (op);
1047
1048 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1049 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1050 free_object (op);
1051 else
1052 {
1053 op->x = x;
1054 op->y = y;
1055 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1056 }
1057
1058 op = tmp;
1059 }
1060 }
1061 }
1062
1063 clear_owner (this);
1064
1065 /* Remove object from the active list */
1066 speed = 0;
1067 update_ob_speed (this);
1068
1069 unlink ();
1070
1071 mortals.push_back (this);
1072} 968}
1073 969
1074/* 970/*
1075 * sub_weight() recursively (outwards) subtracts a number from the 971 * sub_weight() recursively (outwards) subtracts a number from the
1076 * weight of an object (and what is carried by it's environment(s)). 972 * weight of an object (and what is carried by it's environment(s)).
1077 */ 973 */
1078
1079void 974void
1080sub_weight (object *op, signed long weight) 975sub_weight (object *op, signed long weight)
1081{ 976{
1082 while (op != NULL) 977 while (op != NULL)
1083 { 978 {
1084 if (op->type == CONTAINER) 979 if (op->type == CONTAINER)
1085 {
1086 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 980 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087 } 981
1088 op->carrying -= weight; 982 op->carrying -= weight;
1089 op = op->env; 983 op = op->env;
1090 } 984 }
1091} 985}
1092 986
1093/* remove_ob(op): 987/* op->remove ():
1094 * This function removes the object op from the linked list of objects 988 * This function removes the object op from the linked list of objects
1095 * which it is currently tied to. When this function is done, the 989 * which it is currently tied to. When this function is done, the
1096 * object will have no environment. If the object previously had an 990 * object will have no environment. If the object previously had an
1097 * environment, the x and y coordinates will be updated to 991 * environment, the x and y coordinates will be updated to
1098 * the previous environment. 992 * the previous environment.
1099 * Beware: This function is called from the editor as well!
1100 */ 993 */
1101
1102void 994void
1103remove_ob (object *op) 995object::do_remove ()
1104{ 996{
997 object *tmp, *last = 0;
1105 object * 998 object *otmp;
1106 tmp, *
1107 last = NULL;
1108 object *
1109 otmp;
1110 999
1111 tag_t
1112 tag;
1113 int
1114 check_walk_off;
1115 mapstruct *
1116 m;
1117
1118 sint16
1119 x,
1120 y;
1121
1122 if (QUERY_FLAG (op, FLAG_REMOVED)) 1000 if (QUERY_FLAG (this, FLAG_REMOVED))
1123 return; 1001 return;
1124 1002
1125 SET_FLAG (op, FLAG_REMOVED); 1003 SET_FLAG (this, FLAG_REMOVED);
1004 INVOKE_OBJECT (REMOVE, this);
1126 1005
1127 if (op->more != NULL) 1006 if (more)
1128 remove_ob (op->more); 1007 more->remove ();
1129 1008
1130 /* 1009 /*
1131 * In this case, the object to be removed is in someones 1010 * In this case, the object to be removed is in someones
1132 * inventory. 1011 * inventory.
1133 */ 1012 */
1134 if (op->env != NULL) 1013 if (env)
1135 { 1014 {
1136 if (op->nrof) 1015 if (nrof)
1137 sub_weight (op->env, op->weight * op->nrof); 1016 sub_weight (env, weight * nrof);
1138 else 1017 else
1139 sub_weight (op->env, op->weight + op->carrying); 1018 sub_weight (env, weight + carrying);
1140 1019
1141 /* NO_FIX_PLAYER is set when a great many changes are being 1020 /* NO_FIX_PLAYER is set when a great many changes are being
1142 * made to players inventory. If set, avoiding the call 1021 * made to players inventory. If set, avoiding the call
1143 * to save cpu time. 1022 * to save cpu time.
1144 */ 1023 */
1145 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1024 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1146 fix_player (otmp); 1025 otmp->update_stats ();
1147 1026
1148 if (op->above != NULL) 1027 if (above)
1149 op->above->below = op->below; 1028 above->below = below;
1150 else 1029 else
1151 op->env->inv = op->below; 1030 env->inv = below;
1152 1031
1153 if (op->below != NULL) 1032 if (below)
1154 op->below->above = op->above; 1033 below->above = above;
1155 1034
1156 /* we set up values so that it could be inserted into 1035 /* we set up values so that it could be inserted into
1157 * the map, but we don't actually do that - it is up 1036 * the map, but we don't actually do that - it is up
1158 * to the caller to decide what we want to do. 1037 * to the caller to decide what we want to do.
1159 */ 1038 */
1160 op->x = op->env->x, op->y = op->env->y; 1039 x = env->x, y = env->y;
1161 op->map = op->env->map; 1040 map = env->map;
1162 op->above = NULL, op->below = NULL; 1041 above = 0, below = 0;
1163 op->env = NULL; 1042 env = 0;
1164 } 1043 }
1165 else if (op->map) 1044 else if (map)
1166 { 1045 {
1167 x = op->x; 1046 if (type == PLAYER)
1168 y = op->y;
1169 m = get_map_from_coord (op->map, &x, &y);
1170
1171 if (!m)
1172 { 1047 {
1173 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1048 // leaving a spot always closes any open container on the ground
1174 op->map->path, op->x, op->y); 1049 if (container && !container->env)
1175 /* in old days, we used to set x and y to 0 and continue. 1050 // this causes spurious floorbox updates, but it ensures
1176 * it seems if we get into this case, something is probablye 1051 // that the CLOSE event is being sent.
1177 * screwed up and should be fixed. 1052 close_container ();
1178 */ 1053
1179 abort (); 1054 --map->players;
1055 map->touch ();
1180 } 1056 }
1181 1057
1182 if (op->map != m) 1058 map->dirty = true;
1183 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", 1059 mapspace &ms = this->ms ();
1184 op->map->path, m->path, op->x, op->y, x, y);
1185
1186 /* Re did the following section of code - it looks like it had
1187 * lots of logic for things we no longer care about
1188 */
1189 1060
1190 /* link the object above us */ 1061 /* link the object above us */
1191 if (op->above) 1062 if (above)
1192 op->above->below = op->below; 1063 above->below = below;
1193 else 1064 else
1194 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1065 ms.top = below; /* we were top, set new top */
1195 1066
1196 /* Relink the object below us, if there is one */ 1067 /* Relink the object below us, if there is one */
1197 if (op->below) 1068 if (below)
1198 op->below->above = op->above; 1069 below->above = above;
1199 else 1070 else
1200 { 1071 {
1201 /* Nothing below, which means we need to relink map object for this space 1072 /* Nothing below, which means we need to relink map object for this space
1202 * use translated coordinates in case some oddness with map tiling is 1073 * use translated coordinates in case some oddness with map tiling is
1203 * evident 1074 * evident
1204 */ 1075 */
1205 if (GET_MAP_OB (m, x, y) != op) 1076 if (GET_MAP_OB (map, x, y) != this)
1206 {
1207 dump_object (op);
1208 LOG (llevError,
1209 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1077 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1210 dump_object (GET_MAP_OB (m, x, y));
1211 LOG (llevError, "%s\n", errmsg);
1212 }
1213 1078
1214 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1079 ms.bot = above; /* goes on above it. */
1215 } 1080 }
1216 1081
1217 op->above = 0; 1082 above = 0;
1218 op->below = 0; 1083 below = 0;
1219 1084
1220 if (op->map->in_memory == MAP_SAVING) 1085 if (map->in_memory == MAP_SAVING)
1221 return; 1086 return;
1222 1087
1223 tag = op->count; 1088 int check_walk_off = !flag [FLAG_NO_APPLY];
1224 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1225 1089
1226 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1090 for (tmp = ms.bot; tmp; tmp = tmp->above)
1227 { 1091 {
1228 /* No point updating the players look faces if he is the object 1092 /* No point updating the players look faces if he is the object
1229 * being removed. 1093 * being removed.
1230 */ 1094 */
1231 1095
1232 if (tmp->type == PLAYER && tmp != op) 1096 if (tmp->type == PLAYER && tmp != this)
1233 { 1097 {
1234 /* If a container that the player is currently using somehow gets 1098 /* If a container that the player is currently using somehow gets
1235 * removed (most likely destroyed), update the player view 1099 * removed (most likely destroyed), update the player view
1236 * appropriately. 1100 * appropriately.
1237 */ 1101 */
1238 if (tmp->container == op) 1102 if (tmp->container == this)
1239 { 1103 {
1240 CLEAR_FLAG (op, FLAG_APPLIED); 1104 flag [FLAG_APPLIED] = 0;
1241 tmp->container = NULL; 1105 tmp->container = 0;
1242 } 1106 }
1243 1107
1244 tmp->contr->socket.update_look = 1; 1108 if (tmp->contr->ns)
1109 tmp->contr->ns->floorbox_update ();
1245 } 1110 }
1246 1111
1247 /* See if player moving off should effect something */ 1112 /* See if object moving off should effect something */
1248 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1113 if (check_walk_off
1114 && ((move_type & tmp->move_off)
1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249 { 1116 {
1250 move_apply (tmp, op, NULL); 1117 move_apply (tmp, this, 0);
1251 1118
1252 if (was_destroyed (op, tag)) 1119 if (destroyed ())
1253 {
1254 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1120 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1255 }
1256 } 1121 }
1257
1258 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259
1260 if (tmp->above == tmp)
1261 tmp->above = NULL;
1262 1122
1263 last = tmp; 1123 last = tmp;
1264 } 1124 }
1265 1125
1266 /* last == NULL of there are no objects on this space */ 1126 /* last == NULL if there are no objects on this space */
1127 //TODO: this makes little sense, why only update the topmost object?
1267 if (last == NULL) 1128 if (!last)
1268 { 1129 map->at (x, y).flags_ = 0;
1269 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1270 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1271 * those out anyways, and if there are any flags set right now, they won't
1272 * be correct anyways.
1273 */
1274 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1275 update_position (op->map, op->x, op->y);
1276 }
1277 else 1130 else
1278 update_object (last, UP_OBJ_REMOVE); 1131 update_object (last, UP_OBJ_REMOVE);
1279 1132
1280 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1133 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1281 update_all_los (op->map, op->x, op->y); 1134 update_all_los (map, x, y);
1282 } 1135 }
1283} 1136}
1284 1137
1285/* 1138/*
1286 * merge_ob(op,top): 1139 * merge_ob(op,top):
… …
1288 * This function goes through all objects below and including top, and 1141 * This function goes through all objects below and including top, and
1289 * merges op to the first matching object. 1142 * merges op to the first matching object.
1290 * If top is NULL, it is calculated. 1143 * If top is NULL, it is calculated.
1291 * Returns pointer to object if it succeded in the merge, otherwise NULL 1144 * Returns pointer to object if it succeded in the merge, otherwise NULL
1292 */ 1145 */
1293
1294object * 1146object *
1295merge_ob (object *op, object *top) 1147merge_ob (object *op, object *top)
1296{ 1148{
1297 if (!op->nrof) 1149 if (!op->nrof)
1298 return 0; 1150 return 0;
1299 1151
1300 if (top == NULL) 1152 if (top)
1301 for (top = op; top != NULL && top->above != NULL; top = top->above); 1153 for (top = op; top && top->above; top = top->above)
1154 ;
1302 1155
1303 for (; top != NULL; top = top->below) 1156 for (; top; top = top->below)
1304 { 1157 {
1305 if (top == op) 1158 if (top == op)
1306 continue; 1159 continue;
1307 if (CAN_MERGE (op, top)) 1160
1161 if (object::can_merge (op, top))
1308 { 1162 {
1309 top->nrof += op->nrof; 1163 top->nrof += op->nrof;
1310 1164
1311/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1165/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1312 op->weight = 0; /* Don't want any adjustements now */ 1166 op->weight = 0; /* Don't want any adjustements now */
1313 remove_ob (op); 1167 op->destroy ();
1314 free_object (op);
1315 return top; 1168 return top;
1316 } 1169 }
1317 } 1170 }
1318 1171
1319 return NULL; 1172 return 0;
1320} 1173}
1321 1174
1175void
1176object::expand_tail ()
1177{
1178 if (more)
1179 return;
1180
1181 object *prev = this;
1182
1183 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1184 {
1185 object *op = arch_to_object (at);
1186
1187 op->name = name;
1188 op->name_pl = name_pl;
1189 op->title = title;
1190
1191 op->head = this;
1192 prev->more = op;
1193
1194 prev = op;
1195 }
1196}
1197
1322/* 1198/*
1323 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1199 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1324 * job preparing multi-part monsters 1200 * job preparing multi-part monsters.
1325 */ 1201 */
1326object * 1202object *
1327insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1203insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1328{ 1204{
1329 object *tmp;
1330
1331 if (op->head)
1332 op = op->head;
1333
1334 for (tmp = op; tmp; tmp = tmp->more) 1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1335 { 1206 {
1336 tmp->x = x + tmp->arch->clone.x; 1207 tmp->x = x + tmp->arch->x;
1337 tmp->y = y + tmp->arch->clone.y; 1208 tmp->y = y + tmp->arch->y;
1338 } 1209 }
1339 1210
1340 return insert_ob_in_map (op, m, originator, flag); 1211 return insert_ob_in_map (op, m, originator, flag);
1341} 1212}
1342 1213
… …
1358 * Return value: 1229 * Return value:
1359 * new object if 'op' was merged with other object 1230 * new object if 'op' was merged with other object
1360 * NULL if 'op' was destroyed 1231 * NULL if 'op' was destroyed
1361 * just 'op' otherwise 1232 * just 'op' otherwise
1362 */ 1233 */
1363
1364object * 1234object *
1365insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366{ 1236{
1237 assert (!op->flag [FLAG_FREED]);
1238
1367 object *tmp, *top, *floor = NULL; 1239 object *top, *floor = NULL;
1368 sint16 x, y;
1369 1240
1370 if (QUERY_FLAG (op, FLAG_FREED)) 1241 op->remove ();
1371 {
1372 LOG (llevError, "Trying to insert freed object!\n");
1373 return NULL;
1374 }
1375 1242
1376 if (m == NULL) 1243#if 0
1377 { 1244 if (!m->active != !op->active)
1378 dump_object (op); 1245 if (m->active)
1379 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1246 op->activate_recursive ();
1380 return op; 1247 else
1381 } 1248 op->deactivate_recursive ();
1249#endif
1382 1250
1383 if (out_of_map (m, op->x, op->y)) 1251 if (out_of_map (m, op->x, op->y))
1384 { 1252 {
1385 dump_object (op);
1386 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1253 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1387#ifdef MANY_CORES 1254#ifdef MANY_CORES
1388 /* Better to catch this here, as otherwise the next use of this object 1255 /* Better to catch this here, as otherwise the next use of this object
1389 * is likely to cause a crash. Better to find out where it is getting 1256 * is likely to cause a crash. Better to find out where it is getting
1390 * improperly inserted. 1257 * improperly inserted.
1391 */ 1258 */
1392 abort (); 1259 abort ();
1393#endif 1260#endif
1394 return op; 1261 return op;
1395 } 1262 }
1396 1263
1397 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1264 if (object *more = op->more)
1398 { 1265 if (!insert_ob_in_map (more, m, originator, flag))
1399 dump_object (op);
1400 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1401 return op; 1266 return 0;
1402 }
1403
1404 if (op->more != NULL)
1405 {
1406 /* The part may be on a different map. */
1407
1408 object *more = op->more;
1409
1410 /* We really need the caller to normalize coordinates - if
1411 * we set the map, that doesn't work if the location is within
1412 * a map and this is straddling an edge. So only if coordinate
1413 * is clear wrong do we normalize it.
1414 */
1415 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1416 more->map = get_map_from_coord (m, &more->x, &more->y);
1417 else if (!more->map)
1418 {
1419 /* For backwards compatibility - when not dealing with tiled maps,
1420 * more->map should always point to the parent.
1421 */
1422 more->map = m;
1423 }
1424
1425 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1426 {
1427 if (!op->head)
1428 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1429
1430 return NULL;
1431 }
1432 }
1433 1267
1434 CLEAR_FLAG (op, FLAG_REMOVED); 1268 CLEAR_FLAG (op, FLAG_REMOVED);
1435 1269
1436 /* Ideally, the caller figures this out. However, it complicates a lot 1270 /* Ideally, the caller figures this out. However, it complicates a lot
1437 * of areas of callers (eg, anything that uses find_free_spot would now 1271 * of areas of callers (eg, anything that uses find_free_spot would now
1438 * need extra work 1272 * need extra work
1439 */ 1273 */
1440 op->map = get_map_from_coord (m, &op->x, &op->y); 1274 if (!xy_normalise (m, op->x, op->y))
1441 x = op->x; 1275 return 0;
1442 y = op->y; 1276
1277 op->map = m;
1278 mapspace &ms = op->ms ();
1443 1279
1444 /* this has to be done after we translate the coordinates. 1280 /* this has to be done after we translate the coordinates.
1445 */ 1281 */
1446 if (op->nrof && !(flag & INS_NO_MERGE)) 1282 if (op->nrof && !(flag & INS_NO_MERGE))
1447 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1283 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1448 if (CAN_MERGE (op, tmp)) 1284 if (object::can_merge (op, tmp))
1449 { 1285 {
1450 op->nrof += tmp->nrof; 1286 op->nrof += tmp->nrof;
1451 remove_ob (tmp); 1287 tmp->destroy ();
1452 free_object (tmp);
1453 } 1288 }
1454 1289
1455 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1290 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1456 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1291 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1457 1292
… …
1470 op->below = originator->below; 1305 op->below = originator->below;
1471 1306
1472 if (op->below) 1307 if (op->below)
1473 op->below->above = op; 1308 op->below->above = op;
1474 else 1309 else
1475 SET_MAP_OB (op->map, op->x, op->y, op); 1310 ms.bot = op;
1476 1311
1477 /* since *below* originator, no need to update top */ 1312 /* since *below* originator, no need to update top */
1478 originator->below = op; 1313 originator->below = op;
1479 } 1314 }
1480 else 1315 else
1481 { 1316 {
1317 top = ms.bot;
1318
1482 /* If there are other objects, then */ 1319 /* If there are other objects, then */
1483 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1320 if ((!(flag & INS_MAP_LOAD)) && top)
1484 { 1321 {
1485 object *last = NULL; 1322 object *last = 0;
1486 1323
1487 /* 1324 /*
1488 * If there are multiple objects on this space, we do some trickier handling. 1325 * If there are multiple objects on this space, we do some trickier handling.
1489 * We've already dealt with merging if appropriate. 1326 * We've already dealt with merging if appropriate.
1490 * Generally, we want to put the new object on top. But if 1327 * Generally, we want to put the new object on top. But if
… …
1494 * once we get to them. This reduces the need to traverse over all of 1331 * once we get to them. This reduces the need to traverse over all of
1495 * them when adding another one - this saves quite a bit of cpu time 1332 * them when adding another one - this saves quite a bit of cpu time
1496 * when lots of spells are cast in one area. Currently, it is presumed 1333 * when lots of spells are cast in one area. Currently, it is presumed
1497 * that flying non pickable objects are spell objects. 1334 * that flying non pickable objects are spell objects.
1498 */ 1335 */
1499 1336 for (top = ms.bot; top; top = top->above)
1500 while (top != NULL)
1501 { 1337 {
1502 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1338 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1503 floor = top; 1339 floor = top;
1504 1340
1505 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1341 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1508 top = top->below; 1344 top = top->below;
1509 break; 1345 break;
1510 } 1346 }
1511 1347
1512 last = top; 1348 last = top;
1513 top = top->above;
1514 } 1349 }
1515 1350
1516 /* Don't want top to be NULL, so set it to the last valid object */ 1351 /* Don't want top to be NULL, so set it to the last valid object */
1517 top = last; 1352 top = last;
1518 1353
… …
1520 * looks like instead of lots of conditions here. 1355 * looks like instead of lots of conditions here.
1521 * makes things faster, and effectively the same result. 1356 * makes things faster, and effectively the same result.
1522 */ 1357 */
1523 1358
1524 /* Have object 'fall below' other objects that block view. 1359 /* Have object 'fall below' other objects that block view.
1525 * Unless those objects are exits, type 66 1360 * Unless those objects are exits.
1526 * If INS_ON_TOP is used, don't do this processing 1361 * If INS_ON_TOP is used, don't do this processing
1527 * Need to find the object that in fact blocks view, otherwise 1362 * Need to find the object that in fact blocks view, otherwise
1528 * stacking is a bit odd. 1363 * stacking is a bit odd.
1529 */ 1364 */
1530 if (!(flag & INS_ON_TOP) && 1365 if (!(flag & INS_ON_TOP)
1531 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1366 && ms.flags () & P_BLOCKSVIEW
1367 && (op->face && !faces [op->face].visibility))
1532 { 1368 {
1533 for (last = top; last != floor; last = last->below) 1369 for (last = top; last != floor; last = last->below)
1534 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1370 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1535 break; 1371 break;
1372
1536 /* Check to see if we found the object that blocks view, 1373 /* Check to see if we found the object that blocks view,
1537 * and make sure we have a below pointer for it so that 1374 * and make sure we have a below pointer for it so that
1538 * we can get inserted below this one, which requires we 1375 * we can get inserted below this one, which requires we
1539 * set top to the object below us. 1376 * set top to the object below us.
1540 */ 1377 */
1541 if (last && last->below && last != floor) 1378 if (last && last->below && last != floor)
1542 top = last->below; 1379 top = last->below;
1543 } 1380 }
1544 } /* If objects on this space */ 1381 } /* If objects on this space */
1545
1546 if (flag & INS_MAP_LOAD) 1382 if (flag & INS_MAP_LOAD)
1547 top = GET_MAP_TOP (op->map, op->x, op->y); 1383 top = ms.top;
1548 1384
1549 if (flag & INS_ABOVE_FLOOR_ONLY) 1385 if (flag & INS_ABOVE_FLOOR_ONLY)
1550 top = floor; 1386 top = floor;
1551 1387
1552 /* Top is the object that our object (op) is going to get inserted above. 1388 /* Top is the object that our object (op) is going to get inserted above.
1553 */ 1389 */
1554 1390
1555 /* First object on this space */ 1391 /* First object on this space */
1556 if (!top) 1392 if (!top)
1557 { 1393 {
1558 op->above = GET_MAP_OB (op->map, op->x, op->y); 1394 op->above = ms.bot;
1559 1395
1560 if (op->above) 1396 if (op->above)
1561 op->above->below = op; 1397 op->above->below = op;
1562 1398
1563 op->below = NULL; 1399 op->below = 0;
1564 SET_MAP_OB (op->map, op->x, op->y, op); 1400 ms.bot = op;
1565 } 1401 }
1566 else 1402 else
1567 { /* get inserted into the stack above top */ 1403 { /* get inserted into the stack above top */
1568 op->above = top->above; 1404 op->above = top->above;
1569 1405
… …
1572 1408
1573 op->below = top; 1409 op->below = top;
1574 top->above = op; 1410 top->above = op;
1575 } 1411 }
1576 1412
1577 if (op->above == NULL) 1413 if (!op->above)
1578 SET_MAP_TOP (op->map, op->x, op->y, op); 1414 ms.top = op;
1579 } /* else not INS_BELOW_ORIGINATOR */ 1415 } /* else not INS_BELOW_ORIGINATOR */
1580 1416
1581 if (op->type == PLAYER) 1417 if (op->type == PLAYER)
1418 {
1582 op->contr->do_los = 1; 1419 op->contr->do_los = 1;
1420 ++op->map->players;
1421 op->map->touch ();
1422 }
1423
1424 op->map->dirty = true;
1583 1425
1584 /* If we have a floor, we know the player, if any, will be above 1426 /* If we have a floor, we know the player, if any, will be above
1585 * it, so save a few ticks and start from there. 1427 * it, so save a few ticks and start from there.
1586 */ 1428 */
1587 if (!(flag & INS_MAP_LOAD)) 1429 if (!(flag & INS_MAP_LOAD))
1588 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1430 if (object *pl = ms.player ())
1589 if (tmp->type == PLAYER) 1431 if (pl->contr->ns)
1590 tmp->contr->socket.update_look = 1; 1432 pl->contr->ns->floorbox_update ();
1591 1433
1592 /* If this object glows, it may affect lighting conditions that are 1434 /* If this object glows, it may affect lighting conditions that are
1593 * visible to others on this map. But update_all_los is really 1435 * visible to others on this map. But update_all_los is really
1594 * an inefficient way to do this, as it means los for all players 1436 * an inefficient way to do this, as it means los for all players
1595 * on the map will get recalculated. The players could very well 1437 * on the map will get recalculated. The players could very well
1596 * be far away from this change and not affected in any way - 1438 * be far away from this change and not affected in any way -
1597 * this should get redone to only look for players within range, 1439 * this should get redone to only look for players within range,
1598 * or just updating the P_NEED_UPDATE for spaces within this area 1440 * or just updating the P_UPTODATE for spaces within this area
1599 * of effect may be sufficient. 1441 * of effect may be sufficient.
1600 */ 1442 */
1601 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1443 if (op->map->darkness && (op->glow_radius != 0))
1602 update_all_los (op->map, op->x, op->y); 1444 update_all_los (op->map, op->x, op->y);
1603 1445
1604 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1446 /* updates flags (blocked, alive, no magic, etc) for this map space */
1605 update_object (op, UP_OBJ_INSERT); 1447 update_object (op, UP_OBJ_INSERT);
1606 1448
1449 INVOKE_OBJECT (INSERT, op);
1450
1607 /* Don't know if moving this to the end will break anything. However, 1451 /* Don't know if moving this to the end will break anything. However,
1608 * we want to have update_look set above before calling this. 1452 * we want to have floorbox_update called before calling this.
1609 * 1453 *
1610 * check_move_on() must be after this because code called from 1454 * check_move_on() must be after this because code called from
1611 * check_move_on() depends on correct map flags (so functions like 1455 * check_move_on() depends on correct map flags (so functions like
1612 * blocked() and wall() work properly), and these flags are updated by 1456 * blocked() and wall() work properly), and these flags are updated by
1613 * update_object(). 1457 * update_object().
1614 */ 1458 */
1615 1459
1616 /* if this is not the head or flag has been passed, don't check walk on status */ 1460 /* if this is not the head or flag has been passed, don't check walk on status */
1617 if (!(flag & INS_NO_WALK_ON) && !op->head) 1461 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1618 { 1462 {
1619 if (check_move_on (op, originator)) 1463 if (check_move_on (op, originator))
1620 return NULL; 1464 return 0;
1621 1465
1622 /* If we are a multi part object, lets work our way through the check 1466 /* If we are a multi part object, lets work our way through the check
1623 * walk on's. 1467 * walk on's.
1624 */ 1468 */
1625 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1469 for (object *tmp = op->more; tmp; tmp = tmp->more)
1626 if (check_move_on (tmp, originator)) 1470 if (check_move_on (tmp, originator))
1627 return NULL; 1471 return 0;
1628 } 1472 }
1629 1473
1630 return op; 1474 return op;
1631} 1475}
1632 1476
1633/* this function inserts an object in the map, but if it 1477/* this function inserts an object in the map, but if it
1634 * finds an object of its own type, it'll remove that one first. 1478 * finds an object of its own type, it'll remove that one first.
1635 * op is the object to insert it under: supplies x and the map. 1479 * op is the object to insert it under: supplies x and the map.
1636 */ 1480 */
1637void 1481void
1638replace_insert_ob_in_map (const char *arch_string, object *op) 1482replace_insert_ob_in_map (const char *arch_string, object *op)
1639{ 1483{
1640 object * 1484 object *tmp, *tmp1;
1641 tmp;
1642 object *
1643 tmp1;
1644 1485
1645 /* first search for itself and remove any old instances */ 1486 /* first search for itself and remove any old instances */
1646 1487
1647 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1488 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1648 {
1649 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1489 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1650 { 1490 tmp->destroy ();
1651 remove_ob (tmp);
1652 free_object (tmp);
1653 }
1654 }
1655 1491
1656 tmp1 = arch_to_object (find_archetype (arch_string)); 1492 tmp1 = arch_to_object (archetype::find (arch_string));
1657 1493
1658 tmp1->x = op->x; 1494 tmp1->x = op->x;
1659 tmp1->y = op->y; 1495 tmp1->y = op->y;
1660 insert_ob_in_map (tmp1, op->map, op, 0); 1496 insert_ob_in_map (tmp1, op->map, op, 0);
1497}
1498
1499object *
1500object::insert_at (object *where, object *originator, int flags)
1501{
1502 return where->map->insert (this, where->x, where->y, originator, flags);
1661} 1503}
1662 1504
1663/* 1505/*
1664 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1506 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1665 * is returned contains nr objects, and the remaining parts contains 1507 * is returned contains nr objects, and the remaining parts contains
1666 * the rest (or is removed and freed if that number is 0). 1508 * the rest (or is removed and freed if that number is 0).
1667 * On failure, NULL is returned, and the reason put into the 1509 * On failure, NULL is returned, and the reason put into the
1668 * global static errmsg array. 1510 * global static errmsg array.
1669 */ 1511 */
1670
1671object * 1512object *
1672get_split_ob (object *orig_ob, uint32 nr) 1513get_split_ob (object *orig_ob, uint32 nr)
1673{ 1514{
1674 object * 1515 object *newob;
1675 newob;
1676 int
1677 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1516 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1678 1517
1679 if (orig_ob->nrof < nr) 1518 if (orig_ob->nrof < nr)
1680 { 1519 {
1681 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1520 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1682 return NULL; 1521 return NULL;
1683 } 1522 }
1684 1523
1685 newob = object_create_clone (orig_ob); 1524 newob = object_create_clone (orig_ob);
1686 1525
1687 if ((orig_ob->nrof -= nr) < 1) 1526 if ((orig_ob->nrof -= nr) < 1)
1688 { 1527 orig_ob->destroy (1);
1689 if (!is_removed)
1690 remove_ob (orig_ob);
1691 free_object2 (orig_ob, 1);
1692 }
1693 else if (!is_removed) 1528 else if (!is_removed)
1694 { 1529 {
1695 if (orig_ob->env != NULL) 1530 if (orig_ob->env != NULL)
1696 sub_weight (orig_ob->env, orig_ob->weight * nr); 1531 sub_weight (orig_ob->env, orig_ob->weight * nr);
1697 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1532 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1712 * the amount of an object. If the amount reaches 0, the object 1547 * the amount of an object. If the amount reaches 0, the object
1713 * is subsequently removed and freed. 1548 * is subsequently removed and freed.
1714 * 1549 *
1715 * Return value: 'op' if something is left, NULL if the amount reached 0 1550 * Return value: 'op' if something is left, NULL if the amount reached 0
1716 */ 1551 */
1717
1718object * 1552object *
1719decrease_ob_nr (object *op, uint32 i) 1553decrease_ob_nr (object *op, uint32 i)
1720{ 1554{
1721 object *tmp; 1555 object *tmp;
1722 player *pl;
1723 1556
1724 if (i == 0) /* objects with op->nrof require this check */ 1557 if (i == 0) /* objects with op->nrof require this check */
1725 return op; 1558 return op;
1726 1559
1727 if (i > op->nrof) 1560 if (i > op->nrof)
1728 i = op->nrof; 1561 i = op->nrof;
1729 1562
1730 if (QUERY_FLAG (op, FLAG_REMOVED)) 1563 if (QUERY_FLAG (op, FLAG_REMOVED))
1731 op->nrof -= i; 1564 op->nrof -= i;
1732 else if (op->env != NULL) 1565 else if (op->env)
1733 { 1566 {
1734 /* is this object in the players inventory, or sub container 1567 /* is this object in the players inventory, or sub container
1735 * therein? 1568 * therein?
1736 */ 1569 */
1737 tmp = is_player_inv (op->env); 1570 tmp = op->in_player ();
1738 /* nope. Is this a container the player has opened? 1571 /* nope. Is this a container the player has opened?
1739 * If so, set tmp to that player. 1572 * If so, set tmp to that player.
1740 * IMO, searching through all the players will mostly 1573 * IMO, searching through all the players will mostly
1741 * likely be quicker than following op->env to the map, 1574 * likely be quicker than following op->env to the map,
1742 * and then searching the map for a player. 1575 * and then searching the map for a player.
1743 */ 1576 */
1744 if (!tmp) 1577 if (!tmp)
1745 { 1578 for_all_players (pl)
1746 for (pl = first_player; pl; pl = pl->next)
1747 if (pl->ob->container == op->env) 1579 if (pl->ob->container == op->env)
1580 {
1581 tmp = pl->ob;
1748 break; 1582 break;
1749 if (pl)
1750 tmp = pl->ob;
1751 else
1752 tmp = NULL;
1753 } 1583 }
1754 1584
1755 if (i < op->nrof) 1585 if (i < op->nrof)
1756 { 1586 {
1757 sub_weight (op->env, op->weight * i); 1587 sub_weight (op->env, op->weight * i);
1758 op->nrof -= i; 1588 op->nrof -= i;
1759 if (tmp) 1589 if (tmp)
1760 {
1761 esrv_send_item (tmp, op); 1590 esrv_send_item (tmp, op);
1762 }
1763 } 1591 }
1764 else 1592 else
1765 { 1593 {
1766 remove_ob (op); 1594 op->remove ();
1767 op->nrof = 0; 1595 op->nrof = 0;
1768 if (tmp) 1596 if (tmp)
1769 {
1770 esrv_del_item (tmp->contr, op->count); 1597 esrv_del_item (tmp->contr, op->count);
1771 }
1772 } 1598 }
1773 } 1599 }
1774 else 1600 else
1775 { 1601 {
1776 object *above = op->above; 1602 object *above = op->above;
1777 1603
1778 if (i < op->nrof) 1604 if (i < op->nrof)
1779 op->nrof -= i; 1605 op->nrof -= i;
1780 else 1606 else
1781 { 1607 {
1782 remove_ob (op); 1608 op->remove ();
1783 op->nrof = 0; 1609 op->nrof = 0;
1784 } 1610 }
1785 1611
1786 /* Since we just removed op, op->above is null */ 1612 /* Since we just removed op, op->above is null */
1787 for (tmp = above; tmp != NULL; tmp = tmp->above) 1613 for (tmp = above; tmp; tmp = tmp->above)
1788 if (tmp->type == PLAYER) 1614 if (tmp->type == PLAYER)
1789 { 1615 {
1790 if (op->nrof) 1616 if (op->nrof)
1791 esrv_send_item (tmp, op); 1617 esrv_send_item (tmp, op);
1792 else 1618 else
… …
1796 1622
1797 if (op->nrof) 1623 if (op->nrof)
1798 return op; 1624 return op;
1799 else 1625 else
1800 { 1626 {
1801 free_object (op); 1627 op->destroy ();
1802 return NULL; 1628 return 0;
1803 } 1629 }
1804} 1630}
1805 1631
1806/* 1632/*
1807 * add_weight(object, weight) adds the specified weight to an object, 1633 * add_weight(object, weight) adds the specified weight to an object,
1808 * and also updates how much the environment(s) is/are carrying. 1634 * and also updates how much the environment(s) is/are carrying.
1809 */ 1635 */
1810
1811void 1636void
1812add_weight (object *op, signed long weight) 1637add_weight (object *op, signed long weight)
1813{ 1638{
1814 while (op != NULL) 1639 while (op != NULL)
1815 { 1640 {
… …
1819 op->carrying += weight; 1644 op->carrying += weight;
1820 op = op->env; 1645 op = op->env;
1821 } 1646 }
1822} 1647}
1823 1648
1649object *
1650insert_ob_in_ob (object *op, object *where)
1651{
1652 if (!where)
1653 {
1654 char *dump = dump_object (op);
1655 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1656 free (dump);
1657 return op;
1658 }
1659
1660 if (where->head_ () != where)
1661 {
1662 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1663 where = where->head;
1664 }
1665
1666 return where->insert (op);
1667}
1668
1824/* 1669/*
1825 * insert_ob_in_ob(op,environment): 1670 * env->insert (op)
1826 * This function inserts the object op in the linked list 1671 * This function inserts the object op in the linked list
1827 * inside the object environment. 1672 * inside the object environment.
1828 * 1673 *
1829 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1830 * the inventory at the last position or next to other objects of the same
1831 * type.
1832 * Frank: Now sorted by type, archetype and magic!
1833 *
1834 * The function returns now pointer to inserted item, and return value can 1674 * The function returns now pointer to inserted item, and return value can
1835 * be != op, if items are merged. -Tero 1675 * be != op, if items are merged. -Tero
1836 */ 1676 */
1837
1838object * 1677object *
1839insert_ob_in_ob (object *op, object *where) 1678object::insert (object *op)
1840{ 1679{
1841 object * 1680 object *tmp, *otmp;
1842 tmp, *
1843 otmp;
1844 1681
1845 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1682 if (!QUERY_FLAG (op, FLAG_REMOVED))
1846 { 1683 op->remove ();
1847 dump_object (op);
1848 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1849 return op;
1850 }
1851
1852 if (where == NULL)
1853 {
1854 dump_object (op);
1855 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1856 return op;
1857 }
1858
1859 if (where->head)
1860 {
1861 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1862 where = where->head;
1863 }
1864 1684
1865 if (op->more) 1685 if (op->more)
1866 { 1686 {
1867 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1687 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1868 return op; 1688 return op;
… …
1870 1690
1871 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1691 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1872 CLEAR_FLAG (op, FLAG_REMOVED); 1692 CLEAR_FLAG (op, FLAG_REMOVED);
1873 if (op->nrof) 1693 if (op->nrof)
1874 { 1694 {
1875 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1695 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1876 if (CAN_MERGE (tmp, op)) 1696 if (object::can_merge (tmp, op))
1877 { 1697 {
1878 /* return the original object and remove inserted object 1698 /* return the original object and remove inserted object
1879 (client needs the original object) */ 1699 (client needs the original object) */
1880 tmp->nrof += op->nrof; 1700 tmp->nrof += op->nrof;
1881 /* Weight handling gets pretty funky. Since we are adding to 1701 /* Weight handling gets pretty funky. Since we are adding to
1882 * tmp->nrof, we need to increase the weight. 1702 * tmp->nrof, we need to increase the weight.
1883 */ 1703 */
1884 add_weight (where, op->weight * op->nrof); 1704 add_weight (this, op->weight * op->nrof);
1885 SET_FLAG (op, FLAG_REMOVED); 1705 SET_FLAG (op, FLAG_REMOVED);
1886 free_object (op); /* free the inserted object */ 1706 op->destroy (); /* free the inserted object */
1887 op = tmp; 1707 op = tmp;
1888 remove_ob (op); /* and fix old object's links */ 1708 op->remove (); /* and fix old object's links */
1889 CLEAR_FLAG (op, FLAG_REMOVED); 1709 CLEAR_FLAG (op, FLAG_REMOVED);
1890 break; 1710 break;
1891 } 1711 }
1892 1712
1893 /* I assume combined objects have no inventory 1713 /* I assume combined objects have no inventory
1894 * We add the weight - this object could have just been removed 1714 * We add the weight - this object could have just been removed
1895 * (if it was possible to merge). calling remove_ob will subtract 1715 * (if it was possible to merge). calling remove_ob will subtract
1896 * the weight, so we need to add it in again, since we actually do 1716 * the weight, so we need to add it in again, since we actually do
1897 * the linking below 1717 * the linking below
1898 */ 1718 */
1899 add_weight (where, op->weight * op->nrof); 1719 add_weight (this, op->weight * op->nrof);
1900 } 1720 }
1901 else 1721 else
1902 add_weight (where, (op->weight + op->carrying)); 1722 add_weight (this, (op->weight + op->carrying));
1903 1723
1904 otmp = is_player_inv (where); 1724 otmp = this->in_player ();
1905 if (otmp && otmp->contr != NULL) 1725 if (otmp && otmp->contr)
1906 {
1907 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1726 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1908 fix_player (otmp); 1727 otmp->update_stats ();
1909 }
1910 1728
1911 op->map = NULL; 1729 op->map = 0;
1912 op->env = where; 1730 op->env = this;
1913 op->above = NULL; 1731 op->above = 0;
1914 op->below = NULL; 1732 op->below = 0;
1915 op->x = 0, op->y = 0; 1733 op->x = 0, op->y = 0;
1916 1734
1917 /* reset the light list and los of the players on the map */ 1735 /* reset the light list and los of the players on the map */
1918 if ((op->glow_radius != 0) && where->map) 1736 if ((op->glow_radius != 0) && map)
1919 { 1737 {
1920#ifdef DEBUG_LIGHTS 1738#ifdef DEBUG_LIGHTS
1921 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1739 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1922#endif /* DEBUG_LIGHTS */ 1740#endif /* DEBUG_LIGHTS */
1923 if (MAP_DARKNESS (where->map)) 1741 if (map->darkness)
1924 update_all_los (where->map, where->x, where->y); 1742 update_all_los (map, x, y);
1925 } 1743 }
1926 1744
1927 /* Client has no idea of ordering so lets not bother ordering it here. 1745 /* Client has no idea of ordering so lets not bother ordering it here.
1928 * It sure simplifies this function... 1746 * It sure simplifies this function...
1929 */ 1747 */
1930 if (where->inv == NULL) 1748 if (!inv)
1931 where->inv = op; 1749 inv = op;
1932 else 1750 else
1933 { 1751 {
1934 op->below = where->inv; 1752 op->below = inv;
1935 op->below->above = op; 1753 op->below->above = op;
1936 where->inv = op; 1754 inv = op;
1937 } 1755 }
1756
1757 INVOKE_OBJECT (INSERT, this);
1758
1938 return op; 1759 return op;
1939} 1760}
1940 1761
1941/* 1762/*
1942 * Checks if any objects has a move_type that matches objects 1763 * Checks if any objects has a move_type that matches objects
… …
1956 * 1777 *
1957 * MSW 2001-07-08: Check all objects on space, not just those below 1778 * MSW 2001-07-08: Check all objects on space, not just those below
1958 * object being inserted. insert_ob_in_map may not put new objects 1779 * object being inserted. insert_ob_in_map may not put new objects
1959 * on top. 1780 * on top.
1960 */ 1781 */
1961
1962int 1782int
1963check_move_on (object *op, object *originator) 1783check_move_on (object *op, object *originator)
1964{ 1784{
1965 object * 1785 object *tmp;
1966 tmp; 1786 maptile *m = op->map;
1967 tag_t
1968 tag;
1969 mapstruct *
1970 m = op->map;
1971 int
1972 x = op->x, y = op->y; 1787 int x = op->x, y = op->y;
1973 1788
1974 MoveType 1789 MoveType move_on, move_slow, move_block;
1975 move_on,
1976 move_slow,
1977 move_block;
1978 1790
1979 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1791 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980 return 0; 1792 return 0;
1981
1982 tag = op->count;
1983 1793
1984 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1794 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1985 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1795 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1986 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1796 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987 1797
… …
2003 1813
2004 /* The objects have to be checked from top to bottom. 1814 /* The objects have to be checked from top to bottom.
2005 * Hence, we first go to the top: 1815 * Hence, we first go to the top:
2006 */ 1816 */
2007 1817
2008 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1818 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
2009 { 1819 {
2010 /* Trim the search when we find the first other spell effect 1820 /* Trim the search when we find the first other spell effect
2011 * this helps performance so that if a space has 50 spell objects, 1821 * this helps performance so that if a space has 50 spell objects,
2012 * we don't need to check all of them. 1822 * we don't need to check all of them.
2013 */ 1823 */
… …
2031 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1841 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2032 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1842 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2033 { 1843 {
2034 1844
2035 float 1845 float
2036 diff = tmp->move_slow_penalty * FABS (op->speed); 1846 diff = tmp->move_slow_penalty * fabs (op->speed);
2037 1847
2038 if (op->type == PLAYER) 1848 if (op->type == PLAYER)
2039 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1849 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2040 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1850 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2041 diff /= 4.0; 1851 diff /= 4.0;
… …
2048 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1858 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2049 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1859 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050 { 1860 {
2051 move_apply (tmp, op, originator); 1861 move_apply (tmp, op, originator);
2052 1862
2053 if (was_destroyed (op, tag)) 1863 if (op->destroyed ())
2054 return 1; 1864 return 1;
2055 1865
2056 /* what the person/creature stepped onto has moved the object 1866 /* what the person/creature stepped onto has moved the object
2057 * someplace new. Don't process any further - if we did, 1867 * someplace new. Don't process any further - if we did,
2058 * have a feeling strange problems would result. 1868 * have a feeling strange problems would result.
… …
2068/* 1878/*
2069 * present_arch(arch, map, x, y) searches for any objects with 1879 * present_arch(arch, map, x, y) searches for any objects with
2070 * a matching archetype at the given map and coordinates. 1880 * a matching archetype at the given map and coordinates.
2071 * The first matching object is returned, or NULL if none. 1881 * The first matching object is returned, or NULL if none.
2072 */ 1882 */
2073
2074object * 1883object *
2075present_arch (const archetype *at, mapstruct *m, int x, int y) 1884present_arch (const archetype *at, maptile *m, int x, int y)
2076{ 1885{
2077 object *
2078 tmp;
2079
2080 if (m == NULL || out_of_map (m, x, y)) 1886 if (!m || out_of_map (m, x, y))
2081 { 1887 {
2082 LOG (llevError, "Present_arch called outside map.\n"); 1888 LOG (llevError, "Present_arch called outside map.\n");
2083 return NULL; 1889 return NULL;
2084 } 1890 }
2085 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1891
1892 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2086 if (tmp->arch == at) 1893 if (tmp->arch == at)
2087 return tmp; 1894 return tmp;
1895
2088 return NULL; 1896 return NULL;
2089} 1897}
2090 1898
2091/* 1899/*
2092 * present(type, map, x, y) searches for any objects with 1900 * present(type, map, x, y) searches for any objects with
2093 * a matching type variable at the given map and coordinates. 1901 * a matching type variable at the given map and coordinates.
2094 * The first matching object is returned, or NULL if none. 1902 * The first matching object is returned, or NULL if none.
2095 */ 1903 */
2096
2097object * 1904object *
2098present (unsigned char type, mapstruct *m, int x, int y) 1905present (unsigned char type, maptile *m, int x, int y)
2099{ 1906{
2100 object *
2101 tmp;
2102
2103 if (out_of_map (m, x, y)) 1907 if (out_of_map (m, x, y))
2104 { 1908 {
2105 LOG (llevError, "Present called outside map.\n"); 1909 LOG (llevError, "Present called outside map.\n");
2106 return NULL; 1910 return NULL;
2107 } 1911 }
2108 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1912
1913 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2109 if (tmp->type == type) 1914 if (tmp->type == type)
2110 return tmp; 1915 return tmp;
1916
2111 return NULL; 1917 return NULL;
2112} 1918}
2113 1919
2114/* 1920/*
2115 * present_in_ob(type, object) searches for any objects with 1921 * present_in_ob(type, object) searches for any objects with
2116 * a matching type variable in the inventory of the given object. 1922 * a matching type variable in the inventory of the given object.
2117 * The first matching object is returned, or NULL if none. 1923 * The first matching object is returned, or NULL if none.
2118 */ 1924 */
2119
2120object * 1925object *
2121present_in_ob (unsigned char type, const object *op) 1926present_in_ob (unsigned char type, const object *op)
2122{ 1927{
2123 object *
2124 tmp;
2125
2126 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1928 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2127 if (tmp->type == type) 1929 if (tmp->type == type)
2128 return tmp; 1930 return tmp;
1931
2129 return NULL; 1932 return NULL;
2130} 1933}
2131 1934
2132/* 1935/*
2133 * present_in_ob (type, str, object) searches for any objects with 1936 * present_in_ob (type, str, object) searches for any objects with
… …
2141 * str is the string to match against. Note that we match against 1944 * str is the string to match against. Note that we match against
2142 * the object name, not the archetype name. this is so that the 1945 * the object name, not the archetype name. this is so that the
2143 * spell code can use one object type (force), but change it's name 1946 * spell code can use one object type (force), but change it's name
2144 * to be unique. 1947 * to be unique.
2145 */ 1948 */
2146
2147object * 1949object *
2148present_in_ob_by_name (int type, const char *str, const object *op) 1950present_in_ob_by_name (int type, const char *str, const object *op)
2149{ 1951{
2150 object *
2151 tmp;
2152
2153 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1952 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2154 {
2155 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1953 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2156 return tmp; 1954 return tmp;
2157 } 1955
2158 return NULL; 1956 return 0;
2159} 1957}
2160 1958
2161/* 1959/*
2162 * present_arch_in_ob(archetype, object) searches for any objects with 1960 * present_arch_in_ob(archetype, object) searches for any objects with
2163 * a matching archetype in the inventory of the given object. 1961 * a matching archetype in the inventory of the given object.
2164 * The first matching object is returned, or NULL if none. 1962 * The first matching object is returned, or NULL if none.
2165 */ 1963 */
2166
2167object * 1964object *
2168present_arch_in_ob (const archetype *at, const object *op) 1965present_arch_in_ob (const archetype *at, const object *op)
2169{ 1966{
2170 object *
2171 tmp;
2172
2173 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1967 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2174 if (tmp->arch == at) 1968 if (tmp->arch == at)
2175 return tmp; 1969 return tmp;
1970
2176 return NULL; 1971 return NULL;
2177} 1972}
2178 1973
2179/* 1974/*
2180 * activate recursively a flag on an object inventory 1975 * activate recursively a flag on an object inventory
2181 */ 1976 */
2182void 1977void
2183flag_inv (object *op, int flag) 1978flag_inv (object *op, int flag)
2184{ 1979{
2185 object *
2186 tmp;
2187
2188 if (op->inv) 1980 if (op->inv)
2189 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1981 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2190 { 1982 {
2191 SET_FLAG (tmp, flag); 1983 SET_FLAG (tmp, flag);
2192 flag_inv (tmp, flag); 1984 flag_inv (tmp, flag);
2193 } 1985 }
2194} /* 1986}
1987
1988/*
2195 * desactivate recursively a flag on an object inventory 1989 * deactivate recursively a flag on an object inventory
2196 */ 1990 */
2197void 1991void
2198unflag_inv (object *op, int flag) 1992unflag_inv (object *op, int flag)
2199{ 1993{
2200 object *
2201 tmp;
2202
2203 if (op->inv) 1994 if (op->inv)
2204 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1995 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2205 { 1996 {
2206 CLEAR_FLAG (tmp, flag); 1997 CLEAR_FLAG (tmp, flag);
2207 unflag_inv (tmp, flag); 1998 unflag_inv (tmp, flag);
2208 } 1999 }
2209}
2210
2211/*
2212 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2213 * all it's inventory (recursively).
2214 * If checksums are used, a player will get set_cheat called for
2215 * him/her-self and all object carried by a call to this function.
2216 */
2217
2218void
2219set_cheat (object *op)
2220{
2221 SET_FLAG (op, FLAG_WAS_WIZ);
2222 flag_inv (op, FLAG_WAS_WIZ);
2223} 2000}
2224 2001
2225/* 2002/*
2226 * find_free_spot(object, map, x, y, start, stop) will search for 2003 * find_free_spot(object, map, x, y, start, stop) will search for
2227 * a spot at the given map and coordinates which will be able to contain 2004 * a spot at the given map and coordinates which will be able to contain
… …
2241 * because arch_blocked (now ob_blocked) needs to know the movement type 2018 * because arch_blocked (now ob_blocked) needs to know the movement type
2242 * to know if the space in question will block the object. We can't use 2019 * to know if the space in question will block the object. We can't use
2243 * the archetype because that isn't correct if the monster has been 2020 * the archetype because that isn't correct if the monster has been
2244 * customized, changed states, etc. 2021 * customized, changed states, etc.
2245 */ 2022 */
2246
2247int 2023int
2248find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2024find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249{ 2025{
2250 int
2251 i,
2252 index = 0, flag; 2026 int index = 0, flag;
2253 static int
2254 altern[SIZEOFFREE]; 2027 int altern[SIZEOFFREE];
2255 2028
2256 for (i = start; i < stop; i++) 2029 for (int i = start; i < stop; i++)
2257 { 2030 {
2258 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2031 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2259 if (!flag) 2032 if (!flag)
2260 altern[index++] = i; 2033 altern [index++] = i;
2261 2034
2262 /* Basically, if we find a wall on a space, we cut down the search size. 2035 /* Basically, if we find a wall on a space, we cut down the search size.
2263 * In this way, we won't return spaces that are on another side of a wall. 2036 * In this way, we won't return spaces that are on another side of a wall.
2264 * This mostly work, but it cuts down the search size in all directions - 2037 * This mostly work, but it cuts down the search size in all directions -
2265 * if the space being examined only has a wall to the north and empty 2038 * if the space being examined only has a wall to the north and empty
2266 * spaces in all the other directions, this will reduce the search space 2039 * spaces in all the other directions, this will reduce the search space
2267 * to only the spaces immediately surrounding the target area, and 2040 * to only the spaces immediately surrounding the target area, and
2268 * won't look 2 spaces south of the target space. 2041 * won't look 2 spaces south of the target space.
2269 */ 2042 */
2270 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2043 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2271 stop = maxfree[i]; 2044 stop = maxfree[i];
2272 } 2045 }
2046
2273 if (!index) 2047 if (!index)
2274 return -1; 2048 return -1;
2049
2275 return altern[RANDOM () % index]; 2050 return altern [rndm (index)];
2276} 2051}
2277 2052
2278/* 2053/*
2279 * find_first_free_spot(archetype, mapstruct, x, y) works like 2054 * find_first_free_spot(archetype, maptile, x, y) works like
2280 * find_free_spot(), but it will search max number of squares. 2055 * find_free_spot(), but it will search max number of squares.
2281 * But it will return the first available spot, not a random choice. 2056 * But it will return the first available spot, not a random choice.
2282 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2057 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2283 */ 2058 */
2284
2285int 2059int
2286find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2060find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287{ 2061{
2288 int
2289 i;
2290
2291 for (i = 0; i < SIZEOFFREE; i++) 2062 for (int i = 0; i < SIZEOFFREE; i++)
2292 {
2293 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2063 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2294 return i; 2064 return i;
2295 } 2065
2296 return -1; 2066 return -1;
2297} 2067}
2298 2068
2299/* 2069/*
2300 * The function permute(arr, begin, end) randomly reorders the array 2070 * The function permute(arr, begin, end) randomly reorders the array
2301 * arr[begin..end-1]. 2071 * arr[begin..end-1].
2072 * now uses a fisher-yates shuffle, old permute was broken
2302 */ 2073 */
2303static void 2074static void
2304permute (int *arr, int begin, int end) 2075permute (int *arr, int begin, int end)
2305{ 2076{
2306 int 2077 arr += begin;
2307 i,
2308 j,
2309 tmp,
2310 len;
2311
2312 len = end - begin; 2078 end -= begin;
2313 for (i = begin; i < end; i++)
2314 {
2315 j = begin + RANDOM () % len;
2316 2079
2317 tmp = arr[i]; 2080 while (--end)
2318 arr[i] = arr[j]; 2081 swap (arr [end], arr [rndm (end + 1)]);
2319 arr[j] = tmp;
2320 }
2321} 2082}
2322 2083
2323/* new function to make monster searching more efficient, and effective! 2084/* new function to make monster searching more efficient, and effective!
2324 * This basically returns a randomized array (in the passed pointer) of 2085 * This basically returns a randomized array (in the passed pointer) of
2325 * the spaces to find monsters. In this way, it won't always look for 2086 * the spaces to find monsters. In this way, it won't always look for
… …
2328 * the 3x3 area will be searched, just not in a predictable order. 2089 * the 3x3 area will be searched, just not in a predictable order.
2329 */ 2090 */
2330void 2091void
2331get_search_arr (int *search_arr) 2092get_search_arr (int *search_arr)
2332{ 2093{
2333 int 2094 int i;
2334 i;
2335 2095
2336 for (i = 0; i < SIZEOFFREE; i++) 2096 for (i = 0; i < SIZEOFFREE; i++)
2337 {
2338 search_arr[i] = i; 2097 search_arr[i] = i;
2339 }
2340 2098
2341 permute (search_arr, 1, SIZEOFFREE1 + 1); 2099 permute (search_arr, 1, SIZEOFFREE1 + 1);
2342 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2100 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2343 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2101 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2344} 2102}
… …
2353 * Perhaps incorrectly, but I'm making the assumption that exclude 2111 * Perhaps incorrectly, but I'm making the assumption that exclude
2354 * is actually want is going to try and move there. We need this info 2112 * is actually want is going to try and move there. We need this info
2355 * because we have to know what movement the thing looking to move 2113 * because we have to know what movement the thing looking to move
2356 * there is capable of. 2114 * there is capable of.
2357 */ 2115 */
2358
2359int 2116int
2360find_dir (mapstruct *m, int x, int y, object *exclude) 2117find_dir (maptile *m, int x, int y, object *exclude)
2361{ 2118{
2362 int
2363 i,
2364 max = SIZEOFFREE, mflags; 2119 int i, max = SIZEOFFREE, mflags;
2365 2120
2366 sint16 nx, ny; 2121 sint16 nx, ny;
2367 object * 2122 object *tmp;
2368 tmp; 2123 maptile *mp;
2369 mapstruct *
2370 mp;
2371 2124
2372 MoveType blocked, move_type; 2125 MoveType blocked, move_type;
2373 2126
2374 if (exclude && exclude->head) 2127 if (exclude && exclude->head_ () != exclude)
2375 { 2128 {
2376 exclude = exclude->head; 2129 exclude = exclude->head;
2377 move_type = exclude->move_type; 2130 move_type = exclude->move_type;
2378 } 2131 }
2379 else 2132 else
… …
2387 mp = m; 2140 mp = m;
2388 nx = x + freearr_x[i]; 2141 nx = x + freearr_x[i];
2389 ny = y + freearr_y[i]; 2142 ny = y + freearr_y[i];
2390 2143
2391 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2144 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2145
2392 if (mflags & P_OUT_OF_MAP) 2146 if (mflags & P_OUT_OF_MAP)
2393 {
2394 max = maxfree[i]; 2147 max = maxfree[i];
2395 }
2396 else 2148 else
2397 { 2149 {
2398 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2150 mapspace &ms = mp->at (nx, ny);
2151
2152 blocked = ms.move_block;
2399 2153
2400 if ((move_type & blocked) == move_type) 2154 if ((move_type & blocked) == move_type)
2401 {
2402 max = maxfree[i]; 2155 max = maxfree[i];
2403 }
2404 else if (mflags & P_IS_ALIVE) 2156 else if (mflags & P_IS_ALIVE)
2405 { 2157 {
2406 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2158 for (tmp = ms.bot; tmp; tmp = tmp->above)
2407 { 2159 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2408 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2160 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2409 {
2410 break; 2161 break;
2411 } 2162
2412 }
2413 if (tmp) 2163 if (tmp)
2414 {
2415 return freedir[i]; 2164 return freedir[i];
2416 }
2417 } 2165 }
2418 } 2166 }
2419 } 2167 }
2168
2420 return 0; 2169 return 0;
2421} 2170}
2422 2171
2423/* 2172/*
2424 * distance(object 1, object 2) will return the square of the 2173 * distance(object 1, object 2) will return the square of the
2425 * distance between the two given objects. 2174 * distance between the two given objects.
2426 */ 2175 */
2427
2428int 2176int
2429distance (const object *ob1, const object *ob2) 2177distance (const object *ob1, const object *ob2)
2430{ 2178{
2431 int
2432 i;
2433
2434 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2179 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2435 return i;
2436} 2180}
2437 2181
2438/* 2182/*
2439 * find_dir_2(delta-x,delta-y) will return a direction in which 2183 * find_dir_2(delta-x,delta-y) will return a direction in which
2440 * an object which has subtracted the x and y coordinates of another 2184 * an object which has subtracted the x and y coordinates of another
2441 * object, needs to travel toward it. 2185 * object, needs to travel toward it.
2442 */ 2186 */
2443
2444int 2187int
2445find_dir_2 (int x, int y) 2188find_dir_2 (int x, int y)
2446{ 2189{
2447 int 2190 int q;
2448 q;
2449 2191
2450 if (y) 2192 if (y)
2451 q = x * 100 / y; 2193 q = x * 100 / y;
2452 else if (x) 2194 else if (x)
2453 q = -300 * x; 2195 q = -300 * x;
… …
2478 2220
2479 return 3; 2221 return 3;
2480} 2222}
2481 2223
2482/* 2224/*
2483 * absdir(int): Returns a number between 1 and 8, which represent
2484 * the "absolute" direction of a number (it actually takes care of
2485 * "overflow" in previous calculations of a direction).
2486 */
2487
2488int
2489absdir (int d)
2490{
2491 while (d < 1)
2492 d += 8;
2493 while (d > 8)
2494 d -= 8;
2495 return d;
2496}
2497
2498/*
2499 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2225 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2500 * between two directions (which are expected to be absolute (see absdir()) 2226 * between two directions (which are expected to be absolute (see absdir())
2501 */ 2227 */
2502
2503int 2228int
2504dirdiff (int dir1, int dir2) 2229dirdiff (int dir1, int dir2)
2505{ 2230{
2506 int 2231 int d;
2507 d;
2508 2232
2509 d = abs (dir1 - dir2); 2233 d = abs (dir1 - dir2);
2510 if (d > 4) 2234 if (d > 4)
2511 d = 8 - d; 2235 d = 8 - d;
2236
2512 return d; 2237 return d;
2513} 2238}
2514 2239
2515/* peterm: 2240/* peterm:
2516 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2241 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2519 * This basically means that if direction is 15, then it could either go 2244 * This basically means that if direction is 15, then it could either go
2520 * direction 4, 14, or 16 to get back to where we are. 2245 * direction 4, 14, or 16 to get back to where we are.
2521 * Moved from spell_util.c to object.c with the other related direction 2246 * Moved from spell_util.c to object.c with the other related direction
2522 * functions. 2247 * functions.
2523 */ 2248 */
2524
2525int
2526 reduction_dir[SIZEOFFREE][3] = { 2249int reduction_dir[SIZEOFFREE][3] = {
2527 {0, 0, 0}, /* 0 */ 2250 {0, 0, 0}, /* 0 */
2528 {0, 0, 0}, /* 1 */ 2251 {0, 0, 0}, /* 1 */
2529 {0, 0, 0}, /* 2 */ 2252 {0, 0, 0}, /* 2 */
2530 {0, 0, 0}, /* 3 */ 2253 {0, 0, 0}, /* 3 */
2531 {0, 0, 0}, /* 4 */ 2254 {0, 0, 0}, /* 4 */
… …
2579 * find a path to that monster that we found. If not, 2302 * find a path to that monster that we found. If not,
2580 * we don't bother going toward it. Returns 1 if we 2303 * we don't bother going toward it. Returns 1 if we
2581 * can see a direct way to get it 2304 * can see a direct way to get it
2582 * Modified to be map tile aware -.MSW 2305 * Modified to be map tile aware -.MSW
2583 */ 2306 */
2584
2585
2586int 2307int
2587can_see_monsterP (mapstruct *m, int x, int y, int dir) 2308can_see_monsterP (maptile *m, int x, int y, int dir)
2588{ 2309{
2589 sint16 dx, dy; 2310 sint16 dx, dy;
2590 int
2591 mflags; 2311 int mflags;
2592 2312
2593 if (dir < 0) 2313 if (dir < 0)
2594 return 0; /* exit condition: invalid direction */ 2314 return 0; /* exit condition: invalid direction */
2595 2315
2596 dx = x + freearr_x[dir]; 2316 dx = x + freearr_x[dir];
… …
2609 return 0; 2329 return 0;
2610 2330
2611 /* yes, can see. */ 2331 /* yes, can see. */
2612 if (dir < 9) 2332 if (dir < 9)
2613 return 1; 2333 return 1;
2334
2614 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2335 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2615 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2336 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2337 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2616} 2338}
2617
2618
2619 2339
2620/* 2340/*
2621 * can_pick(picker, item): finds out if an object is possible to be 2341 * can_pick(picker, item): finds out if an object is possible to be
2622 * picked up by the picker. Returnes 1 if it can be 2342 * picked up by the picker. Returnes 1 if it can be
2623 * picked up, otherwise 0. 2343 * picked up, otherwise 0.
… …
2634 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2354 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2635 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2355 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2636 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2356 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2637} 2357}
2638 2358
2639
2640/* 2359/*
2641 * create clone from object to another 2360 * create clone from object to another
2642 */ 2361 */
2643object * 2362object *
2644object_create_clone (object *asrc) 2363object_create_clone (object *asrc)
2645{ 2364{
2646 object *
2647 dst = NULL, *tmp, *src, *part, *prev, *item; 2365 object *dst = 0, *tmp, *src, *prev, *item;
2648 2366
2649 if (!asrc) 2367 if (!asrc)
2650 return NULL; 2368 return 0;
2651 src = asrc; 2369
2652 if (src->head)
2653 src = src->head; 2370 src = asrc->head_ ();
2654 2371
2655 prev = NULL; 2372 prev = 0;
2656 for (part = src; part; part = part->more) 2373 for (object *part = src; part; part = part->more)
2657 { 2374 {
2658 tmp = get_object (); 2375 tmp = part->clone ();
2659 copy_object (part, tmp);
2660 tmp->x -= src->x; 2376 tmp->x -= src->x;
2661 tmp->y -= src->y; 2377 tmp->y -= src->y;
2378
2662 if (!part->head) 2379 if (!part->head)
2663 { 2380 {
2664 dst = tmp; 2381 dst = tmp;
2665 tmp->head = NULL; 2382 tmp->head = 0;
2666 } 2383 }
2667 else 2384 else
2668 {
2669 tmp->head = dst; 2385 tmp->head = dst;
2670 } 2386
2671 tmp->more = NULL; 2387 tmp->more = 0;
2388
2672 if (prev) 2389 if (prev)
2673 prev->more = tmp; 2390 prev->more = tmp;
2391
2674 prev = tmp; 2392 prev = tmp;
2675 } 2393 }
2676 2394
2677 /*** copy inventory ***/
2678 for (item = src->inv; item; item = item->below) 2395 for (item = src->inv; item; item = item->below)
2679 {
2680 (void) insert_ob_in_ob (object_create_clone (item), dst); 2396 insert_ob_in_ob (object_create_clone (item), dst);
2681 }
2682 2397
2683 return dst; 2398 return dst;
2684}
2685
2686/* return true if the object was destroyed, 0 otherwise */
2687int
2688was_destroyed (const object *op, tag_t old_tag)
2689{
2690 /* checking for FLAG_FREED isn't necessary, but makes this function more
2691 * robust */
2692 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2693}
2694
2695/* GROS - Creates an object using a string representing its content. */
2696
2697/* Basically, we save the content of the string to a temp file, then call */
2698
2699/* load_object on it. I admit it is a highly inefficient way to make things, */
2700
2701/* but it was simple to make and allows reusing the load_object function. */
2702
2703/* Remember not to use load_object_str in a time-critical situation. */
2704
2705/* Also remember that multiparts objects are not supported for now. */
2706
2707object *
2708load_object_str (const char *obstr)
2709{
2710 object *
2711 op;
2712 char
2713 filename[MAX_BUF];
2714
2715 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716
2717 FILE *
2718 tempfile = fopen (filename, "w");
2719
2720 if (tempfile == NULL)
2721 {
2722 LOG (llevError, "Error - Unable to access load object temp file\n");
2723 return NULL;
2724 };
2725 fprintf (tempfile, obstr);
2726 fclose (tempfile);
2727
2728 op = get_object ();
2729
2730 object_thawer thawer (filename);
2731
2732 if (thawer)
2733 load_object (thawer, op, 0);
2734
2735 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2736 CLEAR_FLAG (op, FLAG_REMOVED);
2737
2738 return op;
2739} 2399}
2740 2400
2741/* This returns the first object in who's inventory that 2401/* This returns the first object in who's inventory that
2742 * has the same type and subtype match. 2402 * has the same type and subtype match.
2743 * returns NULL if no match. 2403 * returns NULL if no match.
2744 */ 2404 */
2745object * 2405object *
2746find_obj_by_type_subtype (const object *who, int type, int subtype) 2406find_obj_by_type_subtype (const object *who, int type, int subtype)
2747{ 2407{
2748 object *
2749 tmp;
2750
2751 for (tmp = who->inv; tmp; tmp = tmp->below) 2408 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2752 if (tmp->type == type && tmp->subtype == subtype) 2409 if (tmp->type == type && tmp->subtype == subtype)
2753 return tmp; 2410 return tmp;
2754 2411
2755 return NULL; 2412 return 0;
2756} 2413}
2757 2414
2758/* If ob has a field named key, return the link from the list, 2415/* If ob has a field named key, return the link from the list,
2759 * otherwise return NULL. 2416 * otherwise return NULL.
2760 * 2417 *
… …
2762 * do the desired thing. 2419 * do the desired thing.
2763 */ 2420 */
2764key_value * 2421key_value *
2765get_ob_key_link (const object *ob, const char *key) 2422get_ob_key_link (const object *ob, const char *key)
2766{ 2423{
2767 key_value *
2768 link;
2769
2770 for (link = ob->key_values; link != NULL; link = link->next) 2424 for (key_value *link = ob->key_values; link; link = link->next)
2771 {
2772 if (link->key == key) 2425 if (link->key == key)
2773 {
2774 return link; 2426 return link;
2775 }
2776 }
2777 2427
2778 return NULL; 2428 return 0;
2779} 2429}
2780 2430
2781/* 2431/*
2782 * Returns the value of op has an extra_field for key, or NULL. 2432 * Returns the value of op has an extra_field for key, or NULL.
2783 * 2433 *
… …
2786 * The returned string is shared. 2436 * The returned string is shared.
2787 */ 2437 */
2788const char * 2438const char *
2789get_ob_key_value (const object *op, const char *const key) 2439get_ob_key_value (const object *op, const char *const key)
2790{ 2440{
2791 key_value * 2441 key_value *link;
2792 link; 2442 shstr_cmp canonical_key (key);
2793 const char *
2794 canonical_key;
2795 2443
2796 canonical_key = shstr::find (key);
2797
2798 if (canonical_key == NULL) 2444 if (!canonical_key)
2799 { 2445 {
2800 /* 1. There being a field named key on any object 2446 /* 1. There being a field named key on any object
2801 * implies there'd be a shared string to find. 2447 * implies there'd be a shared string to find.
2802 * 2. Since there isn't, no object has this field. 2448 * 2. Since there isn't, no object has this field.
2803 * 3. Therefore, *this* object doesn't have this field. 2449 * 3. Therefore, *this* object doesn't have this field.
2804 */ 2450 */
2805 return NULL; 2451 return 0;
2806 } 2452 }
2807 2453
2808 /* This is copied from get_ob_key_link() above - 2454 /* This is copied from get_ob_key_link() above -
2809 * only 4 lines, and saves the function call overhead. 2455 * only 4 lines, and saves the function call overhead.
2810 */ 2456 */
2811 for (link = op->key_values; link != NULL; link = link->next) 2457 for (link = op->key_values; link; link = link->next)
2812 {
2813 if (link->key == canonical_key) 2458 if (link->key == canonical_key)
2814 {
2815 return link->value; 2459 return link->value;
2816 } 2460
2817 }
2818 return NULL; 2461 return 0;
2819} 2462}
2820
2821 2463
2822/* 2464/*
2823 * Updates the canonical_key in op to value. 2465 * Updates the canonical_key in op to value.
2824 * 2466 *
2825 * canonical_key is a shared string (value doesn't have to be). 2467 * canonical_key is a shared string (value doesn't have to be).
… …
2830 * Returns TRUE on success. 2472 * Returns TRUE on success.
2831 */ 2473 */
2832int 2474int
2833set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2475set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2834{ 2476{
2835 key_value *
2836 field = NULL, *last = NULL; 2477 key_value *field = NULL, *last = NULL;
2837 2478
2838 for (field = op->key_values; field != NULL; field = field->next) 2479 for (field = op->key_values; field != NULL; field = field->next)
2839 { 2480 {
2840 if (field->key != canonical_key) 2481 if (field->key != canonical_key)
2841 { 2482 {
… …
2850 /* Basically, if the archetype has this key set, 2491 /* Basically, if the archetype has this key set,
2851 * we need to store the null value so when we save 2492 * we need to store the null value so when we save
2852 * it, we save the empty value so that when we load, 2493 * it, we save the empty value so that when we load,
2853 * we get this value back again. 2494 * we get this value back again.
2854 */ 2495 */
2855 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2496 if (get_ob_key_link (op->arch, canonical_key))
2856 field->value = 0; 2497 field->value = 0;
2857 else 2498 else
2858 { 2499 {
2859 if (last) 2500 if (last)
2860 last->next = field->next; 2501 last->next = field->next;
… …
2869 /* IF we get here, key doesn't exist */ 2510 /* IF we get here, key doesn't exist */
2870 2511
2871 /* No field, we'll have to add it. */ 2512 /* No field, we'll have to add it. */
2872 2513
2873 if (!add_key) 2514 if (!add_key)
2874 {
2875 return FALSE; 2515 return FALSE;
2876 } 2516
2877 /* There isn't any good reason to store a null 2517 /* There isn't any good reason to store a null
2878 * value in the key/value list. If the archetype has 2518 * value in the key/value list. If the archetype has
2879 * this key, then we should also have it, so shouldn't 2519 * this key, then we should also have it, so shouldn't
2880 * be here. If user wants to store empty strings, 2520 * be here. If user wants to store empty strings,
2881 * should pass in "" 2521 * should pass in ""
… …
2908{ 2548{
2909 shstr key_ (key); 2549 shstr key_ (key);
2910 2550
2911 return set_ob_key_value_s (op, key_, value, add_key); 2551 return set_ob_key_value_s (op, key_, value, add_key);
2912} 2552}
2553
2554object::depth_iterator::depth_iterator (object *container)
2555: iterator_base (container)
2556{
2557 while (item->inv)
2558 item = item->inv;
2559}
2560
2561void
2562object::depth_iterator::next ()
2563{
2564 if (item->below)
2565 {
2566 item = item->below;
2567
2568 while (item->inv)
2569 item = item->inv;
2570 }
2571 else
2572 item = item->env;
2573}
2574
2575const char *
2576object::flag_desc (char *desc, int len) const
2577{
2578 char *p = desc;
2579 bool first = true;
2580
2581 *p = 0;
2582
2583 for (int i = 0; i < NUM_FLAGS; i++)
2584 {
2585 if (len <= 10) // magic constant!
2586 {
2587 snprintf (p, len, ",...");
2588 break;
2589 }
2590
2591 if (flag [i])
2592 {
2593 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2594 len -= cnt;
2595 p += cnt;
2596 first = false;
2597 }
2598 }
2599
2600 return desc;
2601}
2602
2603// return a suitable string describing an object in enough detail to find it
2604const char *
2605object::debug_desc (char *info) const
2606{
2607 char flagdesc[512];
2608 char info2[256 * 4];
2609 char *p = info;
2610
2611 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2612 count, uuid.seq,
2613 &name,
2614 title ? "\",title:\"" : "",
2615 title ? (const char *)title : "",
2616 flag_desc (flagdesc, 512), type);
2617
2618 if (env)
2619 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2620
2621 if (map)
2622 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2623
2624 return info;
2625}
2626
2627const char *
2628object::debug_desc () const
2629{
2630 static char info[3][256 * 4];
2631 static int info_idx;
2632
2633 return debug_desc (info [++info_idx % 3]);
2634}
2635
2636struct region *
2637object::region () const
2638{
2639 return map ? map->region (x, y)
2640 : region::default_region ();
2641}
2642
2643const materialtype_t *
2644object::dominant_material () const
2645{
2646 if (materialtype_t *mt = name_to_material (materialname))
2647 return mt;
2648
2649 return name_to_material (shstr_unknown);
2650}
2651
2652void
2653object::open_container (object *new_container)
2654{
2655 if (container == new_container)
2656 return;
2657
2658 if (object *old_container = container)
2659 {
2660 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2661 return;
2662
2663#if 0
2664 // remove the "Close old_container" object.
2665 if (object *closer = old_container->inv)
2666 if (closer->type == CLOSE_CON)
2667 closer->destroy ();
2668#endif
2669
2670 old_container->flag [FLAG_APPLIED] = 0;
2671 container = 0;
2672
2673 esrv_update_item (UPD_FLAGS, this, old_container);
2674 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2675 }
2676
2677 if (new_container)
2678 {
2679 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2680 return;
2681
2682 // TODO: this does not seem to serve any purpose anymore?
2683#if 0
2684 // insert the "Close Container" object.
2685 if (archetype *closer = new_container->other_arch)
2686 {
2687 object *closer = arch_to_object (new_container->other_arch);
2688 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2689 new_container->insert (closer);
2690 }
2691#endif
2692
2693 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2694
2695 new_container->flag [FLAG_APPLIED] = 1;
2696 container = new_container;
2697
2698 esrv_update_item (UPD_FLAGS, this, new_container);
2699 esrv_send_inventory (this, new_container);
2700 }
2701}
2702
2703object *
2704object::force_find (const shstr name)
2705{
2706 /* cycle through his inventory to look for the MARK we want to
2707 * place
2708 */
2709 for (object *tmp = inv; tmp; tmp = tmp->below)
2710 if (tmp->type == FORCE && tmp->slaying == name)
2711 return splay (tmp);
2712
2713 return 0;
2714}
2715
2716void
2717object::force_add (const shstr name, int duration)
2718{
2719 if (object *force = force_find (name))
2720 force->destroy ();
2721
2722 object *force = get_archetype (FORCE_NAME);
2723
2724 force->slaying = name;
2725 force->stats.food = 1;
2726 force->speed_left = -1.f;
2727
2728 force->set_speed (duration ? 1.f / duration : 0.f);
2729 force->flag [FLAG_IS_USED_UP] = true;
2730 force->flag [FLAG_APPLIED] = true;
2731
2732 insert (force);
2733}
2734

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines