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.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.85 by root, Mon Dec 25 17:11:16 2006 UTC

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

Diff Legend

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