… | |
… | |
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 <loader.h> |
33 | #include <loader.h> |
|
|
34 | |
|
|
35 | #include <bitset> |
34 | |
36 | |
35 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
36 | static UUID uuid; |
38 | static UUID uuid; |
37 | const uint64 UUID_SKIP = 1<<19; |
39 | const uint64 UUID_SKIP = 1<<19; |
38 | |
40 | |
… | |
… | |
104 | _exit (1); |
106 | _exit (1); |
105 | } |
107 | } |
106 | |
108 | |
107 | uuid.seq = uid; |
109 | uuid.seq = uid; |
108 | write_uuid (); |
110 | write_uuid (); |
109 | LOG (llevDebug, "read UID: %lld\n", uid); |
111 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
110 | fclose (fp); |
112 | fclose (fp); |
111 | } |
113 | } |
112 | |
114 | |
113 | UUID |
115 | UUID |
114 | gen_uuid () |
116 | gen_uuid () |
… | |
… | |
139 | * objects with lists are rare, and lists stay short. If not, use a |
141 | * objects with lists are rare, and lists stay short. If not, use a |
140 | * different structure or at least keep the lists sorted... |
142 | * different structure or at least keep the lists sorted... |
141 | */ |
143 | */ |
142 | |
144 | |
143 | /* For each field in wants, */ |
145 | /* For each field in wants, */ |
144 | for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) |
146 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
145 | { |
147 | { |
146 | key_value *has_field; |
148 | key_value *has_field; |
147 | |
149 | |
148 | /* Look for a field in has with the same key. */ |
150 | /* Look for a field in has with the same key. */ |
149 | has_field = get_ob_key_link (has, wants_field->key); |
151 | has_field = get_ob_key_link (has, wants_field->key); |
… | |
… | |
183 | * |
185 | * |
184 | * Note that this function appears a lot longer than the macro it |
186 | * Note that this function appears a lot longer than the macro it |
185 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
186 | * reduce this to the same efficiency. |
188 | * reduce this to the same efficiency. |
187 | * |
189 | * |
188 | * Check nrof variable *before* calling CAN_MERGE() |
190 | * Check nrof variable *before* calling can_merge() |
189 | * |
191 | * |
190 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
191 | * check weight |
193 | * check weight |
192 | */ |
194 | */ |
193 | |
195 | |
194 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
195 | { |
197 | { |
196 | /* A couple quicksanity checks */ |
198 | /* A couple quicksanity checks */ |
197 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
199 | if (ob1 == ob2 |
|
|
200 | || ob1->type != ob2->type |
|
|
201 | || ob1->speed != ob2->speed |
|
|
202 | || ob1->value != ob2->value |
|
|
203 | || ob1->name != ob2->name) |
198 | return 0; |
204 | return 0; |
199 | |
205 | |
200 | if (ob1->speed != ob2->speed) |
206 | //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 |
207 | /* 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 |
208 | * value could not be stored in a sint32 (which unfortunately sometimes is |
205 | * used to store nrof). |
209 | * used to store nrof). |
206 | */ |
210 | */ |
207 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
217 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
218 | |
222 | |
219 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
220 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
221 | |
225 | |
222 | |
226 | 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 |
227 | || 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) || |
228 | || ob1->name != ob2->name |
233 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
234 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
235 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
236 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
237 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
238 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
239 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
240 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
241 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
242 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
243 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
244 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
245 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
246 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
247 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
248 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
249 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
250 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
251 | (ob1->move_on != ob2->move_on) || |
247 | || 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)) |
248 | || ob1->move_off != ob2->move_off |
|
|
249 | || ob1->move_slow != ob2->move_slow |
|
|
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
253 | return 0; |
251 | return 0; |
254 | |
252 | |
255 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
256 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
257 | */ |
255 | */ |
… | |
… | |
260 | /* if one object has inventory but the other doesn't, not equiv */ |
258 | /* if one object has inventory but the other doesn't, not equiv */ |
261 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
262 | return 0; |
260 | return 0; |
263 | |
261 | |
264 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
265 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
266 | return 0; |
264 | return 0; |
267 | |
265 | |
268 | /* inventory ok - still need to check rest of this object to see |
266 | /* inventory ok - still need to check rest of this object to see |
269 | * if it is valid. |
267 | * if it is valid. |
270 | */ |
268 | */ |
… | |
… | |
354 | op = op->env; |
352 | op = op->env; |
355 | return op; |
353 | return op; |
356 | } |
354 | } |
357 | |
355 | |
358 | /* |
356 | /* |
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 | |
|
|
364 | object * |
|
|
365 | is_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. |
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
375 | * Some error messages. |
358 | * Some error messages. |
376 | * The result of the dump is stored in the static global errmsg array. |
359 | * The result of the dump is stored in the static global errmsg array. |
377 | */ |
360 | */ |
378 | |
361 | |
379 | void |
362 | char * |
380 | dump_object2 (object *op) |
|
|
381 | { |
|
|
382 | errmsg[0] = 0; |
|
|
383 | return; |
|
|
384 | //TODO//D#d# |
|
|
385 | #if 0 |
|
|
386 | char *cp; |
|
|
387 | |
|
|
388 | /* object *tmp;*/ |
|
|
389 | |
|
|
390 | if (op->arch != NULL) |
|
|
391 | { |
|
|
392 | strcat (errmsg, "arch "); |
|
|
393 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
394 | strcat (errmsg, "\n"); |
|
|
395 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
396 | strcat (errmsg, cp); |
|
|
397 | # if 0 |
|
|
398 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
399 | * will overflow the buffer. |
|
|
400 | * Changed so that we don't dump inventory either. This may |
|
|
401 | * also overflow the buffer. |
|
|
402 | */ |
|
|
403 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
404 | strcat (errmsg, cp); |
|
|
405 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
406 | dump_object2 (tmp); |
|
|
407 | # endif |
|
|
408 | strcat (errmsg, "end\n"); |
|
|
409 | } |
|
|
410 | else |
|
|
411 | { |
|
|
412 | strcat (errmsg, "Object "); |
|
|
413 | if (op->name == NULL) |
|
|
414 | strcat (errmsg, "(null)"); |
|
|
415 | else |
|
|
416 | strcat (errmsg, op->name); |
|
|
417 | strcat (errmsg, "\n"); |
|
|
418 | # if 0 |
|
|
419 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
420 | strcat (errmsg, cp); |
|
|
421 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
422 | dump_object2 (tmp); |
|
|
423 | # endif |
|
|
424 | strcat (errmsg, "end\n"); |
|
|
425 | } |
|
|
426 | #endif |
|
|
427 | } |
|
|
428 | |
|
|
429 | /* |
|
|
430 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
431 | */ |
|
|
432 | |
|
|
433 | void |
|
|
434 | dump_object (object *op) |
363 | dump_object (object *op) |
435 | { |
364 | { |
436 | if (op == NULL) |
365 | if (!op) |
437 | { |
366 | return strdup ("[NULLOBJ]"); |
438 | strcpy (errmsg, "[NULL pointer]"); |
|
|
439 | return; |
|
|
440 | } |
|
|
441 | errmsg[0] = '\0'; |
|
|
442 | dump_object2 (op); |
|
|
443 | } |
|
|
444 | |
367 | |
445 | void |
368 | object_freezer freezer; |
446 | dump_all_objects (void) |
369 | save_object (freezer, op, 1); |
447 | { |
370 | return freezer.as_string (); |
448 | object *op; |
|
|
449 | |
|
|
450 | for (op = object::first; op != NULL; op = op->next) |
|
|
451 | { |
|
|
452 | dump_object (op); |
|
|
453 | fprintf (logfile, "Object %s\n", errmsg); |
|
|
454 | } |
|
|
455 | } |
371 | } |
456 | |
372 | |
457 | /* |
373 | /* |
458 | * get_nearest_part(multi-object, object 2) returns the part of the |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
459 | * multi-object 1 which is closest to the second object. |
375 | * multi-object 1 which is closest to the second object. |
… | |
… | |
479 | */ |
395 | */ |
480 | |
396 | |
481 | object * |
397 | object * |
482 | find_object (tag_t i) |
398 | find_object (tag_t i) |
483 | { |
399 | { |
484 | object *op; |
|
|
485 | |
|
|
486 | for (op = object::first; op != NULL; op = op->next) |
400 | for (object *op = object::first; op; op = op->next) |
487 | if (op->count == i) |
401 | if (op->count == i) |
488 | break; |
402 | return op; |
489 | |
403 | |
490 | return op; |
404 | return 0; |
491 | } |
405 | } |
492 | |
406 | |
493 | /* |
407 | /* |
494 | * Returns the first object which has a name equal to the argument. |
408 | * Returns the first object which has a name equal to the argument. |
495 | * Used only by the patch command, but not all that useful. |
409 | * Used only by the patch command, but not all that useful. |
… | |
… | |
553 | } |
467 | } |
554 | |
468 | |
555 | op->key_values = 0; |
469 | op->key_values = 0; |
556 | } |
470 | } |
557 | |
471 | |
558 | void object::clear () |
|
|
559 | { |
|
|
560 | attachable_base::clear (); |
|
|
561 | |
|
|
562 | free_key_values (this); |
|
|
563 | |
|
|
564 | owner = 0; |
|
|
565 | name = 0; |
|
|
566 | name_pl = 0; |
|
|
567 | title = 0; |
|
|
568 | race = 0; |
|
|
569 | slaying = 0; |
|
|
570 | skill = 0; |
|
|
571 | msg = 0; |
|
|
572 | lore = 0; |
|
|
573 | custom_name = 0; |
|
|
574 | materialname = 0; |
|
|
575 | contr = 0; |
|
|
576 | below = 0; |
|
|
577 | above = 0; |
|
|
578 | inv = 0; |
|
|
579 | container = 0; |
|
|
580 | env = 0; |
|
|
581 | more = 0; |
|
|
582 | head = 0; |
|
|
583 | map = 0; |
|
|
584 | active_next = 0; |
|
|
585 | active_prev = 0; |
|
|
586 | |
|
|
587 | memset (static_cast<object_pod *>(this), 0, sizeof (object_pod)); |
|
|
588 | |
|
|
589 | SET_FLAG (this, FLAG_REMOVED); |
|
|
590 | |
|
|
591 | /* What is not cleared is next, prev, and count */ |
|
|
592 | |
|
|
593 | expmul = 1.0; |
|
|
594 | face = blank_face; |
|
|
595 | |
|
|
596 | if (settings.casting_time) |
|
|
597 | casting_time = -1; |
|
|
598 | } |
|
|
599 | |
|
|
600 | void object::clone (object *destination) |
|
|
601 | { |
|
|
602 | *(object_copy *)destination = *this; |
|
|
603 | *(object_pod *)destination = *this; |
|
|
604 | |
|
|
605 | if (self || cb) |
|
|
606 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
607 | } |
|
|
608 | |
|
|
609 | /* |
472 | /* |
610 | * copy object first frees everything allocated by the second object, |
473 | * copy_to first frees everything allocated by the dst object, |
611 | * and then copies the contends of the first object into the second |
474 | * and then copies the contents of itself into the second |
612 | * object, allocating what needs to be allocated. Basically, any |
475 | * object, allocating what needs to be allocated. Basically, any |
613 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
476 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
614 | * if the first object is freed, the pointers in the new object |
477 | * if the first object is freed, the pointers in the new object |
615 | * will point at garbage. |
478 | * will point at garbage. |
616 | */ |
479 | */ |
617 | void |
480 | void |
618 | copy_object (object *op2, object *op) |
481 | object::copy_to (object *dst) |
619 | { |
482 | { |
620 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
483 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
621 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
484 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
622 | |
485 | |
623 | op2->clone (op); |
486 | *(object_copy *)dst = *this; |
624 | |
487 | |
625 | if (is_freed) |
488 | if (is_freed) |
626 | SET_FLAG (op, FLAG_FREED); |
489 | SET_FLAG (dst, FLAG_FREED); |
|
|
490 | |
627 | if (is_removed) |
491 | if (is_removed) |
628 | SET_FLAG (op, FLAG_REMOVED); |
492 | SET_FLAG (dst, FLAG_REMOVED); |
629 | |
493 | |
630 | if (op2->speed < 0) |
494 | if (speed < 0) |
631 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
495 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
632 | |
496 | |
633 | /* Copy over key_values, if any. */ |
497 | /* Copy over key_values, if any. */ |
634 | if (op2->key_values) |
498 | if (key_values) |
635 | { |
499 | { |
636 | key_value *tail = 0; |
500 | key_value *tail = 0; |
637 | key_value *i; |
501 | key_value *i; |
638 | |
502 | |
639 | op->key_values = 0; |
503 | dst->key_values = 0; |
640 | |
504 | |
641 | for (i = op2->key_values; i; i = i->next) |
505 | for (i = key_values; i; i = i->next) |
642 | { |
506 | { |
643 | key_value *new_link = new key_value; |
507 | key_value *new_link = new key_value; |
644 | |
508 | |
645 | new_link->next = 0; |
509 | new_link->next = 0; |
646 | new_link->key = i->key; |
510 | new_link->key = i->key; |
647 | new_link->value = i->value; |
511 | new_link->value = i->value; |
648 | |
512 | |
649 | /* Try and be clever here, too. */ |
513 | /* Try and be clever here, too. */ |
650 | if (!op->key_values) |
514 | if (!dst->key_values) |
651 | { |
515 | { |
652 | op->key_values = new_link; |
516 | dst->key_values = new_link; |
653 | tail = new_link; |
517 | tail = new_link; |
654 | } |
518 | } |
655 | else |
519 | else |
656 | { |
520 | { |
657 | tail->next = new_link; |
521 | tail->next = new_link; |
658 | tail = new_link; |
522 | tail = new_link; |
659 | } |
523 | } |
660 | } |
524 | } |
661 | } |
525 | } |
662 | |
526 | |
663 | update_ob_speed (op); |
527 | update_ob_speed (dst); |
|
|
528 | } |
|
|
529 | |
|
|
530 | object * |
|
|
531 | object::clone () |
|
|
532 | { |
|
|
533 | object *neu = create (); |
|
|
534 | copy_to (neu); |
|
|
535 | return neu; |
664 | } |
536 | } |
665 | |
537 | |
666 | /* |
538 | /* |
667 | * If an object with the IS_TURNABLE() flag needs to be turned due |
539 | * If an object with the IS_TURNABLE() flag needs to be turned due |
668 | * to the closest player being on the other side, this function can |
540 | * to the closest player being on the other side, this function can |
… | |
… | |
689 | extern int arch_init; |
561 | extern int arch_init; |
690 | |
562 | |
691 | /* No reason putting the archetypes objects on the speed list, |
563 | /* No reason putting the archetypes objects on the speed list, |
692 | * since they never really need to be updated. |
564 | * since they never really need to be updated. |
693 | */ |
565 | */ |
694 | |
|
|
695 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
566 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
696 | { |
567 | { |
697 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
568 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
698 | #ifdef MANY_CORES |
|
|
699 | abort (); |
|
|
700 | #else |
|
|
701 | op->speed = 0; |
569 | op->speed = 0; |
702 | #endif |
|
|
703 | } |
570 | } |
704 | |
571 | |
705 | if (arch_init) |
572 | if (arch_init) |
706 | return; |
573 | return; |
707 | |
574 | |
… | |
… | |
776 | op->active_next = NULL; |
643 | op->active_next = NULL; |
777 | op->active_prev = NULL; |
644 | op->active_prev = NULL; |
778 | } |
645 | } |
779 | |
646 | |
780 | /* |
647 | /* |
781 | * update_object() updates the array which represents the map. |
648 | * update_object() updates the the map. |
782 | * It takes into account invisible objects (and represent squares covered |
649 | * It takes into account invisible objects (and represent squares covered |
783 | * by invisible objects by whatever is below them (unless it's another |
650 | * by invisible objects by whatever is below them (unless it's another |
784 | * invisible object, etc...) |
651 | * invisible object, etc...) |
785 | * If the object being updated is beneath a player, the look-window |
652 | * If the object being updated is beneath a player, the look-window |
786 | * of that player is updated (this might be a suboptimal way of |
653 | * of that player is updated (this might be a suboptimal way of |
787 | * updating that window, though, since update_object() is called _often_) |
654 | * updating that window, though, since update_object() is called _often_) |
788 | * |
655 | * |
789 | * action is a hint of what the caller believes need to be done. |
656 | * action is a hint of what the caller believes need to be done. |
790 | * For example, if the only thing that has changed is the face (due to |
|
|
791 | * an animation), we don't need to call update_position until that actually |
|
|
792 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
793 | * of walls or living creatures may need us to update the flags now. |
|
|
794 | * current action are: |
657 | * current action are: |
795 | * UP_OBJ_INSERT: op was inserted |
658 | * UP_OBJ_INSERT: op was inserted |
796 | * UP_OBJ_REMOVE: op was removed |
659 | * UP_OBJ_REMOVE: op was removed |
797 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
660 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
798 | * as that is easier than trying to look at what may have changed. |
661 | * as that is easier than trying to look at what may have changed. |
799 | * UP_OBJ_FACE: only the objects face has changed. |
662 | * UP_OBJ_FACE: only the objects face has changed. |
800 | */ |
663 | */ |
801 | |
|
|
802 | void |
664 | void |
803 | update_object (object *op, int action) |
665 | update_object (object *op, int action) |
804 | { |
666 | { |
805 | int update_now = 0, flags; |
|
|
806 | MoveType move_on, move_off, move_block, move_slow; |
667 | MoveType move_on, move_off, move_block, move_slow; |
807 | |
668 | |
808 | if (op == NULL) |
669 | if (op == NULL) |
809 | { |
670 | { |
810 | /* this should never happen */ |
671 | /* this should never happen */ |
811 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
672 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
812 | return; |
673 | return; |
813 | } |
674 | } |
814 | |
675 | |
815 | if (op->env != NULL) |
676 | if (op->env) |
816 | { |
677 | { |
817 | /* Animation is currently handled by client, so nothing |
678 | /* Animation is currently handled by client, so nothing |
818 | * to do in this case. |
679 | * to do in this case. |
819 | */ |
680 | */ |
820 | return; |
681 | return; |
… | |
… | |
825 | */ |
686 | */ |
826 | if (!op->map || op->map->in_memory == MAP_SAVING) |
687 | if (!op->map || op->map->in_memory == MAP_SAVING) |
827 | return; |
688 | return; |
828 | |
689 | |
829 | /* make sure the object is within map boundaries */ |
690 | /* make sure the object is within map boundaries */ |
830 | if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) |
691 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
831 | { |
692 | { |
832 | LOG (llevError, "update_object() called for object out of map!\n"); |
693 | LOG (llevError, "update_object() called for object out of map!\n"); |
833 | #ifdef MANY_CORES |
694 | #ifdef MANY_CORES |
834 | abort (); |
695 | abort (); |
835 | #endif |
696 | #endif |
836 | return; |
697 | return; |
837 | } |
698 | } |
838 | |
699 | |
839 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
700 | mapspace &m = op->ms (); |
840 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
841 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
842 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
843 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
844 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
845 | |
701 | |
|
|
702 | if (m.flags_ & P_NEED_UPDATE) |
|
|
703 | /* nop */; |
846 | if (action == UP_OBJ_INSERT) |
704 | else if (action == UP_OBJ_INSERT) |
847 | { |
705 | { |
|
|
706 | // this is likely overkill, TODO: revisit (schmorp) |
848 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
707 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
849 | update_now = 1; |
|
|
850 | |
|
|
851 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
708 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
852 | update_now = 1; |
709 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
853 | |
710 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
711 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
854 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
712 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
855 | update_now = 1; |
|
|
856 | |
|
|
857 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
858 | update_now = 1; |
|
|
859 | |
|
|
860 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
861 | update_now = 1; |
|
|
862 | |
|
|
863 | if ((move_on | op->move_on) != move_on) |
713 | || (m.move_on | op->move_on ) != m.move_on |
864 | update_now = 1; |
|
|
865 | |
|
|
866 | if ((move_off | op->move_off) != move_off) |
714 | || (m.move_off | op->move_off ) != m.move_off |
867 | update_now = 1; |
715 | || (m.move_slow | op->move_slow) != m.move_slow |
868 | |
|
|
869 | /* This isn't perfect, but I don't expect a lot of objects to |
716 | /* This isn't perfect, but I don't expect a lot of objects to |
870 | * to have move_allow right now. |
717 | * to have move_allow right now. |
871 | */ |
718 | */ |
872 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
719 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
873 | update_now = 1; |
720 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
874 | |
721 | m.flags_ = P_NEED_UPDATE; |
875 | if ((move_slow | op->move_slow) != move_slow) |
|
|
876 | update_now = 1; |
|
|
877 | } |
722 | } |
878 | /* if the object is being removed, we can't make intelligent |
723 | /* if the object is being removed, we can't make intelligent |
879 | * decisions, because remove_ob can't really pass the object |
724 | * decisions, because remove_ob can't really pass the object |
880 | * that is being removed. |
725 | * that is being removed. |
881 | */ |
726 | */ |
882 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
727 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
883 | update_now = 1; |
728 | m.flags_ = P_NEED_UPDATE; |
884 | else if (action == UP_OBJ_FACE) |
729 | else if (action == UP_OBJ_FACE) |
885 | /* Nothing to do for that case */ ; |
730 | /* Nothing to do for that case */ ; |
886 | else |
731 | else |
887 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
732 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
888 | |
733 | |
889 | if (update_now) |
|
|
890 | { |
|
|
891 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
892 | update_position (op->map, op->x, op->y); |
|
|
893 | } |
|
|
894 | |
|
|
895 | if (op->more != NULL) |
734 | if (op->more) |
896 | update_object (op->more, action); |
735 | update_object (op->more, action); |
897 | } |
736 | } |
898 | |
737 | |
899 | object::vector object::mortals; |
|
|
900 | object::vector object::objects; // not yet used |
738 | object::vector object::objects; // not yet used |
901 | object *object::first; |
739 | object *object::first; |
902 | |
|
|
903 | void object::free_mortals () |
|
|
904 | { |
|
|
905 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
|
|
906 | if ((*i)->refcnt) |
|
|
907 | ++i; // further delay freeing |
|
|
908 | else |
|
|
909 | { |
|
|
910 | delete *i; |
|
|
911 | mortals.erase (i); |
|
|
912 | } |
|
|
913 | |
|
|
914 | static int lastmortals = 0;//D |
|
|
915 | |
|
|
916 | if (mortals.size() != lastmortals && lastmortals > 100)//D |
|
|
917 | { |
|
|
918 | lastmortals = mortals.size ();//D |
|
|
919 | LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D |
|
|
920 | } |
|
|
921 | } |
|
|
922 | |
740 | |
923 | object::object () |
741 | object::object () |
924 | { |
742 | { |
925 | SET_FLAG (this, FLAG_REMOVED); |
743 | SET_FLAG (this, FLAG_REMOVED); |
926 | |
744 | |
… | |
… | |
972 | * it from the list of used objects, and puts it on the list of |
790 | * it from the list of used objects, and puts it on the list of |
973 | * free objects. The IS_FREED() flag is set in the object. |
791 | * free objects. The IS_FREED() flag is set in the object. |
974 | * The object must have been removed by remove_ob() first for |
792 | * The object must have been removed by remove_ob() first for |
975 | * this function to succeed. |
793 | * this function to succeed. |
976 | * |
794 | * |
977 | * If free_inventory is set, free inventory as well. Else drop items in |
795 | * If destroy_inventory is set, free inventory as well. Else drop items in |
978 | * inventory to the ground. |
796 | * inventory to the ground. |
979 | */ |
797 | */ |
980 | void object::free (bool free_inventory) |
798 | void |
|
|
799 | object::do_destroy () |
981 | { |
800 | { |
982 | if (QUERY_FLAG (this, FLAG_FREED)) |
801 | attachable::do_destroy (); |
|
|
802 | |
|
|
803 | if (flag [FLAG_IS_LINKED]) |
|
|
804 | remove_button_link (this); |
|
|
805 | |
|
|
806 | if (flag [FLAG_FRIENDLY]) |
|
|
807 | remove_friendly_object (this); |
|
|
808 | |
|
|
809 | if (!flag [FLAG_REMOVED]) |
|
|
810 | remove (); |
|
|
811 | |
|
|
812 | if (flag [FLAG_FREED]) |
983 | return; |
813 | return; |
984 | |
814 | |
985 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
815 | flag [FLAG_FREED] = 1; |
986 | remove_friendly_object (this); |
|
|
987 | |
816 | |
988 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
817 | // hack to ensure that freed objects still have a valid map |
989 | remove_ob (this); |
|
|
990 | |
|
|
991 | SET_FLAG (this, FLAG_FREED); |
|
|
992 | |
|
|
993 | if (more) |
|
|
994 | { |
818 | { |
995 | more->free (free_inventory); |
819 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
996 | more = 0; |
|
|
997 | } |
|
|
998 | |
820 | |
999 | if (inv) |
821 | if (!freed_map) |
1000 | { |
|
|
1001 | /* Only if the space blocks everything do we not process - |
|
|
1002 | * if some form of movement is allowed, let objects |
|
|
1003 | * drop on that space. |
|
|
1004 | */ |
|
|
1005 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
1006 | { |
822 | { |
1007 | object *op = inv; |
823 | freed_map = new maptile; |
1008 | |
824 | |
1009 | while (op) |
825 | freed_map->name = "/internal/freed_objects_map"; |
1010 | { |
826 | freed_map->width = 3; |
1011 | object *tmp = op->below; |
827 | freed_map->height = 3; |
1012 | op->free (free_inventory); |
828 | |
1013 | op = tmp; |
829 | freed_map->allocate (); |
1014 | } |
|
|
1015 | } |
830 | } |
1016 | else |
|
|
1017 | { /* Put objects in inventory onto this space */ |
|
|
1018 | object *op = inv; |
|
|
1019 | |
831 | |
1020 | while (op) |
832 | map = freed_map; |
1021 | { |
833 | x = 1; |
1022 | object *tmp = op->below; |
834 | y = 1; |
1023 | |
|
|
1024 | remove_ob (op); |
|
|
1025 | |
|
|
1026 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
|
|
1027 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
|
|
1028 | free_object (op); |
|
|
1029 | else |
|
|
1030 | { |
|
|
1031 | op->x = x; |
|
|
1032 | op->y = y; |
|
|
1033 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
1034 | } |
|
|
1035 | |
|
|
1036 | op = tmp; |
|
|
1037 | } |
|
|
1038 | } |
|
|
1039 | } |
835 | } |
|
|
836 | |
|
|
837 | more = 0; |
|
|
838 | head = 0; |
|
|
839 | inv = 0; |
1040 | |
840 | |
1041 | // clear those pointers that likely might have circular references to us |
841 | // clear those pointers that likely might have circular references to us |
1042 | owner = 0; |
842 | owner = 0; |
1043 | enemy = 0; |
843 | enemy = 0; |
1044 | attacked_by = 0; |
844 | attacked_by = 0; |
1045 | |
845 | |
|
|
846 | // only relevant for players(?), but make sure of it anyways |
|
|
847 | contr = 0; |
|
|
848 | |
1046 | /* Remove object from the active list */ |
849 | /* Remove object from the active list */ |
1047 | speed = 0; |
850 | speed = 0; |
1048 | update_ob_speed (this); |
851 | update_ob_speed (this); |
1049 | |
852 | |
1050 | unlink (); |
853 | unlink (); |
|
|
854 | } |
1051 | |
855 | |
1052 | mortals.push_back (this); |
856 | /* |
|
|
857 | * Remove and free all objects in the inventory of the given object. |
|
|
858 | * object.c ? |
|
|
859 | */ |
|
|
860 | void |
|
|
861 | object::destroy_inv (bool drop_to_ground) |
|
|
862 | { |
|
|
863 | if (!inv) |
|
|
864 | return; |
|
|
865 | |
|
|
866 | /* Only if the space blocks everything do we not process - |
|
|
867 | * if some form of movement is allowed, let objects |
|
|
868 | * drop on that space. |
|
|
869 | */ |
|
|
870 | if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
871 | { |
|
|
872 | while (inv) |
|
|
873 | { |
|
|
874 | inv->destroy_inv (drop_to_ground); |
|
|
875 | inv->destroy (); |
|
|
876 | } |
|
|
877 | } |
|
|
878 | else |
|
|
879 | { /* Put objects in inventory onto this space */ |
|
|
880 | while (inv) |
|
|
881 | { |
|
|
882 | object *op = inv; |
|
|
883 | |
|
|
884 | if (op->flag [FLAG_STARTEQUIP] |
|
|
885 | || op->flag [FLAG_NO_DROP] |
|
|
886 | || op->type == RUNE |
|
|
887 | || op->type == TRAP |
|
|
888 | || op->flag [FLAG_IS_A_TEMPLATE]) |
|
|
889 | op->destroy (); |
|
|
890 | else |
|
|
891 | { |
|
|
892 | op->remove (); |
|
|
893 | op->x = x; |
|
|
894 | op->y = y; |
|
|
895 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
896 | } |
|
|
897 | } |
|
|
898 | } |
|
|
899 | } |
|
|
900 | |
|
|
901 | void |
|
|
902 | object::destroy (bool destroy_inventory) |
|
|
903 | { |
|
|
904 | if (destroyed ()) |
|
|
905 | return; |
|
|
906 | |
|
|
907 | if (more) |
|
|
908 | { |
|
|
909 | //TODO: non-head objects must not have inventory |
|
|
910 | more->destroy (destroy_inventory); |
|
|
911 | more = 0; |
|
|
912 | } |
|
|
913 | |
|
|
914 | if (destroy_inventory) |
|
|
915 | destroy_inv (true); |
|
|
916 | |
|
|
917 | attachable::destroy (); |
1053 | } |
918 | } |
1054 | |
919 | |
1055 | /* |
920 | /* |
1056 | * sub_weight() recursively (outwards) subtracts a number from the |
921 | * sub_weight() recursively (outwards) subtracts a number from the |
1057 | * weight of an object (and what is carried by it's environment(s)). |
922 | * weight of an object (and what is carried by it's environment(s)). |
1058 | */ |
923 | */ |
1059 | |
|
|
1060 | void |
924 | void |
1061 | sub_weight (object *op, signed long weight) |
925 | sub_weight (object *op, signed long weight) |
1062 | { |
926 | { |
1063 | while (op != NULL) |
927 | while (op != NULL) |
1064 | { |
928 | { |
… | |
… | |
1068 | op->carrying -= weight; |
932 | op->carrying -= weight; |
1069 | op = op->env; |
933 | op = op->env; |
1070 | } |
934 | } |
1071 | } |
935 | } |
1072 | |
936 | |
1073 | /* remove_ob(op): |
937 | /* op->remove (): |
1074 | * This function removes the object op from the linked list of objects |
938 | * This function removes the object op from the linked list of objects |
1075 | * which it is currently tied to. When this function is done, the |
939 | * which it is currently tied to. When this function is done, the |
1076 | * object will have no environment. If the object previously had an |
940 | * object will have no environment. If the object previously had an |
1077 | * environment, the x and y coordinates will be updated to |
941 | * environment, the x and y coordinates will be updated to |
1078 | * the previous environment. |
942 | * the previous environment. |
1079 | * Beware: This function is called from the editor as well! |
943 | * Beware: This function is called from the editor as well! |
1080 | */ |
944 | */ |
1081 | |
|
|
1082 | void |
945 | void |
1083 | remove_ob (object *op) |
946 | object::remove () |
1084 | { |
947 | { |
1085 | object *tmp, *last = 0; |
948 | object *tmp, *last = 0; |
1086 | object *otmp; |
949 | object *otmp; |
1087 | |
950 | |
1088 | int check_walk_off; |
|
|
1089 | maptile *m; |
|
|
1090 | |
|
|
1091 | sint16 x, y; |
|
|
1092 | |
|
|
1093 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
951 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1094 | return; |
952 | return; |
1095 | |
953 | |
1096 | SET_FLAG (op, FLAG_REMOVED); |
954 | SET_FLAG (this, FLAG_REMOVED); |
|
|
955 | INVOKE_OBJECT (REMOVE, this); |
1097 | |
956 | |
1098 | if (op->more != NULL) |
957 | if (more) |
1099 | remove_ob (op->more); |
958 | more->remove (); |
1100 | |
959 | |
1101 | /* |
960 | /* |
1102 | * In this case, the object to be removed is in someones |
961 | * In this case, the object to be removed is in someones |
1103 | * inventory. |
962 | * inventory. |
1104 | */ |
963 | */ |
1105 | if (op->env != NULL) |
964 | if (env) |
1106 | { |
965 | { |
1107 | if (op->nrof) |
966 | if (nrof) |
1108 | sub_weight (op->env, op->weight * op->nrof); |
967 | sub_weight (env, weight * nrof); |
1109 | else |
968 | else |
1110 | sub_weight (op->env, op->weight + op->carrying); |
969 | sub_weight (env, weight + carrying); |
1111 | |
970 | |
1112 | /* NO_FIX_PLAYER is set when a great many changes are being |
971 | /* NO_FIX_PLAYER is set when a great many changes are being |
1113 | * made to players inventory. If set, avoiding the call |
972 | * made to players inventory. If set, avoiding the call |
1114 | * to save cpu time. |
973 | * to save cpu time. |
1115 | */ |
974 | */ |
1116 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
975 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1117 | fix_player (otmp); |
976 | otmp->update_stats (); |
1118 | |
977 | |
1119 | if (op->above != NULL) |
978 | if (above != NULL) |
1120 | op->above->below = op->below; |
979 | above->below = below; |
1121 | else |
980 | else |
1122 | op->env->inv = op->below; |
981 | env->inv = below; |
1123 | |
982 | |
1124 | if (op->below != NULL) |
983 | if (below != NULL) |
1125 | op->below->above = op->above; |
984 | below->above = above; |
1126 | |
985 | |
1127 | /* we set up values so that it could be inserted into |
986 | /* we set up values so that it could be inserted into |
1128 | * the map, but we don't actually do that - it is up |
987 | * the map, but we don't actually do that - it is up |
1129 | * to the caller to decide what we want to do. |
988 | * to the caller to decide what we want to do. |
1130 | */ |
989 | */ |
1131 | op->x = op->env->x, op->y = op->env->y; |
990 | x = env->x, y = env->y; |
1132 | op->map = op->env->map; |
991 | map = env->map; |
1133 | op->above = NULL, op->below = NULL; |
992 | above = 0, below = 0; |
1134 | op->env = NULL; |
993 | env = 0; |
1135 | } |
994 | } |
1136 | else if (op->map) |
995 | else if (map) |
1137 | { |
996 | { |
1138 | x = op->x; |
|
|
1139 | y = op->y; |
|
|
1140 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1141 | |
|
|
1142 | if (!m) |
|
|
1143 | { |
|
|
1144 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1145 | op->map->path, op->x, op->y); |
|
|
1146 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1147 | * it seems if we get into this case, something is probablye |
|
|
1148 | * screwed up and should be fixed. |
|
|
1149 | */ |
|
|
1150 | abort (); |
|
|
1151 | } |
|
|
1152 | |
|
|
1153 | if (op->map != m) |
|
|
1154 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1155 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1156 | |
|
|
1157 | /* Re did the following section of code - it looks like it had |
997 | /* Re did the following section of code - it looks like it had |
1158 | * lots of logic for things we no longer care about |
998 | * lots of logic for things we no longer care about |
1159 | */ |
999 | */ |
1160 | |
1000 | |
1161 | /* link the object above us */ |
1001 | /* link the object above us */ |
1162 | if (op->above) |
1002 | if (above) |
1163 | op->above->below = op->below; |
1003 | above->below = below; |
1164 | else |
1004 | else |
1165 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1005 | map->at (x, y).top = below; /* we were top, set new top */ |
1166 | |
1006 | |
1167 | /* Relink the object below us, if there is one */ |
1007 | /* Relink the object below us, if there is one */ |
1168 | if (op->below) |
1008 | if (below) |
1169 | op->below->above = op->above; |
1009 | below->above = above; |
1170 | else |
1010 | else |
1171 | { |
1011 | { |
1172 | /* Nothing below, which means we need to relink map object for this space |
1012 | /* Nothing below, which means we need to relink map object for this space |
1173 | * use translated coordinates in case some oddness with map tiling is |
1013 | * use translated coordinates in case some oddness with map tiling is |
1174 | * evident |
1014 | * evident |
1175 | */ |
1015 | */ |
1176 | if (GET_MAP_OB (m, x, y) != op) |
1016 | if (GET_MAP_OB (map, x, y) != this) |
1177 | { |
1017 | { |
1178 | dump_object (op); |
1018 | char *dump = dump_object (this); |
1179 | LOG (llevError, |
1019 | LOG (llevError, |
1180 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
1020 | "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); |
|
|
1021 | free (dump); |
1181 | dump_object (GET_MAP_OB (m, x, y)); |
1022 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1182 | LOG (llevError, "%s\n", errmsg); |
1023 | LOG (llevError, "%s\n", dump); |
|
|
1024 | free (dump); |
1183 | } |
1025 | } |
1184 | |
1026 | |
1185 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1027 | map->at (x, y).bot = above; /* goes on above it. */ |
1186 | } |
1028 | } |
1187 | |
1029 | |
1188 | op->above = 0; |
1030 | above = 0; |
1189 | op->below = 0; |
1031 | below = 0; |
1190 | |
1032 | |
1191 | if (op->map->in_memory == MAP_SAVING) |
1033 | if (map->in_memory == MAP_SAVING) |
1192 | return; |
1034 | return; |
1193 | |
1035 | |
1194 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
1036 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1195 | |
1037 | |
1196 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1038 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1197 | { |
1039 | { |
1198 | /* No point updating the players look faces if he is the object |
1040 | /* No point updating the players look faces if he is the object |
1199 | * being removed. |
1041 | * being removed. |
1200 | */ |
1042 | */ |
1201 | |
1043 | |
1202 | if (tmp->type == PLAYER && tmp != op) |
1044 | if (tmp->type == PLAYER && tmp != this) |
1203 | { |
1045 | { |
1204 | /* If a container that the player is currently using somehow gets |
1046 | /* If a container that the player is currently using somehow gets |
1205 | * removed (most likely destroyed), update the player view |
1047 | * removed (most likely destroyed), update the player view |
1206 | * appropriately. |
1048 | * appropriately. |
1207 | */ |
1049 | */ |
1208 | if (tmp->container == op) |
1050 | if (tmp->container == this) |
1209 | { |
1051 | { |
1210 | CLEAR_FLAG (op, FLAG_APPLIED); |
1052 | flag [FLAG_APPLIED] = 0; |
1211 | tmp->container = NULL; |
1053 | tmp->container = 0; |
1212 | } |
1054 | } |
1213 | |
1055 | |
1214 | tmp->contr->socket.update_look = 1; |
1056 | if (tmp->contr->ns) |
|
|
1057 | tmp->contr->ns->floorbox_update (); |
1215 | } |
1058 | } |
1216 | |
1059 | |
1217 | /* See if player moving off should effect something */ |
1060 | /* See if player moving off should effect something */ |
1218 | if (check_walk_off |
1061 | if (check_walk_off |
1219 | && ((op->move_type & tmp->move_off) |
1062 | && ((move_type & tmp->move_off) |
1220 | && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1063 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1221 | { |
1064 | { |
1222 | move_apply (tmp, op, NULL); |
1065 | move_apply (tmp, this, 0); |
1223 | |
1066 | |
1224 | if (op->destroyed ()) |
1067 | if (destroyed ()) |
1225 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1068 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1226 | } |
1069 | } |
1227 | |
1070 | |
1228 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1071 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1229 | |
1072 | |
1230 | if (tmp->above == tmp) |
1073 | if (tmp->above == tmp) |
1231 | tmp->above = NULL; |
1074 | tmp->above = 0; |
1232 | |
1075 | |
1233 | last = tmp; |
1076 | last = tmp; |
1234 | } |
1077 | } |
1235 | |
1078 | |
1236 | /* last == NULL of there are no objects on this space */ |
1079 | /* last == NULL of there are no objects on this space */ |
1237 | if (last == NULL) |
1080 | if (!last) |
1238 | { |
1081 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1239 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1240 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1241 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1242 | * be correct anyways. |
|
|
1243 | */ |
|
|
1244 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
|
|
1245 | update_position (op->map, op->x, op->y); |
|
|
1246 | } |
|
|
1247 | else |
1082 | else |
1248 | update_object (last, UP_OBJ_REMOVE); |
1083 | update_object (last, UP_OBJ_REMOVE); |
1249 | |
1084 | |
1250 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1085 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1251 | update_all_los (op->map, op->x, op->y); |
1086 | update_all_los (map, x, y); |
1252 | } |
1087 | } |
1253 | } |
1088 | } |
1254 | |
1089 | |
1255 | /* |
1090 | /* |
1256 | * merge_ob(op,top): |
1091 | * merge_ob(op,top): |
… | |
… | |
1264 | merge_ob (object *op, object *top) |
1099 | merge_ob (object *op, object *top) |
1265 | { |
1100 | { |
1266 | if (!op->nrof) |
1101 | if (!op->nrof) |
1267 | return 0; |
1102 | return 0; |
1268 | |
1103 | |
1269 | if (top == NULL) |
1104 | if (top) |
1270 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1105 | for (top = op; top && top->above; top = top->above) |
|
|
1106 | ; |
1271 | |
1107 | |
1272 | for (; top != NULL; top = top->below) |
1108 | for (; top; top = top->below) |
1273 | { |
1109 | { |
1274 | if (top == op) |
1110 | if (top == op) |
1275 | continue; |
1111 | continue; |
1276 | if (CAN_MERGE (op, top)) |
1112 | |
|
|
1113 | if (object::can_merge (op, top)) |
1277 | { |
1114 | { |
1278 | top->nrof += op->nrof; |
1115 | top->nrof += op->nrof; |
1279 | |
1116 | |
1280 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1117 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1281 | op->weight = 0; /* Don't want any adjustements now */ |
1118 | op->weight = 0; /* Don't want any adjustements now */ |
1282 | remove_ob (op); |
1119 | op->destroy (); |
1283 | free_object (op); |
|
|
1284 | return top; |
1120 | return top; |
1285 | } |
1121 | } |
1286 | } |
1122 | } |
1287 | |
1123 | |
1288 | return 0; |
1124 | return 0; |
… | |
… | |
1327 | * Return value: |
1163 | * Return value: |
1328 | * new object if 'op' was merged with other object |
1164 | * new object if 'op' was merged with other object |
1329 | * NULL if 'op' was destroyed |
1165 | * NULL if 'op' was destroyed |
1330 | * just 'op' otherwise |
1166 | * just 'op' otherwise |
1331 | */ |
1167 | */ |
1332 | |
|
|
1333 | object * |
1168 | object * |
1334 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1169 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1335 | { |
1170 | { |
1336 | object *tmp, *top, *floor = NULL; |
1171 | object *tmp, *top, *floor = NULL; |
1337 | sint16 x, y; |
1172 | sint16 x, y; |
… | |
… | |
1342 | return NULL; |
1177 | return NULL; |
1343 | } |
1178 | } |
1344 | |
1179 | |
1345 | if (m == NULL) |
1180 | if (m == NULL) |
1346 | { |
1181 | { |
1347 | dump_object (op); |
1182 | char *dump = dump_object (op); |
1348 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1183 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1184 | free (dump); |
1349 | return op; |
1185 | return op; |
1350 | } |
1186 | } |
1351 | |
1187 | |
1352 | if (out_of_map (m, op->x, op->y)) |
1188 | if (out_of_map (m, op->x, op->y)) |
1353 | { |
1189 | { |
1354 | dump_object (op); |
1190 | char *dump = dump_object (op); |
1355 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1191 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1356 | #ifdef MANY_CORES |
1192 | #ifdef MANY_CORES |
1357 | /* Better to catch this here, as otherwise the next use of this object |
1193 | /* Better to catch this here, as otherwise the next use of this object |
1358 | * is likely to cause a crash. Better to find out where it is getting |
1194 | * is likely to cause a crash. Better to find out where it is getting |
1359 | * improperly inserted. |
1195 | * improperly inserted. |
1360 | */ |
1196 | */ |
1361 | abort (); |
1197 | abort (); |
1362 | #endif |
1198 | #endif |
|
|
1199 | free (dump); |
1363 | return op; |
1200 | return op; |
1364 | } |
1201 | } |
1365 | |
1202 | |
1366 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1203 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1367 | { |
1204 | { |
1368 | dump_object (op); |
1205 | char *dump = dump_object (op); |
1369 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1206 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1207 | free (dump); |
1370 | return op; |
1208 | return op; |
1371 | } |
1209 | } |
1372 | |
1210 | |
1373 | if (op->more != NULL) |
1211 | if (op->more) |
1374 | { |
1212 | { |
1375 | /* The part may be on a different map. */ |
1213 | /* The part may be on a different map. */ |
1376 | |
1214 | |
1377 | object *more = op->more; |
1215 | object *more = op->more; |
1378 | |
1216 | |
… | |
… | |
1394 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1232 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1395 | { |
1233 | { |
1396 | if (!op->head) |
1234 | if (!op->head) |
1397 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1235 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1398 | |
1236 | |
1399 | return NULL; |
1237 | return 0; |
1400 | } |
1238 | } |
1401 | } |
1239 | } |
1402 | |
1240 | |
1403 | CLEAR_FLAG (op, FLAG_REMOVED); |
1241 | CLEAR_FLAG (op, FLAG_REMOVED); |
1404 | |
1242 | |
… | |
… | |
1412 | |
1250 | |
1413 | /* this has to be done after we translate the coordinates. |
1251 | /* this has to be done after we translate the coordinates. |
1414 | */ |
1252 | */ |
1415 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1253 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1416 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1254 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1417 | if (CAN_MERGE (op, tmp)) |
1255 | if (object::can_merge (op, tmp)) |
1418 | { |
1256 | { |
1419 | op->nrof += tmp->nrof; |
1257 | op->nrof += tmp->nrof; |
1420 | remove_ob (tmp); |
1258 | tmp->destroy (); |
1421 | free_object (tmp); |
|
|
1422 | } |
1259 | } |
1423 | |
1260 | |
1424 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1261 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1425 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1262 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1426 | |
1263 | |
… | |
… | |
1439 | op->below = originator->below; |
1276 | op->below = originator->below; |
1440 | |
1277 | |
1441 | if (op->below) |
1278 | if (op->below) |
1442 | op->below->above = op; |
1279 | op->below->above = op; |
1443 | else |
1280 | else |
1444 | SET_MAP_OB (op->map, op->x, op->y, op); |
1281 | op->ms ().bot = op; |
1445 | |
1282 | |
1446 | /* since *below* originator, no need to update top */ |
1283 | /* since *below* originator, no need to update top */ |
1447 | originator->below = op; |
1284 | originator->below = op; |
1448 | } |
1285 | } |
1449 | else |
1286 | else |
… | |
… | |
1495 | * If INS_ON_TOP is used, don't do this processing |
1332 | * If INS_ON_TOP is used, don't do this processing |
1496 | * Need to find the object that in fact blocks view, otherwise |
1333 | * Need to find the object that in fact blocks view, otherwise |
1497 | * stacking is a bit odd. |
1334 | * stacking is a bit odd. |
1498 | */ |
1335 | */ |
1499 | if (!(flag & INS_ON_TOP) && |
1336 | if (!(flag & INS_ON_TOP) && |
1500 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1337 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1501 | { |
1338 | { |
1502 | for (last = top; last != floor; last = last->below) |
1339 | for (last = top; last != floor; last = last->below) |
1503 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1340 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1504 | break; |
1341 | break; |
1505 | /* Check to see if we found the object that blocks view, |
1342 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1528 | |
1365 | |
1529 | if (op->above) |
1366 | if (op->above) |
1530 | op->above->below = op; |
1367 | op->above->below = op; |
1531 | |
1368 | |
1532 | op->below = NULL; |
1369 | op->below = NULL; |
1533 | SET_MAP_OB (op->map, op->x, op->y, op); |
1370 | op->ms ().bot = op; |
1534 | } |
1371 | } |
1535 | else |
1372 | else |
1536 | { /* get inserted into the stack above top */ |
1373 | { /* get inserted into the stack above top */ |
1537 | op->above = top->above; |
1374 | op->above = top->above; |
1538 | |
1375 | |
… | |
… | |
1542 | op->below = top; |
1379 | op->below = top; |
1543 | top->above = op; |
1380 | top->above = op; |
1544 | } |
1381 | } |
1545 | |
1382 | |
1546 | if (op->above == NULL) |
1383 | if (op->above == NULL) |
1547 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1384 | op->ms ().top = op; |
1548 | } /* else not INS_BELOW_ORIGINATOR */ |
1385 | } /* else not INS_BELOW_ORIGINATOR */ |
1549 | |
1386 | |
1550 | if (op->type == PLAYER) |
1387 | if (op->type == PLAYER) |
1551 | op->contr->do_los = 1; |
1388 | op->contr->do_los = 1; |
1552 | |
1389 | |
1553 | /* If we have a floor, we know the player, if any, will be above |
1390 | /* If we have a floor, we know the player, if any, will be above |
1554 | * it, so save a few ticks and start from there. |
1391 | * it, so save a few ticks and start from there. |
1555 | */ |
1392 | */ |
1556 | if (!(flag & INS_MAP_LOAD)) |
1393 | if (!(flag & INS_MAP_LOAD)) |
1557 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1394 | if (object *pl = op->ms ().player ()) |
1558 | if (tmp->type == PLAYER) |
1395 | if (pl->contr->ns) |
1559 | tmp->contr->socket.update_look = 1; |
1396 | pl->contr->ns->floorbox_update (); |
1560 | |
1397 | |
1561 | /* If this object glows, it may affect lighting conditions that are |
1398 | /* If this object glows, it may affect lighting conditions that are |
1562 | * visible to others on this map. But update_all_los is really |
1399 | * visible to others on this map. But update_all_los is really |
1563 | * an inefficient way to do this, as it means los for all players |
1400 | * an inefficient way to do this, as it means los for all players |
1564 | * on the map will get recalculated. The players could very well |
1401 | * on the map will get recalculated. The players could very well |
1565 | * be far away from this change and not affected in any way - |
1402 | * be far away from this change and not affected in any way - |
1566 | * this should get redone to only look for players within range, |
1403 | * this should get redone to only look for players within range, |
1567 | * or just updating the P_NEED_UPDATE for spaces within this area |
1404 | * or just updating the P_NEED_UPDATE for spaces within this area |
1568 | * of effect may be sufficient. |
1405 | * of effect may be sufficient. |
1569 | */ |
1406 | */ |
1570 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1407 | if (op->map->darkness && (op->glow_radius != 0)) |
1571 | update_all_los (op->map, op->x, op->y); |
1408 | update_all_los (op->map, op->x, op->y); |
1572 | |
1409 | |
1573 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1410 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1574 | update_object (op, UP_OBJ_INSERT); |
1411 | update_object (op, UP_OBJ_INSERT); |
1575 | |
1412 | |
|
|
1413 | INVOKE_OBJECT (INSERT, op); |
|
|
1414 | |
1576 | /* Don't know if moving this to the end will break anything. However, |
1415 | /* Don't know if moving this to the end will break anything. However, |
1577 | * we want to have update_look set above before calling this. |
1416 | * we want to have floorbox_update called before calling this. |
1578 | * |
1417 | * |
1579 | * check_move_on() must be after this because code called from |
1418 | * check_move_on() must be after this because code called from |
1580 | * check_move_on() depends on correct map flags (so functions like |
1419 | * check_move_on() depends on correct map flags (so functions like |
1581 | * blocked() and wall() work properly), and these flags are updated by |
1420 | * blocked() and wall() work properly), and these flags are updated by |
1582 | * update_object(). |
1421 | * update_object(). |
… | |
… | |
1584 | |
1423 | |
1585 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1424 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1586 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1425 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1587 | { |
1426 | { |
1588 | if (check_move_on (op, originator)) |
1427 | if (check_move_on (op, originator)) |
1589 | return NULL; |
1428 | return 0; |
1590 | |
1429 | |
1591 | /* If we are a multi part object, lets work our way through the check |
1430 | /* If we are a multi part object, lets work our way through the check |
1592 | * walk on's. |
1431 | * walk on's. |
1593 | */ |
1432 | */ |
1594 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1433 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1595 | if (check_move_on (tmp, originator)) |
1434 | if (check_move_on (tmp, originator)) |
1596 | return NULL; |
1435 | return 0; |
1597 | } |
1436 | } |
1598 | |
1437 | |
1599 | return op; |
1438 | return op; |
1600 | } |
1439 | } |
1601 | |
1440 | |
1602 | /* this function inserts an object in the map, but if it |
1441 | /* this function inserts an object in the map, but if it |
1603 | * finds an object of its own type, it'll remove that one first. |
1442 | * finds an object of its own type, it'll remove that one first. |
1604 | * op is the object to insert it under: supplies x and the map. |
1443 | * op is the object to insert it under: supplies x and the map. |
1605 | */ |
1444 | */ |
1606 | void |
1445 | void |
1607 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1446 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1608 | { |
1447 | { |
1609 | object * |
1448 | object *tmp, *tmp1; |
1610 | tmp; |
|
|
1611 | object * |
|
|
1612 | tmp1; |
|
|
1613 | |
1449 | |
1614 | /* first search for itself and remove any old instances */ |
1450 | /* first search for itself and remove any old instances */ |
1615 | |
1451 | |
1616 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1452 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1617 | { |
|
|
1618 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1453 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1619 | { |
1454 | tmp->destroy (); |
1620 | remove_ob (tmp); |
|
|
1621 | free_object (tmp); |
|
|
1622 | } |
|
|
1623 | } |
|
|
1624 | |
1455 | |
1625 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1456 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1626 | |
1457 | |
1627 | tmp1->x = op->x; |
1458 | tmp1->x = op->x; |
1628 | tmp1->y = op->y; |
1459 | tmp1->y = op->y; |
… | |
… | |
1638 | */ |
1469 | */ |
1639 | |
1470 | |
1640 | object * |
1471 | object * |
1641 | get_split_ob (object *orig_ob, uint32 nr) |
1472 | get_split_ob (object *orig_ob, uint32 nr) |
1642 | { |
1473 | { |
1643 | object * |
1474 | object *newob; |
1644 | newob; |
|
|
1645 | int |
|
|
1646 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1475 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1647 | |
1476 | |
1648 | if (orig_ob->nrof < nr) |
1477 | if (orig_ob->nrof < nr) |
1649 | { |
1478 | { |
1650 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1479 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1651 | return NULL; |
1480 | return NULL; |
1652 | } |
1481 | } |
1653 | |
1482 | |
1654 | newob = object_create_clone (orig_ob); |
1483 | newob = object_create_clone (orig_ob); |
1655 | |
1484 | |
1656 | if ((orig_ob->nrof -= nr) < 1) |
1485 | if ((orig_ob->nrof -= nr) < 1) |
1657 | { |
1486 | orig_ob->destroy (1); |
1658 | if (!is_removed) |
|
|
1659 | remove_ob (orig_ob); |
|
|
1660 | free_object2 (orig_ob, 1); |
|
|
1661 | } |
|
|
1662 | else if (!is_removed) |
1487 | else if (!is_removed) |
1663 | { |
1488 | { |
1664 | if (orig_ob->env != NULL) |
1489 | if (orig_ob->env != NULL) |
1665 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1490 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1666 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1491 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1686 | |
1511 | |
1687 | object * |
1512 | object * |
1688 | decrease_ob_nr (object *op, uint32 i) |
1513 | decrease_ob_nr (object *op, uint32 i) |
1689 | { |
1514 | { |
1690 | object *tmp; |
1515 | object *tmp; |
1691 | player *pl; |
|
|
1692 | |
1516 | |
1693 | if (i == 0) /* objects with op->nrof require this check */ |
1517 | if (i == 0) /* objects with op->nrof require this check */ |
1694 | return op; |
1518 | return op; |
1695 | |
1519 | |
1696 | if (i > op->nrof) |
1520 | if (i > op->nrof) |
1697 | i = op->nrof; |
1521 | i = op->nrof; |
1698 | |
1522 | |
1699 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1523 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1700 | op->nrof -= i; |
1524 | op->nrof -= i; |
1701 | else if (op->env != NULL) |
1525 | else if (op->env) |
1702 | { |
1526 | { |
1703 | /* is this object in the players inventory, or sub container |
1527 | /* is this object in the players inventory, or sub container |
1704 | * therein? |
1528 | * therein? |
1705 | */ |
1529 | */ |
1706 | tmp = is_player_inv (op->env); |
1530 | tmp = op->in_player (); |
1707 | /* nope. Is this a container the player has opened? |
1531 | /* nope. Is this a container the player has opened? |
1708 | * If so, set tmp to that player. |
1532 | * If so, set tmp to that player. |
1709 | * IMO, searching through all the players will mostly |
1533 | * IMO, searching through all the players will mostly |
1710 | * likely be quicker than following op->env to the map, |
1534 | * likely be quicker than following op->env to the map, |
1711 | * and then searching the map for a player. |
1535 | * and then searching the map for a player. |
1712 | */ |
1536 | */ |
1713 | if (!tmp) |
1537 | if (!tmp) |
1714 | { |
1538 | for_all_players (pl) |
1715 | for (pl = first_player; pl; pl = pl->next) |
|
|
1716 | if (pl->ob->container == op->env) |
1539 | if (pl->ob->container == op->env) |
|
|
1540 | { |
|
|
1541 | tmp = pl->ob; |
1717 | break; |
1542 | break; |
1718 | if (pl) |
|
|
1719 | tmp = pl->ob; |
|
|
1720 | else |
|
|
1721 | tmp = NULL; |
|
|
1722 | } |
1543 | } |
1723 | |
1544 | |
1724 | if (i < op->nrof) |
1545 | if (i < op->nrof) |
1725 | { |
1546 | { |
1726 | sub_weight (op->env, op->weight * i); |
1547 | sub_weight (op->env, op->weight * i); |
1727 | op->nrof -= i; |
1548 | op->nrof -= i; |
1728 | if (tmp) |
1549 | if (tmp) |
1729 | { |
|
|
1730 | esrv_send_item (tmp, op); |
1550 | esrv_send_item (tmp, op); |
1731 | } |
|
|
1732 | } |
1551 | } |
1733 | else |
1552 | else |
1734 | { |
1553 | { |
1735 | remove_ob (op); |
1554 | op->remove (); |
1736 | op->nrof = 0; |
1555 | op->nrof = 0; |
1737 | if (tmp) |
1556 | if (tmp) |
1738 | { |
|
|
1739 | esrv_del_item (tmp->contr, op->count); |
1557 | esrv_del_item (tmp->contr, op->count); |
1740 | } |
|
|
1741 | } |
1558 | } |
1742 | } |
1559 | } |
1743 | else |
1560 | else |
1744 | { |
1561 | { |
1745 | object *above = op->above; |
1562 | object *above = op->above; |
1746 | |
1563 | |
1747 | if (i < op->nrof) |
1564 | if (i < op->nrof) |
1748 | op->nrof -= i; |
1565 | op->nrof -= i; |
1749 | else |
1566 | else |
1750 | { |
1567 | { |
1751 | remove_ob (op); |
1568 | op->remove (); |
1752 | op->nrof = 0; |
1569 | op->nrof = 0; |
1753 | } |
1570 | } |
1754 | |
1571 | |
1755 | /* Since we just removed op, op->above is null */ |
1572 | /* Since we just removed op, op->above is null */ |
1756 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1573 | for (tmp = above; tmp; tmp = tmp->above) |
1757 | if (tmp->type == PLAYER) |
1574 | if (tmp->type == PLAYER) |
1758 | { |
1575 | { |
1759 | if (op->nrof) |
1576 | if (op->nrof) |
1760 | esrv_send_item (tmp, op); |
1577 | esrv_send_item (tmp, op); |
1761 | else |
1578 | else |
… | |
… | |
1765 | |
1582 | |
1766 | if (op->nrof) |
1583 | if (op->nrof) |
1767 | return op; |
1584 | return op; |
1768 | else |
1585 | else |
1769 | { |
1586 | { |
1770 | free_object (op); |
1587 | op->destroy (); |
1771 | return NULL; |
1588 | return 0; |
1772 | } |
1589 | } |
1773 | } |
1590 | } |
1774 | |
1591 | |
1775 | /* |
1592 | /* |
1776 | * add_weight(object, weight) adds the specified weight to an object, |
1593 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1788 | op->carrying += weight; |
1605 | op->carrying += weight; |
1789 | op = op->env; |
1606 | op = op->env; |
1790 | } |
1607 | } |
1791 | } |
1608 | } |
1792 | |
1609 | |
|
|
1610 | object * |
|
|
1611 | insert_ob_in_ob (object *op, object *where) |
|
|
1612 | { |
|
|
1613 | if (!where) |
|
|
1614 | { |
|
|
1615 | char *dump = dump_object (op); |
|
|
1616 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1617 | free (dump); |
|
|
1618 | return op; |
|
|
1619 | } |
|
|
1620 | |
|
|
1621 | if (where->head) |
|
|
1622 | { |
|
|
1623 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1624 | where = where->head; |
|
|
1625 | } |
|
|
1626 | |
|
|
1627 | return where->insert (op); |
|
|
1628 | } |
|
|
1629 | |
1793 | /* |
1630 | /* |
1794 | * insert_ob_in_ob(op,environment): |
1631 | * env->insert (op) |
1795 | * This function inserts the object op in the linked list |
1632 | * This function inserts the object op in the linked list |
1796 | * inside the object environment. |
1633 | * inside the object environment. |
1797 | * |
1634 | * |
1798 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1799 | * the inventory at the last position or next to other objects of the same |
|
|
1800 | * type. |
|
|
1801 | * Frank: Now sorted by type, archetype and magic! |
|
|
1802 | * |
|
|
1803 | * The function returns now pointer to inserted item, and return value can |
1635 | * The function returns now pointer to inserted item, and return value can |
1804 | * be != op, if items are merged. -Tero |
1636 | * be != op, if items are merged. -Tero |
1805 | */ |
1637 | */ |
1806 | |
1638 | |
1807 | object * |
1639 | object * |
1808 | insert_ob_in_ob (object *op, object *where) |
1640 | object::insert (object *op) |
1809 | { |
1641 | { |
1810 | object * |
1642 | object *tmp, *otmp; |
1811 | tmp, * |
|
|
1812 | otmp; |
|
|
1813 | |
1643 | |
1814 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1644 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1815 | { |
1645 | op->remove (); |
1816 | dump_object (op); |
|
|
1817 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1818 | return op; |
|
|
1819 | } |
|
|
1820 | |
|
|
1821 | if (where == NULL) |
|
|
1822 | { |
|
|
1823 | dump_object (op); |
|
|
1824 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1825 | return op; |
|
|
1826 | } |
|
|
1827 | |
|
|
1828 | if (where->head) |
|
|
1829 | { |
|
|
1830 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1831 | where = where->head; |
|
|
1832 | } |
|
|
1833 | |
1646 | |
1834 | if (op->more) |
1647 | if (op->more) |
1835 | { |
1648 | { |
1836 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1649 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1837 | return op; |
1650 | return op; |
… | |
… | |
1839 | |
1652 | |
1840 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1653 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1841 | CLEAR_FLAG (op, FLAG_REMOVED); |
1654 | CLEAR_FLAG (op, FLAG_REMOVED); |
1842 | if (op->nrof) |
1655 | if (op->nrof) |
1843 | { |
1656 | { |
1844 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1657 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1845 | if (CAN_MERGE (tmp, op)) |
1658 | if (object::can_merge (tmp, op)) |
1846 | { |
1659 | { |
1847 | /* return the original object and remove inserted object |
1660 | /* return the original object and remove inserted object |
1848 | (client needs the original object) */ |
1661 | (client needs the original object) */ |
1849 | tmp->nrof += op->nrof; |
1662 | tmp->nrof += op->nrof; |
1850 | /* Weight handling gets pretty funky. Since we are adding to |
1663 | /* Weight handling gets pretty funky. Since we are adding to |
1851 | * tmp->nrof, we need to increase the weight. |
1664 | * tmp->nrof, we need to increase the weight. |
1852 | */ |
1665 | */ |
1853 | add_weight (where, op->weight * op->nrof); |
1666 | add_weight (this, op->weight * op->nrof); |
1854 | SET_FLAG (op, FLAG_REMOVED); |
1667 | SET_FLAG (op, FLAG_REMOVED); |
1855 | free_object (op); /* free the inserted object */ |
1668 | op->destroy (); /* free the inserted object */ |
1856 | op = tmp; |
1669 | op = tmp; |
1857 | remove_ob (op); /* and fix old object's links */ |
1670 | op->remove (); /* and fix old object's links */ |
1858 | CLEAR_FLAG (op, FLAG_REMOVED); |
1671 | CLEAR_FLAG (op, FLAG_REMOVED); |
1859 | break; |
1672 | break; |
1860 | } |
1673 | } |
1861 | |
1674 | |
1862 | /* I assume combined objects have no inventory |
1675 | /* I assume combined objects have no inventory |
1863 | * We add the weight - this object could have just been removed |
1676 | * We add the weight - this object could have just been removed |
1864 | * (if it was possible to merge). calling remove_ob will subtract |
1677 | * (if it was possible to merge). calling remove_ob will subtract |
1865 | * the weight, so we need to add it in again, since we actually do |
1678 | * the weight, so we need to add it in again, since we actually do |
1866 | * the linking below |
1679 | * the linking below |
1867 | */ |
1680 | */ |
1868 | add_weight (where, op->weight * op->nrof); |
1681 | add_weight (this, op->weight * op->nrof); |
1869 | } |
1682 | } |
1870 | else |
1683 | else |
1871 | add_weight (where, (op->weight + op->carrying)); |
1684 | add_weight (this, (op->weight + op->carrying)); |
1872 | |
1685 | |
1873 | otmp = is_player_inv (where); |
1686 | otmp = this->in_player (); |
1874 | if (otmp && otmp->contr != NULL) |
1687 | if (otmp && otmp->contr) |
1875 | { |
|
|
1876 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1688 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1877 | fix_player (otmp); |
1689 | otmp->update_stats (); |
1878 | } |
|
|
1879 | |
1690 | |
1880 | op->map = NULL; |
1691 | op->map = 0; |
1881 | op->env = where; |
1692 | op->env = this; |
1882 | op->above = NULL; |
1693 | op->above = 0; |
1883 | op->below = NULL; |
1694 | op->below = 0; |
1884 | op->x = 0, op->y = 0; |
1695 | op->x = 0, op->y = 0; |
1885 | |
1696 | |
1886 | /* reset the light list and los of the players on the map */ |
1697 | /* reset the light list and los of the players on the map */ |
1887 | if ((op->glow_radius != 0) && where->map) |
1698 | if ((op->glow_radius != 0) && map) |
1888 | { |
1699 | { |
1889 | #ifdef DEBUG_LIGHTS |
1700 | #ifdef DEBUG_LIGHTS |
1890 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1701 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1891 | #endif /* DEBUG_LIGHTS */ |
1702 | #endif /* DEBUG_LIGHTS */ |
1892 | if (MAP_DARKNESS (where->map)) |
1703 | if (map->darkness) |
1893 | update_all_los (where->map, where->x, where->y); |
1704 | update_all_los (map, x, y); |
1894 | } |
1705 | } |
1895 | |
1706 | |
1896 | /* Client has no idea of ordering so lets not bother ordering it here. |
1707 | /* Client has no idea of ordering so lets not bother ordering it here. |
1897 | * It sure simplifies this function... |
1708 | * It sure simplifies this function... |
1898 | */ |
1709 | */ |
1899 | if (where->inv == NULL) |
1710 | if (!inv) |
1900 | where->inv = op; |
1711 | inv = op; |
1901 | else |
1712 | else |
1902 | { |
1713 | { |
1903 | op->below = where->inv; |
1714 | op->below = inv; |
1904 | op->below->above = op; |
1715 | op->below->above = op; |
1905 | where->inv = op; |
1716 | inv = op; |
1906 | } |
1717 | } |
|
|
1718 | |
|
|
1719 | INVOKE_OBJECT (INSERT, this); |
|
|
1720 | |
1907 | return op; |
1721 | return op; |
1908 | } |
1722 | } |
1909 | |
1723 | |
1910 | /* |
1724 | /* |
1911 | * Checks if any objects has a move_type that matches objects |
1725 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1962 | |
1776 | |
1963 | /* The objects have to be checked from top to bottom. |
1777 | /* The objects have to be checked from top to bottom. |
1964 | * Hence, we first go to the top: |
1778 | * Hence, we first go to the top: |
1965 | */ |
1779 | */ |
1966 | |
1780 | |
1967 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
1781 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1968 | { |
1782 | { |
1969 | /* Trim the search when we find the first other spell effect |
1783 | /* Trim the search when we find the first other spell effect |
1970 | * this helps performance so that if a space has 50 spell objects, |
1784 | * this helps performance so that if a space has 50 spell objects, |
1971 | * we don't need to check all of them. |
1785 | * we don't need to check all of them. |
1972 | */ |
1786 | */ |
… | |
… | |
2027 | /* |
1841 | /* |
2028 | * present_arch(arch, map, x, y) searches for any objects with |
1842 | * present_arch(arch, map, x, y) searches for any objects with |
2029 | * a matching archetype at the given map and coordinates. |
1843 | * a matching archetype at the given map and coordinates. |
2030 | * The first matching object is returned, or NULL if none. |
1844 | * The first matching object is returned, or NULL if none. |
2031 | */ |
1845 | */ |
2032 | |
|
|
2033 | object * |
1846 | object * |
2034 | present_arch (const archetype *at, maptile *m, int x, int y) |
1847 | present_arch (const archetype *at, maptile *m, int x, int y) |
2035 | { |
1848 | { |
2036 | object * |
|
|
2037 | tmp; |
|
|
2038 | |
|
|
2039 | if (m == NULL || out_of_map (m, x, y)) |
1849 | if (m == NULL || out_of_map (m, x, y)) |
2040 | { |
1850 | { |
2041 | LOG (llevError, "Present_arch called outside map.\n"); |
1851 | LOG (llevError, "Present_arch called outside map.\n"); |
2042 | return NULL; |
1852 | return NULL; |
2043 | } |
1853 | } |
|
|
1854 | |
2044 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1855 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
2045 | if (tmp->arch == at) |
1856 | if (tmp->arch == at) |
2046 | return tmp; |
1857 | return tmp; |
|
|
1858 | |
2047 | return NULL; |
1859 | return NULL; |
2048 | } |
1860 | } |
2049 | |
1861 | |
2050 | /* |
1862 | /* |
2051 | * present(type, map, x, y) searches for any objects with |
1863 | * present(type, map, x, y) searches for any objects with |
2052 | * a matching type variable at the given map and coordinates. |
1864 | * a matching type variable at the given map and coordinates. |
2053 | * The first matching object is returned, or NULL if none. |
1865 | * The first matching object is returned, or NULL if none. |
2054 | */ |
1866 | */ |
2055 | |
|
|
2056 | object * |
1867 | object * |
2057 | present (unsigned char type, maptile *m, int x, int y) |
1868 | present (unsigned char type, maptile *m, int x, int y) |
2058 | { |
1869 | { |
2059 | object * |
|
|
2060 | tmp; |
|
|
2061 | |
|
|
2062 | if (out_of_map (m, x, y)) |
1870 | if (out_of_map (m, x, y)) |
2063 | { |
1871 | { |
2064 | LOG (llevError, "Present called outside map.\n"); |
1872 | LOG (llevError, "Present called outside map.\n"); |
2065 | return NULL; |
1873 | return NULL; |
2066 | } |
1874 | } |
|
|
1875 | |
2067 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1876 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
2068 | if (tmp->type == type) |
1877 | if (tmp->type == type) |
2069 | return tmp; |
1878 | return tmp; |
|
|
1879 | |
2070 | return NULL; |
1880 | return NULL; |
2071 | } |
1881 | } |
2072 | |
1882 | |
2073 | /* |
1883 | /* |
2074 | * present_in_ob(type, object) searches for any objects with |
1884 | * present_in_ob(type, object) searches for any objects with |
2075 | * a matching type variable in the inventory of the given object. |
1885 | * a matching type variable in the inventory of the given object. |
2076 | * The first matching object is returned, or NULL if none. |
1886 | * The first matching object is returned, or NULL if none. |
2077 | */ |
1887 | */ |
2078 | |
|
|
2079 | object * |
1888 | object * |
2080 | present_in_ob (unsigned char type, const object *op) |
1889 | present_in_ob (unsigned char type, const object *op) |
2081 | { |
1890 | { |
2082 | object * |
|
|
2083 | tmp; |
|
|
2084 | |
|
|
2085 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1891 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2086 | if (tmp->type == type) |
1892 | if (tmp->type == type) |
2087 | return tmp; |
1893 | return tmp; |
|
|
1894 | |
2088 | return NULL; |
1895 | return NULL; |
2089 | } |
1896 | } |
2090 | |
1897 | |
2091 | /* |
1898 | /* |
2092 | * present_in_ob (type, str, object) searches for any objects with |
1899 | * present_in_ob (type, str, object) searches for any objects with |
… | |
… | |
2100 | * str is the string to match against. Note that we match against |
1907 | * str is the string to match against. Note that we match against |
2101 | * the object name, not the archetype name. this is so that the |
1908 | * the object name, not the archetype name. this is so that the |
2102 | * spell code can use one object type (force), but change it's name |
1909 | * spell code can use one object type (force), but change it's name |
2103 | * to be unique. |
1910 | * to be unique. |
2104 | */ |
1911 | */ |
2105 | |
|
|
2106 | object * |
1912 | object * |
2107 | present_in_ob_by_name (int type, const char *str, const object *op) |
1913 | present_in_ob_by_name (int type, const char *str, const object *op) |
2108 | { |
1914 | { |
2109 | object * |
|
|
2110 | tmp; |
|
|
2111 | |
|
|
2112 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1915 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2113 | { |
|
|
2114 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1916 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
2115 | return tmp; |
1917 | return tmp; |
2116 | } |
1918 | |
2117 | return NULL; |
1919 | return 0; |
2118 | } |
1920 | } |
2119 | |
1921 | |
2120 | /* |
1922 | /* |
2121 | * present_arch_in_ob(archetype, object) searches for any objects with |
1923 | * present_arch_in_ob(archetype, object) searches for any objects with |
2122 | * a matching archetype in the inventory of the given object. |
1924 | * a matching archetype in the inventory of the given object. |
2123 | * The first matching object is returned, or NULL if none. |
1925 | * The first matching object is returned, or NULL if none. |
2124 | */ |
1926 | */ |
2125 | |
|
|
2126 | object * |
1927 | object * |
2127 | present_arch_in_ob (const archetype *at, const object *op) |
1928 | present_arch_in_ob (const archetype *at, const object *op) |
2128 | { |
1929 | { |
2129 | object * |
|
|
2130 | tmp; |
|
|
2131 | |
|
|
2132 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1930 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2133 | if (tmp->arch == at) |
1931 | if (tmp->arch == at) |
2134 | return tmp; |
1932 | return tmp; |
|
|
1933 | |
2135 | return NULL; |
1934 | return NULL; |
2136 | } |
1935 | } |
2137 | |
1936 | |
2138 | /* |
1937 | /* |
2139 | * activate recursively a flag on an object inventory |
1938 | * activate recursively a flag on an object inventory |
2140 | */ |
1939 | */ |
2141 | void |
1940 | void |
2142 | flag_inv (object *op, int flag) |
1941 | flag_inv (object *op, int flag) |
2143 | { |
1942 | { |
2144 | object * |
|
|
2145 | tmp; |
|
|
2146 | |
|
|
2147 | if (op->inv) |
1943 | if (op->inv) |
2148 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1944 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2149 | { |
1945 | { |
2150 | SET_FLAG (tmp, flag); |
1946 | SET_FLAG (tmp, flag); |
2151 | flag_inv (tmp, flag); |
1947 | flag_inv (tmp, flag); |
2152 | } |
1948 | } |
2153 | } /* |
1949 | } |
|
|
1950 | |
|
|
1951 | /* |
2154 | * desactivate recursively a flag on an object inventory |
1952 | * deactivate recursively a flag on an object inventory |
2155 | */ |
1953 | */ |
2156 | void |
1954 | void |
2157 | unflag_inv (object *op, int flag) |
1955 | unflag_inv (object *op, int flag) |
2158 | { |
1956 | { |
2159 | object * |
|
|
2160 | tmp; |
|
|
2161 | |
|
|
2162 | if (op->inv) |
1957 | if (op->inv) |
2163 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1958 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2164 | { |
1959 | { |
2165 | CLEAR_FLAG (tmp, flag); |
1960 | CLEAR_FLAG (tmp, flag); |
2166 | unflag_inv (tmp, flag); |
1961 | unflag_inv (tmp, flag); |
2167 | } |
1962 | } |
2168 | } |
1963 | } |
… | |
… | |
2171 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1966 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
2172 | * all it's inventory (recursively). |
1967 | * all it's inventory (recursively). |
2173 | * If checksums are used, a player will get set_cheat called for |
1968 | * If checksums are used, a player will get set_cheat called for |
2174 | * him/her-self and all object carried by a call to this function. |
1969 | * him/her-self and all object carried by a call to this function. |
2175 | */ |
1970 | */ |
2176 | |
|
|
2177 | void |
1971 | void |
2178 | set_cheat (object *op) |
1972 | set_cheat (object *op) |
2179 | { |
1973 | { |
2180 | SET_FLAG (op, FLAG_WAS_WIZ); |
1974 | SET_FLAG (op, FLAG_WAS_WIZ); |
2181 | flag_inv (op, FLAG_WAS_WIZ); |
1975 | flag_inv (op, FLAG_WAS_WIZ); |
… | |
… | |
2200 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1994 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2201 | * to know if the space in question will block the object. We can't use |
1995 | * to know if the space in question will block the object. We can't use |
2202 | * the archetype because that isn't correct if the monster has been |
1996 | * the archetype because that isn't correct if the monster has been |
2203 | * customized, changed states, etc. |
1997 | * customized, changed states, etc. |
2204 | */ |
1998 | */ |
2205 | |
|
|
2206 | int |
1999 | int |
2207 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2000 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2208 | { |
2001 | { |
2209 | int |
|
|
2210 | i, |
|
|
2211 | index = 0, flag; |
2002 | int index = 0, flag; |
2212 | static int |
|
|
2213 | altern[SIZEOFFREE]; |
2003 | int altern[SIZEOFFREE]; |
2214 | |
2004 | |
2215 | for (i = start; i < stop; i++) |
2005 | for (int i = start; i < stop; i++) |
2216 | { |
2006 | { |
2217 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2007 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2218 | if (!flag) |
2008 | if (!flag) |
2219 | altern[index++] = i; |
2009 | altern [index++] = i; |
2220 | |
2010 | |
2221 | /* Basically, if we find a wall on a space, we cut down the search size. |
2011 | /* Basically, if we find a wall on a space, we cut down the search size. |
2222 | * In this way, we won't return spaces that are on another side of a wall. |
2012 | * In this way, we won't return spaces that are on another side of a wall. |
2223 | * This mostly work, but it cuts down the search size in all directions - |
2013 | * This mostly work, but it cuts down the search size in all directions - |
2224 | * if the space being examined only has a wall to the north and empty |
2014 | * if the space being examined only has a wall to the north and empty |
2225 | * spaces in all the other directions, this will reduce the search space |
2015 | * spaces in all the other directions, this will reduce the search space |
2226 | * to only the spaces immediately surrounding the target area, and |
2016 | * to only the spaces immediately surrounding the target area, and |
2227 | * won't look 2 spaces south of the target space. |
2017 | * won't look 2 spaces south of the target space. |
2228 | */ |
2018 | */ |
2229 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2019 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2230 | stop = maxfree[i]; |
2020 | stop = maxfree[i]; |
2231 | } |
2021 | } |
|
|
2022 | |
2232 | if (!index) |
2023 | if (!index) |
2233 | return -1; |
2024 | return -1; |
|
|
2025 | |
2234 | return altern[RANDOM () % index]; |
2026 | return altern[RANDOM () % index]; |
2235 | } |
2027 | } |
2236 | |
2028 | |
2237 | /* |
2029 | /* |
2238 | * find_first_free_spot(archetype, maptile, x, y) works like |
2030 | * find_first_free_spot(archetype, maptile, x, y) works like |
2239 | * find_free_spot(), but it will search max number of squares. |
2031 | * find_free_spot(), but it will search max number of squares. |
2240 | * But it will return the first available spot, not a random choice. |
2032 | * But it will return the first available spot, not a random choice. |
2241 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2033 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2242 | */ |
2034 | */ |
2243 | |
|
|
2244 | int |
2035 | int |
2245 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2036 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2246 | { |
2037 | { |
2247 | int |
|
|
2248 | i; |
|
|
2249 | |
|
|
2250 | for (i = 0; i < SIZEOFFREE; i++) |
2038 | for (int i = 0; i < SIZEOFFREE; i++) |
2251 | { |
|
|
2252 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2039 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2253 | return i; |
2040 | return i; |
2254 | } |
2041 | |
2255 | return -1; |
2042 | return -1; |
2256 | } |
2043 | } |
2257 | |
2044 | |
2258 | /* |
2045 | /* |
2259 | * The function permute(arr, begin, end) randomly reorders the array |
2046 | * The function permute(arr, begin, end) randomly reorders the array |
2260 | * arr[begin..end-1]. |
2047 | * arr[begin..end-1]. |
|
|
2048 | * now uses a fisher-yates shuffle, old permute was broken |
2261 | */ |
2049 | */ |
2262 | static void |
2050 | static void |
2263 | permute (int *arr, int begin, int end) |
2051 | permute (int *arr, int begin, int end) |
2264 | { |
2052 | { |
2265 | int |
2053 | arr += begin; |
2266 | i, |
|
|
2267 | j, |
|
|
2268 | tmp, |
|
|
2269 | len; |
|
|
2270 | |
|
|
2271 | len = end - begin; |
2054 | end -= begin; |
2272 | for (i = begin; i < end; i++) |
|
|
2273 | { |
|
|
2274 | j = begin + RANDOM () % len; |
|
|
2275 | |
2055 | |
2276 | tmp = arr[i]; |
2056 | while (--end) |
2277 | arr[i] = arr[j]; |
2057 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2278 | arr[j] = tmp; |
|
|
2279 | } |
|
|
2280 | } |
2058 | } |
2281 | |
2059 | |
2282 | /* new function to make monster searching more efficient, and effective! |
2060 | /* new function to make monster searching more efficient, and effective! |
2283 | * This basically returns a randomized array (in the passed pointer) of |
2061 | * This basically returns a randomized array (in the passed pointer) of |
2284 | * the spaces to find monsters. In this way, it won't always look for |
2062 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2287 | * the 3x3 area will be searched, just not in a predictable order. |
2065 | * the 3x3 area will be searched, just not in a predictable order. |
2288 | */ |
2066 | */ |
2289 | void |
2067 | void |
2290 | get_search_arr (int *search_arr) |
2068 | get_search_arr (int *search_arr) |
2291 | { |
2069 | { |
2292 | int |
2070 | int i; |
2293 | i; |
|
|
2294 | |
2071 | |
2295 | for (i = 0; i < SIZEOFFREE; i++) |
2072 | for (i = 0; i < SIZEOFFREE; i++) |
2296 | { |
|
|
2297 | search_arr[i] = i; |
2073 | search_arr[i] = i; |
2298 | } |
|
|
2299 | |
2074 | |
2300 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2075 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2301 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2076 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2302 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2077 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2303 | } |
2078 | } |
… | |
… | |
2312 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2087 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2313 | * is actually want is going to try and move there. We need this info |
2088 | * is actually want is going to try and move there. We need this info |
2314 | * because we have to know what movement the thing looking to move |
2089 | * because we have to know what movement the thing looking to move |
2315 | * there is capable of. |
2090 | * there is capable of. |
2316 | */ |
2091 | */ |
2317 | |
|
|
2318 | int |
2092 | int |
2319 | find_dir (maptile *m, int x, int y, object *exclude) |
2093 | find_dir (maptile *m, int x, int y, object *exclude) |
2320 | { |
2094 | { |
2321 | int |
|
|
2322 | i, |
|
|
2323 | max = SIZEOFFREE, mflags; |
2095 | int i, max = SIZEOFFREE, mflags; |
2324 | |
2096 | |
2325 | sint16 nx, ny; |
2097 | sint16 nx, ny; |
2326 | object * |
2098 | object *tmp; |
2327 | tmp; |
|
|
2328 | maptile * |
2099 | maptile *mp; |
2329 | mp; |
|
|
2330 | |
2100 | |
2331 | MoveType blocked, move_type; |
2101 | MoveType blocked, move_type; |
2332 | |
2102 | |
2333 | if (exclude && exclude->head) |
2103 | if (exclude && exclude->head) |
2334 | { |
2104 | { |
… | |
… | |
2346 | mp = m; |
2116 | mp = m; |
2347 | nx = x + freearr_x[i]; |
2117 | nx = x + freearr_x[i]; |
2348 | ny = y + freearr_y[i]; |
2118 | ny = y + freearr_y[i]; |
2349 | |
2119 | |
2350 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2120 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2121 | |
2351 | if (mflags & P_OUT_OF_MAP) |
2122 | if (mflags & P_OUT_OF_MAP) |
2352 | { |
|
|
2353 | max = maxfree[i]; |
2123 | max = maxfree[i]; |
2354 | } |
|
|
2355 | else |
2124 | else |
2356 | { |
2125 | { |
2357 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2126 | mapspace &ms = mp->at (nx, ny); |
|
|
2127 | |
|
|
2128 | blocked = ms.move_block; |
2358 | |
2129 | |
2359 | if ((move_type & blocked) == move_type) |
2130 | if ((move_type & blocked) == move_type) |
2360 | { |
|
|
2361 | max = maxfree[i]; |
2131 | max = maxfree[i]; |
2362 | } |
|
|
2363 | else if (mflags & P_IS_ALIVE) |
2132 | else if (mflags & P_IS_ALIVE) |
2364 | { |
2133 | { |
2365 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2134 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2366 | { |
2135 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2367 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2136 | && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2368 | { |
|
|
2369 | break; |
2137 | break; |
2370 | } |
2138 | |
2371 | } |
|
|
2372 | if (tmp) |
2139 | if (tmp) |
2373 | { |
|
|
2374 | return freedir[i]; |
2140 | return freedir[i]; |
2375 | } |
|
|
2376 | } |
2141 | } |
2377 | } |
2142 | } |
2378 | } |
2143 | } |
|
|
2144 | |
2379 | return 0; |
2145 | return 0; |
2380 | } |
2146 | } |
2381 | |
2147 | |
2382 | /* |
2148 | /* |
2383 | * distance(object 1, object 2) will return the square of the |
2149 | * distance(object 1, object 2) will return the square of the |
2384 | * distance between the two given objects. |
2150 | * distance between the two given objects. |
2385 | */ |
2151 | */ |
2386 | |
|
|
2387 | int |
2152 | int |
2388 | distance (const object *ob1, const object *ob2) |
2153 | distance (const object *ob1, const object *ob2) |
2389 | { |
2154 | { |
2390 | int |
|
|
2391 | i; |
|
|
2392 | |
|
|
2393 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2155 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2394 | return i; |
|
|
2395 | } |
2156 | } |
2396 | |
2157 | |
2397 | /* |
2158 | /* |
2398 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2159 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2399 | * an object which has subtracted the x and y coordinates of another |
2160 | * an object which has subtracted the x and y coordinates of another |
2400 | * object, needs to travel toward it. |
2161 | * object, needs to travel toward it. |
2401 | */ |
2162 | */ |
2402 | |
|
|
2403 | int |
2163 | int |
2404 | find_dir_2 (int x, int y) |
2164 | find_dir_2 (int x, int y) |
2405 | { |
2165 | { |
2406 | int |
2166 | int q; |
2407 | q; |
|
|
2408 | |
2167 | |
2409 | if (y) |
2168 | if (y) |
2410 | q = x * 100 / y; |
2169 | q = x * 100 / y; |
2411 | else if (x) |
2170 | else if (x) |
2412 | q = -300 * x; |
2171 | q = -300 * x; |
… | |
… | |
2447 | int |
2206 | int |
2448 | absdir (int d) |
2207 | absdir (int d) |
2449 | { |
2208 | { |
2450 | while (d < 1) |
2209 | while (d < 1) |
2451 | d += 8; |
2210 | d += 8; |
|
|
2211 | |
2452 | while (d > 8) |
2212 | while (d > 8) |
2453 | d -= 8; |
2213 | d -= 8; |
|
|
2214 | |
2454 | return d; |
2215 | return d; |
2455 | } |
2216 | } |
2456 | |
2217 | |
2457 | /* |
2218 | /* |
2458 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2219 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
… | |
… | |
2460 | */ |
2221 | */ |
2461 | |
2222 | |
2462 | int |
2223 | int |
2463 | dirdiff (int dir1, int dir2) |
2224 | dirdiff (int dir1, int dir2) |
2464 | { |
2225 | { |
2465 | int |
2226 | int d; |
2466 | d; |
|
|
2467 | |
2227 | |
2468 | d = abs (dir1 - dir2); |
2228 | d = abs (dir1 - dir2); |
2469 | if (d > 4) |
2229 | if (d > 4) |
2470 | d = 8 - d; |
2230 | d = 8 - d; |
|
|
2231 | |
2471 | return d; |
2232 | return d; |
2472 | } |
2233 | } |
2473 | |
2234 | |
2474 | /* peterm: |
2235 | /* peterm: |
2475 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2236 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
… | |
… | |
2478 | * This basically means that if direction is 15, then it could either go |
2239 | * This basically means that if direction is 15, then it could either go |
2479 | * direction 4, 14, or 16 to get back to where we are. |
2240 | * direction 4, 14, or 16 to get back to where we are. |
2480 | * Moved from spell_util.c to object.c with the other related direction |
2241 | * Moved from spell_util.c to object.c with the other related direction |
2481 | * functions. |
2242 | * functions. |
2482 | */ |
2243 | */ |
2483 | |
|
|
2484 | int |
|
|
2485 | reduction_dir[SIZEOFFREE][3] = { |
2244 | int reduction_dir[SIZEOFFREE][3] = { |
2486 | {0, 0, 0}, /* 0 */ |
2245 | {0, 0, 0}, /* 0 */ |
2487 | {0, 0, 0}, /* 1 */ |
2246 | {0, 0, 0}, /* 1 */ |
2488 | {0, 0, 0}, /* 2 */ |
2247 | {0, 0, 0}, /* 2 */ |
2489 | {0, 0, 0}, /* 3 */ |
2248 | {0, 0, 0}, /* 3 */ |
2490 | {0, 0, 0}, /* 4 */ |
2249 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2538 | * find a path to that monster that we found. If not, |
2297 | * find a path to that monster that we found. If not, |
2539 | * we don't bother going toward it. Returns 1 if we |
2298 | * we don't bother going toward it. Returns 1 if we |
2540 | * can see a direct way to get it |
2299 | * can see a direct way to get it |
2541 | * Modified to be map tile aware -.MSW |
2300 | * Modified to be map tile aware -.MSW |
2542 | */ |
2301 | */ |
2543 | |
|
|
2544 | |
|
|
2545 | int |
2302 | int |
2546 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2303 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2547 | { |
2304 | { |
2548 | sint16 dx, dy; |
2305 | sint16 dx, dy; |
2549 | int |
|
|
2550 | mflags; |
2306 | int mflags; |
2551 | |
2307 | |
2552 | if (dir < 0) |
2308 | if (dir < 0) |
2553 | return 0; /* exit condition: invalid direction */ |
2309 | return 0; /* exit condition: invalid direction */ |
2554 | |
2310 | |
2555 | dx = x + freearr_x[dir]; |
2311 | dx = x + freearr_x[dir]; |
… | |
… | |
2568 | return 0; |
2324 | return 0; |
2569 | |
2325 | |
2570 | /* yes, can see. */ |
2326 | /* yes, can see. */ |
2571 | if (dir < 9) |
2327 | if (dir < 9) |
2572 | return 1; |
2328 | return 1; |
|
|
2329 | |
2573 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2330 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2574 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2331 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2332 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2575 | } |
2333 | } |
2576 | |
|
|
2577 | |
|
|
2578 | |
2334 | |
2579 | /* |
2335 | /* |
2580 | * can_pick(picker, item): finds out if an object is possible to be |
2336 | * can_pick(picker, item): finds out if an object is possible to be |
2581 | * picked up by the picker. Returnes 1 if it can be |
2337 | * picked up by the picker. Returnes 1 if it can be |
2582 | * picked up, otherwise 0. |
2338 | * picked up, otherwise 0. |
… | |
… | |
2593 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2349 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2594 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2350 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2595 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2351 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2596 | } |
2352 | } |
2597 | |
2353 | |
2598 | |
|
|
2599 | /* |
2354 | /* |
2600 | * create clone from object to another |
2355 | * create clone from object to another |
2601 | */ |
2356 | */ |
2602 | object * |
2357 | object * |
2603 | object_create_clone (object *asrc) |
2358 | object_create_clone (object *asrc) |
2604 | { |
2359 | { |
2605 | object * |
|
|
2606 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2360 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2607 | |
2361 | |
2608 | if (!asrc) |
2362 | if (!asrc) |
2609 | return NULL; |
2363 | return 0; |
|
|
2364 | |
2610 | src = asrc; |
2365 | src = asrc; |
2611 | if (src->head) |
2366 | if (src->head) |
2612 | src = src->head; |
2367 | src = src->head; |
2613 | |
2368 | |
2614 | prev = NULL; |
2369 | prev = 0; |
2615 | for (part = src; part; part = part->more) |
2370 | for (part = src; part; part = part->more) |
2616 | { |
2371 | { |
2617 | tmp = get_object (); |
2372 | tmp = part->clone (); |
2618 | copy_object (part, tmp); |
|
|
2619 | tmp->x -= src->x; |
2373 | tmp->x -= src->x; |
2620 | tmp->y -= src->y; |
2374 | tmp->y -= src->y; |
|
|
2375 | |
2621 | if (!part->head) |
2376 | if (!part->head) |
2622 | { |
2377 | { |
2623 | dst = tmp; |
2378 | dst = tmp; |
2624 | tmp->head = NULL; |
2379 | tmp->head = 0; |
2625 | } |
2380 | } |
2626 | else |
2381 | else |
2627 | { |
|
|
2628 | tmp->head = dst; |
2382 | tmp->head = dst; |
2629 | } |
2383 | |
2630 | tmp->more = NULL; |
2384 | tmp->more = 0; |
|
|
2385 | |
2631 | if (prev) |
2386 | if (prev) |
2632 | prev->more = tmp; |
2387 | prev->more = tmp; |
|
|
2388 | |
2633 | prev = tmp; |
2389 | prev = tmp; |
2634 | } |
2390 | } |
2635 | |
2391 | |
2636 | for (item = src->inv; item; item = item->below) |
2392 | for (item = src->inv; item; item = item->below) |
2637 | insert_ob_in_ob (object_create_clone (item), dst); |
2393 | insert_ob_in_ob (object_create_clone (item), dst); |
… | |
… | |
2643 | /* Basically, we save the content of the string to a temp file, then call */ |
2399 | /* Basically, we save the content of the string to a temp file, then call */ |
2644 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2400 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2645 | /* but it was simple to make and allows reusing the load_object function. */ |
2401 | /* but it was simple to make and allows reusing the load_object function. */ |
2646 | /* Remember not to use load_object_str in a time-critical situation. */ |
2402 | /* Remember not to use load_object_str in a time-critical situation. */ |
2647 | /* Also remember that multiparts objects are not supported for now. */ |
2403 | /* Also remember that multiparts objects are not supported for now. */ |
2648 | |
|
|
2649 | object * |
2404 | object * |
2650 | load_object_str (const char *obstr) |
2405 | load_object_str (const char *obstr) |
2651 | { |
2406 | { |
2652 | object *op; |
2407 | object *op; |
2653 | char filename[MAX_BUF]; |
2408 | char filename[MAX_BUF]; |
… | |
… | |
2663 | } |
2418 | } |
2664 | |
2419 | |
2665 | fprintf (tempfile, obstr); |
2420 | fprintf (tempfile, obstr); |
2666 | fclose (tempfile); |
2421 | fclose (tempfile); |
2667 | |
2422 | |
2668 | op = get_object (); |
2423 | op = object::create (); |
2669 | |
2424 | |
2670 | object_thawer thawer (filename); |
2425 | object_thawer thawer (filename); |
2671 | |
2426 | |
2672 | if (thawer) |
2427 | if (thawer) |
2673 | load_object (thawer, op, 0); |
2428 | load_object (thawer, op, 0); |
… | |
… | |
2683 | * returns NULL if no match. |
2438 | * returns NULL if no match. |
2684 | */ |
2439 | */ |
2685 | object * |
2440 | object * |
2686 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2441 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2687 | { |
2442 | { |
2688 | object *tmp; |
|
|
2689 | |
|
|
2690 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2443 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
2691 | if (tmp->type == type && tmp->subtype == subtype) |
2444 | if (tmp->type == type && tmp->subtype == subtype) |
2692 | return tmp; |
2445 | return tmp; |
2693 | |
2446 | |
2694 | return NULL; |
2447 | return 0; |
2695 | } |
2448 | } |
2696 | |
2449 | |
2697 | /* If ob has a field named key, return the link from the list, |
2450 | /* If ob has a field named key, return the link from the list, |
2698 | * otherwise return NULL. |
2451 | * otherwise return NULL. |
2699 | * |
2452 | * |
… | |
… | |
2701 | * do the desired thing. |
2454 | * do the desired thing. |
2702 | */ |
2455 | */ |
2703 | key_value * |
2456 | key_value * |
2704 | get_ob_key_link (const object *ob, const char *key) |
2457 | get_ob_key_link (const object *ob, const char *key) |
2705 | { |
2458 | { |
2706 | key_value *link; |
|
|
2707 | |
|
|
2708 | for (link = ob->key_values; link != NULL; link = link->next) |
2459 | for (key_value *link = ob->key_values; link; link = link->next) |
2709 | if (link->key == key) |
2460 | if (link->key == key) |
2710 | return link; |
2461 | return link; |
2711 | |
2462 | |
2712 | return NULL; |
2463 | return 0; |
2713 | } |
2464 | } |
2714 | |
2465 | |
2715 | /* |
2466 | /* |
2716 | * Returns the value of op has an extra_field for key, or NULL. |
2467 | * Returns the value of op has an extra_field for key, or NULL. |
2717 | * |
2468 | * |
… | |
… | |
2757 | * Returns TRUE on success. |
2508 | * Returns TRUE on success. |
2758 | */ |
2509 | */ |
2759 | int |
2510 | int |
2760 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2511 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2761 | { |
2512 | { |
2762 | key_value * |
|
|
2763 | field = NULL, *last = NULL; |
2513 | key_value *field = NULL, *last = NULL; |
2764 | |
2514 | |
2765 | for (field = op->key_values; field != NULL; field = field->next) |
2515 | for (field = op->key_values; field != NULL; field = field->next) |
2766 | { |
2516 | { |
2767 | if (field->key != canonical_key) |
2517 | if (field->key != canonical_key) |
2768 | { |
2518 | { |
… | |
… | |
2796 | /* IF we get here, key doesn't exist */ |
2546 | /* IF we get here, key doesn't exist */ |
2797 | |
2547 | |
2798 | /* No field, we'll have to add it. */ |
2548 | /* No field, we'll have to add it. */ |
2799 | |
2549 | |
2800 | if (!add_key) |
2550 | if (!add_key) |
2801 | { |
|
|
2802 | return FALSE; |
2551 | return FALSE; |
2803 | } |
2552 | |
2804 | /* There isn't any good reason to store a null |
2553 | /* There isn't any good reason to store a null |
2805 | * value in the key/value list. If the archetype has |
2554 | * value in the key/value list. If the archetype has |
2806 | * this key, then we should also have it, so shouldn't |
2555 | * this key, then we should also have it, so shouldn't |
2807 | * be here. If user wants to store empty strings, |
2556 | * be here. If user wants to store empty strings, |
2808 | * should pass in "" |
2557 | * should pass in "" |