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.52 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 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 && lastmortals > 100)//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 909{
973 * free objects. The IS_FREED() flag is set in the object. 910 attachable::do_destroy ();
974 * The object must have been removed by remove_ob() first for 911
975 * this function to succeed. 912 if (flag [FLAG_IS_LINKED])
976 * 913 remove_button_link (this);
977 * If destroy_inventory is set, free inventory as well. Else drop items in 914
978 * inventory to the ground. 915 if (flag [FLAG_FRIENDLY])
979 */ 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 freed_map->nodrop = 1;
941
942 freed_map->alloc ();
943 freed_map->in_memory = MAP_IN_MEMORY;
944 }
945
946 map = freed_map;
947 x = 1;
948 y = 1;
949 }
950
951 if (more)
952 {
953 more->destroy ();
954 more = 0;
955 }
956
957 head = 0;
958
959 // clear those pointers that likely might cause circular references
960 owner = 0;
961 enemy = 0;
962 attacked_by = 0;
963 current_weapon = 0;
964}
965
966void
980void object::destroy (bool destroy_inventory) 967object::destroy (bool destroy_inventory)
981{ 968{
982 if (QUERY_FLAG (this, FLAG_FREED)) 969 if (destroyed ())
983 return; 970 return;
984 971
985 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 972 if (destroy_inventory)
986 remove_friendly_object (this); 973 destroy_inv (false);
987 974
988 if (!QUERY_FLAG (this, FLAG_REMOVED)) 975 if (is_head ())
989 remove_ob (this); 976 if (sound_destroy)
977 play_sound (sound_destroy);
978 else if (flag [FLAG_MONSTER])
979 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
990 980
991 SET_FLAG (this, FLAG_FREED); 981 attachable::destroy ();
992
993 if (more)
994 {
995 more->destroy (destroy_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 (destroy_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->destroy (destroy_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 // only relevant for players(?), but make sure of it anyways
1047 contr = 0;
1048
1049 /* Remove object from the active list */
1050 speed = 0;
1051 update_ob_speed (this);
1052
1053 unlink ();
1054
1055 mortals.push_back (this);
1056} 982}
1057 983
1058/* 984/*
1059 * sub_weight() recursively (outwards) subtracts a number from the 985 * sub_weight() recursively (outwards) subtracts a number from the
1060 * weight of an object (and what is carried by it's environment(s)). 986 * weight of an object (and what is carried by it's environment(s)).
1061 */ 987 */
1062
1063void 988void
1064sub_weight (object *op, signed long weight) 989sub_weight (object *op, signed long weight)
1065{ 990{
1066 while (op != NULL) 991 while (op != NULL)
1067 { 992 {
… …
1071 op->carrying -= weight; 996 op->carrying -= weight;
1072 op = op->env; 997 op = op->env;
1073 } 998 }
1074} 999}
1075 1000
1076/* remove_ob(op): 1001/* op->remove ():
1077 * This function removes the object op from the linked list of objects 1002 * This function removes the object op from the linked list of objects
1078 * which it is currently tied to. When this function is done, the 1003 * which it is currently tied to. When this function is done, the
1079 * object will have no environment. If the object previously had an 1004 * object will have no environment. If the object previously had an
1080 * environment, the x and y coordinates will be updated to 1005 * environment, the x and y coordinates will be updated to
1081 * the previous environment. 1006 * the previous environment.
1082 * Beware: This function is called from the editor as well!
1083 */ 1007 */
1084
1085void 1008void
1086remove_ob (object *op) 1009object::do_remove ()
1087{ 1010{
1088 object *tmp, *last = 0; 1011 object *tmp, *last = 0;
1089 object *otmp; 1012 object *otmp;
1090 1013
1091 int check_walk_off;
1092 maptile *m;
1093
1094 sint16 x, y;
1095
1096 if (QUERY_FLAG (op, FLAG_REMOVED)) 1014 if (QUERY_FLAG (this, FLAG_REMOVED))
1097 return; 1015 return;
1098 1016
1099 SET_FLAG (op, FLAG_REMOVED); 1017 SET_FLAG (this, FLAG_REMOVED);
1018 INVOKE_OBJECT (REMOVE, this);
1100 1019
1101 if (op->more != NULL) 1020 if (more)
1102 remove_ob (op->more); 1021 more->remove ();
1103 1022
1104 /* 1023 /*
1105 * In this case, the object to be removed is in someones 1024 * In this case, the object to be removed is in someones
1106 * inventory. 1025 * inventory.
1107 */ 1026 */
1108 if (op->env != NULL) 1027 if (env)
1109 { 1028 {
1110 if (op->nrof) 1029 if (nrof)
1111 sub_weight (op->env, op->weight * op->nrof); 1030 sub_weight (env, weight * nrof);
1112 else 1031 else
1113 sub_weight (op->env, op->weight + op->carrying); 1032 sub_weight (env, weight + carrying);
1114 1033
1115 /* NO_FIX_PLAYER is set when a great many changes are being 1034 /* NO_FIX_PLAYER is set when a great many changes are being
1116 * made to players inventory. If set, avoiding the call 1035 * made to players inventory. If set, avoiding the call
1117 * to save cpu time. 1036 * to save cpu time.
1118 */ 1037 */
1119 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1038 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1120 fix_player (otmp); 1039 otmp->update_stats ();
1121 1040
1122 if (op->above != NULL) 1041 if (above)
1123 op->above->below = op->below; 1042 above->below = below;
1124 else 1043 else
1125 op->env->inv = op->below; 1044 env->inv = below;
1126 1045
1127 if (op->below != NULL) 1046 if (below)
1128 op->below->above = op->above; 1047 below->above = above;
1129 1048
1130 /* we set up values so that it could be inserted into 1049 /* we set up values so that it could be inserted into
1131 * the map, but we don't actually do that - it is up 1050 * the map, but we don't actually do that - it is up
1132 * to the caller to decide what we want to do. 1051 * to the caller to decide what we want to do.
1133 */ 1052 */
1134 op->x = op->env->x, op->y = op->env->y; 1053 x = env->x, y = env->y;
1135 op->map = op->env->map; 1054 map = env->map;
1136 op->above = NULL, op->below = NULL; 1055 above = 0, below = 0;
1137 op->env = NULL; 1056 env = 0;
1138 } 1057 }
1139 else if (op->map) 1058 else if (map)
1140 { 1059 {
1141 x = op->x; 1060 if (type == PLAYER)
1142 y = op->y;
1143 m = get_map_from_coord (op->map, &x, &y);
1144
1145 if (!m)
1146 {
1147 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1148 op->map->path, op->x, op->y);
1149 /* in old days, we used to set x and y to 0 and continue.
1150 * it seems if we get into this case, something is probablye
1151 * screwed up and should be fixed.
1152 */
1153 abort ();
1154 } 1061 {
1062 // leaving a spot always closes any open container on the ground
1063 if (container && !container->env)
1064 // this causes spurious floorbox updates, but it ensures
1065 // that the CLOSE event is being sent.
1066 close_container ();
1155 1067
1156 if (op->map != m) 1068 --map->players;
1157 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", 1069 map->touch ();
1158 op->map->path, m->path, op->x, op->y, x, y);
1159
1160 /* Re did the following section of code - it looks like it had
1161 * lots of logic for things we no longer care about
1162 */ 1070 }
1071
1072 map->dirty = true;
1073 mapspace &ms = this->ms ();
1163 1074
1164 /* link the object above us */ 1075 /* link the object above us */
1165 if (op->above) 1076 if (above)
1166 op->above->below = op->below; 1077 above->below = below;
1167 else 1078 else
1168 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1079 ms.top = below; /* we were top, set new top */
1169 1080
1170 /* Relink the object below us, if there is one */ 1081 /* Relink the object below us, if there is one */
1171 if (op->below) 1082 if (below)
1172 op->below->above = op->above; 1083 below->above = above;
1173 else 1084 else
1174 { 1085 {
1175 /* Nothing below, which means we need to relink map object for this space 1086 /* Nothing below, which means we need to relink map object for this space
1176 * use translated coordinates in case some oddness with map tiling is 1087 * use translated coordinates in case some oddness with map tiling is
1177 * evident 1088 * evident
1178 */ 1089 */
1179 if (GET_MAP_OB (m, x, y) != op) 1090 if (GET_MAP_OB (map, x, y) != this)
1180 {
1181 dump_object (op);
1182 LOG (llevError,
1183 "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); 1091 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 ());
1184 dump_object (GET_MAP_OB (m, x, y)); 1092
1185 LOG (llevError, "%s\n", errmsg); 1093 ms.bot = above; /* goes on above it. */
1186 } 1094 }
1187 1095
1188 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1189 }
1190
1191 op->above = 0; 1096 above = 0;
1192 op->below = 0; 1097 below = 0;
1193 1098
1194 if (op->map->in_memory == MAP_SAVING) 1099 if (map->in_memory == MAP_SAVING)
1195 return; 1100 return;
1196 1101
1197 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1102 int check_walk_off = !flag [FLAG_NO_APPLY];
1198 1103
1199 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1104 if (object *pl = ms.player ())
1105 {
1106 if (pl->container == this)
1107 /* If a container that the player is currently using somehow gets
1108 * removed (most likely destroyed), update the player view
1109 * appropriately.
1110 */
1111 pl->close_container ();
1112
1113 pl->contr->ns->floorbox_update ();
1114 }
1115
1116 for (tmp = ms.bot; tmp; tmp = tmp->above)
1200 { 1117 {
1201 /* No point updating the players look faces if he is the object 1118 /* No point updating the players look faces if he is the object
1202 * being removed. 1119 * being removed.
1203 */ 1120 */
1204 1121
1205 if (tmp->type == PLAYER && tmp != op) 1122 /* See if object moving off should effect something */
1123 if (check_walk_off
1124 && ((move_type & tmp->move_off)
1125 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1206 { 1126 {
1207 /* If a container that the player is currently using somehow gets
1208 * removed (most likely destroyed), update the player view
1209 * appropriately.
1210 */
1211 if (tmp->container == op)
1212 {
1213 CLEAR_FLAG (op, FLAG_APPLIED);
1214 tmp->container = NULL;
1215 }
1216
1217 tmp->contr->socket.update_look = 1;
1218 }
1219
1220 /* See if player moving off should effect something */
1221 if (check_walk_off
1222 && ((op->move_type & tmp->move_off)
1223 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224 {
1225 move_apply (tmp, op, NULL); 1127 move_apply (tmp, this, 0);
1226 1128
1227 if (op->destroyed ()) 1129 if (destroyed ())
1228 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1130 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1229 } 1131 }
1230 1132
1231 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1232
1233 if (tmp->above == tmp)
1234 tmp->above = NULL;
1235
1236 last = tmp; 1133 last = tmp;
1237 } 1134 }
1238 1135
1239 /* last == NULL of there are no objects on this space */ 1136 /* last == NULL if there are no objects on this space */
1137 //TODO: this makes little sense, why only update the topmost object?
1240 if (last == NULL) 1138 if (!last)
1241 { 1139 map->at (x, y).flags_ = 0;
1242 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1243 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1244 * those out anyways, and if there are any flags set right now, they won't
1245 * be correct anyways.
1246 */
1247 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1248 update_position (op->map, op->x, op->y);
1249 }
1250 else 1140 else
1251 update_object (last, UP_OBJ_REMOVE); 1141 update_object (last, UP_OBJ_REMOVE);
1252 1142
1253 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1143 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1254 update_all_los (op->map, op->x, op->y); 1144 update_all_los (map, x, y);
1255 } 1145 }
1256} 1146}
1257 1147
1258/* 1148/*
1259 * merge_ob(op,top): 1149 * merge_ob(op,top):
… …
1267merge_ob (object *op, object *top) 1157merge_ob (object *op, object *top)
1268{ 1158{
1269 if (!op->nrof) 1159 if (!op->nrof)
1270 return 0; 1160 return 0;
1271 1161
1272 if (top == NULL) 1162 if (!top)
1273 for (top = op; top != NULL && top->above != NULL; top = top->above); 1163 for (top = op; top && top->above; top = top->above)
1164 ;
1274 1165
1275 for (; top != NULL; top = top->below) 1166 for (; top; top = top->below)
1276 { 1167 {
1277 if (top == op) 1168 if (top == op)
1278 continue; 1169 continue;
1279 if (CAN_MERGE (op, top)) 1170
1171 if (object::can_merge (op, top))
1280 { 1172 {
1281 top->nrof += op->nrof; 1173 top->nrof += op->nrof;
1282 1174
1283/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1175/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1284 op->weight = 0; /* Don't want any adjustements now */ 1176 op->weight = 0; /* Don't want any adjustements now */
1285 remove_ob (op); 1177 op->destroy ();
1286 free_object (op);
1287 return top; 1178 return top;
1288 } 1179 }
1289 } 1180 }
1290 1181
1291 return 0; 1182 return 0;
1292} 1183}
1293 1184
1185void
1186object::expand_tail ()
1187{
1188 if (more)
1189 return;
1190
1191 object *prev = this;
1192
1193 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1194 {
1195 object *op = arch_to_object (at);
1196
1197 op->name = name;
1198 op->name_pl = name_pl;
1199 op->title = title;
1200
1201 op->head = this;
1202 prev->more = op;
1203
1204 prev = op;
1205 }
1206}
1207
1294/* 1208/*
1295 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1209 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1296 * job preparing multi-part monsters 1210 * job preparing multi-part monsters.
1297 */ 1211 */
1298object * 1212object *
1299insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1213insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1300{ 1214{
1301 object *tmp;
1302
1303 if (op->head)
1304 op = op->head;
1305
1306 for (tmp = op; tmp; tmp = tmp->more) 1215 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1307 { 1216 {
1308 tmp->x = x + tmp->arch->clone.x; 1217 tmp->x = x + tmp->arch->x;
1309 tmp->y = y + tmp->arch->clone.y; 1218 tmp->y = y + tmp->arch->y;
1310 } 1219 }
1311 1220
1312 return insert_ob_in_map (op, m, originator, flag); 1221 return insert_ob_in_map (op, m, originator, flag);
1313} 1222}
1314 1223
… …
1330 * Return value: 1239 * Return value:
1331 * new object if 'op' was merged with other object 1240 * new object if 'op' was merged with other object
1332 * NULL if 'op' was destroyed 1241 * NULL if 'op' was destroyed
1333 * just 'op' otherwise 1242 * just 'op' otherwise
1334 */ 1243 */
1335
1336object * 1244object *
1337insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1245insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1338{ 1246{
1247 assert (!op->flag [FLAG_FREED]);
1248
1339 object *tmp, *top, *floor = NULL; 1249 object *top, *floor = NULL;
1340 sint16 x, y;
1341 1250
1342 if (QUERY_FLAG (op, FLAG_FREED)) 1251 op->remove ();
1343 {
1344 LOG (llevError, "Trying to insert freed object!\n");
1345 return NULL;
1346 }
1347
1348 if (m == NULL)
1349 {
1350 dump_object (op);
1351 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1352 return op;
1353 }
1354
1355 if (out_of_map (m, op->x, op->y))
1356 {
1357 dump_object (op);
1358 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1359#ifdef MANY_CORES
1360 /* Better to catch this here, as otherwise the next use of this object
1361 * is likely to cause a crash. Better to find out where it is getting
1362 * improperly inserted.
1363 */
1364 abort ();
1365#endif
1366 return op;
1367 }
1368
1369 if (!QUERY_FLAG (op, FLAG_REMOVED))
1370 {
1371 dump_object (op);
1372 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1373 return op;
1374 }
1375
1376 if (op->more != NULL)
1377 {
1378 /* The part may be on a different map. */
1379
1380 object *more = op->more;
1381
1382 /* We really need the caller to normalize coordinates - if
1383 * we set the map, that doesn't work if the location is within
1384 * a map and this is straddling an edge. So only if coordinate
1385 * is clear wrong do we normalize it.
1386 */
1387 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1388 more->map = get_map_from_coord (m, &more->x, &more->y);
1389 else if (!more->map)
1390 {
1391 /* For backwards compatibility - when not dealing with tiled maps,
1392 * more->map should always point to the parent.
1393 */
1394 more->map = m;
1395 }
1396
1397 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1398 {
1399 if (!op->head)
1400 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1401
1402 return NULL;
1403 }
1404 }
1405
1406 CLEAR_FLAG (op, FLAG_REMOVED);
1407 1252
1408 /* Ideally, the caller figures this out. However, it complicates a lot 1253 /* Ideally, the caller figures this out. However, it complicates a lot
1409 * of areas of callers (eg, anything that uses find_free_spot would now 1254 * of areas of callers (eg, anything that uses find_free_spot would now
1410 * need extra work 1255 * need extra work
1411 */ 1256 */
1412 op->map = get_map_from_coord (m, &op->x, &op->y); 1257 if (!xy_normalise (m, op->x, op->y))
1413 x = op->x; 1258 {
1414 y = op->y; 1259 op->destroy ();
1260 return 0;
1261 }
1262
1263 if (object *more = op->more)
1264 if (!insert_ob_in_map (more, m, originator, flag))
1265 return 0;
1266
1267 CLEAR_FLAG (op, FLAG_REMOVED);
1268
1269 op->map = m;
1270 mapspace &ms = op->ms ();
1415 1271
1416 /* this has to be done after we translate the coordinates. 1272 /* this has to be done after we translate the coordinates.
1417 */ 1273 */
1418 if (op->nrof && !(flag & INS_NO_MERGE)) 1274 if (op->nrof && !(flag & INS_NO_MERGE))
1419 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1275 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1420 if (CAN_MERGE (op, tmp)) 1276 if (object::can_merge (op, tmp))
1421 { 1277 {
1422 op->nrof += tmp->nrof; 1278 op->nrof += tmp->nrof;
1423 remove_ob (tmp); 1279 tmp->destroy ();
1424 free_object (tmp);
1425 } 1280 }
1426 1281
1427 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1282 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1428 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1283 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1429 1284
… …
1442 op->below = originator->below; 1297 op->below = originator->below;
1443 1298
1444 if (op->below) 1299 if (op->below)
1445 op->below->above = op; 1300 op->below->above = op;
1446 else 1301 else
1447 SET_MAP_OB (op->map, op->x, op->y, op); 1302 ms.bot = op;
1448 1303
1449 /* since *below* originator, no need to update top */ 1304 /* since *below* originator, no need to update top */
1450 originator->below = op; 1305 originator->below = op;
1451 } 1306 }
1452 else 1307 else
1453 { 1308 {
1309 top = ms.bot;
1310
1454 /* If there are other objects, then */ 1311 /* If there are other objects, then */
1455 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1312 if (top)
1456 { 1313 {
1457 object *last = NULL; 1314 object *last = 0;
1458 1315
1459 /* 1316 /*
1460 * If there are multiple objects on this space, we do some trickier handling. 1317 * If there are multiple objects on this space, we do some trickier handling.
1461 * We've already dealt with merging if appropriate. 1318 * We've already dealt with merging if appropriate.
1462 * Generally, we want to put the new object on top. But if 1319 * Generally, we want to put the new object on top. But if
… …
1466 * once we get to them. This reduces the need to traverse over all of 1323 * once we get to them. This reduces the need to traverse over all of
1467 * them when adding another one - this saves quite a bit of cpu time 1324 * them when adding another one - this saves quite a bit of cpu time
1468 * when lots of spells are cast in one area. Currently, it is presumed 1325 * when lots of spells are cast in one area. Currently, it is presumed
1469 * that flying non pickable objects are spell objects. 1326 * that flying non pickable objects are spell objects.
1470 */ 1327 */
1471 1328 for (top = ms.bot; top; top = top->above)
1472 while (top != NULL)
1473 { 1329 {
1474 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1330 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1475 floor = top; 1331 floor = top;
1476 1332
1477 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1333 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1480 top = top->below; 1336 top = top->below;
1481 break; 1337 break;
1482 } 1338 }
1483 1339
1484 last = top; 1340 last = top;
1485 top = top->above;
1486 } 1341 }
1487 1342
1488 /* Don't want top to be NULL, so set it to the last valid object */ 1343 /* Don't want top to be NULL, so set it to the last valid object */
1489 top = last; 1344 top = last;
1490 1345
… …
1492 * looks like instead of lots of conditions here. 1347 * looks like instead of lots of conditions here.
1493 * makes things faster, and effectively the same result. 1348 * makes things faster, and effectively the same result.
1494 */ 1349 */
1495 1350
1496 /* Have object 'fall below' other objects that block view. 1351 /* Have object 'fall below' other objects that block view.
1497 * Unless those objects are exits, type 66 1352 * Unless those objects are exits.
1498 * If INS_ON_TOP is used, don't do this processing 1353 * If INS_ON_TOP is used, don't do this processing
1499 * Need to find the object that in fact blocks view, otherwise 1354 * Need to find the object that in fact blocks view, otherwise
1500 * stacking is a bit odd. 1355 * stacking is a bit odd.
1501 */ 1356 */
1502 if (!(flag & INS_ON_TOP) && 1357 if (!(flag & INS_ON_TOP)
1503 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1358 && ms.flags () & P_BLOCKSVIEW
1359 && (op->face && !faces [op->face].visibility))
1504 { 1360 {
1505 for (last = top; last != floor; last = last->below) 1361 for (last = top; last != floor; last = last->below)
1506 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1362 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1507 break; 1363 break;
1364
1508 /* Check to see if we found the object that blocks view, 1365 /* Check to see if we found the object that blocks view,
1509 * and make sure we have a below pointer for it so that 1366 * and make sure we have a below pointer for it so that
1510 * we can get inserted below this one, which requires we 1367 * we can get inserted below this one, which requires we
1511 * set top to the object below us. 1368 * set top to the object below us.
1512 */ 1369 */
1513 if (last && last->below && last != floor) 1370 if (last && last->below && last != floor)
1514 top = last->below; 1371 top = last->below;
1515 } 1372 }
1516 } /* If objects on this space */ 1373 } /* If objects on this space */
1517 1374
1518 if (flag & INS_MAP_LOAD)
1519 top = GET_MAP_TOP (op->map, op->x, op->y);
1520
1521 if (flag & INS_ABOVE_FLOOR_ONLY) 1375 if (flag & INS_ABOVE_FLOOR_ONLY)
1522 top = floor; 1376 top = floor;
1523 1377
1524 /* Top is the object that our object (op) is going to get inserted above. 1378 /* Top is the object that our object (op) is going to get inserted above.
1525 */ 1379 */
1526 1380
1527 /* First object on this space */ 1381 /* First object on this space */
1528 if (!top) 1382 if (!top)
1529 { 1383 {
1530 op->above = GET_MAP_OB (op->map, op->x, op->y); 1384 op->above = ms.bot;
1531 1385
1532 if (op->above) 1386 if (op->above)
1533 op->above->below = op; 1387 op->above->below = op;
1534 1388
1535 op->below = NULL; 1389 op->below = 0;
1536 SET_MAP_OB (op->map, op->x, op->y, op); 1390 ms.bot = op;
1537 } 1391 }
1538 else 1392 else
1539 { /* get inserted into the stack above top */ 1393 { /* get inserted into the stack above top */
1540 op->above = top->above; 1394 op->above = top->above;
1541 1395
… …
1544 1398
1545 op->below = top; 1399 op->below = top;
1546 top->above = op; 1400 top->above = op;
1547 } 1401 }
1548 1402
1549 if (op->above == NULL) 1403 if (!op->above)
1550 SET_MAP_TOP (op->map, op->x, op->y, op); 1404 ms.top = op;
1551 } /* else not INS_BELOW_ORIGINATOR */ 1405 } /* else not INS_BELOW_ORIGINATOR */
1552 1406
1553 if (op->type == PLAYER) 1407 if (op->type == PLAYER)
1408 {
1554 op->contr->do_los = 1; 1409 op->contr->do_los = 1;
1410 ++op->map->players;
1411 op->map->touch ();
1412 }
1555 1413
1556 /* If we have a floor, we know the player, if any, will be above 1414 op->map->dirty = true;
1557 * it, so save a few ticks and start from there. 1415
1558 */ 1416 if (object *pl = ms.player ())
1559 if (!(flag & INS_MAP_LOAD)) 1417 pl->contr->ns->floorbox_update ();
1560 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1561 if (tmp->type == PLAYER)
1562 tmp->contr->socket.update_look = 1;
1563 1418
1564 /* If this object glows, it may affect lighting conditions that are 1419 /* If this object glows, it may affect lighting conditions that are
1565 * visible to others on this map. But update_all_los is really 1420 * visible to others on this map. But update_all_los is really
1566 * an inefficient way to do this, as it means los for all players 1421 * an inefficient way to do this, as it means los for all players
1567 * on the map will get recalculated. The players could very well 1422 * on the map will get recalculated. The players could very well
1568 * be far away from this change and not affected in any way - 1423 * be far away from this change and not affected in any way -
1569 * this should get redone to only look for players within range, 1424 * this should get redone to only look for players within range,
1570 * or just updating the P_NEED_UPDATE for spaces within this area 1425 * or just updating the P_UPTODATE for spaces within this area
1571 * of effect may be sufficient. 1426 * of effect may be sufficient.
1572 */ 1427 */
1573 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1428 if (op->map->darkness && (op->glow_radius != 0))
1574 update_all_los (op->map, op->x, op->y); 1429 update_all_los (op->map, op->x, op->y);
1575 1430
1576 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1431 /* updates flags (blocked, alive, no magic, etc) for this map space */
1577 update_object (op, UP_OBJ_INSERT); 1432 update_object (op, UP_OBJ_INSERT);
1578 1433
1434 INVOKE_OBJECT (INSERT, op);
1435
1579 /* Don't know if moving this to the end will break anything. However, 1436 /* Don't know if moving this to the end will break anything. However,
1580 * we want to have update_look set above before calling this. 1437 * we want to have floorbox_update called before calling this.
1581 * 1438 *
1582 * check_move_on() must be after this because code called from 1439 * check_move_on() must be after this because code called from
1583 * check_move_on() depends on correct map flags (so functions like 1440 * check_move_on() depends on correct map flags (so functions like
1584 * blocked() and wall() work properly), and these flags are updated by 1441 * blocked() and wall() work properly), and these flags are updated by
1585 * update_object(). 1442 * update_object().
1586 */ 1443 */
1587 1444
1588 /* if this is not the head or flag has been passed, don't check walk on status */ 1445 /* if this is not the head or flag has been passed, don't check walk on status */
1589 if (!(flag & INS_NO_WALK_ON) && !op->head) 1446 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1590 { 1447 {
1591 if (check_move_on (op, originator)) 1448 if (check_move_on (op, originator))
1592 return NULL; 1449 return 0;
1593 1450
1594 /* If we are a multi part object, lets work our way through the check 1451 /* If we are a multi part object, lets work our way through the check
1595 * walk on's. 1452 * walk on's.
1596 */ 1453 */
1597 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1454 for (object *tmp = op->more; tmp; tmp = tmp->more)
1598 if (check_move_on (tmp, originator)) 1455 if (check_move_on (tmp, originator))
1599 return NULL; 1456 return 0;
1600 } 1457 }
1601 1458
1602 return op; 1459 return op;
1603} 1460}
1604 1461
1605/* this function inserts an object in the map, but if it 1462/* this function inserts an object in the map, but if it
1606 * finds an object of its own type, it'll remove that one first. 1463 * finds an object of its own type, it'll remove that one first.
1607 * op is the object to insert it under: supplies x and the map. 1464 * op is the object to insert it under: supplies x and the map.
1608 */ 1465 */
1609void 1466void
1610replace_insert_ob_in_map (const char *arch_string, object *op) 1467replace_insert_ob_in_map (const char *arch_string, object *op)
1611{ 1468{
1612 object * 1469 object *tmp, *tmp1;
1613 tmp;
1614 object *
1615 tmp1;
1616 1470
1617 /* first search for itself and remove any old instances */ 1471 /* first search for itself and remove any old instances */
1618 1472
1619 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1473 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1620 {
1621 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1474 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1622 { 1475 tmp->destroy ();
1623 remove_ob (tmp);
1624 free_object (tmp);
1625 }
1626 }
1627 1476
1628 tmp1 = arch_to_object (archetype::find (arch_string)); 1477 tmp1 = arch_to_object (archetype::find (arch_string));
1629 1478
1630 tmp1->x = op->x; 1479 tmp1->x = op->x;
1631 tmp1->y = op->y; 1480 tmp1->y = op->y;
1632 insert_ob_in_map (tmp1, op->map, op, 0); 1481 insert_ob_in_map (tmp1, op->map, op, 0);
1482}
1483
1484object *
1485object::insert_at (object *where, object *originator, int flags)
1486{
1487 return where->map->insert (this, where->x, where->y, originator, flags);
1633} 1488}
1634 1489
1635/* 1490/*
1636 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1491 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1637 * is returned contains nr objects, and the remaining parts contains 1492 * is returned contains nr objects, and the remaining parts contains
1638 * the rest (or is removed and freed if that number is 0). 1493 * the rest (or is removed and freed if that number is 0).
1639 * On failure, NULL is returned, and the reason put into the 1494 * On failure, NULL is returned, and the reason put into the
1640 * global static errmsg array. 1495 * global static errmsg array.
1641 */ 1496 */
1642
1643object * 1497object *
1644get_split_ob (object *orig_ob, uint32 nr) 1498get_split_ob (object *orig_ob, uint32 nr)
1645{ 1499{
1646 object * 1500 object *newob;
1647 newob;
1648 int
1649 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1501 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1650 1502
1651 if (orig_ob->nrof < nr) 1503 if (orig_ob->nrof < nr)
1652 { 1504 {
1653 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1505 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1654 return NULL; 1506 return NULL;
1655 } 1507 }
1656 1508
1657 newob = object_create_clone (orig_ob); 1509 newob = object_create_clone (orig_ob);
1658 1510
1659 if ((orig_ob->nrof -= nr) < 1) 1511 if ((orig_ob->nrof -= nr) < 1)
1660 { 1512 orig_ob->destroy (1);
1661 if (!is_removed)
1662 remove_ob (orig_ob);
1663 free_object2 (orig_ob, 1);
1664 }
1665 else if (!is_removed) 1513 else if (!is_removed)
1666 { 1514 {
1667 if (orig_ob->env != NULL) 1515 if (orig_ob->env != NULL)
1668 sub_weight (orig_ob->env, orig_ob->weight * nr); 1516 sub_weight (orig_ob->env, orig_ob->weight * nr);
1669 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1517 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1684 * the amount of an object. If the amount reaches 0, the object 1532 * the amount of an object. If the amount reaches 0, the object
1685 * is subsequently removed and freed. 1533 * is subsequently removed and freed.
1686 * 1534 *
1687 * Return value: 'op' if something is left, NULL if the amount reached 0 1535 * Return value: 'op' if something is left, NULL if the amount reached 0
1688 */ 1536 */
1689
1690object * 1537object *
1691decrease_ob_nr (object *op, uint32 i) 1538decrease_ob_nr (object *op, uint32 i)
1692{ 1539{
1693 object *tmp; 1540 object *tmp;
1694 player *pl;
1695 1541
1696 if (i == 0) /* objects with op->nrof require this check */ 1542 if (i == 0) /* objects with op->nrof require this check */
1697 return op; 1543 return op;
1698 1544
1699 if (i > op->nrof) 1545 if (i > op->nrof)
1700 i = op->nrof; 1546 i = op->nrof;
1701 1547
1702 if (QUERY_FLAG (op, FLAG_REMOVED)) 1548 if (QUERY_FLAG (op, FLAG_REMOVED))
1703 op->nrof -= i; 1549 op->nrof -= i;
1704 else if (op->env != NULL) 1550 else if (op->env)
1705 { 1551 {
1706 /* is this object in the players inventory, or sub container 1552 /* is this object in the players inventory, or sub container
1707 * therein? 1553 * therein?
1708 */ 1554 */
1709 tmp = is_player_inv (op->env); 1555 tmp = op->in_player ();
1710 /* nope. Is this a container the player has opened? 1556 /* nope. Is this a container the player has opened?
1711 * If so, set tmp to that player. 1557 * If so, set tmp to that player.
1712 * IMO, searching through all the players will mostly 1558 * IMO, searching through all the players will mostly
1713 * likely be quicker than following op->env to the map, 1559 * likely be quicker than following op->env to the map,
1714 * and then searching the map for a player. 1560 * and then searching the map for a player.
1715 */ 1561 */
1716 if (!tmp) 1562 if (!tmp)
1717 { 1563 for_all_players (pl)
1718 for (pl = first_player; pl; pl = pl->next)
1719 if (pl->ob->container == op->env) 1564 if (pl->ob->container == op->env)
1565 {
1566 tmp = pl->ob;
1720 break; 1567 break;
1721 if (pl)
1722 tmp = pl->ob;
1723 else
1724 tmp = NULL;
1725 } 1568 }
1726 1569
1727 if (i < op->nrof) 1570 if (i < op->nrof)
1728 { 1571 {
1729 sub_weight (op->env, op->weight * i); 1572 sub_weight (op->env, op->weight * i);
1730 op->nrof -= i; 1573 op->nrof -= i;
1731 if (tmp) 1574 if (tmp)
1732 {
1733 esrv_send_item (tmp, op); 1575 esrv_send_item (tmp, op);
1734 }
1735 } 1576 }
1736 else 1577 else
1737 { 1578 {
1738 remove_ob (op); 1579 op->remove ();
1739 op->nrof = 0; 1580 op->nrof = 0;
1740 if (tmp) 1581 if (tmp)
1741 {
1742 esrv_del_item (tmp->contr, op->count); 1582 esrv_del_item (tmp->contr, op->count);
1743 }
1744 } 1583 }
1745 } 1584 }
1746 else 1585 else
1747 { 1586 {
1748 object *above = op->above; 1587 object *above = op->above;
1749 1588
1750 if (i < op->nrof) 1589 if (i < op->nrof)
1751 op->nrof -= i; 1590 op->nrof -= i;
1752 else 1591 else
1753 { 1592 {
1754 remove_ob (op); 1593 op->remove ();
1755 op->nrof = 0; 1594 op->nrof = 0;
1756 } 1595 }
1757 1596
1758 /* Since we just removed op, op->above is null */ 1597 /* Since we just removed op, op->above is null */
1759 for (tmp = above; tmp != NULL; tmp = tmp->above) 1598 for (tmp = above; tmp; tmp = tmp->above)
1760 if (tmp->type == PLAYER) 1599 if (tmp->type == PLAYER)
1761 { 1600 {
1762 if (op->nrof) 1601 if (op->nrof)
1763 esrv_send_item (tmp, op); 1602 esrv_send_item (tmp, op);
1764 else 1603 else
… …
1768 1607
1769 if (op->nrof) 1608 if (op->nrof)
1770 return op; 1609 return op;
1771 else 1610 else
1772 { 1611 {
1773 free_object (op); 1612 op->destroy ();
1774 return NULL; 1613 return 0;
1775 } 1614 }
1776} 1615}
1777 1616
1778/* 1617/*
1779 * add_weight(object, weight) adds the specified weight to an object, 1618 * add_weight(object, weight) adds the specified weight to an object,
1780 * and also updates how much the environment(s) is/are carrying. 1619 * and also updates how much the environment(s) is/are carrying.
1781 */ 1620 */
1782
1783void 1621void
1784add_weight (object *op, signed long weight) 1622add_weight (object *op, signed long weight)
1785{ 1623{
1786 while (op != NULL) 1624 while (op != NULL)
1787 { 1625 {
… …
1791 op->carrying += weight; 1629 op->carrying += weight;
1792 op = op->env; 1630 op = op->env;
1793 } 1631 }
1794} 1632}
1795 1633
1634object *
1635insert_ob_in_ob (object *op, object *where)
1636{
1637 if (!where)
1638 {
1639 char *dump = dump_object (op);
1640 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1641 free (dump);
1642 return op;
1643 }
1644
1645 if (where->head_ () != where)
1646 {
1647 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1648 where = where->head;
1649 }
1650
1651 return where->insert (op);
1652}
1653
1796/* 1654/*
1797 * insert_ob_in_ob(op,environment): 1655 * env->insert (op)
1798 * This function inserts the object op in the linked list 1656 * This function inserts the object op in the linked list
1799 * inside the object environment. 1657 * inside the object environment.
1800 * 1658 *
1801 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1802 * the inventory at the last position or next to other objects of the same
1803 * type.
1804 * Frank: Now sorted by type, archetype and magic!
1805 *
1806 * The function returns now pointer to inserted item, and return value can 1659 * The function returns now pointer to inserted item, and return value can
1807 * be != op, if items are merged. -Tero 1660 * be != op, if items are merged. -Tero
1808 */ 1661 */
1809
1810object * 1662object *
1811insert_ob_in_ob (object *op, object *where) 1663object::insert (object *op)
1812{ 1664{
1813 object *
1814 tmp, *
1815 otmp;
1816
1817 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1818 { 1666 op->remove ();
1819 dump_object (op);
1820 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1821 return op;
1822 }
1823
1824 if (where == NULL)
1825 {
1826 dump_object (op);
1827 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1828 return op;
1829 }
1830
1831 if (where->head)
1832 {
1833 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1834 where = where->head;
1835 }
1836 1667
1837 if (op->more) 1668 if (op->more)
1838 { 1669 {
1839 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1670 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1840 return op; 1671 return op;
1841 } 1672 }
1842 1673
1843 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1844 CLEAR_FLAG (op, FLAG_REMOVED); 1675 CLEAR_FLAG (op, FLAG_REMOVED);
1676
1845 if (op->nrof) 1677 if (op->nrof)
1846 { 1678 {
1847 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1679 for (object *tmp = inv; tmp; tmp = tmp->below)
1848 if (CAN_MERGE (tmp, op)) 1680 if (object::can_merge (tmp, op))
1849 { 1681 {
1850 /* return the original object and remove inserted object 1682 /* return the original object and remove inserted object
1851 (client needs the original object) */ 1683 (client needs the original object) */
1852 tmp->nrof += op->nrof; 1684 tmp->nrof += op->nrof;
1853 /* Weight handling gets pretty funky. Since we are adding to 1685 /* Weight handling gets pretty funky. Since we are adding to
1854 * tmp->nrof, we need to increase the weight. 1686 * tmp->nrof, we need to increase the weight.
1855 */ 1687 */
1856 add_weight (where, op->weight * op->nrof); 1688 add_weight (this, op->weight * op->nrof);
1857 SET_FLAG (op, FLAG_REMOVED); 1689 SET_FLAG (op, FLAG_REMOVED);
1858 free_object (op); /* free the inserted object */ 1690 op->destroy (); /* free the inserted object */
1859 op = tmp; 1691 op = tmp;
1860 remove_ob (op); /* and fix old object's links */ 1692 op->remove (); /* and fix old object's links */
1861 CLEAR_FLAG (op, FLAG_REMOVED); 1693 CLEAR_FLAG (op, FLAG_REMOVED);
1862 break; 1694 break;
1863 } 1695 }
1864 1696
1865 /* I assume combined objects have no inventory 1697 /* I assume combined objects have no inventory
1866 * We add the weight - this object could have just been removed 1698 * We add the weight - this object could have just been removed
1867 * (if it was possible to merge). calling remove_ob will subtract 1699 * (if it was possible to merge). calling remove_ob will subtract
1868 * the weight, so we need to add it in again, since we actually do 1700 * the weight, so we need to add it in again, since we actually do
1869 * the linking below 1701 * the linking below
1870 */ 1702 */
1871 add_weight (where, op->weight * op->nrof); 1703 add_weight (this, op->weight * op->nrof);
1872 } 1704 }
1873 else 1705 else
1874 add_weight (where, (op->weight + op->carrying)); 1706 add_weight (this, (op->weight + op->carrying));
1875 1707
1876 otmp = is_player_inv (where); 1708 if (object *otmp = this->in_player ())
1877 if (otmp && otmp->contr != NULL)
1878 {
1879 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1880 fix_player (otmp); 1710 otmp->update_stats ();
1881 }
1882 1711
1712 op->owner = 0; // its his/hers now. period.
1883 op->map = NULL; 1713 op->map = 0;
1884 op->env = where; 1714 op->env = this;
1885 op->above = NULL; 1715 op->above = 0;
1886 op->below = NULL; 1716 op->below = 0;
1887 op->x = 0, op->y = 0; 1717 op->x = op->y = 0;
1888 1718
1889 /* reset the light list and los of the players on the map */ 1719 /* reset the light list and los of the players on the map */
1890 if ((op->glow_radius != 0) && where->map) 1720 if (op->glow_radius && map)
1891 { 1721 {
1892#ifdef DEBUG_LIGHTS 1722#ifdef DEBUG_LIGHTS
1893 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1723 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1894#endif /* DEBUG_LIGHTS */ 1724#endif /* DEBUG_LIGHTS */
1895 if (MAP_DARKNESS (where->map)) 1725 if (map->darkness)
1896 update_all_los (where->map, where->x, where->y); 1726 update_all_los (map, x, y);
1897 } 1727 }
1898 1728
1899 /* Client has no idea of ordering so lets not bother ordering it here. 1729 /* Client has no idea of ordering so lets not bother ordering it here.
1900 * It sure simplifies this function... 1730 * It sure simplifies this function...
1901 */ 1731 */
1902 if (where->inv == NULL) 1732 if (!inv)
1903 where->inv = op; 1733 inv = op;
1904 else 1734 else
1905 { 1735 {
1906 op->below = where->inv; 1736 op->below = inv;
1907 op->below->above = op; 1737 op->below->above = op;
1908 where->inv = op; 1738 inv = op;
1909 } 1739 }
1740
1741 INVOKE_OBJECT (INSERT, this);
1742
1910 return op; 1743 return op;
1911} 1744}
1912 1745
1913/* 1746/*
1914 * Checks if any objects has a move_type that matches objects 1747 * Checks if any objects has a move_type that matches objects
… …
1928 * 1761 *
1929 * MSW 2001-07-08: Check all objects on space, not just those below 1762 * MSW 2001-07-08: Check all objects on space, not just those below
1930 * object being inserted. insert_ob_in_map may not put new objects 1763 * object being inserted. insert_ob_in_map may not put new objects
1931 * on top. 1764 * on top.
1932 */ 1765 */
1933
1934int 1766int
1935check_move_on (object *op, object *originator) 1767check_move_on (object *op, object *originator)
1936{ 1768{
1937 object *tmp; 1769 object *tmp;
1938 maptile *m = op->map; 1770 maptile *m = op->map;
… …
1965 1797
1966 /* The objects have to be checked from top to bottom. 1798 /* The objects have to be checked from top to bottom.
1967 * Hence, we first go to the top: 1799 * Hence, we first go to the top:
1968 */ 1800 */
1969 1801
1970 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1802 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1971 { 1803 {
1972 /* Trim the search when we find the first other spell effect 1804 /* Trim the search when we find the first other spell effect
1973 * this helps performance so that if a space has 50 spell objects, 1805 * this helps performance so that if a space has 50 spell objects,
1974 * we don't need to check all of them. 1806 * we don't need to check all of them.
1975 */ 1807 */
… …
1993 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1825 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1994 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1826 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1995 { 1827 {
1996 1828
1997 float 1829 float
1998 diff = tmp->move_slow_penalty * FABS (op->speed); 1830 diff = tmp->move_slow_penalty * fabs (op->speed);
1999 1831
2000 if (op->type == PLAYER) 1832 if (op->type == PLAYER)
2001 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1833 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2002 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1834 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2003 diff /= 4.0; 1835 diff /= 4.0;
… …
2030/* 1862/*
2031 * present_arch(arch, map, x, y) searches for any objects with 1863 * present_arch(arch, map, x, y) searches for any objects with
2032 * a matching archetype at the given map and coordinates. 1864 * a matching archetype at the given map and coordinates.
2033 * The first matching object is returned, or NULL if none. 1865 * The first matching object is returned, or NULL if none.
2034 */ 1866 */
2035
2036object * 1867object *
2037present_arch (const archetype *at, maptile *m, int x, int y) 1868present_arch (const archetype *at, maptile *m, int x, int y)
2038{ 1869{
2039 object *
2040 tmp;
2041
2042 if (m == NULL || out_of_map (m, x, y)) 1870 if (!m || out_of_map (m, x, y))
2043 { 1871 {
2044 LOG (llevError, "Present_arch called outside map.\n"); 1872 LOG (llevError, "Present_arch called outside map.\n");
2045 return NULL; 1873 return NULL;
2046 } 1874 }
2047 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1875
1876 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2048 if (tmp->arch == at) 1877 if (tmp->arch == at)
2049 return tmp; 1878 return tmp;
1879
2050 return NULL; 1880 return NULL;
2051} 1881}
2052 1882
2053/* 1883/*
2054 * present(type, map, x, y) searches for any objects with 1884 * present(type, map, x, y) searches for any objects with
2055 * a matching type variable at the given map and coordinates. 1885 * a matching type variable at the given map and coordinates.
2056 * The first matching object is returned, or NULL if none. 1886 * The first matching object is returned, or NULL if none.
2057 */ 1887 */
2058
2059object * 1888object *
2060present (unsigned char type, maptile *m, int x, int y) 1889present (unsigned char type, maptile *m, int x, int y)
2061{ 1890{
2062 object *
2063 tmp;
2064
2065 if (out_of_map (m, x, y)) 1891 if (out_of_map (m, x, y))
2066 { 1892 {
2067 LOG (llevError, "Present called outside map.\n"); 1893 LOG (llevError, "Present called outside map.\n");
2068 return NULL; 1894 return NULL;
2069 } 1895 }
2070 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1896
1897 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2071 if (tmp->type == type) 1898 if (tmp->type == type)
2072 return tmp; 1899 return tmp;
1900
2073 return NULL; 1901 return NULL;
2074} 1902}
2075 1903
2076/* 1904/*
2077 * present_in_ob(type, object) searches for any objects with 1905 * present_in_ob(type, object) searches for any objects with
2078 * a matching type variable in the inventory of the given object. 1906 * a matching type variable in the inventory of the given object.
2079 * The first matching object is returned, or NULL if none. 1907 * The first matching object is returned, or NULL if none.
2080 */ 1908 */
2081
2082object * 1909object *
2083present_in_ob (unsigned char type, const object *op) 1910present_in_ob (unsigned char type, const object *op)
2084{ 1911{
2085 object *
2086 tmp;
2087
2088 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1912 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2089 if (tmp->type == type) 1913 if (tmp->type == type)
2090 return tmp; 1914 return tmp;
1915
2091 return NULL; 1916 return NULL;
2092} 1917}
2093 1918
2094/* 1919/*
2095 * present_in_ob (type, str, object) searches for any objects with 1920 * present_in_ob (type, str, object) searches for any objects with
… …
2103 * str is the string to match against. Note that we match against 1928 * str is the string to match against. Note that we match against
2104 * the object name, not the archetype name. this is so that the 1929 * the object name, not the archetype name. this is so that the
2105 * spell code can use one object type (force), but change it's name 1930 * spell code can use one object type (force), but change it's name
2106 * to be unique. 1931 * to be unique.
2107 */ 1932 */
2108
2109object * 1933object *
2110present_in_ob_by_name (int type, const char *str, const object *op) 1934present_in_ob_by_name (int type, const char *str, const object *op)
2111{ 1935{
2112 object *
2113 tmp;
2114
2115 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1936 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2116 {
2117 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1937 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2118 return tmp; 1938 return tmp;
2119 } 1939
2120 return NULL; 1940 return 0;
2121} 1941}
2122 1942
2123/* 1943/*
2124 * present_arch_in_ob(archetype, object) searches for any objects with 1944 * present_arch_in_ob(archetype, object) searches for any objects with
2125 * a matching archetype in the inventory of the given object. 1945 * a matching archetype in the inventory of the given object.
2126 * The first matching object is returned, or NULL if none. 1946 * The first matching object is returned, or NULL if none.
2127 */ 1947 */
2128
2129object * 1948object *
2130present_arch_in_ob (const archetype *at, const object *op) 1949present_arch_in_ob (const archetype *at, const object *op)
2131{ 1950{
2132 object *
2133 tmp;
2134
2135 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1951 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2136 if (tmp->arch == at) 1952 if (tmp->arch == at)
2137 return tmp; 1953 return tmp;
1954
2138 return NULL; 1955 return NULL;
2139} 1956}
2140 1957
2141/* 1958/*
2142 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
2143 */ 1960 */
2144void 1961void
2145flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
2146{ 1963{
2147 object *
2148 tmp;
2149
2150 if (op->inv)
2151 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2152 { 1965 {
2153 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
2154 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
2155 } 1968 }
2156} /* 1969}
1970
1971/*
2157 * desactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
2158 */ 1973 */
2159void 1974void
2160unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
2161{ 1976{
2162 object *
2163 tmp;
2164
2165 if (op->inv)
2166 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2167 { 1978 {
2168 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
2169 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
2170 } 1981 }
2171}
2172
2173/*
2174 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2175 * all it's inventory (recursively).
2176 * If checksums are used, a player will get set_cheat called for
2177 * him/her-self and all object carried by a call to this function.
2178 */
2179
2180void
2181set_cheat (object *op)
2182{
2183 SET_FLAG (op, FLAG_WAS_WIZ);
2184 flag_inv (op, FLAG_WAS_WIZ);
2185} 1982}
2186 1983
2187/* 1984/*
2188 * find_free_spot(object, map, x, y, start, stop) will search for 1985 * find_free_spot(object, map, x, y, start, stop) will search for
2189 * a spot at the given map and coordinates which will be able to contain 1986 * a spot at the given map and coordinates which will be able to contain
… …
2191 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
2192 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
2193 * start and stop are where to start relative to the free_arr array (1,9 1990 * start and stop are where to start relative to the free_arr array (1,9
2194 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
2195 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1992 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2196 * Note - this only checks to see if there is space for the head of the
2197 * object - if it is a multispace object, this should be called for all
2198 * pieces.
2199 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
2200 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
2201 * necessary, so the caller shouldn't need to do any special work. 1995 * necessary, so the caller shouldn't need to do any special work.
2202 * Note - updated to take an object instead of archetype - this is necessary 1996 * Note - updated to take an object instead of archetype - this is necessary
2203 * because arch_blocked (now ob_blocked) needs to know the movement type 1997 * because arch_blocked (now ob_blocked) needs to know the movement type
2204 * to know if the space in question will block the object. We can't use 1998 * to know if the space in question will block the object. We can't use
2205 * the archetype because that isn't correct if the monster has been 1999 * the archetype because that isn't correct if the monster has been
2206 * customized, changed states, etc. 2000 * customized, changed states, etc.
2207 */ 2001 */
2208
2209int 2002int
2210find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2003find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2211{ 2004{
2212 int
2213 i,
2214 index = 0, flag;
2215 static int
2216 altern[SIZEOFFREE]; 2005 int altern[SIZEOFFREE];
2006 int index = 0, flag;
2217 2007
2218 for (i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
2219 { 2009 {
2220 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2010 mapxy pos (m, x, y); pos.move (i);
2221 if (!flag) 2011
2012 if (!pos.normalise ())
2013 continue;
2014
2015 mapspace &ms = *pos;
2016
2017 if (ms.flags () & P_IS_ALIVE)
2018 continue;
2019
2020 /* However, often
2021 * ob doesn't have any move type (when used to place exits)
2022 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2023 */
2024 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2025 {
2222 altern[index++] = i; 2026 altern [index++] = i;
2027 continue;
2028 }
2223 2029
2224 /* Basically, if we find a wall on a space, we cut down the search size. 2030 /* Basically, if we find a wall on a space, we cut down the search size.
2225 * In this way, we won't return spaces that are on another side of a wall. 2031 * In this way, we won't return spaces that are on another side of a wall.
2226 * This mostly work, but it cuts down the search size in all directions - 2032 * This mostly work, but it cuts down the search size in all directions -
2227 * if the space being examined only has a wall to the north and empty 2033 * if the space being examined only has a wall to the north and empty
2228 * spaces in all the other directions, this will reduce the search space 2034 * spaces in all the other directions, this will reduce the search space
2229 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
2230 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
2231 */ 2037 */
2232 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2038 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2039 {
2233 stop = maxfree[i]; 2040 stop = maxfree[i];
2041 continue;
2042 }
2043
2044 /* Note it is intentional that we check ob - the movement type of the
2045 * head of the object should correspond for the entire object.
2046 */
2047 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2048 continue;
2049
2050 if (ob->blocked (m, pos.x, pos.y))
2051 continue;
2052
2053 altern [index++] = i;
2234 } 2054 }
2055
2235 if (!index) 2056 if (!index)
2236 return -1; 2057 return -1;
2058
2237 return altern[RANDOM () % index]; 2059 return altern [rndm (index)];
2238} 2060}
2239 2061
2240/* 2062/*
2241 * find_first_free_spot(archetype, maptile, x, y) works like 2063 * find_first_free_spot(archetype, maptile, x, y) works like
2242 * find_free_spot(), but it will search max number of squares. 2064 * find_free_spot(), but it will search max number of squares.
2243 * But it will return the first available spot, not a random choice. 2065 * But it will return the first available spot, not a random choice.
2244 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2066 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2245 */ 2067 */
2246
2247int 2068int
2248find_first_free_spot (const object *ob, maptile *m, int x, int y) 2069find_first_free_spot (const object *ob, maptile *m, int x, int y)
2249{ 2070{
2250 int
2251 i;
2252
2253 for (i = 0; i < SIZEOFFREE; i++) 2071 for (int i = 0; i < SIZEOFFREE; i++)
2254 {
2255 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2072 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2256 return i; 2073 return i;
2257 } 2074
2258 return -1; 2075 return -1;
2259} 2076}
2260 2077
2261/* 2078/*
2262 * The function permute(arr, begin, end) randomly reorders the array 2079 * The function permute(arr, begin, end) randomly reorders the array
2263 * arr[begin..end-1]. 2080 * arr[begin..end-1].
2081 * now uses a fisher-yates shuffle, old permute was broken
2264 */ 2082 */
2265static void 2083static void
2266permute (int *arr, int begin, int end) 2084permute (int *arr, int begin, int end)
2267{ 2085{
2268 int 2086 arr += begin;
2269 i,
2270 j,
2271 tmp,
2272 len;
2273
2274 len = end - begin; 2087 end -= begin;
2275 for (i = begin; i < end; i++)
2276 {
2277 j = begin + RANDOM () % len;
2278 2088
2279 tmp = arr[i]; 2089 while (--end)
2280 arr[i] = arr[j]; 2090 swap (arr [end], arr [rndm (end + 1)]);
2281 arr[j] = tmp;
2282 }
2283} 2091}
2284 2092
2285/* new function to make monster searching more efficient, and effective! 2093/* new function to make monster searching more efficient, and effective!
2286 * This basically returns a randomized array (in the passed pointer) of 2094 * This basically returns a randomized array (in the passed pointer) of
2287 * the spaces to find monsters. In this way, it won't always look for 2095 * the spaces to find monsters. In this way, it won't always look for
… …
2290 * the 3x3 area will be searched, just not in a predictable order. 2098 * the 3x3 area will be searched, just not in a predictable order.
2291 */ 2099 */
2292void 2100void
2293get_search_arr (int *search_arr) 2101get_search_arr (int *search_arr)
2294{ 2102{
2295 int 2103 int i;
2296 i;
2297 2104
2298 for (i = 0; i < SIZEOFFREE; i++) 2105 for (i = 0; i < SIZEOFFREE; i++)
2299 {
2300 search_arr[i] = i; 2106 search_arr[i] = i;
2301 }
2302 2107
2303 permute (search_arr, 1, SIZEOFFREE1 + 1); 2108 permute (search_arr, 1, SIZEOFFREE1 + 1);
2304 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2109 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2305 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2110 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2306} 2111}
… …
2315 * Perhaps incorrectly, but I'm making the assumption that exclude 2120 * Perhaps incorrectly, but I'm making the assumption that exclude
2316 * is actually want is going to try and move there. We need this info 2121 * is actually want is going to try and move there. We need this info
2317 * because we have to know what movement the thing looking to move 2122 * because we have to know what movement the thing looking to move
2318 * there is capable of. 2123 * there is capable of.
2319 */ 2124 */
2320
2321int 2125int
2322find_dir (maptile *m, int x, int y, object *exclude) 2126find_dir (maptile *m, int x, int y, object *exclude)
2323{ 2127{
2324 int
2325 i,
2326 max = SIZEOFFREE, mflags; 2128 int i, max = SIZEOFFREE, mflags;
2327 2129
2328 sint16 nx, ny; 2130 sint16 nx, ny;
2329 object * 2131 object *tmp;
2330 tmp;
2331 maptile * 2132 maptile *mp;
2332 mp;
2333 2133
2334 MoveType blocked, move_type; 2134 MoveType blocked, move_type;
2335 2135
2336 if (exclude && exclude->head) 2136 if (exclude && exclude->head_ () != exclude)
2337 { 2137 {
2338 exclude = exclude->head; 2138 exclude = exclude->head;
2339 move_type = exclude->move_type; 2139 move_type = exclude->move_type;
2340 } 2140 }
2341 else 2141 else
… …
2349 mp = m; 2149 mp = m;
2350 nx = x + freearr_x[i]; 2150 nx = x + freearr_x[i];
2351 ny = y + freearr_y[i]; 2151 ny = y + freearr_y[i];
2352 2152
2353 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2153 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2154
2354 if (mflags & P_OUT_OF_MAP) 2155 if (mflags & P_OUT_OF_MAP)
2355 {
2356 max = maxfree[i]; 2156 max = maxfree[i];
2357 }
2358 else 2157 else
2359 { 2158 {
2360 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2159 mapspace &ms = mp->at (nx, ny);
2160
2161 blocked = ms.move_block;
2361 2162
2362 if ((move_type & blocked) == move_type) 2163 if ((move_type & blocked) == move_type)
2363 {
2364 max = maxfree[i]; 2164 max = maxfree[i];
2365 }
2366 else if (mflags & P_IS_ALIVE) 2165 else if (mflags & P_IS_ALIVE)
2367 { 2166 {
2368 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2167 for (tmp = ms.bot; tmp; tmp = tmp->above)
2369 { 2168 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2370 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2169 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2371 {
2372 break; 2170 break;
2373 } 2171
2374 }
2375 if (tmp) 2172 if (tmp)
2376 {
2377 return freedir[i]; 2173 return freedir[i];
2378 }
2379 } 2174 }
2380 } 2175 }
2381 } 2176 }
2177
2382 return 0; 2178 return 0;
2383} 2179}
2384 2180
2385/* 2181/*
2386 * distance(object 1, object 2) will return the square of the 2182 * distance(object 1, object 2) will return the square of the
2387 * distance between the two given objects. 2183 * distance between the two given objects.
2388 */ 2184 */
2389
2390int 2185int
2391distance (const object *ob1, const object *ob2) 2186distance (const object *ob1, const object *ob2)
2392{ 2187{
2393 int
2394 i;
2395
2396 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2188 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2397 return i;
2398} 2189}
2399 2190
2400/* 2191/*
2401 * find_dir_2(delta-x,delta-y) will return a direction in which 2192 * find_dir_2(delta-x,delta-y) will return a direction in which
2402 * an object which has subtracted the x and y coordinates of another 2193 * an object which has subtracted the x and y coordinates of another
2403 * object, needs to travel toward it. 2194 * object, needs to travel toward it.
2404 */ 2195 */
2405
2406int 2196int
2407find_dir_2 (int x, int y) 2197find_dir_2 (int x, int y)
2408{ 2198{
2409 int 2199 int q;
2410 q;
2411 2200
2412 if (y) 2201 if (y)
2413 q = x * 100 / y; 2202 q = x * 100 / y;
2414 else if (x) 2203 else if (x)
2415 q = -300 * x; 2204 q = -300 * x;
… …
2440 2229
2441 return 3; 2230 return 3;
2442} 2231}
2443 2232
2444/* 2233/*
2445 * absdir(int): Returns a number between 1 and 8, which represent
2446 * the "absolute" direction of a number (it actually takes care of
2447 * "overflow" in previous calculations of a direction).
2448 */
2449
2450int
2451absdir (int d)
2452{
2453 while (d < 1)
2454 d += 8;
2455 while (d > 8)
2456 d -= 8;
2457 return d;
2458}
2459
2460/*
2461 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2234 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2462 * between two directions (which are expected to be absolute (see absdir()) 2235 * between two directions (which are expected to be absolute (see absdir())
2463 */ 2236 */
2464
2465int 2237int
2466dirdiff (int dir1, int dir2) 2238dirdiff (int dir1, int dir2)
2467{ 2239{
2468 int 2240 int d;
2469 d;
2470 2241
2471 d = abs (dir1 - dir2); 2242 d = abs (dir1 - dir2);
2472 if (d > 4) 2243 if (d > 4)
2473 d = 8 - d; 2244 d = 8 - d;
2245
2474 return d; 2246 return d;
2475} 2247}
2476 2248
2477/* peterm: 2249/* peterm:
2478 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2250 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2481 * This basically means that if direction is 15, then it could either go 2253 * This basically means that if direction is 15, then it could either go
2482 * direction 4, 14, or 16 to get back to where we are. 2254 * direction 4, 14, or 16 to get back to where we are.
2483 * Moved from spell_util.c to object.c with the other related direction 2255 * Moved from spell_util.c to object.c with the other related direction
2484 * functions. 2256 * functions.
2485 */ 2257 */
2486
2487int
2488 reduction_dir[SIZEOFFREE][3] = { 2258int reduction_dir[SIZEOFFREE][3] = {
2489 {0, 0, 0}, /* 0 */ 2259 {0, 0, 0}, /* 0 */
2490 {0, 0, 0}, /* 1 */ 2260 {0, 0, 0}, /* 1 */
2491 {0, 0, 0}, /* 2 */ 2261 {0, 0, 0}, /* 2 */
2492 {0, 0, 0}, /* 3 */ 2262 {0, 0, 0}, /* 3 */
2493 {0, 0, 0}, /* 4 */ 2263 {0, 0, 0}, /* 4 */
… …
2541 * find a path to that monster that we found. If not, 2311 * find a path to that monster that we found. If not,
2542 * we don't bother going toward it. Returns 1 if we 2312 * we don't bother going toward it. Returns 1 if we
2543 * can see a direct way to get it 2313 * can see a direct way to get it
2544 * Modified to be map tile aware -.MSW 2314 * Modified to be map tile aware -.MSW
2545 */ 2315 */
2546
2547
2548int 2316int
2549can_see_monsterP (maptile *m, int x, int y, int dir) 2317can_see_monsterP (maptile *m, int x, int y, int dir)
2550{ 2318{
2551 sint16 dx, dy; 2319 sint16 dx, dy;
2552 int
2553 mflags; 2320 int mflags;
2554 2321
2555 if (dir < 0) 2322 if (dir < 0)
2556 return 0; /* exit condition: invalid direction */ 2323 return 0; /* exit condition: invalid direction */
2557 2324
2558 dx = x + freearr_x[dir]; 2325 dx = x + freearr_x[dir];
… …
2571 return 0; 2338 return 0;
2572 2339
2573 /* yes, can see. */ 2340 /* yes, can see. */
2574 if (dir < 9) 2341 if (dir < 9)
2575 return 1; 2342 return 1;
2343
2576 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2344 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2577 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2345 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2346 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2578} 2347}
2579
2580
2581 2348
2582/* 2349/*
2583 * can_pick(picker, item): finds out if an object is possible to be 2350 * can_pick(picker, item): finds out if an object is possible to be
2584 * picked up by the picker. Returnes 1 if it can be 2351 * picked up by the picker. Returnes 1 if it can be
2585 * picked up, otherwise 0. 2352 * picked up, otherwise 0.
… …
2587 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2354 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2588 * core dumps if they do. 2355 * core dumps if they do.
2589 * 2356 *
2590 * Add a check so we can't pick up invisible objects (0.93.8) 2357 * Add a check so we can't pick up invisible objects (0.93.8)
2591 */ 2358 */
2592
2593int 2359int
2594can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2595{ 2361{
2596 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2597 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2598 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2364 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2599} 2365}
2600 2366
2601
2602/* 2367/*
2603 * create clone from object to another 2368 * create clone from object to another
2604 */ 2369 */
2605object * 2370object *
2606object_create_clone (object *asrc) 2371object_create_clone (object *asrc)
2607{ 2372{
2608 object *
2609 dst = NULL, *tmp, *src, *part, *prev, *item; 2373 object *dst = 0, *tmp, *src, *prev, *item;
2610 2374
2611 if (!asrc) 2375 if (!asrc)
2612 return NULL; 2376 return 0;
2613 src = asrc; 2377
2614 if (src->head)
2615 src = src->head; 2378 src = asrc->head_ ();
2616 2379
2617 prev = NULL; 2380 prev = 0;
2618 for (part = src; part; part = part->more) 2381 for (object *part = src; part; part = part->more)
2619 { 2382 {
2620 tmp = get_object (); 2383 tmp = part->clone ();
2621 copy_object (part, tmp);
2622 tmp->x -= src->x; 2384 tmp->x -= src->x;
2623 tmp->y -= src->y; 2385 tmp->y -= src->y;
2386
2624 if (!part->head) 2387 if (!part->head)
2625 { 2388 {
2626 dst = tmp; 2389 dst = tmp;
2627 tmp->head = NULL; 2390 tmp->head = 0;
2628 } 2391 }
2629 else 2392 else
2630 {
2631 tmp->head = dst; 2393 tmp->head = dst;
2632 } 2394
2633 tmp->more = NULL; 2395 tmp->more = 0;
2396
2634 if (prev) 2397 if (prev)
2635 prev->more = tmp; 2398 prev->more = tmp;
2399
2636 prev = tmp; 2400 prev = tmp;
2637 } 2401 }
2638 2402
2639 for (item = src->inv; item; item = item->below) 2403 for (item = src->inv; item; item = item->below)
2640 insert_ob_in_ob (object_create_clone (item), dst); 2404 insert_ob_in_ob (object_create_clone (item), dst);
2641 2405
2642 return dst; 2406 return dst;
2643}
2644
2645/* GROS - Creates an object using a string representing its content. */
2646/* Basically, we save the content of the string to a temp file, then call */
2647/* load_object on it. I admit it is a highly inefficient way to make things, */
2648/* but it was simple to make and allows reusing the load_object function. */
2649/* Remember not to use load_object_str in a time-critical situation. */
2650/* Also remember that multiparts objects are not supported for now. */
2651
2652object *
2653load_object_str (const char *obstr)
2654{
2655 object *op;
2656 char filename[MAX_BUF];
2657
2658 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2659
2660 FILE *tempfile = fopen (filename, "w");
2661
2662 if (tempfile == NULL)
2663 {
2664 LOG (llevError, "Error - Unable to access load object temp file\n");
2665 return NULL;
2666 }
2667
2668 fprintf (tempfile, obstr);
2669 fclose (tempfile);
2670
2671 op = get_object ();
2672
2673 object_thawer thawer (filename);
2674
2675 if (thawer)
2676 load_object (thawer, op, 0);
2677
2678 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2679 CLEAR_FLAG (op, FLAG_REMOVED);
2680
2681 return op;
2682} 2407}
2683 2408
2684/* This returns the first object in who's inventory that 2409/* This returns the first object in who's inventory that
2685 * has the same type and subtype match. 2410 * has the same type and subtype match.
2686 * returns NULL if no match. 2411 * returns NULL if no match.
2687 */ 2412 */
2688object * 2413object *
2689find_obj_by_type_subtype (const object *who, int type, int subtype) 2414find_obj_by_type_subtype (const object *who, int type, int subtype)
2690{ 2415{
2691 object *tmp;
2692
2693 for (tmp = who->inv; tmp; tmp = tmp->below) 2416 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2694 if (tmp->type == type && tmp->subtype == subtype) 2417 if (tmp->type == type && tmp->subtype == subtype)
2695 return tmp; 2418 return tmp;
2696 2419
2697 return NULL; 2420 return 0;
2698} 2421}
2699 2422
2700/* If ob has a field named key, return the link from the list, 2423/* If ob has a field named key, return the link from the list,
2701 * otherwise return NULL. 2424 * otherwise return NULL.
2702 * 2425 *
… …
2704 * do the desired thing. 2427 * do the desired thing.
2705 */ 2428 */
2706key_value * 2429key_value *
2707get_ob_key_link (const object *ob, const char *key) 2430get_ob_key_link (const object *ob, const char *key)
2708{ 2431{
2709 key_value *link;
2710
2711 for (link = ob->key_values; link != NULL; link = link->next) 2432 for (key_value *link = ob->key_values; link; link = link->next)
2712 if (link->key == key) 2433 if (link->key == key)
2713 return link; 2434 return link;
2714 2435
2715 return NULL; 2436 return 0;
2716} 2437}
2717 2438
2718/* 2439/*
2719 * Returns the value of op has an extra_field for key, or NULL. 2440 * Returns the value of op has an extra_field for key, or NULL.
2720 * 2441 *
… …
2745 if (link->key == canonical_key) 2466 if (link->key == canonical_key)
2746 return link->value; 2467 return link->value;
2747 2468
2748 return 0; 2469 return 0;
2749} 2470}
2750
2751 2471
2752/* 2472/*
2753 * Updates the canonical_key in op to value. 2473 * Updates the canonical_key in op to value.
2754 * 2474 *
2755 * canonical_key is a shared string (value doesn't have to be). 2475 * canonical_key is a shared string (value doesn't have to be).
… …
2760 * Returns TRUE on success. 2480 * Returns TRUE on success.
2761 */ 2481 */
2762int 2482int
2763set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2483set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2764{ 2484{
2765 key_value *
2766 field = NULL, *last = NULL; 2485 key_value *field = NULL, *last = NULL;
2767 2486
2768 for (field = op->key_values; field != NULL; field = field->next) 2487 for (field = op->key_values; field != NULL; field = field->next)
2769 { 2488 {
2770 if (field->key != canonical_key) 2489 if (field->key != canonical_key)
2771 { 2490 {
… …
2780 /* Basically, if the archetype has this key set, 2499 /* Basically, if the archetype has this key set,
2781 * we need to store the null value so when we save 2500 * we need to store the null value so when we save
2782 * it, we save the empty value so that when we load, 2501 * it, we save the empty value so that when we load,
2783 * we get this value back again. 2502 * we get this value back again.
2784 */ 2503 */
2785 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2504 if (get_ob_key_link (op->arch, canonical_key))
2786 field->value = 0; 2505 field->value = 0;
2787 else 2506 else
2788 { 2507 {
2789 if (last) 2508 if (last)
2790 last->next = field->next; 2509 last->next = field->next;
… …
2799 /* IF we get here, key doesn't exist */ 2518 /* IF we get here, key doesn't exist */
2800 2519
2801 /* No field, we'll have to add it. */ 2520 /* No field, we'll have to add it. */
2802 2521
2803 if (!add_key) 2522 if (!add_key)
2804 {
2805 return FALSE; 2523 return FALSE;
2806 } 2524
2807 /* There isn't any good reason to store a null 2525 /* There isn't any good reason to store a null
2808 * value in the key/value list. If the archetype has 2526 * value in the key/value list. If the archetype has
2809 * this key, then we should also have it, so shouldn't 2527 * this key, then we should also have it, so shouldn't
2810 * be here. If user wants to store empty strings, 2528 * be here. If user wants to store empty strings,
2811 * should pass in "" 2529 * should pass in ""
… …
2860 } 2578 }
2861 else 2579 else
2862 item = item->env; 2580 item = item->env;
2863} 2581}
2864 2582
2583const char *
2584object::flag_desc (char *desc, int len) const
2585{
2586 char *p = desc;
2587 bool first = true;
2588
2589 *p = 0;
2590
2591 for (int i = 0; i < NUM_FLAGS; i++)
2592 {
2593 if (len <= 10) // magic constant!
2594 {
2595 snprintf (p, len, ",...");
2596 break;
2597 }
2598
2599 if (flag [i])
2600 {
2601 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2602 len -= cnt;
2603 p += cnt;
2604 first = false;
2605 }
2606 }
2607
2608 return desc;
2609}
2610
2865// return a suitable string describing an objetc in enough detail to find it 2611// return a suitable string describing an object in enough detail to find it
2866const char * 2612const char *
2867object::debug_desc (char *info) const 2613object::debug_desc (char *info) const
2868{ 2614{
2615 char flagdesc[512];
2869 char info2[256 * 3]; 2616 char info2[256 * 4];
2870 char *p = info; 2617 char *p = info;
2871 2618
2872 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2619 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2873 count, 2620 count, uuid.seq,
2874 &name, 2621 &name,
2875 title ? " " : "", 2622 title ? "\",title:\"" : "",
2876 title ? (const char *)title : ""); 2623 title ? (const char *)title : "",
2624 flag_desc (flagdesc, 512), type);
2877 2625
2878 if (env) 2626 if (!this->flag[FLAG_REMOVED] && env)
2879 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2627 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2880 2628
2881 if (map) 2629 if (map)
2882 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2630 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2883 2631
2884 return info; 2632 return info;
2885} 2633}
2886 2634
2887const char * 2635const char *
2888object::debug_desc () const 2636object::debug_desc () const
2889{ 2637{
2890 static char info[256 * 3]; 2638 static char info[3][256 * 4];
2639 static int info_idx;
2640
2891 return debug_desc (info); 2641 return debug_desc (info [++info_idx % 3]);
2892} 2642}
2893 2643
2644struct region *
2645object::region () const
2646{
2647 return map ? map->region (x, y)
2648 : region::default_region ();
2649}
2650
2651const materialtype_t *
2652object::dominant_material () const
2653{
2654 if (materialtype_t *mt = name_to_material (materialname))
2655 return mt;
2656
2657 return name_to_material (shstr_unknown);
2658}
2659
2660void
2661object::open_container (object *new_container)
2662{
2663 if (container == new_container)
2664 return;
2665
2666 if (object *old_container = container)
2667 {
2668 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2669 return;
2670
2671#if 0
2672 // remove the "Close old_container" object.
2673 if (object *closer = old_container->inv)
2674 if (closer->type == CLOSE_CON)
2675 closer->destroy ();
2676#endif
2677
2678 old_container->flag [FLAG_APPLIED] = 0;
2679 container = 0;
2680
2681 esrv_update_item (UPD_FLAGS, this, old_container);
2682 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2683 play_sound (sound_find ("chest_close"));
2684 }
2685
2686 if (new_container)
2687 {
2688 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2689 return;
2690
2691 // TODO: this does not seem to serve any purpose anymore?
2692#if 0
2693 // insert the "Close Container" object.
2694 if (archetype *closer = new_container->other_arch)
2695 {
2696 object *closer = arch_to_object (new_container->other_arch);
2697 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2698 new_container->insert (closer);
2699 }
2700#endif
2701
2702 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2703
2704 new_container->flag [FLAG_APPLIED] = 1;
2705 container = new_container;
2706
2707 esrv_update_item (UPD_FLAGS, this, new_container);
2708 esrv_send_inventory (this, new_container);
2709 play_sound (sound_find ("chest_open"));
2710 }
2711}
2712
2713object *
2714object::force_find (const shstr name)
2715{
2716 /* cycle through his inventory to look for the MARK we want to
2717 * place
2718 */
2719 for (object *tmp = inv; tmp; tmp = tmp->below)
2720 if (tmp->type == FORCE && tmp->slaying == name)
2721 return splay (tmp);
2722
2723 return 0;
2724}
2725
2726void
2727object::force_add (const shstr name, int duration)
2728{
2729 if (object *force = force_find (name))
2730 force->destroy ();
2731
2732 object *force = get_archetype (FORCE_NAME);
2733
2734 force->slaying = name;
2735 force->stats.food = 1;
2736 force->speed_left = -1.f;
2737
2738 force->set_speed (duration ? 1.f / duration : 0.f);
2739 force->flag [FLAG_IS_USED_UP] = true;
2740 force->flag [FLAG_APPLIED] = true;
2741
2742 insert (force);
2743}
2744
2745void
2746object::play_sound (faceidx sound) const
2747{
2748 if (!sound)
2749 return;
2750
2751 if (flag [FLAG_REMOVED])
2752 return;
2753
2754 if (env)
2755 {
2756 if (object *pl = in_player ())
2757 pl->contr->play_sound (sound);
2758 }
2759 else
2760 map->play_sound (sound, x, y);
2761}
2762

Diff Legend

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