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.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC vs.
Revision 1.187 by root, Tue Sep 4 08:42:55 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,
… …
104 _exit (1); 108 _exit (1);
105 } 109 }
106 110
107 uuid.seq = uid; 111 uuid.seq = uid;
108 write_uuid (); 112 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 114 fclose (fp);
111} 115}
112 116
113UUID 117UUID
114gen_uuid () 118gen_uuid ()
… …
139 * objects with lists are rare, and lists stay short. If not, use a 143 * objects with lists are rare, and lists stay short. If not, use a
140 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
141 */ 145 */
142 146
143 /* For each field in wants, */ 147 /* For each field in wants, */
144 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145 { 149 {
146 key_value *has_field; 150 key_value *has_field;
147 151
148 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
149 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
… …
183 * 187 *
184 * Note that this function appears a lot longer than the macro it 188 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 189 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 190 * reduce this to the same efficiency.
187 * 191 *
188 * Check nrof variable *before* calling CAN_MERGE() 192 * Check nrof variable *before* calling can_merge()
189 * 193 *
190 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
191 * check weight 195 * check weight
192 */ 196 */
193
194bool object::can_merge (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
195{ 198{
196 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 200 if (ob1 == ob2
201 || ob1->type != ob2->type
202 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value
204 || ob1->name != ob2->name)
198 return 0; 205 return 0;
199 206
200 if (ob1->speed != ob2->speed) 207 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204 * value could not be stored in a sint32 (which unfortunately sometimes is 209 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 210 * used to store nrof).
206 */ 211 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 212 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 222 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 223
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 225 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 226
222 227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 228 || ob1->arch != ob2->arch
224 * being locked in inventory should prevent merging.
225 * 0x4 in flags3 is CLIENT_SENT
226 */
227 if ((ob1->arch != ob2->arch) ||
228 (ob1->flags[0] != ob2->flags[0]) ||
229 (ob1->flags[1] != ob2->flags[1]) ||
230 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232 (ob1->name != ob2->name) || 229 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 230 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 231 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 232 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 235 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 236 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 237 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 238 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 239 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 240 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 241 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 242 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 243 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 244 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 245 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 246 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 247 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 248 || ob1->move_on != ob2->move_on
252 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 249 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 252 return 0;
254 253
255 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 255 * check all objects in the inventory.
257 */ 256 */
… …
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 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED);
560
561 if (op2->speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
563 539
564 /* Copy over key_values, if any. */ 540 /* Copy over key_values, if any. */
565 if (op2->key_values) 541 if (src.key_values)
566 { 542 {
567 key_value *tail = 0; 543 key_value *tail = 0;
568 key_value *i;
569
570 op->key_values = 0; 544 key_values = 0;
571 545
572 for (i = op2->key_values; i; i = i->next) 546 for (key_value *i = src.key_values; i; i = i->next)
573 { 547 {
574 key_value *new_link = new key_value; 548 key_value *new_link = new key_value;
575 549
576 new_link->next = 0; 550 new_link->next = 0;
577 new_link->key = i->key; 551 new_link->key = i->key;
578 new_link->value = i->value; 552 new_link->value = i->value;
579 553
580 /* Try and be clever here, too. */ 554 /* Try and be clever here, too. */
581 if (!op->key_values) 555 if (!key_values)
582 { 556 {
583 op->key_values = new_link; 557 key_values = new_link;
584 tail = new_link; 558 tail = new_link;
585 } 559 }
586 else 560 else
587 { 561 {
588 tail->next = new_link; 562 tail->next = new_link;
589 tail = new_link; 563 tail = new_link;
590 } 564 }
591 } 565 }
592 } 566 }
567}
593 568
594 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;
595} 613}
596 614
597/* 615/*
598 * 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
599 * 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
600 * 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.
601 */ 619 */
602
603void 620void
604update_turn_face (object *op) 621update_turn_face (object *op)
605{ 622{
606 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 623 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
607 return; 624 return;
625
608 SET_ANIMATION (op, op->direction); 626 SET_ANIMATION (op, op->direction);
609 update_object (op, UP_OBJ_FACE); 627 update_object (op, UP_OBJ_FACE);
610} 628}
611 629
612/* 630/*
613 * 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
614 * 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.
615 * 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.
616 */ 634 */
617void 635void
618update_ob_speed (object *op) 636object::set_speed (float speed)
619{ 637{
620 extern int arch_init; 638 if (flag [FLAG_FREED] && speed)
621
622 /* No reason putting the archetypes objects on the speed list,
623 * since they never really need to be updated.
624 */
625
626 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
627 { 639 {
628 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 640 LOG (llevError, "Object %s is freed but has speed.\n", &name);
629#ifdef MANY_CORES
630 abort ();
631#else
632 op->speed = 0; 641 speed = 0;
633#endif
634 }
635
636 if (arch_init)
637 return;
638
639 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
640 { 642 }
641 /* If already on active list, don't do anything */
642 if (op->active_next || op->active_prev || op == active_objects)
643 return;
644 643
645 /* process_events() expects us to insert the object at the beginning 644 this->speed = speed;
646 * of the list. */
647 op->active_next = active_objects;
648 645
649 if (op->active_next != NULL) 646 if (has_active_speed ())
650 op->active_next->active_prev = op; 647 activate ();
651
652 active_objects = op;
653 }
654 else 648 else
655 { 649 deactivate ();
656 /* If not on the active list, nothing needs to be done */
657 if (!op->active_next && !op->active_prev && op != active_objects)
658 return;
659
660 if (op->active_prev == NULL)
661 {
662 active_objects = op->active_next;
663
664 if (op->active_next != NULL)
665 op->active_next->active_prev = NULL;
666 }
667 else
668 {
669 op->active_prev->active_next = op->active_next;
670
671 if (op->active_next)
672 op->active_next->active_prev = op->active_prev;
673 }
674
675 op->active_next = NULL;
676 op->active_prev = NULL;
677 }
678} 650}
679 651
680/* This function removes object 'op' from the list of active
681 * objects.
682 * This should only be used for style maps or other such
683 * reference maps where you don't want an object that isn't
684 * in play chewing up cpu time getting processed.
685 * The reverse of this is to call update_ob_speed, which
686 * will do the right thing based on the speed of the object.
687 */
688void
689remove_from_active_list (object *op)
690{
691 /* If not on the active list, nothing needs to be done */
692 if (!op->active_next && !op->active_prev && op != active_objects)
693 return;
694
695 if (op->active_prev == NULL)
696 {
697 active_objects = op->active_next;
698 if (op->active_next != NULL)
699 op->active_next->active_prev = NULL;
700 }
701 else
702 {
703 op->active_prev->active_next = op->active_next;
704 if (op->active_next)
705 op->active_next->active_prev = op->active_prev;
706 }
707 op->active_next = NULL;
708 op->active_prev = NULL;
709}
710
711/* 652/*
712 * update_object() updates the array which represents the map. 653 * update_object() updates the the map.
713 * It takes into account invisible objects (and represent squares covered 654 * It takes into account invisible objects (and represent squares covered
714 * 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
715 * invisible object, etc...) 656 * invisible object, etc...)
716 * 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
717 * 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
718 * updating that window, though, since update_object() is called _often_) 659 * updating that window, though, since update_object() is called _often_)
719 * 660 *
720 * 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.
721 * For example, if the only thing that has changed is the face (due to
722 * an animation), we don't need to call update_position until that actually
723 * comes into view of a player. OTOH, many other things, like addition/removal
724 * of walls or living creatures may need us to update the flags now.
725 * current action are: 662 * current action are:
726 * UP_OBJ_INSERT: op was inserted 663 * UP_OBJ_INSERT: op was inserted
727 * UP_OBJ_REMOVE: op was removed 664 * UP_OBJ_REMOVE: op was removed
728 * 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
729 * 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.
730 * UP_OBJ_FACE: only the objects face has changed. 667 * UP_OBJ_FACE: only the objects face has changed.
731 */ 668 */
732
733void 669void
734update_object (object *op, int action) 670update_object (object *op, int action)
735{ 671{
736 int update_now = 0, flags;
737 MoveType move_on, move_off, move_block, move_slow;
738
739 if (op == NULL) 672 if (op == NULL)
740 { 673 {
741 /* this should never happen */ 674 /* this should never happen */
742 LOG (llevDebug, "update_object() called for NULL object.\n"); 675 LOG (llevDebug, "update_object() called for NULL object.\n");
743 return; 676 return;
744 } 677 }
745 678
746 if (op->env != NULL) 679 if (op->env)
747 { 680 {
748 /* Animation is currently handled by client, so nothing 681 /* Animation is currently handled by client, so nothing
749 * to do in this case. 682 * to do in this case.
750 */ 683 */
751 return; 684 return;
… …
756 */ 689 */
757 if (!op->map || op->map->in_memory == MAP_SAVING) 690 if (!op->map || op->map->in_memory == MAP_SAVING)
758 return; 691 return;
759 692
760 /* make sure the object is within map boundaries */ 693 /* make sure the object is within map boundaries */
761 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)
762 { 695 {
763 LOG (llevError, "update_object() called for object out of map!\n"); 696 LOG (llevError, "update_object() called for object out of map!\n");
764#ifdef MANY_CORES 697#ifdef MANY_CORES
765 abort (); 698 abort ();
766#endif 699#endif
767 return; 700 return;
768 } 701 }
769 702
770 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 703 mapspace &m = op->ms ();
771 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
772 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
773 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
774 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
775 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
776 704
705 if (!(m.flags_ & P_UPTODATE))
706 /* nop */;
777 if (action == UP_OBJ_INSERT) 707 else if (action == UP_OBJ_INSERT)
778 { 708 {
709 // this is likely overkill, TODO: revisit (schmorp)
779 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 710 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
780 update_now = 1;
781
782 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 711 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783 update_now = 1; 712 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
784 713 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
714 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
785 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 715 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
786 update_now = 1;
787
788 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
789 update_now = 1;
790
791 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
792 update_now = 1;
793
794 if ((move_on | op->move_on) != move_on) 716 || (m.move_on | op->move_on ) != m.move_on
795 update_now = 1;
796
797 if ((move_off | op->move_off) != move_off) 717 || (m.move_off | op->move_off ) != m.move_off
798 update_now = 1; 718 || (m.move_slow | op->move_slow) != m.move_slow
799
800 /* 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
801 * to have move_allow right now. 720 * to have move_allow right now.
802 */ 721 */
803 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 722 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
804 update_now = 1; 723 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
805 724 m.flags_ = 0;
806 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1;
808 } 725 }
809 /* if the object is being removed, we can't make intelligent 726 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 727 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 728 * that is being removed.
812 */ 729 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 730 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
814 update_now = 1; 731 m.flags_ = 0;
815 else if (action == UP_OBJ_FACE) 732 else if (action == UP_OBJ_FACE)
816 /* Nothing to do for that case */ ; 733 /* Nothing to do for that case */ ;
817 else 734 else
818 LOG (llevError, "update_object called with invalid action: %d\n", action); 735 LOG (llevError, "update_object called with invalid action: %d\n", action);
819 736
820 if (update_now)
821 {
822 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
823 update_position (op->map, op->x, op->y);
824 }
825
826 if (op->more != NULL) 737 if (op->more)
827 update_object (op->more, action); 738 update_object (op->more, action);
828}
829
830object::vector object::mortals;
831object::vector object::objects; // not yet used
832object *object::first;
833
834void object::free_mortals ()
835{
836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
837 if ((*i)->refcnt)
838 ++i; // further delay freeing
839 else
840 {
841 delete *i;
842 mortals.erase (i);
843 }
844} 739}
845 740
846object::object () 741object::object ()
847{ 742{
848 SET_FLAG (this, FLAG_REMOVED); 743 SET_FLAG (this, FLAG_REMOVED);
… …
851 face = blank_face; 746 face = blank_face;
852} 747}
853 748
854object::~object () 749object::~object ()
855{ 750{
751 unlink ();
752
856 free_key_values (this); 753 free_key_values (this);
857} 754}
858 755
756static int object_count;
757
859void object::link () 758void object::link ()
860{ 759{
861 count = ++ob_count; 760 assert (!index);//D
862 uuid = gen_uuid (); 761 uuid = gen_uuid ();
762 count = ++object_count;
863 763
864 prev = 0; 764 refcnt_inc ();
865 next = object::first; 765 objects.insert (this);
866
867 if (object::first)
868 object::first->prev = this;
869
870 object::first = this;
871} 766}
872 767
873void object::unlink () 768void object::unlink ()
874{ 769{
875 if (this == object::first) 770 if (!index)
876 object::first = next; 771 return;
877 772
878 /* Remove this object from the list of used objects */ 773 objects.erase (this);
879 if (prev) prev->next = next; 774 refcnt_dec ();
880 if (next) next->prev = prev; 775}
881 776
882 prev = 0; 777void
883 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 }
884} 882}
885 883
886object *object::create () 884object *object::create ()
887{ 885{
888 object *op = new object; 886 object *op = new object;
889 op->link (); 887 op->link ();
890 return op; 888 return op;
891} 889}
892 890
893/* 891void
894 * free_object() frees everything allocated by an object, removes 892object::do_destroy ()
895 * it from the list of used objects, and puts it on the list of
896 * free objects. The IS_FREED() flag is set in the object.
897 * The object must have been removed by remove_ob() first for
898 * this function to succeed.
899 *
900 * If destroy_inventory is set, free inventory as well. Else drop items in
901 * inventory to the ground.
902 */
903void object::destroy (bool destroy_inventory)
904{ 893{
905 if (QUERY_FLAG (this, FLAG_FREED)) 894 attachable::do_destroy ();
906 return;
907 895
908 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 896 if (flag [FLAG_IS_LINKED])
897 remove_button_link (this);
898
899 if (flag [FLAG_FRIENDLY])
909 remove_friendly_object (this); 900 remove_friendly_object (this);
910 901
911 if (!QUERY_FLAG (this, FLAG_REMOVED)) 902 if (!flag [FLAG_REMOVED])
912 remove_ob (this); 903 remove ();
913 904
914 SET_FLAG (this, FLAG_FREED); 905 destroy_inv (true);
915 906
916 if (more) 907 deactivate ();
917 { 908 unlink ();
918 more->destroy (destroy_inventory);
919 more = 0;
920 }
921 909
922 if (inv) 910 flag [FLAG_FREED] = 1;
923 {
924 /* Only if the space blocks everything do we not process -
925 * if some form of movement is allowed, let objects
926 * drop on that space.
927 */
928 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
929 {
930 object *op = inv;
931
932 while (op)
933 {
934 object *tmp = op->below;
935 op->destroy (destroy_inventory);
936 op = tmp;
937 }
938 }
939 else
940 { /* Put objects in inventory onto this space */
941 object *op = inv;
942
943 while (op)
944 {
945 object *tmp = op->below;
946
947 remove_ob (op);
948
949 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
950 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
951 free_object (op);
952 else
953 {
954 op->x = x;
955 op->y = y;
956 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
957 }
958
959 op = tmp;
960 }
961 }
962 }
963 911
964 // hack to ensure that freed objects still have a valid map 912 // hack to ensure that freed objects still have a valid map
965 { 913 {
966 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
967 915
968 if (!freed_map) 916 if (!freed_map)
969 { 917 {
970 freed_map = new maptile; 918 freed_map = new maptile;
971 919
920 freed_map->path = "<freed objects map>";
972 freed_map->name = "/internal/freed_objects_map"; 921 freed_map->name = "/internal/freed_objects_map";
973 freed_map->width = 3; 922 freed_map->width = 3;
974 freed_map->height = 3; 923 freed_map->height = 3;
975 924
976 freed_map->allocate (); 925 freed_map->alloc ();
926 freed_map->in_memory = MAP_IN_MEMORY;
977 } 927 }
978 928
979 map = freed_map; 929 map = freed_map;
980 x = 1; 930 x = 1;
981 y = 1; 931 y = 1;
982 } 932 }
983 933
934 if (more)
935 {
936 more->destroy ();
937 more = 0;
938 }
939
940 head = 0;
941
984 // clear those pointers that likely might have circular references to us 942 // clear those pointers that likely might cause circular references
985 owner = 0; 943 owner = 0;
986 enemy = 0; 944 enemy = 0;
987 attacked_by = 0; 945 attacked_by = 0;
946 current_weapon = 0;
947}
988 948
989 // only relevant for players(?), but make sure of it anyways 949void
990 contr = 0; 950object::destroy (bool destroy_inventory)
951{
952 if (destroyed ())
953 return;
991 954
992 /* Remove object from the active list */ 955 if (destroy_inventory)
993 speed = 0; 956 destroy_inv (false);
994 update_ob_speed (this);
995 957
996 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
997 963
998 mortals.push_back (this); 964 attachable::destroy ();
999} 965}
1000 966
1001/* 967/*
1002 * sub_weight() recursively (outwards) subtracts a number from the 968 * sub_weight() recursively (outwards) subtracts a number from the
1003 * 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)).
1004 */ 970 */
1005
1006void 971void
1007sub_weight (object *op, signed long weight) 972sub_weight (object *op, signed long weight)
1008{ 973{
1009 while (op != NULL) 974 while (op != NULL)
1010 { 975 {
… …
1014 op->carrying -= weight; 979 op->carrying -= weight;
1015 op = op->env; 980 op = op->env;
1016 } 981 }
1017} 982}
1018 983
1019/* remove_ob(op): 984/* op->remove ():
1020 * 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
1021 * 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
1022 * object will have no environment. If the object previously had an 987 * object will have no environment. If the object previously had an
1023 * environment, the x and y coordinates will be updated to 988 * environment, the x and y coordinates will be updated to
1024 * the previous environment. 989 * the previous environment.
1025 * Beware: This function is called from the editor as well!
1026 */ 990 */
1027
1028void 991void
1029remove_ob (object *op) 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 maptile *m;
1036
1037 sint16 x, y;
1038
1039 if (QUERY_FLAG (op, FLAG_REMOVED)) 997 if (QUERY_FLAG (this, FLAG_REMOVED))
1040 return; 998 return;
1041 999
1042 SET_FLAG (op, FLAG_REMOVED); 1000 SET_FLAG (this, FLAG_REMOVED);
1001 INVOKE_OBJECT (REMOVE, this);
1043 1002
1044 if (op->more != NULL) 1003 if (more)
1045 remove_ob (op->more); 1004 more->remove ();
1046 1005
1047 /* 1006 /*
1048 * In this case, the object to be removed is in someones 1007 * In this case, the object to be removed is in someones
1049 * inventory. 1008 * inventory.
1050 */ 1009 */
1051 if (op->env != NULL) 1010 if (env)
1052 { 1011 {
1053 if (op->nrof) 1012 if (nrof)
1054 sub_weight (op->env, op->weight * op->nrof); 1013 sub_weight (env, weight * nrof);
1055 else 1014 else
1056 sub_weight (op->env, op->weight + op->carrying); 1015 sub_weight (env, weight + carrying);
1057 1016
1058 /* 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
1059 * made to players inventory. If set, avoiding the call 1018 * made to players inventory. If set, avoiding the call
1060 * to save cpu time. 1019 * to save cpu time.
1061 */ 1020 */
1062 if ((otmp = is_player_inv (op->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))
1063 fix_player (otmp); 1022 otmp->update_stats ();
1064 1023
1065 if (op->above != NULL) 1024 if (above)
1066 op->above->below = op->below; 1025 above->below = below;
1067 else 1026 else
1068 op->env->inv = op->below; 1027 env->inv = below;
1069 1028
1070 if (op->below != NULL) 1029 if (below)
1071 op->below->above = op->above; 1030 below->above = above;
1072 1031
1073 /* we set up values so that it could be inserted into 1032 /* we set up values so that it could be inserted into
1074 * 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
1075 * to the caller to decide what we want to do. 1034 * to the caller to decide what we want to do.
1076 */ 1035 */
1077 op->x = op->env->x, op->y = op->env->y; 1036 x = env->x, y = env->y;
1078 op->map = op->env->map; 1037 map = env->map;
1079 op->above = NULL, op->below = NULL; 1038 above = 0, below = 0;
1080 op->env = NULL; 1039 env = 0;
1081 } 1040 }
1082 else if (op->map) 1041 else if (map)
1083 { 1042 {
1084 x = op->x; 1043 if (type == PLAYER)
1085 y = op->y;
1086 m = get_map_from_coord (op->map, &x, &y);
1087
1088 if (!m)
1089 { 1044 {
1090 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1045 // leaving a spot always closes any open container on the ground
1091 op->map->path, op->x, op->y); 1046 if (container && !container->env)
1092 /* in old days, we used to set x and y to 0 and continue. 1047 // this causes spurious floorbox updates, but it ensures
1093 * it seems if we get into this case, something is probablye 1048 // that the CLOSE event is being sent.
1094 * screwed up and should be fixed. 1049 close_container ();
1095 */ 1050
1096 abort (); 1051 --map->players;
1052 map->touch ();
1097 } 1053 }
1098 1054
1099 if (op->map != m) 1055 map->dirty = true;
1100 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", 1056 mapspace &ms = this->ms ();
1101 op->map->path, m->path, op->x, op->y, x, y);
1102
1103 /* Re did the following section of code - it looks like it had
1104 * lots of logic for things we no longer care about
1105 */
1106 1057
1107 /* link the object above us */ 1058 /* link the object above us */
1108 if (op->above) 1059 if (above)
1109 op->above->below = op->below; 1060 above->below = below;
1110 else 1061 else
1111 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1062 ms.top = below; /* we were top, set new top */
1112 1063
1113 /* Relink the object below us, if there is one */ 1064 /* Relink the object below us, if there is one */
1114 if (op->below) 1065 if (below)
1115 op->below->above = op->above; 1066 below->above = above;
1116 else 1067 else
1117 { 1068 {
1118 /* 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
1119 * use translated coordinates in case some oddness with map tiling is 1070 * use translated coordinates in case some oddness with map tiling is
1120 * evident 1071 * evident
1121 */ 1072 */
1122 if (GET_MAP_OB (m, x, y) != op) 1073 if (GET_MAP_OB (map, x, y) != this)
1123 {
1124 char *dump = dump_object (op);
1125 LOG (llevError,
1126 "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 ());
1127 free (dump);
1128 dump = dump_object (GET_MAP_OB (m, x, y));
1129 LOG (llevError, "%s\n", dump);
1130 free (dump);
1131 }
1132 1075
1133 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1076 ms.bot = above; /* goes on above it. */
1134 } 1077 }
1135 1078
1136 op->above = 0; 1079 above = 0;
1137 op->below = 0; 1080 below = 0;
1138 1081
1139 if (op->map->in_memory == MAP_SAVING) 1082 if (map->in_memory == MAP_SAVING)
1140 return; 1083 return;
1141 1084
1142 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1085 int check_walk_off = !flag [FLAG_NO_APPLY];
1143 1086
1144 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 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
1099 for (tmp = ms.bot; tmp; tmp = tmp->above)
1145 { 1100 {
1146 /* 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
1147 * being removed. 1102 * being removed.
1148 */ 1103 */
1149 1104
1150 if (tmp->type == PLAYER && tmp != op) 1105 /* See if object moving off should effect something */
1106 if (check_walk_off
1107 && ((move_type & tmp->move_off)
1108 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1151 { 1109 {
1152 /* If a container that the player is currently using somehow gets
1153 * removed (most likely destroyed), update the player view
1154 * appropriately.
1155 */
1156 if (tmp->container == op)
1157 {
1158 CLEAR_FLAG (op, FLAG_APPLIED);
1159 tmp->container = NULL;
1160 }
1161
1162 tmp->contr->socket.update_look = 1;
1163 }
1164
1165 /* See if player moving off should effect something */
1166 if (check_walk_off
1167 && ((op->move_type & tmp->move_off)
1168 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1169 {
1170 move_apply (tmp, op, NULL); 1110 move_apply (tmp, this, 0);
1171 1111
1172 if (op->destroyed ()) 1112 if (destroyed ())
1173 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 ());
1174 } 1114 }
1175 1115
1176 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1177
1178 if (tmp->above == tmp)
1179 tmp->above = NULL;
1180
1181 last = tmp; 1116 last = tmp;
1182 } 1117 }
1183 1118
1184 /* 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?
1185 if (last == NULL) 1121 if (!last)
1186 { 1122 map->at (x, y).flags_ = 0;
1187 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1188 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1189 * those out anyways, and if there are any flags set right now, they won't
1190 * be correct anyways.
1191 */
1192 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1193 update_position (op->map, op->x, op->y);
1194 }
1195 else 1123 else
1196 update_object (last, UP_OBJ_REMOVE); 1124 update_object (last, UP_OBJ_REMOVE);
1197 1125
1198 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1126 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1199 update_all_los (op->map, op->x, op->y); 1127 update_all_los (map, x, y);
1200 } 1128 }
1201} 1129}
1202 1130
1203/* 1131/*
1204 * merge_ob(op,top): 1132 * merge_ob(op,top):
… …
1212merge_ob (object *op, object *top) 1140merge_ob (object *op, object *top)
1213{ 1141{
1214 if (!op->nrof) 1142 if (!op->nrof)
1215 return 0; 1143 return 0;
1216 1144
1217 if (top == NULL) 1145 if (top)
1218 for (top = op; top != NULL && top->above != NULL; top = top->above); 1146 for (top = op; top && top->above; top = top->above)
1147 ;
1219 1148
1220 for (; top != NULL; top = top->below) 1149 for (; top; top = top->below)
1221 { 1150 {
1222 if (top == op) 1151 if (top == op)
1223 continue; 1152 continue;
1224 if (CAN_MERGE (op, top)) 1153
1154 if (object::can_merge (op, top))
1225 { 1155 {
1226 top->nrof += op->nrof; 1156 top->nrof += op->nrof;
1227 1157
1228/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1158/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1229 op->weight = 0; /* Don't want any adjustements now */ 1159 op->weight = 0; /* Don't want any adjustements now */
1230 remove_ob (op); 1160 op->destroy ();
1231 free_object (op);
1232 return top; 1161 return top;
1233 } 1162 }
1234 } 1163 }
1235 1164
1236 return 0; 1165 return 0;
1237} 1166}
1238 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
1239/* 1191/*
1240 * 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
1241 * job preparing multi-part monsters 1193 * job preparing multi-part monsters.
1242 */ 1194 */
1243object * 1195object *
1244insert_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)
1245{ 1197{
1246 object *tmp;
1247
1248 if (op->head)
1249 op = op->head;
1250
1251 for (tmp = op; tmp; tmp = tmp->more) 1198 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1252 { 1199 {
1253 tmp->x = x + tmp->arch->clone.x; 1200 tmp->x = x + tmp->arch->x;
1254 tmp->y = y + tmp->arch->clone.y; 1201 tmp->y = y + tmp->arch->y;
1255 } 1202 }
1256 1203
1257 return insert_ob_in_map (op, m, originator, flag); 1204 return insert_ob_in_map (op, m, originator, flag);
1258} 1205}
1259 1206
… …
1275 * Return value: 1222 * Return value:
1276 * new object if 'op' was merged with other object 1223 * new object if 'op' was merged with other object
1277 * NULL if 'op' was destroyed 1224 * NULL if 'op' was destroyed
1278 * just 'op' otherwise 1225 * just 'op' otherwise
1279 */ 1226 */
1280
1281object * 1227object *
1282insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1228insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1283{ 1229{
1230 assert (!op->flag [FLAG_FREED]);
1231
1284 object *tmp, *top, *floor = NULL; 1232 object *top, *floor = NULL;
1285 sint16 x, y;
1286 1233
1287 if (QUERY_FLAG (op, FLAG_FREED)) 1234 op->remove ();
1288 {
1289 LOG (llevError, "Trying to insert freed object!\n");
1290 return NULL;
1291 }
1292
1293 if (m == NULL)
1294 {
1295 char *dump = dump_object (op);
1296 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1297 free (dump);
1298 return op;
1299 }
1300
1301 if (out_of_map (m, op->x, op->y))
1302 {
1303 char *dump = dump_object (op);
1304 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1305#ifdef MANY_CORES
1306 /* Better to catch this here, as otherwise the next use of this object
1307 * is likely to cause a crash. Better to find out where it is getting
1308 * improperly inserted.
1309 */
1310 abort ();
1311#endif
1312 free (dump);
1313 return op;
1314 }
1315
1316 if (!QUERY_FLAG (op, FLAG_REMOVED))
1317 {
1318 char *dump = dump_object (op);
1319 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1320 free (dump);
1321 return op;
1322 }
1323
1324 if (op->more != NULL)
1325 {
1326 /* The part may be on a different map. */
1327
1328 object *more = op->more;
1329
1330 /* We really need the caller to normalize coordinates - if
1331 * we set the map, that doesn't work if the location is within
1332 * a map and this is straddling an edge. So only if coordinate
1333 * is clear wrong do we normalize it.
1334 */
1335 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1336 more->map = get_map_from_coord (m, &more->x, &more->y);
1337 else if (!more->map)
1338 {
1339 /* For backwards compatibility - when not dealing with tiled maps,
1340 * more->map should always point to the parent.
1341 */
1342 more->map = m;
1343 }
1344
1345 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1346 {
1347 if (!op->head)
1348 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1349
1350 return NULL;
1351 }
1352 }
1353
1354 CLEAR_FLAG (op, FLAG_REMOVED);
1355 1235
1356 /* Ideally, the caller figures this out. However, it complicates a lot 1236 /* Ideally, the caller figures this out. However, it complicates a lot
1357 * 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
1358 * need extra work 1238 * need extra work
1359 */ 1239 */
1360 op->map = get_map_from_coord (m, &op->x, &op->y); 1240 if (!xy_normalise (m, op->x, op->y))
1361 x = op->x; 1241 {
1362 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 ();
1363 1254
1364 /* this has to be done after we translate the coordinates. 1255 /* this has to be done after we translate the coordinates.
1365 */ 1256 */
1366 if (op->nrof && !(flag & INS_NO_MERGE)) 1257 if (op->nrof && !(flag & INS_NO_MERGE))
1367 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1258 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1368 if (CAN_MERGE (op, tmp)) 1259 if (object::can_merge (op, tmp))
1369 { 1260 {
1370 op->nrof += tmp->nrof; 1261 op->nrof += tmp->nrof;
1371 remove_ob (tmp); 1262 tmp->destroy ();
1372 free_object (tmp);
1373 } 1263 }
1374 1264
1375 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 */
1376 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1266 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1377 1267
… …
1390 op->below = originator->below; 1280 op->below = originator->below;
1391 1281
1392 if (op->below) 1282 if (op->below)
1393 op->below->above = op; 1283 op->below->above = op;
1394 else 1284 else
1395 SET_MAP_OB (op->map, op->x, op->y, op); 1285 ms.bot = op;
1396 1286
1397 /* since *below* originator, no need to update top */ 1287 /* since *below* originator, no need to update top */
1398 originator->below = op; 1288 originator->below = op;
1399 } 1289 }
1400 else 1290 else
1401 { 1291 {
1292 top = ms.bot;
1293
1402 /* If there are other objects, then */ 1294 /* If there are other objects, then */
1403 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1295 if ((!(flag & INS_MAP_LOAD)) && top)
1404 { 1296 {
1405 object *last = NULL; 1297 object *last = 0;
1406 1298
1407 /* 1299 /*
1408 * 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.
1409 * We've already dealt with merging if appropriate. 1301 * We've already dealt with merging if appropriate.
1410 * 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
… …
1414 * 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
1415 * 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
1416 * 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
1417 * that flying non pickable objects are spell objects. 1309 * that flying non pickable objects are spell objects.
1418 */ 1310 */
1419 1311 for (top = ms.bot; top; top = top->above)
1420 while (top != NULL)
1421 { 1312 {
1422 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))
1423 floor = top; 1314 floor = top;
1424 1315
1425 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))
… …
1428 top = top->below; 1319 top = top->below;
1429 break; 1320 break;
1430 } 1321 }
1431 1322
1432 last = top; 1323 last = top;
1433 top = top->above;
1434 } 1324 }
1435 1325
1436 /* 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 */
1437 top = last; 1327 top = last;
1438 1328
… …
1440 * looks like instead of lots of conditions here. 1330 * looks like instead of lots of conditions here.
1441 * makes things faster, and effectively the same result. 1331 * makes things faster, and effectively the same result.
1442 */ 1332 */
1443 1333
1444 /* Have object 'fall below' other objects that block view. 1334 /* Have object 'fall below' other objects that block view.
1445 * Unless those objects are exits, type 66 1335 * Unless those objects are exits.
1446 * If INS_ON_TOP is used, don't do this processing 1336 * If INS_ON_TOP is used, don't do this processing
1447 * Need to find the object that in fact blocks view, otherwise 1337 * Need to find the object that in fact blocks view, otherwise
1448 * stacking is a bit odd. 1338 * stacking is a bit odd.
1449 */ 1339 */
1450 if (!(flag & INS_ON_TOP) && 1340 if (!(flag & INS_ON_TOP)
1451 (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))
1452 { 1343 {
1453 for (last = top; last != floor; last = last->below) 1344 for (last = top; last != floor; last = last->below)
1454 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1345 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1455 break; 1346 break;
1347
1456 /* Check to see if we found the object that blocks view, 1348 /* Check to see if we found the object that blocks view,
1457 * 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
1458 * we can get inserted below this one, which requires we 1350 * we can get inserted below this one, which requires we
1459 * set top to the object below us. 1351 * set top to the object below us.
1460 */ 1352 */
1461 if (last && last->below && last != floor) 1353 if (last && last->below && last != floor)
1462 top = last->below; 1354 top = last->below;
1463 } 1355 }
1464 } /* If objects on this space */ 1356 } /* If objects on this space */
1465
1466 if (flag & INS_MAP_LOAD) 1357 if (flag & INS_MAP_LOAD)
1467 top = GET_MAP_TOP (op->map, op->x, op->y); 1358 top = ms.top;
1468 1359
1469 if (flag & INS_ABOVE_FLOOR_ONLY) 1360 if (flag & INS_ABOVE_FLOOR_ONLY)
1470 top = floor; 1361 top = floor;
1471 1362
1472 /* 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.
1473 */ 1364 */
1474 1365
1475 /* First object on this space */ 1366 /* First object on this space */
1476 if (!top) 1367 if (!top)
1477 { 1368 {
1478 op->above = GET_MAP_OB (op->map, op->x, op->y); 1369 op->above = ms.bot;
1479 1370
1480 if (op->above) 1371 if (op->above)
1481 op->above->below = op; 1372 op->above->below = op;
1482 1373
1483 op->below = NULL; 1374 op->below = 0;
1484 SET_MAP_OB (op->map, op->x, op->y, op); 1375 ms.bot = op;
1485 } 1376 }
1486 else 1377 else
1487 { /* get inserted into the stack above top */ 1378 { /* get inserted into the stack above top */
1488 op->above = top->above; 1379 op->above = top->above;
1489 1380
… …
1492 1383
1493 op->below = top; 1384 op->below = top;
1494 top->above = op; 1385 top->above = op;
1495 } 1386 }
1496 1387
1497 if (op->above == NULL) 1388 if (!op->above)
1498 SET_MAP_TOP (op->map, op->x, op->y, op); 1389 ms.top = op;
1499 } /* else not INS_BELOW_ORIGINATOR */ 1390 } /* else not INS_BELOW_ORIGINATOR */
1500 1391
1501 if (op->type == PLAYER) 1392 if (op->type == PLAYER)
1393 {
1502 op->contr->do_los = 1; 1394 op->contr->do_los = 1;
1395 ++op->map->players;
1396 op->map->touch ();
1397 }
1503 1398
1504 /* If we have a floor, we know the player, if any, will be above 1399 op->map->dirty = true;
1505 * it, so save a few ticks and start from there. 1400
1506 */
1507 if (!(flag & INS_MAP_LOAD)) 1401 if (!(flag & INS_MAP_LOAD))
1508 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1402 if (object *pl = ms.player ())
1509 if (tmp->type == PLAYER) 1403 pl->contr->ns->floorbox_update ();
1510 tmp->contr->socket.update_look = 1;
1511 1404
1512 /* If this object glows, it may affect lighting conditions that are 1405 /* If this object glows, it may affect lighting conditions that are
1513 * 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
1514 * 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
1515 * on the map will get recalculated. The players could very well 1408 * on the map will get recalculated. The players could very well
1516 * 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 -
1517 * this should get redone to only look for players within range, 1410 * this should get redone to only look for players within range,
1518 * or just updating the P_NEED_UPDATE for spaces within this area 1411 * or just updating the P_UPTODATE for spaces within this area
1519 * of effect may be sufficient. 1412 * of effect may be sufficient.
1520 */ 1413 */
1521 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1414 if (op->map->darkness && (op->glow_radius != 0))
1522 update_all_los (op->map, op->x, op->y); 1415 update_all_los (op->map, op->x, op->y);
1523 1416
1524 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1417 /* updates flags (blocked, alive, no magic, etc) for this map space */
1525 update_object (op, UP_OBJ_INSERT); 1418 update_object (op, UP_OBJ_INSERT);
1526 1419
1420 INVOKE_OBJECT (INSERT, op);
1421
1527 /* 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,
1528 * we want to have update_look set above before calling this. 1423 * we want to have floorbox_update called before calling this.
1529 * 1424 *
1530 * check_move_on() must be after this because code called from 1425 * check_move_on() must be after this because code called from
1531 * check_move_on() depends on correct map flags (so functions like 1426 * check_move_on() depends on correct map flags (so functions like
1532 * blocked() and wall() work properly), and these flags are updated by 1427 * blocked() and wall() work properly), and these flags are updated by
1533 * update_object(). 1428 * update_object().
1534 */ 1429 */
1535 1430
1536 /* 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 */
1537 if (!(flag & INS_NO_WALK_ON) && !op->head) 1432 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1538 { 1433 {
1539 if (check_move_on (op, originator)) 1434 if (check_move_on (op, originator))
1540 return NULL; 1435 return 0;
1541 1436
1542 /* 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
1543 * walk on's. 1438 * walk on's.
1544 */ 1439 */
1545 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1440 for (object *tmp = op->more; tmp; tmp = tmp->more)
1546 if (check_move_on (tmp, originator)) 1441 if (check_move_on (tmp, originator))
1547 return NULL; 1442 return 0;
1548 } 1443 }
1549 1444
1550 return op; 1445 return op;
1551} 1446}
1552 1447
1553/* this function inserts an object in the map, but if it 1448/* this function inserts an object in the map, but if it
1554 * 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.
1555 * 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.
1556 */ 1451 */
1557void 1452void
1558replace_insert_ob_in_map (const char *arch_string, object *op) 1453replace_insert_ob_in_map (const char *arch_string, object *op)
1559{ 1454{
1560 object * 1455 object *tmp, *tmp1;
1561 tmp;
1562 object *
1563 tmp1;
1564 1456
1565 /* first search for itself and remove any old instances */ 1457 /* first search for itself and remove any old instances */
1566 1458
1567 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)
1568 {
1569 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1460 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1570 { 1461 tmp->destroy ();
1571 remove_ob (tmp);
1572 free_object (tmp);
1573 }
1574 }
1575 1462
1576 tmp1 = arch_to_object (archetype::find (arch_string)); 1463 tmp1 = arch_to_object (archetype::find (arch_string));
1577 1464
1578 tmp1->x = op->x; 1465 tmp1->x = op->x;
1579 tmp1->y = op->y; 1466 tmp1->y = op->y;
1580 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);
1581} 1474}
1582 1475
1583/* 1476/*
1584 * 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
1585 * is returned contains nr objects, and the remaining parts contains 1478 * is returned contains nr objects, and the remaining parts contains
1586 * 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).
1587 * On failure, NULL is returned, and the reason put into the 1480 * On failure, NULL is returned, and the reason put into the
1588 * global static errmsg array. 1481 * global static errmsg array.
1589 */ 1482 */
1590
1591object * 1483object *
1592get_split_ob (object *orig_ob, uint32 nr) 1484get_split_ob (object *orig_ob, uint32 nr)
1593{ 1485{
1594 object * 1486 object *newob;
1595 newob;
1596 int
1597 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1487 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1598 1488
1599 if (orig_ob->nrof < nr) 1489 if (orig_ob->nrof < nr)
1600 { 1490 {
1601 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);
1602 return NULL; 1492 return NULL;
1603 } 1493 }
1604 1494
1605 newob = object_create_clone (orig_ob); 1495 newob = object_create_clone (orig_ob);
1606 1496
1607 if ((orig_ob->nrof -= nr) < 1) 1497 if ((orig_ob->nrof -= nr) < 1)
1608 { 1498 orig_ob->destroy (1);
1609 if (!is_removed)
1610 remove_ob (orig_ob);
1611 free_object2 (orig_ob, 1);
1612 }
1613 else if (!is_removed) 1499 else if (!is_removed)
1614 { 1500 {
1615 if (orig_ob->env != NULL) 1501 if (orig_ob->env != NULL)
1616 sub_weight (orig_ob->env, orig_ob->weight * nr); 1502 sub_weight (orig_ob->env, orig_ob->weight * nr);
1617 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)
… …
1632 * 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
1633 * is subsequently removed and freed. 1519 * is subsequently removed and freed.
1634 * 1520 *
1635 * 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
1636 */ 1522 */
1637
1638object * 1523object *
1639decrease_ob_nr (object *op, uint32 i) 1524decrease_ob_nr (object *op, uint32 i)
1640{ 1525{
1641 object *tmp; 1526 object *tmp;
1642 player *pl;
1643 1527
1644 if (i == 0) /* objects with op->nrof require this check */ 1528 if (i == 0) /* objects with op->nrof require this check */
1645 return op; 1529 return op;
1646 1530
1647 if (i > op->nrof) 1531 if (i > op->nrof)
1648 i = op->nrof; 1532 i = op->nrof;
1649 1533
1650 if (QUERY_FLAG (op, FLAG_REMOVED)) 1534 if (QUERY_FLAG (op, FLAG_REMOVED))
1651 op->nrof -= i; 1535 op->nrof -= i;
1652 else if (op->env != NULL) 1536 else if (op->env)
1653 { 1537 {
1654 /* is this object in the players inventory, or sub container 1538 /* is this object in the players inventory, or sub container
1655 * therein? 1539 * therein?
1656 */ 1540 */
1657 tmp = is_player_inv (op->env); 1541 tmp = op->in_player ();
1658 /* nope. Is this a container the player has opened? 1542 /* nope. Is this a container the player has opened?
1659 * If so, set tmp to that player. 1543 * If so, set tmp to that player.
1660 * IMO, searching through all the players will mostly 1544 * IMO, searching through all the players will mostly
1661 * likely be quicker than following op->env to the map, 1545 * likely be quicker than following op->env to the map,
1662 * and then searching the map for a player. 1546 * and then searching the map for a player.
1663 */ 1547 */
1664 if (!tmp) 1548 if (!tmp)
1665 { 1549 for_all_players (pl)
1666 for (pl = first_player; pl; pl = pl->next)
1667 if (pl->ob->container == op->env) 1550 if (pl->ob->container == op->env)
1551 {
1552 tmp = pl->ob;
1668 break; 1553 break;
1669 if (pl)
1670 tmp = pl->ob;
1671 else
1672 tmp = NULL;
1673 } 1554 }
1674 1555
1675 if (i < op->nrof) 1556 if (i < op->nrof)
1676 { 1557 {
1677 sub_weight (op->env, op->weight * i); 1558 sub_weight (op->env, op->weight * i);
1678 op->nrof -= i; 1559 op->nrof -= i;
1679 if (tmp) 1560 if (tmp)
1680 {
1681 esrv_send_item (tmp, op); 1561 esrv_send_item (tmp, op);
1682 }
1683 } 1562 }
1684 else 1563 else
1685 { 1564 {
1686 remove_ob (op); 1565 op->remove ();
1687 op->nrof = 0; 1566 op->nrof = 0;
1688 if (tmp) 1567 if (tmp)
1689 {
1690 esrv_del_item (tmp->contr, op->count); 1568 esrv_del_item (tmp->contr, op->count);
1691 }
1692 } 1569 }
1693 } 1570 }
1694 else 1571 else
1695 { 1572 {
1696 object *above = op->above; 1573 object *above = op->above;
1697 1574
1698 if (i < op->nrof) 1575 if (i < op->nrof)
1699 op->nrof -= i; 1576 op->nrof -= i;
1700 else 1577 else
1701 { 1578 {
1702 remove_ob (op); 1579 op->remove ();
1703 op->nrof = 0; 1580 op->nrof = 0;
1704 } 1581 }
1705 1582
1706 /* Since we just removed op, op->above is null */ 1583 /* Since we just removed op, op->above is null */
1707 for (tmp = above; tmp != NULL; tmp = tmp->above) 1584 for (tmp = above; tmp; tmp = tmp->above)
1708 if (tmp->type == PLAYER) 1585 if (tmp->type == PLAYER)
1709 { 1586 {
1710 if (op->nrof) 1587 if (op->nrof)
1711 esrv_send_item (tmp, op); 1588 esrv_send_item (tmp, op);
1712 else 1589 else
… …
1716 1593
1717 if (op->nrof) 1594 if (op->nrof)
1718 return op; 1595 return op;
1719 else 1596 else
1720 { 1597 {
1721 free_object (op); 1598 op->destroy ();
1722 return NULL; 1599 return 0;
1723 } 1600 }
1724} 1601}
1725 1602
1726/* 1603/*
1727 * add_weight(object, weight) adds the specified weight to an object, 1604 * add_weight(object, weight) adds the specified weight to an object,
1728 * and also updates how much the environment(s) is/are carrying. 1605 * and also updates how much the environment(s) is/are carrying.
1729 */ 1606 */
1730
1731void 1607void
1732add_weight (object *op, signed long weight) 1608add_weight (object *op, signed long weight)
1733{ 1609{
1734 while (op != NULL) 1610 while (op != NULL)
1735 { 1611 {
… …
1739 op->carrying += weight; 1615 op->carrying += weight;
1740 op = op->env; 1616 op = op->env;
1741 } 1617 }
1742} 1618}
1743 1619
1744/*
1745 * insert_ob_in_ob(op,environment):
1746 * This function inserts the object op in the linked list
1747 * inside the object environment.
1748 *
1749 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1750 * the inventory at the last position or next to other objects of the same
1751 * type.
1752 * Frank: Now sorted by type, archetype and magic!
1753 *
1754 * The function returns now pointer to inserted item, and return value can
1755 * be != op, if items are merged. -Tero
1756 */
1757
1758object * 1620object *
1759insert_ob_in_ob (object *op, object *where) 1621insert_ob_in_ob (object *op, object *where)
1760{ 1622{
1761 object * 1623 if (!where)
1762 tmp, *
1763 otmp;
1764
1765 if (!QUERY_FLAG (op, FLAG_REMOVED))
1766 {
1767 char *dump = dump_object (op);
1768 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1769 free (dump);
1770 return op;
1771 }
1772
1773 if (where == NULL)
1774 { 1624 {
1775 char *dump = dump_object (op); 1625 char *dump = dump_object (op);
1776 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);
1777 free (dump); 1627 free (dump);
1778 return op; 1628 return op;
1779 } 1629 }
1780 1630
1781 if (where->head) 1631 if (where->head_ () != where)
1782 { 1632 {
1783 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1633 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1784 where = where->head; 1634 where = where->head;
1785 } 1635 }
1636
1637 return where->insert (op);
1638}
1639
1640/*
1641 * env->insert (op)
1642 * This function inserts the object op in the linked list
1643 * inside the object environment.
1644 *
1645 * The function returns now pointer to inserted item, and return value can
1646 * be != op, if items are merged. -Tero
1647 */
1648object *
1649object::insert (object *op)
1650{
1651 if (!QUERY_FLAG (op, FLAG_REMOVED))
1652 op->remove ();
1786 1653
1787 if (op->more) 1654 if (op->more)
1788 { 1655 {
1789 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1656 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1790 return op; 1657 return op;
1791 } 1658 }
1792 1659
1793 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1660 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1794 CLEAR_FLAG (op, FLAG_REMOVED); 1661 CLEAR_FLAG (op, FLAG_REMOVED);
1662
1795 if (op->nrof) 1663 if (op->nrof)
1796 { 1664 {
1797 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1665 for (object *tmp = inv; tmp; tmp = tmp->below)
1798 if (CAN_MERGE (tmp, op)) 1666 if (object::can_merge (tmp, op))
1799 { 1667 {
1800 /* return the original object and remove inserted object 1668 /* return the original object and remove inserted object
1801 (client needs the original object) */ 1669 (client needs the original object) */
1802 tmp->nrof += op->nrof; 1670 tmp->nrof += op->nrof;
1803 /* Weight handling gets pretty funky. Since we are adding to 1671 /* Weight handling gets pretty funky. Since we are adding to
1804 * tmp->nrof, we need to increase the weight. 1672 * tmp->nrof, we need to increase the weight.
1805 */ 1673 */
1806 add_weight (where, op->weight * op->nrof); 1674 add_weight (this, op->weight * op->nrof);
1807 SET_FLAG (op, FLAG_REMOVED); 1675 SET_FLAG (op, FLAG_REMOVED);
1808 free_object (op); /* free the inserted object */ 1676 op->destroy (); /* free the inserted object */
1809 op = tmp; 1677 op = tmp;
1810 remove_ob (op); /* and fix old object's links */ 1678 op->remove (); /* and fix old object's links */
1811 CLEAR_FLAG (op, FLAG_REMOVED); 1679 CLEAR_FLAG (op, FLAG_REMOVED);
1812 break; 1680 break;
1813 } 1681 }
1814 1682
1815 /* I assume combined objects have no inventory 1683 /* I assume combined objects have no inventory
1816 * We add the weight - this object could have just been removed 1684 * We add the weight - this object could have just been removed
1817 * (if it was possible to merge). calling remove_ob will subtract 1685 * (if it was possible to merge). calling remove_ob will subtract
1818 * the weight, so we need to add it in again, since we actually do 1686 * the weight, so we need to add it in again, since we actually do
1819 * the linking below 1687 * the linking below
1820 */ 1688 */
1821 add_weight (where, op->weight * op->nrof); 1689 add_weight (this, op->weight * op->nrof);
1822 } 1690 }
1823 else 1691 else
1824 add_weight (where, (op->weight + op->carrying)); 1692 add_weight (this, (op->weight + op->carrying));
1825 1693
1826 otmp = is_player_inv (where); 1694 if (object *otmp = this->in_player ())
1827 if (otmp && otmp->contr != NULL)
1828 {
1829 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1695 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1830 fix_player (otmp); 1696 otmp->update_stats ();
1831 }
1832 1697
1698 op->owner = 0; // its his/hers now. period.
1833 op->map = NULL; 1699 op->map = 0;
1834 op->env = where; 1700 op->env = this;
1835 op->above = NULL; 1701 op->above = 0;
1836 op->below = NULL; 1702 op->below = 0;
1837 op->x = 0, op->y = 0; 1703 op->x = op->y = 0;
1838 1704
1839 /* 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 */
1840 if ((op->glow_radius != 0) && where->map) 1706 if (op->glow_radius && map)
1841 { 1707 {
1842#ifdef DEBUG_LIGHTS 1708#ifdef DEBUG_LIGHTS
1843 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);
1844#endif /* DEBUG_LIGHTS */ 1710#endif /* DEBUG_LIGHTS */
1845 if (MAP_DARKNESS (where->map)) 1711 if (map->darkness)
1846 update_all_los (where->map, where->x, where->y); 1712 update_all_los (map, x, y);
1847 } 1713 }
1848 1714
1849 /* 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.
1850 * It sure simplifies this function... 1716 * It sure simplifies this function...
1851 */ 1717 */
1852 if (where->inv == NULL) 1718 if (!inv)
1853 where->inv = op; 1719 inv = op;
1854 else 1720 else
1855 { 1721 {
1856 op->below = where->inv; 1722 op->below = inv;
1857 op->below->above = op; 1723 op->below->above = op;
1858 where->inv = op; 1724 inv = op;
1859 } 1725 }
1726
1727 INVOKE_OBJECT (INSERT, this);
1728
1860 return op; 1729 return op;
1861} 1730}
1862 1731
1863/* 1732/*
1864 * Checks if any objects has a move_type that matches objects 1733 * Checks if any objects has a move_type that matches objects
… …
1878 * 1747 *
1879 * 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
1880 * 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
1881 * on top. 1750 * on top.
1882 */ 1751 */
1883
1884int 1752int
1885check_move_on (object *op, object *originator) 1753check_move_on (object *op, object *originator)
1886{ 1754{
1887 object *tmp; 1755 object *tmp;
1888 maptile *m = op->map; 1756 maptile *m = op->map;
… …
1915 1783
1916 /* The objects have to be checked from top to bottom. 1784 /* The objects have to be checked from top to bottom.
1917 * Hence, we first go to the top: 1785 * Hence, we first go to the top:
1918 */ 1786 */
1919 1787
1920 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)
1921 { 1789 {
1922 /* Trim the search when we find the first other spell effect 1790 /* Trim the search when we find the first other spell effect
1923 * 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,
1924 * we don't need to check all of them. 1792 * we don't need to check all of them.
1925 */ 1793 */
… …
1943 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1811 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1944 ((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))
1945 { 1813 {
1946 1814
1947 float 1815 float
1948 diff = tmp->move_slow_penalty * FABS (op->speed); 1816 diff = tmp->move_slow_penalty * fabs (op->speed);
1949 1817
1950 if (op->type == PLAYER) 1818 if (op->type == PLAYER)
1951 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)) ||
1952 (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)))
1953 diff /= 4.0; 1821 diff /= 4.0;
… …
1980/* 1848/*
1981 * present_arch(arch, map, x, y) searches for any objects with 1849 * present_arch(arch, map, x, y) searches for any objects with
1982 * a matching archetype at the given map and coordinates. 1850 * a matching archetype at the given map and coordinates.
1983 * The first matching object is returned, or NULL if none. 1851 * The first matching object is returned, or NULL if none.
1984 */ 1852 */
1985
1986object * 1853object *
1987present_arch (const archetype *at, maptile *m, int x, int y) 1854present_arch (const archetype *at, maptile *m, int x, int y)
1988{ 1855{
1989 object *
1990 tmp;
1991
1992 if (m == NULL || out_of_map (m, x, y)) 1856 if (!m || out_of_map (m, x, y))
1993 { 1857 {
1994 LOG (llevError, "Present_arch called outside map.\n"); 1858 LOG (llevError, "Present_arch called outside map.\n");
1995 return NULL; 1859 return NULL;
1996 } 1860 }
1997 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)
1998 if (tmp->arch == at) 1863 if (tmp->arch == at)
1999 return tmp; 1864 return tmp;
1865
2000 return NULL; 1866 return NULL;
2001} 1867}
2002 1868
2003/* 1869/*
2004 * present(type, map, x, y) searches for any objects with 1870 * present(type, map, x, y) searches for any objects with
2005 * a matching type variable at the given map and coordinates. 1871 * a matching type variable at the given map and coordinates.
2006 * The first matching object is returned, or NULL if none. 1872 * The first matching object is returned, or NULL if none.
2007 */ 1873 */
2008
2009object * 1874object *
2010present (unsigned char type, maptile *m, int x, int y) 1875present (unsigned char type, maptile *m, int x, int y)
2011{ 1876{
2012 object *
2013 tmp;
2014
2015 if (out_of_map (m, x, y)) 1877 if (out_of_map (m, x, y))
2016 { 1878 {
2017 LOG (llevError, "Present called outside map.\n"); 1879 LOG (llevError, "Present called outside map.\n");
2018 return NULL; 1880 return NULL;
2019 } 1881 }
2020 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)
2021 if (tmp->type == type) 1884 if (tmp->type == type)
2022 return tmp; 1885 return tmp;
1886
2023 return NULL; 1887 return NULL;
2024} 1888}
2025 1889
2026/* 1890/*
2027 * present_in_ob(type, object) searches for any objects with 1891 * present_in_ob(type, object) searches for any objects with
2028 * a matching type variable in the inventory of the given object. 1892 * a matching type variable in the inventory of the given object.
2029 * The first matching object is returned, or NULL if none. 1893 * The first matching object is returned, or NULL if none.
2030 */ 1894 */
2031
2032object * 1895object *
2033present_in_ob (unsigned char type, const object *op) 1896present_in_ob (unsigned char type, const object *op)
2034{ 1897{
2035 object *
2036 tmp;
2037
2038 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1898 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2039 if (tmp->type == type) 1899 if (tmp->type == type)
2040 return tmp; 1900 return tmp;
1901
2041 return NULL; 1902 return NULL;
2042} 1903}
2043 1904
2044/* 1905/*
2045 * present_in_ob (type, str, object) searches for any objects with 1906 * present_in_ob (type, str, object) searches for any objects with
… …
2053 * 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
2054 * 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
2055 * 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
2056 * to be unique. 1917 * to be unique.
2057 */ 1918 */
2058
2059object * 1919object *
2060present_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)
2061{ 1921{
2062 object *
2063 tmp;
2064
2065 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1922 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2066 {
2067 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1923 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2068 return tmp; 1924 return tmp;
2069 } 1925
2070 return NULL; 1926 return 0;
2071} 1927}
2072 1928
2073/* 1929/*
2074 * present_arch_in_ob(archetype, object) searches for any objects with 1930 * present_arch_in_ob(archetype, object) searches for any objects with
2075 * a matching archetype in the inventory of the given object. 1931 * a matching archetype in the inventory of the given object.
2076 * The first matching object is returned, or NULL if none. 1932 * The first matching object is returned, or NULL if none.
2077 */ 1933 */
2078
2079object * 1934object *
2080present_arch_in_ob (const archetype *at, const object *op) 1935present_arch_in_ob (const archetype *at, const object *op)
2081{ 1936{
2082 object *
2083 tmp;
2084
2085 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1937 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2086 if (tmp->arch == at) 1938 if (tmp->arch == at)
2087 return tmp; 1939 return tmp;
1940
2088 return NULL; 1941 return NULL;
2089} 1942}
2090 1943
2091/* 1944/*
2092 * activate recursively a flag on an object inventory 1945 * activate recursively a flag on an object inventory
2093 */ 1946 */
2094void 1947void
2095flag_inv (object *op, int flag) 1948flag_inv (object *op, int flag)
2096{ 1949{
2097 object *
2098 tmp;
2099
2100 if (op->inv) 1950 if (op->inv)
2101 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1951 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2102 { 1952 {
2103 SET_FLAG (tmp, flag); 1953 SET_FLAG (tmp, flag);
2104 flag_inv (tmp, flag); 1954 flag_inv (tmp, flag);
2105 } 1955 }
2106} /* 1956}
1957
1958/*
2107 * desactivate recursively a flag on an object inventory 1959 * deactivate recursively a flag on an object inventory
2108 */ 1960 */
2109void 1961void
2110unflag_inv (object *op, int flag) 1962unflag_inv (object *op, int flag)
2111{ 1963{
2112 object *
2113 tmp;
2114
2115 if (op->inv) 1964 if (op->inv)
2116 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1965 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2117 { 1966 {
2118 CLEAR_FLAG (tmp, flag); 1967 CLEAR_FLAG (tmp, flag);
2119 unflag_inv (tmp, flag); 1968 unflag_inv (tmp, flag);
2120 } 1969 }
2121}
2122
2123/*
2124 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2125 * all it's inventory (recursively).
2126 * If checksums are used, a player will get set_cheat called for
2127 * him/her-self and all object carried by a call to this function.
2128 */
2129
2130void
2131set_cheat (object *op)
2132{
2133 SET_FLAG (op, FLAG_WAS_WIZ);
2134 flag_inv (op, FLAG_WAS_WIZ);
2135} 1970}
2136 1971
2137/* 1972/*
2138 * 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
2139 * 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
… …
2153 * 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
2154 * 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
2155 * 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
2156 * customized, changed states, etc. 1991 * customized, changed states, etc.
2157 */ 1992 */
2158
2159int 1993int
2160find_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)
2161{ 1995{
2162 int
2163 i,
2164 index = 0, flag; 1996 int index = 0, flag;
2165 static int
2166 altern[SIZEOFFREE]; 1997 int altern[SIZEOFFREE];
2167 1998
2168 for (i = start; i < stop; i++) 1999 for (int i = start; i < stop; i++)
2169 { 2000 {
2170 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2001 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2171 if (!flag) 2002 if (!flag)
2172 altern[index++] = i; 2003 altern [index++] = i;
2173 2004
2174 /* Basically, if we find a wall on a space, we cut down the search size. 2005 /* Basically, if we find a wall on a space, we cut down the search size.
2175 * In this way, we won't return spaces that are on another side of a wall. 2006 * In this way, we won't return spaces that are on another side of a wall.
2176 * This mostly work, but it cuts down the search size in all directions - 2007 * This mostly work, but it cuts down the search size in all directions -
2177 * if the space being examined only has a wall to the north and empty 2008 * if the space being examined only has a wall to the north and empty
2178 * spaces in all the other directions, this will reduce the search space 2009 * spaces in all the other directions, this will reduce the search space
2179 * to only the spaces immediately surrounding the target area, and 2010 * to only the spaces immediately surrounding the target area, and
2180 * won't look 2 spaces south of the target space. 2011 * won't look 2 spaces south of the target space.
2181 */ 2012 */
2182 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2013 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2183 stop = maxfree[i]; 2014 stop = maxfree[i];
2184 } 2015 }
2016
2185 if (!index) 2017 if (!index)
2186 return -1; 2018 return -1;
2019
2187 return altern[RANDOM () % index]; 2020 return altern [rndm (index)];
2188} 2021}
2189 2022
2190/* 2023/*
2191 * find_first_free_spot(archetype, maptile, x, y) works like 2024 * find_first_free_spot(archetype, maptile, x, y) works like
2192 * find_free_spot(), but it will search max number of squares. 2025 * find_free_spot(), but it will search max number of squares.
2193 * But it will return the first available spot, not a random choice. 2026 * But it will return the first available spot, not a random choice.
2194 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2027 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2195 */ 2028 */
2196
2197int 2029int
2198find_first_free_spot (const object *ob, maptile *m, int x, int y) 2030find_first_free_spot (const object *ob, maptile *m, int x, int y)
2199{ 2031{
2200 int
2201 i;
2202
2203 for (i = 0; i < SIZEOFFREE; i++) 2032 for (int i = 0; i < SIZEOFFREE; i++)
2204 {
2205 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2033 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2206 return i; 2034 return i;
2207 } 2035
2208 return -1; 2036 return -1;
2209} 2037}
2210 2038
2211/* 2039/*
2212 * The function permute(arr, begin, end) randomly reorders the array 2040 * The function permute(arr, begin, end) randomly reorders the array
2213 * arr[begin..end-1]. 2041 * arr[begin..end-1].
2042 * now uses a fisher-yates shuffle, old permute was broken
2214 */ 2043 */
2215static void 2044static void
2216permute (int *arr, int begin, int end) 2045permute (int *arr, int begin, int end)
2217{ 2046{
2218 int 2047 arr += begin;
2219 i,
2220 j,
2221 tmp,
2222 len;
2223
2224 len = end - begin; 2048 end -= begin;
2225 for (i = begin; i < end; i++)
2226 {
2227 j = begin + RANDOM () % len;
2228 2049
2229 tmp = arr[i]; 2050 while (--end)
2230 arr[i] = arr[j]; 2051 swap (arr [end], arr [rndm (end + 1)]);
2231 arr[j] = tmp;
2232 }
2233} 2052}
2234 2053
2235/* new function to make monster searching more efficient, and effective! 2054/* new function to make monster searching more efficient, and effective!
2236 * This basically returns a randomized array (in the passed pointer) of 2055 * This basically returns a randomized array (in the passed pointer) of
2237 * the spaces to find monsters. In this way, it won't always look for 2056 * the spaces to find monsters. In this way, it won't always look for
… …
2240 * the 3x3 area will be searched, just not in a predictable order. 2059 * the 3x3 area will be searched, just not in a predictable order.
2241 */ 2060 */
2242void 2061void
2243get_search_arr (int *search_arr) 2062get_search_arr (int *search_arr)
2244{ 2063{
2245 int 2064 int i;
2246 i;
2247 2065
2248 for (i = 0; i < SIZEOFFREE; i++) 2066 for (i = 0; i < SIZEOFFREE; i++)
2249 {
2250 search_arr[i] = i; 2067 search_arr[i] = i;
2251 }
2252 2068
2253 permute (search_arr, 1, SIZEOFFREE1 + 1); 2069 permute (search_arr, 1, SIZEOFFREE1 + 1);
2254 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2070 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2255 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2071 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2256} 2072}
… …
2265 * Perhaps incorrectly, but I'm making the assumption that exclude 2081 * Perhaps incorrectly, but I'm making the assumption that exclude
2266 * is actually want is going to try and move there. We need this info 2082 * is actually want is going to try and move there. We need this info
2267 * because we have to know what movement the thing looking to move 2083 * because we have to know what movement the thing looking to move
2268 * there is capable of. 2084 * there is capable of.
2269 */ 2085 */
2270
2271int 2086int
2272find_dir (maptile *m, int x, int y, object *exclude) 2087find_dir (maptile *m, int x, int y, object *exclude)
2273{ 2088{
2274 int
2275 i,
2276 max = SIZEOFFREE, mflags; 2089 int i, max = SIZEOFFREE, mflags;
2277 2090
2278 sint16 nx, ny; 2091 sint16 nx, ny;
2279 object * 2092 object *tmp;
2280 tmp;
2281 maptile * 2093 maptile *mp;
2282 mp;
2283 2094
2284 MoveType blocked, move_type; 2095 MoveType blocked, move_type;
2285 2096
2286 if (exclude && exclude->head) 2097 if (exclude && exclude->head_ () != exclude)
2287 { 2098 {
2288 exclude = exclude->head; 2099 exclude = exclude->head;
2289 move_type = exclude->move_type; 2100 move_type = exclude->move_type;
2290 } 2101 }
2291 else 2102 else
… …
2299 mp = m; 2110 mp = m;
2300 nx = x + freearr_x[i]; 2111 nx = x + freearr_x[i];
2301 ny = y + freearr_y[i]; 2112 ny = y + freearr_y[i];
2302 2113
2303 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2114 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2115
2304 if (mflags & P_OUT_OF_MAP) 2116 if (mflags & P_OUT_OF_MAP)
2305 {
2306 max = maxfree[i]; 2117 max = maxfree[i];
2307 }
2308 else 2118 else
2309 { 2119 {
2310 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2120 mapspace &ms = mp->at (nx, ny);
2121
2122 blocked = ms.move_block;
2311 2123
2312 if ((move_type & blocked) == move_type) 2124 if ((move_type & blocked) == move_type)
2313 {
2314 max = maxfree[i]; 2125 max = maxfree[i];
2315 }
2316 else if (mflags & P_IS_ALIVE) 2126 else if (mflags & P_IS_ALIVE)
2317 { 2127 {
2318 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2128 for (tmp = ms.bot; tmp; tmp = tmp->above)
2319 { 2129 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2320 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2130 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2321 {
2322 break; 2131 break;
2323 } 2132
2324 }
2325 if (tmp) 2133 if (tmp)
2326 {
2327 return freedir[i]; 2134 return freedir[i];
2328 }
2329 } 2135 }
2330 } 2136 }
2331 } 2137 }
2138
2332 return 0; 2139 return 0;
2333} 2140}
2334 2141
2335/* 2142/*
2336 * distance(object 1, object 2) will return the square of the 2143 * distance(object 1, object 2) will return the square of the
2337 * distance between the two given objects. 2144 * distance between the two given objects.
2338 */ 2145 */
2339
2340int 2146int
2341distance (const object *ob1, const object *ob2) 2147distance (const object *ob1, const object *ob2)
2342{ 2148{
2343 int
2344 i;
2345
2346 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2149 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2347 return i;
2348} 2150}
2349 2151
2350/* 2152/*
2351 * find_dir_2(delta-x,delta-y) will return a direction in which 2153 * find_dir_2(delta-x,delta-y) will return a direction in which
2352 * an object which has subtracted the x and y coordinates of another 2154 * an object which has subtracted the x and y coordinates of another
2353 * object, needs to travel toward it. 2155 * object, needs to travel toward it.
2354 */ 2156 */
2355
2356int 2157int
2357find_dir_2 (int x, int y) 2158find_dir_2 (int x, int y)
2358{ 2159{
2359 int 2160 int q;
2360 q;
2361 2161
2362 if (y) 2162 if (y)
2363 q = x * 100 / y; 2163 q = x * 100 / y;
2364 else if (x) 2164 else if (x)
2365 q = -300 * x; 2165 q = -300 * x;
… …
2390 2190
2391 return 3; 2191 return 3;
2392} 2192}
2393 2193
2394/* 2194/*
2395 * absdir(int): Returns a number between 1 and 8, which represent
2396 * the "absolute" direction of a number (it actually takes care of
2397 * "overflow" in previous calculations of a direction).
2398 */
2399
2400int
2401absdir (int d)
2402{
2403 while (d < 1)
2404 d += 8;
2405 while (d > 8)
2406 d -= 8;
2407 return d;
2408}
2409
2410/*
2411 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2195 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2412 * between two directions (which are expected to be absolute (see absdir()) 2196 * between two directions (which are expected to be absolute (see absdir())
2413 */ 2197 */
2414
2415int 2198int
2416dirdiff (int dir1, int dir2) 2199dirdiff (int dir1, int dir2)
2417{ 2200{
2418 int 2201 int d;
2419 d;
2420 2202
2421 d = abs (dir1 - dir2); 2203 d = abs (dir1 - dir2);
2422 if (d > 4) 2204 if (d > 4)
2423 d = 8 - d; 2205 d = 8 - d;
2206
2424 return d; 2207 return d;
2425} 2208}
2426 2209
2427/* peterm: 2210/* peterm:
2428 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2211 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2431 * This basically means that if direction is 15, then it could either go 2214 * This basically means that if direction is 15, then it could either go
2432 * direction 4, 14, or 16 to get back to where we are. 2215 * direction 4, 14, or 16 to get back to where we are.
2433 * Moved from spell_util.c to object.c with the other related direction 2216 * Moved from spell_util.c to object.c with the other related direction
2434 * functions. 2217 * functions.
2435 */ 2218 */
2436
2437int
2438 reduction_dir[SIZEOFFREE][3] = { 2219int reduction_dir[SIZEOFFREE][3] = {
2439 {0, 0, 0}, /* 0 */ 2220 {0, 0, 0}, /* 0 */
2440 {0, 0, 0}, /* 1 */ 2221 {0, 0, 0}, /* 1 */
2441 {0, 0, 0}, /* 2 */ 2222 {0, 0, 0}, /* 2 */
2442 {0, 0, 0}, /* 3 */ 2223 {0, 0, 0}, /* 3 */
2443 {0, 0, 0}, /* 4 */ 2224 {0, 0, 0}, /* 4 */
… …
2491 * find a path to that monster that we found. If not, 2272 * find a path to that monster that we found. If not,
2492 * we don't bother going toward it. Returns 1 if we 2273 * we don't bother going toward it. Returns 1 if we
2493 * can see a direct way to get it 2274 * can see a direct way to get it
2494 * Modified to be map tile aware -.MSW 2275 * Modified to be map tile aware -.MSW
2495 */ 2276 */
2496
2497
2498int 2277int
2499can_see_monsterP (maptile *m, int x, int y, int dir) 2278can_see_monsterP (maptile *m, int x, int y, int dir)
2500{ 2279{
2501 sint16 dx, dy; 2280 sint16 dx, dy;
2502 int
2503 mflags; 2281 int mflags;
2504 2282
2505 if (dir < 0) 2283 if (dir < 0)
2506 return 0; /* exit condition: invalid direction */ 2284 return 0; /* exit condition: invalid direction */
2507 2285
2508 dx = x + freearr_x[dir]; 2286 dx = x + freearr_x[dir];
… …
2521 return 0; 2299 return 0;
2522 2300
2523 /* yes, can see. */ 2301 /* yes, can see. */
2524 if (dir < 9) 2302 if (dir < 9)
2525 return 1; 2303 return 1;
2304
2526 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2305 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2527 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2306 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2307 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2528} 2308}
2529
2530
2531 2309
2532/* 2310/*
2533 * can_pick(picker, item): finds out if an object is possible to be 2311 * can_pick(picker, item): finds out if an object is possible to be
2534 * picked up by the picker. Returnes 1 if it can be 2312 * picked up by the picker. Returnes 1 if it can be
2535 * picked up, otherwise 0. 2313 * picked up, otherwise 0.
… …
2537 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2315 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2538 * core dumps if they do. 2316 * core dumps if they do.
2539 * 2317 *
2540 * Add a check so we can't pick up invisible objects (0.93.8) 2318 * Add a check so we can't pick up invisible objects (0.93.8)
2541 */ 2319 */
2542
2543int 2320int
2544can_pick (const object *who, const object *item) 2321can_pick (const object *who, const object *item)
2545{ 2322{
2546 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2323 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2547 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2324 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2548 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2325 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2549} 2326}
2550 2327
2551
2552/* 2328/*
2553 * create clone from object to another 2329 * create clone from object to another
2554 */ 2330 */
2555object * 2331object *
2556object_create_clone (object *asrc) 2332object_create_clone (object *asrc)
2557{ 2333{
2558 object *
2559 dst = NULL, *tmp, *src, *part, *prev, *item; 2334 object *dst = 0, *tmp, *src, *prev, *item;
2560 2335
2561 if (!asrc) 2336 if (!asrc)
2562 return NULL; 2337 return 0;
2563 src = asrc; 2338
2564 if (src->head)
2565 src = src->head; 2339 src = asrc->head_ ();
2566 2340
2567 prev = NULL; 2341 prev = 0;
2568 for (part = src; part; part = part->more) 2342 for (object *part = src; part; part = part->more)
2569 { 2343 {
2570 tmp = get_object (); 2344 tmp = part->clone ();
2571 copy_object (part, tmp);
2572 tmp->x -= src->x; 2345 tmp->x -= src->x;
2573 tmp->y -= src->y; 2346 tmp->y -= src->y;
2347
2574 if (!part->head) 2348 if (!part->head)
2575 { 2349 {
2576 dst = tmp; 2350 dst = tmp;
2577 tmp->head = NULL; 2351 tmp->head = 0;
2578 } 2352 }
2579 else 2353 else
2580 {
2581 tmp->head = dst; 2354 tmp->head = dst;
2582 } 2355
2583 tmp->more = NULL; 2356 tmp->more = 0;
2357
2584 if (prev) 2358 if (prev)
2585 prev->more = tmp; 2359 prev->more = tmp;
2360
2586 prev = tmp; 2361 prev = tmp;
2587 } 2362 }
2588 2363
2589 for (item = src->inv; item; item = item->below) 2364 for (item = src->inv; item; item = item->below)
2590 insert_ob_in_ob (object_create_clone (item), dst); 2365 insert_ob_in_ob (object_create_clone (item), dst);
2591 2366
2592 return dst; 2367 return dst;
2593}
2594
2595/* GROS - Creates an object using a string representing its content. */
2596/* Basically, we save the content of the string to a temp file, then call */
2597/* load_object on it. I admit it is a highly inefficient way to make things, */
2598/* but it was simple to make and allows reusing the load_object function. */
2599/* Remember not to use load_object_str in a time-critical situation. */
2600/* Also remember that multiparts objects are not supported for now. */
2601
2602object *
2603load_object_str (const char *obstr)
2604{
2605 object *op;
2606 char filename[MAX_BUF];
2607
2608 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2609
2610 FILE *tempfile = fopen (filename, "w");
2611
2612 if (tempfile == NULL)
2613 {
2614 LOG (llevError, "Error - Unable to access load object temp file\n");
2615 return NULL;
2616 }
2617
2618 fprintf (tempfile, obstr);
2619 fclose (tempfile);
2620
2621 op = get_object ();
2622
2623 object_thawer thawer (filename);
2624
2625 if (thawer)
2626 load_object (thawer, op, 0);
2627
2628 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2629 CLEAR_FLAG (op, FLAG_REMOVED);
2630
2631 return op;
2632} 2368}
2633 2369
2634/* This returns the first object in who's inventory that 2370/* This returns the first object in who's inventory that
2635 * has the same type and subtype match. 2371 * has the same type and subtype match.
2636 * returns NULL if no match. 2372 * returns NULL if no match.
2637 */ 2373 */
2638object * 2374object *
2639find_obj_by_type_subtype (const object *who, int type, int subtype) 2375find_obj_by_type_subtype (const object *who, int type, int subtype)
2640{ 2376{
2641 object *tmp;
2642
2643 for (tmp = who->inv; tmp; tmp = tmp->below) 2377 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2644 if (tmp->type == type && tmp->subtype == subtype) 2378 if (tmp->type == type && tmp->subtype == subtype)
2645 return tmp; 2379 return tmp;
2646 2380
2647 return NULL; 2381 return 0;
2648} 2382}
2649 2383
2650/* If ob has a field named key, return the link from the list, 2384/* If ob has a field named key, return the link from the list,
2651 * otherwise return NULL. 2385 * otherwise return NULL.
2652 * 2386 *
… …
2654 * do the desired thing. 2388 * do the desired thing.
2655 */ 2389 */
2656key_value * 2390key_value *
2657get_ob_key_link (const object *ob, const char *key) 2391get_ob_key_link (const object *ob, const char *key)
2658{ 2392{
2659 key_value *link;
2660
2661 for (link = ob->key_values; link != NULL; link = link->next) 2393 for (key_value *link = ob->key_values; link; link = link->next)
2662 if (link->key == key) 2394 if (link->key == key)
2663 return link; 2395 return link;
2664 2396
2665 return NULL; 2397 return 0;
2666} 2398}
2667 2399
2668/* 2400/*
2669 * Returns the value of op has an extra_field for key, or NULL. 2401 * Returns the value of op has an extra_field for key, or NULL.
2670 * 2402 *
… …
2695 if (link->key == canonical_key) 2427 if (link->key == canonical_key)
2696 return link->value; 2428 return link->value;
2697 2429
2698 return 0; 2430 return 0;
2699} 2431}
2700
2701 2432
2702/* 2433/*
2703 * Updates the canonical_key in op to value. 2434 * Updates the canonical_key in op to value.
2704 * 2435 *
2705 * canonical_key is a shared string (value doesn't have to be). 2436 * canonical_key is a shared string (value doesn't have to be).
… …
2710 * Returns TRUE on success. 2441 * Returns TRUE on success.
2711 */ 2442 */
2712int 2443int
2713set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2444set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2714{ 2445{
2715 key_value *
2716 field = NULL, *last = NULL; 2446 key_value *field = NULL, *last = NULL;
2717 2447
2718 for (field = op->key_values; field != NULL; field = field->next) 2448 for (field = op->key_values; field != NULL; field = field->next)
2719 { 2449 {
2720 if (field->key != canonical_key) 2450 if (field->key != canonical_key)
2721 { 2451 {
… …
2730 /* Basically, if the archetype has this key set, 2460 /* Basically, if the archetype has this key set,
2731 * we need to store the null value so when we save 2461 * we need to store the null value so when we save
2732 * it, we save the empty value so that when we load, 2462 * it, we save the empty value so that when we load,
2733 * we get this value back again. 2463 * we get this value back again.
2734 */ 2464 */
2735 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2465 if (get_ob_key_link (op->arch, canonical_key))
2736 field->value = 0; 2466 field->value = 0;
2737 else 2467 else
2738 { 2468 {
2739 if (last) 2469 if (last)
2740 last->next = field->next; 2470 last->next = field->next;
… …
2749 /* IF we get here, key doesn't exist */ 2479 /* IF we get here, key doesn't exist */
2750 2480
2751 /* No field, we'll have to add it. */ 2481 /* No field, we'll have to add it. */
2752 2482
2753 if (!add_key) 2483 if (!add_key)
2754 {
2755 return FALSE; 2484 return FALSE;
2756 } 2485
2757 /* There isn't any good reason to store a null 2486 /* There isn't any good reason to store a null
2758 * value in the key/value list. If the archetype has 2487 * value in the key/value list. If the archetype has
2759 * this key, then we should also have it, so shouldn't 2488 * this key, then we should also have it, so shouldn't
2760 * be here. If user wants to store empty strings, 2489 * be here. If user wants to store empty strings,
2761 * should pass in "" 2490 * should pass in ""
… …
2810 } 2539 }
2811 else 2540 else
2812 item = item->env; 2541 item = item->env;
2813} 2542}
2814 2543
2544const char *
2545object::flag_desc (char *desc, int len) const
2546{
2547 char *p = desc;
2548 bool first = true;
2549
2550 *p = 0;
2551
2552 for (int i = 0; i < NUM_FLAGS; i++)
2553 {
2554 if (len <= 10) // magic constant!
2555 {
2556 snprintf (p, len, ",...");
2557 break;
2558 }
2559
2560 if (flag [i])
2561 {
2562 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2563 len -= cnt;
2564 p += cnt;
2565 first = false;
2566 }
2567 }
2568
2569 return desc;
2570}
2571
2815// return a suitable string describing an objetc in enough detail to find it 2572// return a suitable string describing an object in enough detail to find it
2816const char * 2573const char *
2817object::debug_desc (char *info) const 2574object::debug_desc (char *info) const
2818{ 2575{
2576 char flagdesc[512];
2819 char info2[256 * 3]; 2577 char info2[256 * 4];
2820 char *p = info; 2578 char *p = info;
2821 2579
2822 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2580 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2823 count, 2581 count, uuid.seq,
2824 &name, 2582 &name,
2825 title ? " " : "", 2583 title ? "\",title:\"" : "",
2826 title ? (const char *)title : ""); 2584 title ? (const char *)title : "",
2585 flag_desc (flagdesc, 512), type);
2827 2586
2828 if (env) 2587 if (!this->flag[FLAG_REMOVED] && env)
2829 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2588 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2830 2589
2831 if (map) 2590 if (map)
2832 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2591 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2833 2592
2834 return info; 2593 return info;
2835} 2594}
2836 2595
2837const char * 2596const char *
2838object::debug_desc () const 2597object::debug_desc () const
2839{ 2598{
2840 static char info[256 * 3]; 2599 static char info[3][256 * 4];
2600 static int info_idx;
2601
2841 return debug_desc (info); 2602 return debug_desc (info [++info_idx % 3]);
2842} 2603}
2843 2604
2605struct region *
2606object::region () const
2607{
2608 return map ? map->region (x, y)
2609 : region::default_region ();
2610}
2611
2612const materialtype_t *
2613object::dominant_material () const
2614{
2615 if (materialtype_t *mt = name_to_material (materialname))
2616 return mt;
2617
2618 return name_to_material (shstr_unknown);
2619}
2620
2621void
2622object::open_container (object *new_container)
2623{
2624 if (container == new_container)
2625 return;
2626
2627 if (object *old_container = container)
2628 {
2629 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2630 return;
2631
2632#if 0
2633 // remove the "Close old_container" object.
2634 if (object *closer = old_container->inv)
2635 if (closer->type == CLOSE_CON)
2636 closer->destroy ();
2637#endif
2638
2639 old_container->flag [FLAG_APPLIED] = 0;
2640 container = 0;
2641
2642 esrv_update_item (UPD_FLAGS, this, old_container);
2643 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2644 play_sound (sound_find ("chest_close"));
2645 }
2646
2647 if (new_container)
2648 {
2649 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2650 return;
2651
2652 // TODO: this does not seem to serve any purpose anymore?
2653#if 0
2654 // insert the "Close Container" object.
2655 if (archetype *closer = new_container->other_arch)
2656 {
2657 object *closer = arch_to_object (new_container->other_arch);
2658 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2659 new_container->insert (closer);
2660 }
2661#endif
2662
2663 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2664
2665 new_container->flag [FLAG_APPLIED] = 1;
2666 container = new_container;
2667
2668 esrv_update_item (UPD_FLAGS, this, new_container);
2669 esrv_send_inventory (this, new_container);
2670 play_sound (sound_find ("chest_open"));
2671 }
2672}
2673
2674object *
2675object::force_find (const shstr name)
2676{
2677 /* cycle through his inventory to look for the MARK we want to
2678 * place
2679 */
2680 for (object *tmp = inv; tmp; tmp = tmp->below)
2681 if (tmp->type == FORCE && tmp->slaying == name)
2682 return splay (tmp);
2683
2684 return 0;
2685}
2686
2687void
2688object::force_add (const shstr name, int duration)
2689{
2690 if (object *force = force_find (name))
2691 force->destroy ();
2692
2693 object *force = get_archetype (FORCE_NAME);
2694
2695 force->slaying = name;
2696 force->stats.food = 1;
2697 force->speed_left = -1.f;
2698
2699 force->set_speed (duration ? 1.f / duration : 0.f);
2700 force->flag [FLAG_IS_USED_UP] = true;
2701 force->flag [FLAG_APPLIED] = true;
2702
2703 insert (force);
2704}
2705
2706void
2707object::play_sound (faceidx sound) const
2708{
2709 if (!sound)
2710 return;
2711
2712 if (flag [FLAG_REMOVED])
2713 return;
2714
2715 if (env)
2716 {
2717 if (object *pl = in_player ())
2718 pl->contr->play_sound (sound);
2719 }
2720 else
2721 map->play_sound (sound, x, y);
2722}
2723

Diff Legend

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