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.37 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.116 by pippijn, Mon Jan 15 21:06:18 2007 UTC

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

Diff Legend

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