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.61 by root, Mon Dec 11 21:32:16 2006 UTC vs.
Revision 1.188 by root, Wed Sep 12 11:10:09 2007 UTC

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

Diff Legend

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