ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC

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

Diff Legend

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