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.37 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.59 by root, Wed Dec 6 13:59:00 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <loader.h> 33#include <loader.h>
35 34
36int nrofallocobjects = 0; 35int nrofallocobjects = 0;
36static UUID uuid;
37const uint64 UUID_SKIP = 1<<19;
37 38
38object *objects; /* Pointer to the list of used objects */
39object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
40 40
41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43}; 43};
… …
49}; 49};
50int freedir[SIZEOFFREE] = { 50int freedir[SIZEOFFREE] = {
51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53}; 53};
54
55static void
56write_uuid (void)
57{
58 char filename1[MAX_BUF], filename2[MAX_BUF];
59
60 sprintf (filename1, "%s/uuid", settings.localdir);
61 sprintf (filename2, "%s/uuid~", settings.localdir);
62
63 FILE *fp;
64
65 if (!(fp = fopen (filename2, "w")))
66 {
67 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
68 return;
69 }
70
71 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
72 fclose (fp);
73 rename (filename2, filename1);
74}
75
76static void
77read_uuid (void)
78{
79 char filename[MAX_BUF];
80
81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 FILE *fp;
84
85 if (!(fp = fopen (filename, "r")))
86 {
87 if (errno == ENOENT)
88 {
89 LOG (llevInfo, "RESET uid to 1\n");
90 uuid.seq = 0;
91 write_uuid ();
92 return;
93 }
94
95 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
96 _exit (1);
97 }
98
99 int version;
100 unsigned long long uid;
101 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
102 {
103 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
104 _exit (1);
105 }
106
107 uuid.seq = uid;
108 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid);
110 fclose (fp);
111}
112
113UUID
114gen_uuid ()
115{
116 UUID uid;
117
118 uid.seq = ++uuid.seq;
119
120 if (!(uuid.seq & (UUID_SKIP - 1)))
121 write_uuid ();
122
123 return uid;
124}
125
126void
127init_uuid ()
128{
129 read_uuid ();
130}
54 131
55/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 132/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56static int 133static int
57compare_ob_value_lists_one (const object *wants, const object *has) 134compare_ob_value_lists_one (const object *wants, const object *has)
58{ 135{
… …
297 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
298 * Some error messages. 375 * Some error messages.
299 * The result of the dump is stored in the static global errmsg array. 376 * The result of the dump is stored in the static global errmsg array.
300 */ 377 */
301 378
302void 379char *
303dump_object2 (object *op)
304{
305 errmsg[0] = 0;
306 return;
307 //TODO//D#d#
308#if 0
309 char *cp;
310
311/* object *tmp;*/
312
313 if (op->arch != NULL)
314 {
315 strcat (errmsg, "arch ");
316 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
317 strcat (errmsg, "\n");
318 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
319 strcat (errmsg, cp);
320# if 0
321 /* Don't dump player diffs - they are too long, mostly meaningless, and
322 * will overflow the buffer.
323 * Changed so that we don't dump inventory either. This may
324 * also overflow the buffer.
325 */
326 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
327 strcat (errmsg, cp);
328 for (tmp = op->inv; tmp; tmp = tmp->below)
329 dump_object2 (tmp);
330# endif
331 strcat (errmsg, "end\n");
332 }
333 else
334 {
335 strcat (errmsg, "Object ");
336 if (op->name == NULL)
337 strcat (errmsg, "(null)");
338 else
339 strcat (errmsg, op->name);
340 strcat (errmsg, "\n");
341# if 0
342 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
343 strcat (errmsg, cp);
344 for (tmp = op->inv; tmp; tmp = tmp->below)
345 dump_object2 (tmp);
346# endif
347 strcat (errmsg, "end\n");
348 }
349#endif
350}
351
352/*
353 * Dumps an object. Returns output in the static global errmsg array.
354 */
355
356void
357dump_object (object *op) 380dump_object (object *op)
358{ 381{
359 if (op == NULL) 382 if (!op)
360 { 383 return strdup ("[NULLOBJ]");
361 strcpy (errmsg, "[NULL pointer]");
362 return;
363 }
364 errmsg[0] = '\0';
365 dump_object2 (op);
366}
367 384
368void 385 object_freezer freezer;
369dump_all_objects (void) 386 save_object (freezer, op, 3);
370{ 387 return freezer.as_string ();
371 object *op;
372
373 for (op = objects; op != NULL; op = op->next)
374 {
375 dump_object (op);
376 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
377 }
378} 388}
379 389
380/* 390/*
381 * get_nearest_part(multi-object, object 2) returns the part of the 391 * get_nearest_part(multi-object, object 2) returns the part of the
382 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
… …
402 */ 412 */
403 413
404object * 414object *
405find_object (tag_t i) 415find_object (tag_t i)
406{ 416{
407 object *op; 417 for (object *op = object::first; op; op = op->next)
408
409 for (op = objects; op != NULL; op = op->next)
410 if (op->count == i) 418 if (op->count == i)
411 break; 419 return op;
420
412 return op; 421 return 0;
413} 422}
414 423
415/* 424/*
416 * Returns the first object which has a name equal to the argument. 425 * Returns the first object which has a name equal to the argument.
417 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
422find_object_name (const char *str) 431find_object_name (const char *str)
423{ 432{
424 shstr_cmp str_ (str); 433 shstr_cmp str_ (str);
425 object *op; 434 object *op;
426 435
427 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
428 if (op->name == str_) 437 if (op->name == str_)
429 break; 438 break;
430 439
431 return op; 440 return op;
432} 441}
433 442
434void 443void
435free_all_object_data () 444free_all_object_data ()
436{ 445{
437 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438}
439
440/*
441 * Returns the object which this object marks as being the owner.
442 * A id-scheme is used to avoid pointing to objects which have been
443 * freed and are now reused. If this is detected, the owner is
444 * set to NULL, and NULL is returned.
445 * Changed 2004-02-12 - if the player is setting at the play again
446 * prompt, he is removed, and we don't want to treat him as an owner of
447 * anything, so check removed flag. I don't expect that this should break
448 * anything - once an object is removed, it is basically dead anyways.
449 */
450object *
451object::get_owner ()
452{
453 if (!owner
454 || QUERY_FLAG (owner, FLAG_FREED)
455 || QUERY_FLAG (owner, FLAG_REMOVED))
456 owner = 0;
457
458 return owner;
459} 447}
460 448
461/* 449/*
462 * Sets the owner and sets the skill and exp pointers to owner's current 450 * Sets the owner and sets the skill and exp pointers to owner's current
463 * skill and experience objects. 451 * skill and experience objects.
… …
533 521
534 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
535 523
536 expmul = 1.0; 524 expmul = 1.0;
537 face = blank_face; 525 face = blank_face;
538 attacked_by_count = -1;
539 526
540 if (settings.casting_time) 527 if (settings.casting_time)
541 casting_time = -1; 528 casting_time = -1;
542} 529}
543 530
… …
566 553
567 op2->clone (op); 554 op2->clone (op);
568 555
569 if (is_freed) 556 if (is_freed)
570 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
571 if (is_removed) 559 if (is_removed)
572 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
573 561
574 if (op2->speed < 0) 562 if (op2->speed < 0)
575 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
… …
817 update_now = 1; 805 update_now = 1;
818 806
819 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
820 update_now = 1; 808 update_now = 1;
821 } 809 }
810
822 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
823 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
824 * that is being removed. 813 * that is being removed.
825 */ 814 */
826 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
838 827
839 if (op->more != NULL) 828 if (op->more != NULL)
840 update_object (op->more, action); 829 update_object (op->more, action);
841} 830}
842 831
843static unordered_vector<object *> mortals; 832object::vector object::mortals;
844static std::vector<object *, slice_allocator <object *> > freed; 833object::vector object::objects; // not yet used
834object *object::first;
845 835
846void object::free_mortals () 836void object::free_mortals ()
847{ 837{
848 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849 if ((*i)->refcnt) 839 if ((*i)->refcnt)
850 ++i; // further delay freeing 840 ++i; // further delay freeing
851 else 841 else
852 { 842 {
853 freed.push_back (*i);//D
854 //delete *i; 843 delete *i;
855 mortals.erase (i); 844 mortals.erase (i);
856 } 845 }
857
858 if (mortals.size() && 0)//D
859 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
860} 846}
861 847
862object::object () 848object::object ()
863{ 849{
864 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
865 851
866 expmul = 1.0; 852 expmul = 1.0;
867 face = blank_face; 853 face = blank_face;
868 attacked_by_count = -1;
869} 854}
870 855
871object::~object () 856object::~object ()
872{ 857{
873 free_key_values (this); 858 free_key_values (this);
874} 859}
875 860
876void object::link () 861void object::link ()
877{ 862{
878 count = ++ob_count; 863 count = ++ob_count;
864 uuid = gen_uuid ();
879 865
880 prev = 0; 866 prev = 0;
881 next = objects; 867 next = object::first;
882 868
883 if (objects) 869 if (object::first)
884 objects->prev = this; 870 object::first->prev = this;
885 871
886 objects = this; 872 object::first = this;
887} 873}
888 874
889void object::unlink () 875void object::unlink ()
890{ 876{
891 count = 0; 877 if (this == object::first)
878 object::first = next;
892 879
893 /* Remove this object from the list of used objects */ 880 /* Remove this object from the list of used objects */
894 if (prev)
895 {
896 prev->next = next; 881 if (prev) prev->next = next;
882 if (next) next->prev = prev;
883
897 prev = 0; 884 prev = 0;
898 }
899
900 if (next)
901 {
902 next->prev = prev;
903 next = 0; 885 next = 0;
904 }
905
906 if (this == objects)
907 objects = next;
908} 886}
909 887
910object *object::create () 888object *object::create ()
911{ 889{
912 object *op;
913
914 if (freed.empty ())
915 op = new object; 890 object *op = new object;
916 else
917 {
918 // highly annoying, but the only way to get it stable right now
919 op = freed.back ();
920 freed.pop_back ();
921 op->~object ();
922 new ((void *) op) object;
923 }
924
925 op->link (); 891 op->link ();
926 return op; 892 return op;
927} 893}
928 894
929/* 895/*
… …
931 * it from the list of used objects, and puts it on the list of 897 * it from the list of used objects, and puts it on the list of
932 * free objects. The IS_FREED() flag is set in the object. 898 * free objects. The IS_FREED() flag is set in the object.
933 * The object must have been removed by remove_ob() first for 899 * The object must have been removed by remove_ob() first for
934 * this function to succeed. 900 * this function to succeed.
935 * 901 *
936 * If free_inventory is set, free inventory as well. Else drop items in 902 * If destroy_inventory is set, free inventory as well. Else drop items in
937 * inventory to the ground. 903 * inventory to the ground.
938 */ 904 */
939void object::free (bool free_inventory) 905void object::destroy (bool destroy_inventory)
940{ 906{
941 if (QUERY_FLAG (this, FLAG_FREED)) 907 if (QUERY_FLAG (this, FLAG_FREED))
942 return; 908 return;
943 909
944 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 910 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
949 915
950 SET_FLAG (this, FLAG_FREED); 916 SET_FLAG (this, FLAG_FREED);
951 917
952 if (more) 918 if (more)
953 { 919 {
954 more->free (free_inventory); 920 more->destroy (destroy_inventory);
955 more = 0; 921 more = 0;
956 } 922 }
957 923
958 if (inv) 924 if (inv)
959 { 925 {
960 /* Only if the space blocks everything do we not process - 926 /* Only if the space blocks everything do we not process -
961 * if some form of movement is allowed, let objects 927 * if some form of movement is allowed, let objects
962 * drop on that space. 928 * drop on that space.
963 */ 929 */
964 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 930 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
965 { 931 {
966 object *op = inv; 932 object *op = inv;
967 933
968 while (op) 934 while (op)
969 { 935 {
970 object *tmp = op->below; 936 object *tmp = op->below;
971 op->free (free_inventory); 937 op->destroy (destroy_inventory);
972 op = tmp; 938 op = tmp;
973 } 939 }
974 } 940 }
975 else 941 else
976 { /* Put objects in inventory onto this space */ 942 { /* Put objects in inventory onto this space */
… …
995 op = tmp; 961 op = tmp;
996 } 962 }
997 } 963 }
998 } 964 }
999 965
966 // hack to ensure that freed objects still have a valid map
967 {
968 static maptile *freed_map; // freed objects are moved here to avoid crashes
969
970 if (!freed_map)
971 {
972 freed_map = new maptile;
973
974 freed_map->name = "/internal/freed_objects_map";
975 freed_map->width = 3;
976 freed_map->height = 3;
977
978 freed_map->allocate ();
979 }
980
981 map = freed_map;
982 x = 1;
983 y = 1;
984 }
985
986 // clear those pointers that likely might have circular references to us
1000 owner = 0; 987 owner = 0;
988 enemy = 0;
989 attacked_by = 0;
990
991 // only relevant for players(?), but make sure of it anyways
992 contr = 0;
1001 993
1002 /* Remove object from the active list */ 994 /* Remove object from the active list */
1003 speed = 0; 995 speed = 0;
1004 update_ob_speed (this); 996 update_ob_speed (this);
1005 997
… …
1010 1002
1011/* 1003/*
1012 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1013 * weight of an object (and what is carried by it's environment(s)). 1005 * weight of an object (and what is carried by it's environment(s)).
1014 */ 1006 */
1015
1016void 1007void
1017sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1018{ 1009{
1019 while (op != NULL) 1010 while (op != NULL)
1020 { 1011 {
1021 if (op->type == CONTAINER) 1012 if (op->type == CONTAINER)
1022 {
1023 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1013 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024 } 1014
1025 op->carrying -= weight; 1015 op->carrying -= weight;
1026 op = op->env; 1016 op = op->env;
1027 } 1017 }
1028} 1018}
1029 1019
… …
1033 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1034 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1035 * the previous environment. 1025 * the previous environment.
1036 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1037 */ 1027 */
1038
1039void 1028void
1040remove_ob (object *op) 1029object::remove ()
1041{ 1030{
1031 object *tmp, *last = 0;
1042 object * 1032 object *otmp;
1043 tmp, *
1044 last = NULL;
1045 object *
1046 otmp;
1047 1033
1048 tag_t
1049 tag;
1050 int
1051 check_walk_off; 1034 int check_walk_off;
1052 mapstruct *
1053 m;
1054 1035
1055 sint16
1056 x,
1057 y;
1058
1059 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1060 return; 1037 return;
1061 1038
1062 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1063 1040
1064 if (op->more != NULL) 1041 if (more)
1065 remove_ob (op->more); 1042 more->remove ();
1066 1043
1067 /* 1044 /*
1068 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1069 * inventory. 1046 * inventory.
1070 */ 1047 */
1071 if (op->env != NULL) 1048 if (env)
1072 { 1049 {
1073 if (op->nrof) 1050 if (nrof)
1074 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1075 else 1052 else
1076 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1077 1054
1078 /* NO_FIX_PLAYER is set when a great many changes are being 1055 /* NO_FIX_PLAYER is set when a great many changes are being
1079 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1080 * to save cpu time. 1057 * to save cpu time.
1081 */ 1058 */
1082 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1059 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1083 fix_player (otmp); 1060 fix_player (otmp);
1084 1061
1085 if (op->above != NULL) 1062 if (above != NULL)
1086 op->above->below = op->below; 1063 above->below = below;
1087 else 1064 else
1088 op->env->inv = op->below; 1065 env->inv = below;
1089 1066
1090 if (op->below != NULL) 1067 if (below != NULL)
1091 op->below->above = op->above; 1068 below->above = above;
1092 1069
1093 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1094 * the map, but we don't actually do that - it is up 1071 * the map, but we don't actually do that - it is up
1095 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1096 */ 1073 */
1097 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1098 op->map = op->env->map; 1075 map = env->map;
1099 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1100 op->env = NULL; 1077 env = 0;
1101 } 1078 }
1102 else if (op->map) 1079 else if (map)
1103 { 1080 {
1104 x = op->x;
1105 y = op->y;
1106 m = get_map_from_coord (op->map, &x, &y);
1107
1108 if (!m)
1109 {
1110 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1111 op->map->path, op->x, op->y);
1112 /* in old days, we used to set x and y to 0 and continue.
1113 * it seems if we get into this case, something is probablye
1114 * screwed up and should be fixed.
1115 */
1116 abort ();
1117 }
1118
1119 if (op->map != m)
1120 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1121 op->map->path, m->path, op->x, op->y, x, y);
1122
1123 /* Re did the following section of code - it looks like it had 1081 /* Re did the following section of code - it looks like it had
1124 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1125 */ 1083 */
1126 1084
1127 /* link the object above us */ 1085 /* link the object above us */
1128 if (op->above) 1086 if (above)
1129 op->above->below = op->below; 1087 above->below = below;
1130 else 1088 else
1131 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1089 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1132 1090
1133 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1134 if (op->below) 1092 if (below)
1135 op->below->above = op->above; 1093 below->above = above;
1136 else 1094 else
1137 { 1095 {
1138 /* Nothing below, which means we need to relink map object for this space 1096 /* Nothing below, which means we need to relink map object for this space
1139 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1140 * evident 1098 * evident
1141 */ 1099 */
1142 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1143 { 1101 {
1144 dump_object (op); 1102 char *dump = dump_object (this);
1145 LOG (llevError, 1103 LOG (llevError,
1146 "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); 1104 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1105 free (dump);
1147 dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1148 LOG (llevError, "%s\n", errmsg); 1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1149 } 1109 }
1150 1110
1151 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1152 } 1112 }
1153 1113
1154 op->above = 0; 1114 above = 0;
1155 op->below = 0; 1115 below = 0;
1156 1116
1157 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1158 return; 1118 return;
1159 1119
1160 tag = op->count;
1161 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1162 1121
1163 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1122 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1164 { 1123 {
1165 /* No point updating the players look faces if he is the object 1124 /* No point updating the players look faces if he is the object
1166 * being removed. 1125 * being removed.
1167 */ 1126 */
1168 1127
1169 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1170 { 1129 {
1171 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1172 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1173 * appropriately. 1132 * appropriately.
1174 */ 1133 */
1175 if (tmp->container == op) 1134 if (tmp->container == this)
1176 { 1135 {
1177 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1178 tmp->container = NULL; 1137 tmp->container = 0;
1179 } 1138 }
1180 1139
1181 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1182 } 1141 }
1183 1142
1184 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1185 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1144 if (check_walk_off
1145 && ((move_type & tmp->move_off)
1146 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186 { 1147 {
1187 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1188 1149
1189 if (was_destroyed (op, tag)) 1150 if (destroyed ())
1190 {
1191 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1151 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192 }
1193 } 1152 }
1194 1153
1195 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196 1155
1197 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1198 tmp->above = NULL; 1157 tmp->above = 0;
1199 1158
1200 last = tmp; 1159 last = tmp;
1201 } 1160 }
1202 1161
1203 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1204 if (last == NULL) 1163 if (!last)
1205 { 1164 {
1206 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1207 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1166 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1208 * those out anyways, and if there are any flags set right now, they won't 1167 * those out anyways, and if there are any flags set right now, they won't
1209 * be correct anyways. 1168 * be correct anyways.
1210 */ 1169 */
1211 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1212 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1213 } 1172 }
1214 else 1173 else
1215 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1216 1175
1217 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1218 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1219 } 1178 }
1220} 1179}
1221 1180
1222/* 1181/*
1223 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1250 free_object (op); 1209 free_object (op);
1251 return top; 1210 return top;
1252 } 1211 }
1253 } 1212 }
1254 1213
1255 return NULL; 1214 return 0;
1256} 1215}
1257 1216
1258/* 1217/*
1259 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1218 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1260 * job preparing multi-part monsters 1219 * job preparing multi-part monsters
1261 */ 1220 */
1262object * 1221object *
1263insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1222insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264{ 1223{
1265 object *tmp; 1224 object *tmp;
1266 1225
1267 if (op->head) 1226 if (op->head)
1268 op = op->head; 1227 op = op->head;
… …
1296 * NULL if 'op' was destroyed 1255 * NULL if 'op' was destroyed
1297 * just 'op' otherwise 1256 * just 'op' otherwise
1298 */ 1257 */
1299 1258
1300object * 1259object *
1301insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302{ 1261{
1303 object *tmp, *top, *floor = NULL; 1262 object *tmp, *top, *floor = NULL;
1304 sint16 x, y; 1263 sint16 x, y;
1305 1264
1306 if (QUERY_FLAG (op, FLAG_FREED)) 1265 if (QUERY_FLAG (op, FLAG_FREED))
… …
1309 return NULL; 1268 return NULL;
1310 } 1269 }
1311 1270
1312 if (m == NULL) 1271 if (m == NULL)
1313 { 1272 {
1314 dump_object (op); 1273 char *dump = dump_object (op);
1315 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1274 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1275 free (dump);
1316 return op; 1276 return op;
1317 } 1277 }
1318 1278
1319 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1320 { 1280 {
1321 dump_object (op); 1281 char *dump = dump_object (op);
1322 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1282 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323#ifdef MANY_CORES 1283#ifdef MANY_CORES
1324 /* Better to catch this here, as otherwise the next use of this object 1284 /* Better to catch this here, as otherwise the next use of this object
1325 * is likely to cause a crash. Better to find out where it is getting 1285 * is likely to cause a crash. Better to find out where it is getting
1326 * improperly inserted. 1286 * improperly inserted.
1327 */ 1287 */
1328 abort (); 1288 abort ();
1329#endif 1289#endif
1290 free (dump);
1330 return op; 1291 return op;
1331 } 1292 }
1332 1293
1333 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1334 { 1295 {
1335 dump_object (op); 1296 char *dump = dump_object (op);
1336 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1297 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1298 free (dump);
1337 return op; 1299 return op;
1338 } 1300 }
1339 1301
1340 if (op->more != NULL) 1302 if (op->more != NULL)
1341 { 1303 {
… …
1587 remove_ob (tmp); 1549 remove_ob (tmp);
1588 free_object (tmp); 1550 free_object (tmp);
1589 } 1551 }
1590 } 1552 }
1591 1553
1592 tmp1 = arch_to_object (find_archetype (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1593 1555
1594 tmp1->x = op->x; 1556 tmp1->x = op->x;
1595 tmp1->y = op->y; 1557 tmp1->y = op->y;
1596 insert_ob_in_map (tmp1, op->map, op, 0); 1558 insert_ob_in_map (tmp1, op->map, op, 0);
1597} 1559}
… …
1755 op->carrying += weight; 1717 op->carrying += weight;
1756 op = op->env; 1718 op = op->env;
1757 } 1719 }
1758} 1720}
1759 1721
1722object *
1723insert_ob_in_ob (object *op, object *where)
1724{
1725 if (!where)
1726 {
1727 char *dump = dump_object (op);
1728 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1729 free (dump);
1730 return op;
1731 }
1732
1733 if (where->head)
1734 {
1735 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1736 where = where->head;
1737 }
1738
1739 return where->insert (op);
1740}
1741
1760/* 1742/*
1761 * insert_ob_in_ob(op,environment): 1743 * env->insert (op)
1762 * This function inserts the object op in the linked list 1744 * This function inserts the object op in the linked list
1763 * inside the object environment. 1745 * inside the object environment.
1764 * 1746 *
1765 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1766 * the inventory at the last position or next to other objects of the same
1767 * type.
1768 * Frank: Now sorted by type, archetype and magic!
1769 *
1770 * The function returns now pointer to inserted item, and return value can 1747 * The function returns now pointer to inserted item, and return value can
1771 * be != op, if items are merged. -Tero 1748 * be != op, if items are merged. -Tero
1772 */ 1749 */
1773 1750
1774object * 1751object *
1775insert_ob_in_ob (object *op, object *where) 1752object::insert (object *op)
1776{ 1753{
1777 object * 1754 object *tmp, *otmp;
1778 tmp, *
1779 otmp;
1780 1755
1781 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1756 if (!QUERY_FLAG (op, FLAG_REMOVED))
1782 { 1757 op->remove ();
1783 dump_object (op);
1784 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1785 return op;
1786 }
1787
1788 if (where == NULL)
1789 {
1790 dump_object (op);
1791 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1792 return op;
1793 }
1794
1795 if (where->head)
1796 {
1797 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1798 where = where->head;
1799 }
1800 1758
1801 if (op->more) 1759 if (op->more)
1802 { 1760 {
1803 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1761 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804 return op; 1762 return op;
… …
1806 1764
1807 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1765 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808 CLEAR_FLAG (op, FLAG_REMOVED); 1766 CLEAR_FLAG (op, FLAG_REMOVED);
1809 if (op->nrof) 1767 if (op->nrof)
1810 { 1768 {
1811 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1769 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812 if (CAN_MERGE (tmp, op)) 1770 if (CAN_MERGE (tmp, op))
1813 { 1771 {
1814 /* return the original object and remove inserted object 1772 /* return the original object and remove inserted object
1815 (client needs the original object) */ 1773 (client needs the original object) */
1816 tmp->nrof += op->nrof; 1774 tmp->nrof += op->nrof;
1817 /* Weight handling gets pretty funky. Since we are adding to 1775 /* Weight handling gets pretty funky. Since we are adding to
1818 * tmp->nrof, we need to increase the weight. 1776 * tmp->nrof, we need to increase the weight.
1819 */ 1777 */
1820 add_weight (where, op->weight * op->nrof); 1778 add_weight (this, op->weight * op->nrof);
1821 SET_FLAG (op, FLAG_REMOVED); 1779 SET_FLAG (op, FLAG_REMOVED);
1822 free_object (op); /* free the inserted object */ 1780 op->destroy (); /* free the inserted object */
1823 op = tmp; 1781 op = tmp;
1824 remove_ob (op); /* and fix old object's links */ 1782 op->remove (); /* and fix old object's links */
1825 CLEAR_FLAG (op, FLAG_REMOVED); 1783 CLEAR_FLAG (op, FLAG_REMOVED);
1826 break; 1784 break;
1827 } 1785 }
1828 1786
1829 /* I assume combined objects have no inventory 1787 /* I assume combined objects have no inventory
1830 * We add the weight - this object could have just been removed 1788 * We add the weight - this object could have just been removed
1831 * (if it was possible to merge). calling remove_ob will subtract 1789 * (if it was possible to merge). calling remove_ob will subtract
1832 * the weight, so we need to add it in again, since we actually do 1790 * the weight, so we need to add it in again, since we actually do
1833 * the linking below 1791 * the linking below
1834 */ 1792 */
1835 add_weight (where, op->weight * op->nrof); 1793 add_weight (this, op->weight * op->nrof);
1836 } 1794 }
1837 else 1795 else
1838 add_weight (where, (op->weight + op->carrying)); 1796 add_weight (this, (op->weight + op->carrying));
1839 1797
1840 otmp = is_player_inv (where); 1798 otmp = is_player_inv (this);
1841 if (otmp && otmp->contr != NULL) 1799 if (otmp && otmp->contr)
1842 {
1843 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1800 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844 fix_player (otmp); 1801 fix_player (otmp);
1845 }
1846 1802
1847 op->map = NULL; 1803 op->map = NULL;
1848 op->env = where; 1804 op->env = this;
1849 op->above = NULL; 1805 op->above = NULL;
1850 op->below = NULL; 1806 op->below = NULL;
1851 op->x = 0, op->y = 0; 1807 op->x = 0, op->y = 0;
1852 1808
1853 /* reset the light list and los of the players on the map */ 1809 /* reset the light list and los of the players on the map */
1854 if ((op->glow_radius != 0) && where->map) 1810 if ((op->glow_radius != 0) && map)
1855 { 1811 {
1856#ifdef DEBUG_LIGHTS 1812#ifdef DEBUG_LIGHTS
1857 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1813 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858#endif /* DEBUG_LIGHTS */ 1814#endif /* DEBUG_LIGHTS */
1859 if (MAP_DARKNESS (where->map)) 1815 if (MAP_DARKNESS (map))
1860 update_all_los (where->map, where->x, where->y); 1816 update_all_los (map, x, y);
1861 } 1817 }
1862 1818
1863 /* Client has no idea of ordering so lets not bother ordering it here. 1819 /* Client has no idea of ordering so lets not bother ordering it here.
1864 * It sure simplifies this function... 1820 * It sure simplifies this function...
1865 */ 1821 */
1866 if (where->inv == NULL) 1822 if (!inv)
1867 where->inv = op; 1823 inv = op;
1868 else 1824 else
1869 { 1825 {
1870 op->below = where->inv; 1826 op->below = inv;
1871 op->below->above = op; 1827 op->below->above = op;
1872 where->inv = op; 1828 inv = op;
1873 } 1829 }
1830
1874 return op; 1831 return op;
1875} 1832}
1876 1833
1877/* 1834/*
1878 * Checks if any objects has a move_type that matches objects 1835 * Checks if any objects has a move_type that matches objects
… …
1896 */ 1853 */
1897 1854
1898int 1855int
1899check_move_on (object *op, object *originator) 1856check_move_on (object *op, object *originator)
1900{ 1857{
1901 object * 1858 object *tmp;
1902 tmp; 1859 maptile *m = op->map;
1903 tag_t
1904 tag;
1905 mapstruct *
1906 m = op->map;
1907 int
1908 x = op->x, y = op->y; 1860 int x = op->x, y = op->y;
1909 1861
1910 MoveType 1862 MoveType move_on, move_slow, move_block;
1911 move_on,
1912 move_slow,
1913 move_block;
1914 1863
1915 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1864 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916 return 0; 1865 return 0;
1917
1918 tag = op->count;
1919 1866
1920 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1867 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1921 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1868 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1922 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1869 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923 1870
… …
1984 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1931 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1985 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1932 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986 { 1933 {
1987 move_apply (tmp, op, originator); 1934 move_apply (tmp, op, originator);
1988 1935
1989 if (was_destroyed (op, tag)) 1936 if (op->destroyed ())
1990 return 1; 1937 return 1;
1991 1938
1992 /* what the person/creature stepped onto has moved the object 1939 /* what the person/creature stepped onto has moved the object
1993 * someplace new. Don't process any further - if we did, 1940 * someplace new. Don't process any further - if we did,
1994 * have a feeling strange problems would result. 1941 * have a feeling strange problems would result.
… …
2006 * a matching archetype at the given map and coordinates. 1953 * a matching archetype at the given map and coordinates.
2007 * The first matching object is returned, or NULL if none. 1954 * The first matching object is returned, or NULL if none.
2008 */ 1955 */
2009 1956
2010object * 1957object *
2011present_arch (const archetype *at, mapstruct *m, int x, int y) 1958present_arch (const archetype *at, maptile *m, int x, int y)
2012{ 1959{
2013 object * 1960 object *
2014 tmp; 1961 tmp;
2015 1962
2016 if (m == NULL || out_of_map (m, x, y)) 1963 if (m == NULL || out_of_map (m, x, y))
… …
2029 * a matching type variable at the given map and coordinates. 1976 * a matching type variable at the given map and coordinates.
2030 * The first matching object is returned, or NULL if none. 1977 * The first matching object is returned, or NULL if none.
2031 */ 1978 */
2032 1979
2033object * 1980object *
2034present (unsigned char type, mapstruct *m, int x, int y) 1981present (unsigned char type, maptile *m, int x, int y)
2035{ 1982{
2036 object * 1983 object *
2037 tmp; 1984 tmp;
2038 1985
2039 if (out_of_map (m, x, y)) 1986 if (out_of_map (m, x, y))
… …
2179 * the archetype because that isn't correct if the monster has been 2126 * the archetype because that isn't correct if the monster has been
2180 * customized, changed states, etc. 2127 * customized, changed states, etc.
2181 */ 2128 */
2182 2129
2183int 2130int
2184find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2131find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185{ 2132{
2186 int 2133 int
2187 i, 2134 i,
2188 index = 0, flag; 2135 index = 0, flag;
2189 static int 2136 static int
… …
2210 return -1; 2157 return -1;
2211 return altern[RANDOM () % index]; 2158 return altern[RANDOM () % index];
2212} 2159}
2213 2160
2214/* 2161/*
2215 * find_first_free_spot(archetype, mapstruct, x, y) works like 2162 * find_first_free_spot(archetype, maptile, x, y) works like
2216 * find_free_spot(), but it will search max number of squares. 2163 * find_free_spot(), but it will search max number of squares.
2217 * But it will return the first available spot, not a random choice. 2164 * But it will return the first available spot, not a random choice.
2218 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2165 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2219 */ 2166 */
2220 2167
2221int 2168int
2222find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2169find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223{ 2170{
2224 int 2171 int
2225 i; 2172 i;
2226 2173
2227 for (i = 0; i < SIZEOFFREE; i++) 2174 for (i = 0; i < SIZEOFFREE; i++)
… …
2291 * because we have to know what movement the thing looking to move 2238 * because we have to know what movement the thing looking to move
2292 * there is capable of. 2239 * there is capable of.
2293 */ 2240 */
2294 2241
2295int 2242int
2296find_dir (mapstruct *m, int x, int y, object *exclude) 2243find_dir (maptile *m, int x, int y, object *exclude)
2297{ 2244{
2298 int 2245 int
2299 i, 2246 i,
2300 max = SIZEOFFREE, mflags; 2247 max = SIZEOFFREE, mflags;
2301 2248
2302 sint16 nx, ny; 2249 sint16 nx, ny;
2303 object * 2250 object *
2304 tmp; 2251 tmp;
2305 mapstruct * 2252 maptile *
2306 mp; 2253 mp;
2307 2254
2308 MoveType blocked, move_type; 2255 MoveType blocked, move_type;
2309 2256
2310 if (exclude && exclude->head) 2257 if (exclude && exclude->head)
… …
2518 * Modified to be map tile aware -.MSW 2465 * Modified to be map tile aware -.MSW
2519 */ 2466 */
2520 2467
2521 2468
2522int 2469int
2523can_see_monsterP (mapstruct *m, int x, int y, int dir) 2470can_see_monsterP (maptile *m, int x, int y, int dir)
2524{ 2471{
2525 sint16 dx, dy; 2472 sint16 dx, dy;
2526 int 2473 int
2527 mflags; 2474 mflags;
2528 2475
… …
2608 if (prev) 2555 if (prev)
2609 prev->more = tmp; 2556 prev->more = tmp;
2610 prev = tmp; 2557 prev = tmp;
2611 } 2558 }
2612 2559
2613 /*** copy inventory ***/
2614 for (item = src->inv; item; item = item->below) 2560 for (item = src->inv; item; item = item->below)
2615 {
2616 (void) insert_ob_in_ob (object_create_clone (item), dst); 2561 insert_ob_in_ob (object_create_clone (item), dst);
2617 }
2618 2562
2619 return dst; 2563 return dst;
2620} 2564}
2621 2565
2622/* return true if the object was destroyed, 0 otherwise */
2623int
2624was_destroyed (const object *op, tag_t old_tag)
2625{
2626 /* checking for FLAG_FREED isn't necessary, but makes this function more
2627 * robust */
2628 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2629}
2630
2631/* GROS - Creates an object using a string representing its content. */ 2566/* GROS - Creates an object using a string representing its content. */
2632
2633/* Basically, we save the content of the string to a temp file, then call */ 2567/* Basically, we save the content of the string to a temp file, then call */
2634
2635/* load_object on it. I admit it is a highly inefficient way to make things, */ 2568/* load_object on it. I admit it is a highly inefficient way to make things, */
2636
2637/* but it was simple to make and allows reusing the load_object function. */ 2569/* but it was simple to make and allows reusing the load_object function. */
2638
2639/* Remember not to use load_object_str in a time-critical situation. */ 2570/* Remember not to use load_object_str in a time-critical situation. */
2640
2641/* Also remember that multiparts objects are not supported for now. */ 2571/* Also remember that multiparts objects are not supported for now. */
2642 2572
2643object * 2573object *
2644load_object_str (const char *obstr) 2574load_object_str (const char *obstr)
2645{ 2575{
2646 object * 2576 object *op;
2647 op;
2648 char
2649 filename[MAX_BUF]; 2577 char filename[MAX_BUF];
2650 2578
2651 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2579 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652 2580
2653 FILE *
2654 tempfile = fopen (filename, "w"); 2581 FILE *tempfile = fopen (filename, "w");
2655 2582
2656 if (tempfile == NULL) 2583 if (tempfile == NULL)
2657 { 2584 {
2658 LOG (llevError, "Error - Unable to access load object temp file\n"); 2585 LOG (llevError, "Error - Unable to access load object temp file\n");
2659 return NULL; 2586 return NULL;
2660 }; 2587 }
2588
2661 fprintf (tempfile, obstr); 2589 fprintf (tempfile, obstr);
2662 fclose (tempfile); 2590 fclose (tempfile);
2663 2591
2664 op = get_object (); 2592 op = get_object ();
2665 2593
… …
2679 * returns NULL if no match. 2607 * returns NULL if no match.
2680 */ 2608 */
2681object * 2609object *
2682find_obj_by_type_subtype (const object *who, int type, int subtype) 2610find_obj_by_type_subtype (const object *who, int type, int subtype)
2683{ 2611{
2684 object * 2612 object *tmp;
2685 tmp;
2686 2613
2687 for (tmp = who->inv; tmp; tmp = tmp->below) 2614 for (tmp = who->inv; tmp; tmp = tmp->below)
2688 if (tmp->type == type && tmp->subtype == subtype) 2615 if (tmp->type == type && tmp->subtype == subtype)
2689 return tmp; 2616 return tmp;
2690 2617
… …
2698 * do the desired thing. 2625 * do the desired thing.
2699 */ 2626 */
2700key_value * 2627key_value *
2701get_ob_key_link (const object *ob, const char *key) 2628get_ob_key_link (const object *ob, const char *key)
2702{ 2629{
2703 key_value * 2630 key_value *link;
2704 link;
2705 2631
2706 for (link = ob->key_values; link != NULL; link = link->next) 2632 for (link = ob->key_values; link != NULL; link = link->next)
2707 {
2708 if (link->key == key) 2633 if (link->key == key)
2709 {
2710 return link; 2634 return link;
2711 }
2712 }
2713 2635
2714 return NULL; 2636 return NULL;
2715} 2637}
2716 2638
2717/* 2639/*

Diff Legend

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