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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.90 by root, Tue Dec 26 10:14:24 2006 UTC

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

Diff Legend

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