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

Diff Legend

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