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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.145 by root, Mon May 7 03:05:58 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines