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.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.139 by root, Sat Apr 21 17:34:22 2007 UTC

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

Diff Legend

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