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.49 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.199 by root, Thu Nov 8 19:43:23 2007 UTC

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

Diff Legend

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