ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.105 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.135 by root, Sun Mar 11 02:12:44 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27#include <global.h> 28#include <global.h>
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 47};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
355/* 357/*
356 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357 * Some error messages. 359 * Some error messages.
358 * The result of the dump is stored in the static global errmsg array. 360 * The result of the dump is stored in the static global errmsg array.
359 */ 361 */
360
361char * 362char *
362dump_object (object *op) 363dump_object (object *op)
363{ 364{
364 if (!op) 365 if (!op)
365 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
366 367
367 object_freezer freezer; 368 object_freezer freezer;
368 save_object (freezer, op, 1); 369 op->write (freezer);
369 return freezer.as_string (); 370 return freezer.as_string ();
370} 371}
371 372
372/* 373/*
373 * 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
390} 391}
391 392
392/* 393/*
393 * Returns the object which has the count-variable equal to the argument. 394 * Returns the object which has the count-variable equal to the argument.
394 */ 395 */
395
396object * 396object *
397find_object (tag_t i) 397find_object (tag_t i)
398{ 398{
399 for (object *op = object::first; op; op = op->next) 399 for_all_objects (op)
400 if (op->count == i) 400 if (op->count == i)
401 return op; 401 return op;
402 402
403 return 0; 403 return 0;
404} 404}
405 405
406/* 406/*
407 * Returns the first object which has a name equal to the argument. 407 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 408 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 409 * Enables features like "patch <name-of-other-player> food 999"
410 */ 410 */
411
412object * 411object *
413find_object_name (const char *str) 412find_object_name (const char *str)
414{ 413{
415 shstr_cmp str_ (str); 414 shstr_cmp str_ (str);
416 object *op; 415 object *op;
417 416
418 for (op = object::first; op != NULL; op = op->next) 417 for_all_objects (op)
419 if (op->name == str_) 418 if (op->name == str_)
420 break; 419 break;
421 420
422 return op; 421 return op;
423} 422}
489 488
490 if (is_removed) 489 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED); 490 SET_FLAG (dst, FLAG_REMOVED);
492 491
493 if (speed < 0) 492 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 493 dst->speed_left = speed_left - rndm ();
495 494
496 /* Copy over key_values, if any. */ 495 /* Copy over key_values, if any. */
497 if (key_values) 496 if (key_values)
498 { 497 {
499 key_value *tail = 0; 498 key_value *tail = 0;
522 } 521 }
523 } 522 }
524 } 523 }
525 524
526 dst->set_speed (dst->speed); 525 dst->set_speed (dst->speed);
526}
527
528void
529object::instantiate ()
530{
531 if (!uuid.seq) // HACK
532 uuid = gen_uuid ();
533
534 speed_left = -0.1f;
535 /* copy the body_info to the body_used - this is only really
536 * need for monsters, but doesn't hurt to do it for everything.
537 * by doing so, when a monster is created, it has good starting
538 * values for the body_used info, so when items are created
539 * for it, they can be properly equipped.
540 */
541 memcpy (body_used, body_info, sizeof (body_used));
542
543 attachable::instantiate ();
527} 544}
528 545
529object * 546object *
530object::clone () 547object::clone ()
531{ 548{
589 * UP_OBJ_FACE: only the objects face has changed. 606 * UP_OBJ_FACE: only the objects face has changed.
590 */ 607 */
591void 608void
592update_object (object *op, int action) 609update_object (object *op, int action)
593{ 610{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 611 if (op == NULL)
597 { 612 {
598 /* this should never happen */ 613 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 614 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 615 return;
660 675
661 if (op->more) 676 if (op->more)
662 update_object (op->more, action); 677 update_object (op->more, action);
663} 678}
664 679
665object *object::first;
666
667object::object () 680object::object ()
668{ 681{
669 SET_FLAG (this, FLAG_REMOVED); 682 SET_FLAG (this, FLAG_REMOVED);
670 683
671 expmul = 1.0; 684 expmul = 1.0;
672 face = blank_face; 685 face = blank_face;
673} 686}
674 687
675object::~object () 688object::~object ()
676{ 689{
690 unlink ();
691
677 free_key_values (this); 692 free_key_values (this);
678} 693}
679 694
695static int object_count;
696
680void object::link () 697void object::link ()
681{ 698{
682 count = ++ob_count; 699 assert (!index);//D
683 uuid = gen_uuid (); 700 uuid = gen_uuid ();
701 count = ++object_count;
684 702
685 prev = 0; 703 refcnt_inc ();
686 next = object::first; 704 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 705}
693 706
694void object::unlink () 707void object::unlink ()
695{ 708{
696 if (this == object::first) 709 if (!index)
697 object::first = next; 710 return;
698 711
699 /* Remove this object from the list of used objects */ 712 objects.erase (this);
700 if (prev) prev->next = next; 713 refcnt_dec ();
701 if (next) next->prev = prev;
702
703 prev = 0;
704 next = 0;
705}
706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711} 714}
712 715
713void 716void
714object::activate () 717object::activate ()
715{ 718{
716 /* If already on active list, don't do anything */ 719 /* If already on active list, don't do anything */
717 if (active ()) 720 if (active)
718 return; 721 return;
719 722
720 if (has_active_speed ()) 723 if (has_active_speed ())
721 { 724 actives.insert (this);
722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
725
726 if (active_next)
727 active_next->active_prev = this;
728
729 active_objects = this;
730 }
731} 725}
732 726
733void 727void
734object::activate_recursive () 728object::activate_recursive ()
735{ 729{
749 */ 743 */
750void 744void
751object::deactivate () 745object::deactivate ()
752{ 746{
753 /* If not on the active list, nothing needs to be done */ 747 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 748 if (!active)
755 return; 749 return;
756 750
757 if (active_prev == 0) 751 actives.erase (this);
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772} 752}
773 753
774void 754void
775object::deactivate_recursive () 755object::deactivate_recursive ()
776{ 756{
777 for (object *op = inv; op; op = op->below) 757 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 758 op->deactivate_recursive ();
779 759
780 deactivate (); 760 deactivate ();
761}
762
763void
764object::set_flag_inv (int flag, int value)
765{
766 for (object *op = inv; op; op = op->below)
767 {
768 op->flag [flag] = value;
769 op->set_flag_inv (flag, value);
770 }
781} 771}
782 772
783/* 773/*
784 * Remove and free all objects in the inventory of the given object. 774 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 775 * object.c ?
800 * drop on that space. 790 * drop on that space.
801 */ 791 */
802 if (!drop_to_ground 792 if (!drop_to_ground
803 || !map 793 || !map
804 || map->in_memory != MAP_IN_MEMORY 794 || map->in_memory != MAP_IN_MEMORY
795 || map->nodrop
805 || ms ().move_block == MOVE_ALL) 796 || ms ().move_block == MOVE_ALL)
806 { 797 {
807 while (inv) 798 while (inv)
808 { 799 {
809 inv->destroy_inv (drop_to_ground); 800 inv->destroy_inv (drop_to_ground);
818 809
819 if (op->flag [FLAG_STARTEQUIP] 810 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 811 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 812 || op->type == RUNE
822 || op->type == TRAP 813 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 814 || op->flag [FLAG_IS_A_TEMPLATE]
815 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 816 op->destroy ();
825 else 817 else
826 map->insert (op, x, y); 818 map->insert (op, x, y);
827 } 819 }
828 } 820 }
836} 828}
837 829
838void 830void
839object::do_destroy () 831object::do_destroy ()
840{ 832{
833 attachable::do_destroy ();
834
841 if (flag [FLAG_IS_LINKED]) 835 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this); 836 remove_button_link (this);
843 837
844 if (flag [FLAG_FRIENDLY]) 838 if (flag [FLAG_FRIENDLY])
839 {
845 remove_friendly_object (this); 840 remove_friendly_object (this);
841
842 if (type == GOLEM
843 && owner
844 && owner->type == PLAYER
845 && owner->contr->ranges[range_golem] == this)
846 owner->contr->ranges[range_golem] = 0;
847 }
846 848
847 if (!flag [FLAG_REMOVED]) 849 if (!flag [FLAG_REMOVED])
848 remove (); 850 remove ();
849 851
850 if (flag [FLAG_FREED]) 852 destroy_inv (true);
851 return;
852 853
853 set_speed (0); 854 deactivate ();
855 unlink ();
854 856
855 flag [FLAG_FREED] = 1; 857 flag [FLAG_FREED] = 1;
856
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861 858
862 // hack to ensure that freed objects still have a valid map 859 // hack to ensure that freed objects still have a valid map
863 { 860 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes 861 static maptile *freed_map; // freed objects are moved here to avoid crashes
865 862
890 887
891 // clear those pointers that likely might have circular references to us 888 // clear those pointers that likely might have circular references to us
892 owner = 0; 889 owner = 0;
893 enemy = 0; 890 enemy = 0;
894 attacked_by = 0; 891 attacked_by = 0;
895
896 // only relevant for players(?), but make sure of it anyways
897 contr = 0;
898} 892}
899 893
900void 894void
901object::destroy (bool destroy_inventory) 895object::destroy (bool destroy_inventory)
902{ 896{
930 * This function removes the object op from the linked list of objects 924 * This function removes the object op from the linked list of objects
931 * which it is currently tied to. When this function is done, the 925 * which it is currently tied to. When this function is done, the
932 * object will have no environment. If the object previously had an 926 * object will have no environment. If the object previously had an
933 * environment, the x and y coordinates will be updated to 927 * environment, the x and y coordinates will be updated to
934 * the previous environment. 928 * the previous environment.
935 * Beware: This function is called from the editor as well!
936 */ 929 */
937void 930void
938object::remove () 931object::do_remove ()
939{ 932{
940 object *tmp, *last = 0; 933 object *tmp, *last = 0;
941 object *otmp; 934 object *otmp;
942 935
943 if (QUERY_FLAG (this, FLAG_REMOVED)) 936 if (QUERY_FLAG (this, FLAG_REMOVED))
986 } 979 }
987 else if (map) 980 else if (map)
988 { 981 {
989 if (type == PLAYER) 982 if (type == PLAYER)
990 { 983 {
984 // leaving a spot always closes any open container on the ground
985 if (container && !container->env)
986 // this causes spurious floorbox updates, but it ensures
987 // that the CLOSE event is being sent.
988 close_container ();
989
991 --map->players; 990 --map->players;
992 map->touch (); 991 map->touch ();
993 } 992 }
994 993
995 map->dirty = true; 994 map->dirty = true;
995 mapspace &ms = this->ms ();
996 996
997 /* link the object above us */ 997 /* link the object above us */
998 if (above) 998 if (above)
999 above->below = below; 999 above->below = below;
1000 else 1000 else
1001 map->at (x, y).top = below; /* we were top, set new top */ 1001 ms.top = below; /* we were top, set new top */
1002 1002
1003 /* Relink the object below us, if there is one */ 1003 /* Relink the object below us, if there is one */
1004 if (below) 1004 if (below)
1005 below->above = above; 1005 below->above = above;
1006 else 1006 else
1008 /* Nothing below, which means we need to relink map object for this space 1008 /* Nothing below, which means we need to relink map object for this space
1009 * use translated coordinates in case some oddness with map tiling is 1009 * use translated coordinates in case some oddness with map tiling is
1010 * evident 1010 * evident
1011 */ 1011 */
1012 if (GET_MAP_OB (map, x, y) != this) 1012 if (GET_MAP_OB (map, x, y) != this)
1013 {
1014 char *dump = dump_object (this);
1015 LOG (llevError,
1016 "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); 1013 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1017 free (dump);
1018 dump = dump_object (GET_MAP_OB (map, x, y));
1019 LOG (llevError, "%s\n", dump);
1020 free (dump);
1021 }
1022 1014
1023 map->at (x, y).bot = above; /* goes on above it. */ 1015 ms.bot = above; /* goes on above it. */
1024 } 1016 }
1025 1017
1026 above = 0; 1018 above = 0;
1027 below = 0; 1019 below = 0;
1028 1020
1029 if (map->in_memory == MAP_SAVING) 1021 if (map->in_memory == MAP_SAVING)
1030 return; 1022 return;
1031 1023
1032 int check_walk_off = !flag [FLAG_NO_APPLY]; 1024 int check_walk_off = !flag [FLAG_NO_APPLY];
1033 1025
1034 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1026 for (tmp = ms.bot; tmp; tmp = tmp->above)
1035 { 1027 {
1036 /* No point updating the players look faces if he is the object 1028 /* No point updating the players look faces if he is the object
1037 * being removed. 1029 * being removed.
1038 */ 1030 */
1039 1031
1120 1112
1121 return 0; 1113 return 0;
1122} 1114}
1123 1115
1124/* 1116/*
1125 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1117 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1126 * job preparing multi-part monsters 1118 * job preparing multi-part monsters.
1127 */ 1119 */
1128object * 1120object *
1129insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1121insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1130{ 1122{
1131 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1123 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1159 */ 1151 */
1160object * 1152object *
1161insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1153insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1162{ 1154{
1163 object *tmp, *top, *floor = NULL; 1155 object *tmp, *top, *floor = NULL;
1164 sint16 x, y;
1165 1156
1166 if (QUERY_FLAG (op, FLAG_FREED)) 1157 if (QUERY_FLAG (op, FLAG_FREED))
1167 { 1158 {
1168 LOG (llevError, "Trying to insert freed object!\n"); 1159 LOG (llevError, "Trying to insert freed object!\n");
1169 return NULL; 1160 return NULL;
1170 } 1161 }
1162
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1165
1166 op->remove ();
1171 1167
1172 if (!m) 1168 if (!m)
1173 { 1169 {
1174 char *dump = dump_object (op); 1170 char *dump = dump_object (op);
1175 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1171 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1190#endif 1186#endif
1191 free (dump); 1187 free (dump);
1192 return op; 1188 return op;
1193 } 1189 }
1194 1190
1195 if (!QUERY_FLAG (op, FLAG_REMOVED))
1196 {
1197 char *dump = dump_object (op);
1198 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1199 free (dump);
1200 return op;
1201 }
1202
1203 if (op->more)
1204 {
1205 /* The part may be on a different map. */
1206
1207 object *more = op->more; 1191 if (object *more = op->more)
1208 1192 {
1209 /* We really need the caller to normalise coordinates - if
1210 * we set the map, that doesn't work if the location is within
1211 * a map and this is straddling an edge. So only if coordinate
1212 * is clear wrong do we normalise it.
1213 */
1214 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1215 more->map = get_map_from_coord (m, &more->x, &more->y);
1216 else if (!more->map)
1217 {
1218 /* For backwards compatibility - when not dealing with tiled maps,
1219 * more->map should always point to the parent.
1220 */
1221 more->map = m;
1222 }
1223
1224 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1193 if (!insert_ob_in_map (more, m, originator, flag))
1225 { 1194 {
1226 if (!op->head) 1195 if (!op->head)
1227 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1196 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1228 1197
1229 return 0; 1198 return 0;
1234 1203
1235 /* Ideally, the caller figures this out. However, it complicates a lot 1204 /* Ideally, the caller figures this out. However, it complicates a lot
1236 * of areas of callers (eg, anything that uses find_free_spot would now 1205 * of areas of callers (eg, anything that uses find_free_spot would now
1237 * need extra work 1206 * need extra work
1238 */ 1207 */
1239 op->map = get_map_from_coord (m, &op->x, &op->y); 1208 if (!xy_normalise (m, op->x, op->y))
1240 x = op->x; 1209 return 0;
1241 y = op->y; 1210
1211 op->map = m;
1212 mapspace &ms = op->ms ();
1242 1213
1243 /* this has to be done after we translate the coordinates. 1214 /* this has to be done after we translate the coordinates.
1244 */ 1215 */
1245 if (op->nrof && !(flag & INS_NO_MERGE)) 1216 if (op->nrof && !(flag & INS_NO_MERGE))
1246 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1217 for (tmp = ms.bot; tmp; tmp = tmp->above)
1247 if (object::can_merge (op, tmp)) 1218 if (object::can_merge (op, tmp))
1248 { 1219 {
1249 op->nrof += tmp->nrof; 1220 op->nrof += tmp->nrof;
1250 tmp->destroy (); 1221 tmp->destroy ();
1251 } 1222 }
1268 op->below = originator->below; 1239 op->below = originator->below;
1269 1240
1270 if (op->below) 1241 if (op->below)
1271 op->below->above = op; 1242 op->below->above = op;
1272 else 1243 else
1273 op->ms ().bot = op; 1244 ms.bot = op;
1274 1245
1275 /* since *below* originator, no need to update top */ 1246 /* since *below* originator, no need to update top */
1276 originator->below = op; 1247 originator->below = op;
1277 } 1248 }
1278 else 1249 else
1279 { 1250 {
1251 top = ms.bot;
1252
1280 /* If there are other objects, then */ 1253 /* If there are other objects, then */
1281 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1254 if ((!(flag & INS_MAP_LOAD)) && top)
1282 { 1255 {
1283 object *last = 0; 1256 object *last = 0;
1284 1257
1285 /* 1258 /*
1286 * If there are multiple objects on this space, we do some trickier handling. 1259 * If there are multiple objects on this space, we do some trickier handling.
1292 * once we get to them. This reduces the need to traverse over all of 1265 * once we get to them. This reduces the need to traverse over all of
1293 * them when adding another one - this saves quite a bit of cpu time 1266 * them when adding another one - this saves quite a bit of cpu time
1294 * when lots of spells are cast in one area. Currently, it is presumed 1267 * when lots of spells are cast in one area. Currently, it is presumed
1295 * that flying non pickable objects are spell objects. 1268 * that flying non pickable objects are spell objects.
1296 */ 1269 */
1297 while (top) 1270 for (top = ms.bot; top; top = top->above)
1298 { 1271 {
1299 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1272 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1300 floor = top; 1273 floor = top;
1301 1274
1302 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1275 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1305 top = top->below; 1278 top = top->below;
1306 break; 1279 break;
1307 } 1280 }
1308 1281
1309 last = top; 1282 last = top;
1310 top = top->above;
1311 } 1283 }
1312 1284
1313 /* Don't want top to be NULL, so set it to the last valid object */ 1285 /* Don't want top to be NULL, so set it to the last valid object */
1314 top = last; 1286 top = last;
1315 1287
1317 * looks like instead of lots of conditions here. 1289 * looks like instead of lots of conditions here.
1318 * makes things faster, and effectively the same result. 1290 * makes things faster, and effectively the same result.
1319 */ 1291 */
1320 1292
1321 /* Have object 'fall below' other objects that block view. 1293 /* Have object 'fall below' other objects that block view.
1322 * Unless those objects are exits, type 66 1294 * Unless those objects are exits.
1323 * If INS_ON_TOP is used, don't do this processing 1295 * If INS_ON_TOP is used, don't do this processing
1324 * Need to find the object that in fact blocks view, otherwise 1296 * Need to find the object that in fact blocks view, otherwise
1325 * stacking is a bit odd. 1297 * stacking is a bit odd.
1326 */ 1298 */
1327 if (!(flag & INS_ON_TOP) && 1299 if (!(flag & INS_ON_TOP)
1328 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1300 && ms.flags () & P_BLOCKSVIEW
1301 && (op->face && !faces [op->face].visibility))
1329 { 1302 {
1330 for (last = top; last != floor; last = last->below) 1303 for (last = top; last != floor; last = last->below)
1331 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1304 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1332 break; 1305 break;
1306
1333 /* Check to see if we found the object that blocks view, 1307 /* Check to see if we found the object that blocks view,
1334 * and make sure we have a below pointer for it so that 1308 * and make sure we have a below pointer for it so that
1335 * we can get inserted below this one, which requires we 1309 * we can get inserted below this one, which requires we
1336 * set top to the object below us. 1310 * set top to the object below us.
1337 */ 1311 */
1339 top = last->below; 1313 top = last->below;
1340 } 1314 }
1341 } /* If objects on this space */ 1315 } /* If objects on this space */
1342 1316
1343 if (flag & INS_MAP_LOAD) 1317 if (flag & INS_MAP_LOAD)
1344 top = GET_MAP_TOP (op->map, op->x, op->y); 1318 top = ms.top;
1345 1319
1346 if (flag & INS_ABOVE_FLOOR_ONLY) 1320 if (flag & INS_ABOVE_FLOOR_ONLY)
1347 top = floor; 1321 top = floor;
1348 1322
1349 /* Top is the object that our object (op) is going to get inserted above. 1323 /* Top is the object that our object (op) is going to get inserted above.
1350 */ 1324 */
1351 1325
1352 /* First object on this space */ 1326 /* First object on this space */
1353 if (!top) 1327 if (!top)
1354 { 1328 {
1355 op->above = GET_MAP_OB (op->map, op->x, op->y); 1329 op->above = ms.bot;
1356 1330
1357 if (op->above) 1331 if (op->above)
1358 op->above->below = op; 1332 op->above->below = op;
1359 1333
1360 op->below = 0; 1334 op->below = 0;
1361 op->ms ().bot = op; 1335 ms.bot = op;
1362 } 1336 }
1363 else 1337 else
1364 { /* get inserted into the stack above top */ 1338 { /* get inserted into the stack above top */
1365 op->above = top->above; 1339 op->above = top->above;
1366 1340
1370 op->below = top; 1344 op->below = top;
1371 top->above = op; 1345 top->above = op;
1372 } 1346 }
1373 1347
1374 if (!op->above) 1348 if (!op->above)
1375 op->ms ().top = op; 1349 ms.top = op;
1376 } /* else not INS_BELOW_ORIGINATOR */ 1350 } /* else not INS_BELOW_ORIGINATOR */
1377 1351
1378 if (op->type == PLAYER) 1352 if (op->type == PLAYER)
1379 { 1353 {
1380 op->contr->do_los = 1; 1354 op->contr->do_los = 1;
1386 1360
1387 /* If we have a floor, we know the player, if any, will be above 1361 /* If we have a floor, we know the player, if any, will be above
1388 * it, so save a few ticks and start from there. 1362 * it, so save a few ticks and start from there.
1389 */ 1363 */
1390 if (!(flag & INS_MAP_LOAD)) 1364 if (!(flag & INS_MAP_LOAD))
1391 if (object *pl = op->ms ().player ()) 1365 if (object *pl = ms.player ())
1392 if (pl->contr->ns) 1366 if (pl->contr->ns)
1393 pl->contr->ns->floorbox_update (); 1367 pl->contr->ns->floorbox_update ();
1394 1368
1395 /* If this object glows, it may affect lighting conditions that are 1369 /* If this object glows, it may affect lighting conditions that are
1396 * visible to others on this map. But update_all_los is really 1370 * visible to others on this map. But update_all_los is really
1455 tmp1->x = op->x; 1429 tmp1->x = op->x;
1456 tmp1->y = op->y; 1430 tmp1->y = op->y;
1457 insert_ob_in_map (tmp1, op->map, op, 0); 1431 insert_ob_in_map (tmp1, op->map, op, 0);
1458} 1432}
1459 1433
1434// XXX: function not returning object*
1460object * 1435object *
1461object::insert_at (object *where, object *originator, int flags) 1436object::insert_at (object *where, object *originator, int flags)
1462{ 1437{
1463 where->map->insert (this, where->x, where->y, originator, flags); 1438 where->map->insert (this, where->x, where->y, originator, flags);
1464} 1439}
1805 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1780 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1806 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1781 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1807 { 1782 {
1808 1783
1809 float 1784 float
1810 diff = tmp->move_slow_penalty * FABS (op->speed); 1785 diff = tmp->move_slow_penalty * fabs (op->speed);
1811 1786
1812 if (op->type == PLAYER) 1787 if (op->type == PLAYER)
1813 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1788 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1814 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1789 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1815 diff /= 4.0; 1790 diff /= 4.0;
2022 } 1997 }
2023 1998
2024 if (!index) 1999 if (!index)
2025 return -1; 2000 return -1;
2026 2001
2027 return altern[RANDOM () % index]; 2002 return altern [rndm (index)];
2028} 2003}
2029 2004
2030/* 2005/*
2031 * find_first_free_spot(archetype, maptile, x, y) works like 2006 * find_first_free_spot(archetype, maptile, x, y) works like
2032 * find_free_spot(), but it will search max number of squares. 2007 * find_free_spot(), but it will search max number of squares.
2053{ 2028{
2054 arr += begin; 2029 arr += begin;
2055 end -= begin; 2030 end -= begin;
2056 2031
2057 while (--end) 2032 while (--end)
2058 swap (arr [end], arr [RANDOM () % (end + 1)]); 2033 swap (arr [end], arr [rndm (end + 1)]);
2059} 2034}
2060 2035
2061/* new function to make monster searching more efficient, and effective! 2036/* new function to make monster searching more efficient, and effective!
2062 * This basically returns a randomized array (in the passed pointer) of 2037 * This basically returns a randomized array (in the passed pointer) of
2063 * the spaces to find monsters. In this way, it won't always look for 2038 * the spaces to find monsters. In this way, it won't always look for
2197 2172
2198 return 3; 2173 return 3;
2199} 2174}
2200 2175
2201/* 2176/*
2202 * absdir(int): Returns a number between 1 and 8, which represent
2203 * the "absolute" direction of a number (it actually takes care of
2204 * "overflow" in previous calculations of a direction).
2205 */
2206
2207int
2208absdir (int d)
2209{
2210 while (d < 1)
2211 d += 8;
2212
2213 while (d > 8)
2214 d -= 8;
2215
2216 return d;
2217}
2218
2219/*
2220 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2177 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2221 * between two directions (which are expected to be absolute (see absdir()) 2178 * between two directions (which are expected to be absolute (see absdir())
2222 */ 2179 */
2223
2224int 2180int
2225dirdiff (int dir1, int dir2) 2181dirdiff (int dir1, int dir2)
2226{ 2182{
2227 int d; 2183 int d;
2228 2184
2394 insert_ob_in_ob (object_create_clone (item), dst); 2350 insert_ob_in_ob (object_create_clone (item), dst);
2395 2351
2396 return dst; 2352 return dst;
2397} 2353}
2398 2354
2399/* GROS - Creates an object using a string representing its content. */
2400/* Basically, we save the content of the string to a temp file, then call */
2401/* load_object on it. I admit it is a highly inefficient way to make things, */
2402/* but it was simple to make and allows reusing the load_object function. */
2403/* Remember not to use load_object_str in a time-critical situation. */
2404/* Also remember that multiparts objects are not supported for now. */
2405object *
2406load_object_str (const char *obstr)
2407{
2408 object *op;
2409 char filename[MAX_BUF];
2410
2411 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2412
2413 FILE *tempfile = fopen (filename, "w");
2414
2415 if (tempfile == NULL)
2416 {
2417 LOG (llevError, "Error - Unable to access load object temp file\n");
2418 return NULL;
2419 }
2420
2421 fprintf (tempfile, obstr);
2422 fclose (tempfile);
2423
2424 op = object::create ();
2425
2426 object_thawer thawer (filename);
2427
2428 if (thawer)
2429 load_object (thawer, op, 0);
2430
2431 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2432 CLEAR_FLAG (op, FLAG_REMOVED);
2433
2434 return op;
2435}
2436
2437/* This returns the first object in who's inventory that 2355/* This returns the first object in who's inventory that
2438 * has the same type and subtype match. 2356 * has the same type and subtype match.
2439 * returns NULL if no match. 2357 * returns NULL if no match.
2440 */ 2358 */
2441object * 2359object *
2644{ 2562{
2645 char flagdesc[512]; 2563 char flagdesc[512];
2646 char info2[256 * 4]; 2564 char info2[256 * 4];
2647 char *p = info; 2565 char *p = info;
2648 2566
2649 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2567 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2650 count, uuid.seq, 2568 count, uuid.seq,
2651 &name, 2569 &name,
2652 title ? "\",title:" : "", 2570 title ? "\",title:\"" : "",
2653 title ? (const char *)title : "", 2571 title ? (const char *)title : "",
2654 flag_desc (flagdesc, 512), type); 2572 flag_desc (flagdesc, 512), type);
2655 2573
2656 if (env) 2574 if (env)
2657 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2575 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2667{ 2585{
2668 static char info[256 * 4]; 2586 static char info[256 * 4];
2669 return debug_desc (info); 2587 return debug_desc (info);
2670} 2588}
2671 2589
2590const char *
2591object::debug_desc2 () const
2592{
2593 static char info[256 * 4];
2594 return debug_desc (info);
2595}
2596
2597struct region *
2598object::region () const
2599{
2600 return map ? map->region (x, y)
2601 : region::default_region ();
2602}
2603
2604const materialtype_t *
2605object::dominant_material () const
2606{
2607 if (materialtype_t *mat = name_to_material (materialname))
2608 return mat;
2609
2610 // omfg this is slow, this has to be temporary :)
2611 shstr unknown ("unknown");
2612
2613 return name_to_material (unknown);
2614}
2615
2616void
2617object::open_container (object *new_container)
2618{
2619 if (container == new_container)
2620 return;
2621
2622 if (object *old_container = container)
2623 {
2624 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2625 return;
2626
2627#if 0
2628 // remove the "Close old_container" object.
2629 if (object *closer = old_container->inv)
2630 if (closer->type == CLOSE_CON)
2631 closer->destroy ();
2632#endif
2633
2634 old_container->flag [FLAG_APPLIED] = 0;
2635 container = 0;
2636
2637 esrv_update_item (UPD_FLAGS, this, old_container);
2638 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2639 }
2640
2641 if (new_container)
2642 {
2643 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2644 return;
2645
2646 // TODO: this does not seem to serve any purpose anymore?
2647#if 0
2648 // insert the "Close Container" object.
2649 if (archetype *closer = new_container->other_arch)
2650 {
2651 object *closer = arch_to_object (new_container->other_arch);
2652 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2653 new_container->insert (closer);
2654 }
2655#endif
2656
2657 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2658
2659 new_container->flag [FLAG_APPLIED] = 1;
2660 container = new_container;
2661
2662 esrv_update_item (UPD_FLAGS, this, new_container);
2663 esrv_send_inventory (this, new_container);
2664 }
2665}
2666
2667

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines