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.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.155 by root, Thu May 17 21:32:08 2007 UTC

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

Diff Legend

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