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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines