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.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.133 by root, Fri Feb 16 19:43:40 2007 UTC

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

Diff Legend

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