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

Diff Legend

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