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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.99 by root, Sun Dec 31 18:10:40 2006 UTC

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

Diff Legend

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