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.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 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. */
… …
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <skills.h>
35#include <loader.h> 33#include <loader.h>
36 34
37int nrofallocobjects = 0; 35int nrofallocobjects = 0;
36static UUID uuid;
37const uint64 UUID_SKIP = 1<<19;
38 38
39object *objects; /* Pointer to the list of used objects */
40object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
41 40
42short 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,
43 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
44}; 43};
… …
50}; 49};
51int freedir[SIZEOFFREE] = { 50int freedir[SIZEOFFREE] = {
52 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,
53 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
54}; 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: %" PRId64 "\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}
55 131
56/* 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. */
57static int 133static int
58compare_ob_value_lists_one (const object *wants, const object *has) 134compare_ob_value_lists_one (const object *wants, const object *has)
59{ 135{
… …
255 { 331 {
256 if (inv->inv) 332 if (inv->inv)
257 sum_weight (inv); 333 sum_weight (inv);
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 335 }
336
260 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
339
262 if (op->carrying != sum) 340 if (op->carrying != sum)
263 op->carrying = sum; 341 op->carrying = sum;
342
264 return sum; 343 return sum;
265} 344}
266 345
267/** 346/**
268 * Return the outermost environment object for a given object. 347 * Return the outermost environment object for a given object.
… …
295 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296 * Some error messages. 375 * Some error messages.
297 * 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.
298 */ 377 */
299 378
300void 379char *
301dump_object2 (object *op)
302{
303 errmsg[0] = 0;
304 return;
305 //TODO//D#d#
306#if 0
307 char *cp;
308
309/* object *tmp;*/
310
311 if (op->arch != NULL)
312 {
313 strcat (errmsg, "arch ");
314 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315 strcat (errmsg, "\n");
316 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317 strcat (errmsg, cp);
318# if 0
319 /* Don't dump player diffs - they are too long, mostly meaningless, and
320 * will overflow the buffer.
321 * Changed so that we don't dump inventory either. This may
322 * also overflow the buffer.
323 */
324 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325 strcat (errmsg, cp);
326 for (tmp = op->inv; tmp; tmp = tmp->below)
327 dump_object2 (tmp);
328# endif
329 strcat (errmsg, "end\n");
330 }
331 else
332 {
333 strcat (errmsg, "Object ");
334 if (op->name == NULL)
335 strcat (errmsg, "(null)");
336 else
337 strcat (errmsg, op->name);
338 strcat (errmsg, "\n");
339# if 0
340 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341 strcat (errmsg, cp);
342 for (tmp = op->inv; tmp; tmp = tmp->below)
343 dump_object2 (tmp);
344# endif
345 strcat (errmsg, "end\n");
346 }
347#endif
348}
349
350/*
351 * Dumps an object. Returns output in the static global errmsg array.
352 */
353
354void
355dump_object (object *op) 380dump_object (object *op)
356{ 381{
357 if (op == NULL) 382 if (!op)
358 { 383 return strdup ("[NULLOBJ]");
359 strcpy (errmsg, "[NULL pointer]");
360 return;
361 }
362 errmsg[0] = '\0';
363 dump_object2 (op);
364}
365 384
366void 385 object_freezer freezer;
367dump_all_objects (void) 386 save_object (freezer, op, 3);
368{ 387 return freezer.as_string ();
369 object *op;
370
371 for (op = objects; op != NULL; op = op->next)
372 {
373 dump_object (op);
374 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375 }
376} 388}
377 389
378/* 390/*
379 * 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
380 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
… …
400 */ 412 */
401 413
402object * 414object *
403find_object (tag_t i) 415find_object (tag_t i)
404{ 416{
405 object *op; 417 for (object *op = object::first; op; op = op->next)
406
407 for (op = objects; op != NULL; op = op->next)
408 if (op->count == i) 418 if (op->count == i)
409 break; 419 return op;
420
410 return op; 421 return 0;
411} 422}
412 423
413/* 424/*
414 * 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.
415 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
417 */ 428 */
418 429
419object * 430object *
420find_object_name (const char *str) 431find_object_name (const char *str)
421{ 432{
422 const char *name = shstr::find (str); 433 shstr_cmp str_ (str);
423 object *op; 434 object *op;
424 435
425 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
426 if (&op->name == name) 437 if (op->name == str_)
427 break; 438 break;
428 439
429 return op; 440 return op;
430} 441}
431 442
432void 443void
433free_all_object_data () 444free_all_object_data ()
434{ 445{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436}
437
438/*
439 * Returns the object which this object marks as being the owner.
440 * A id-scheme is used to avoid pointing to objects which have been
441 * freed and are now reused. If this is detected, the owner is
442 * set to NULL, and NULL is returned.
443 * Changed 2004-02-12 - if the player is setting at the play again
444 * prompt, he is removed, and we don't want to treat him as an owner of
445 * anything, so check removed flag. I don't expect that this should break
446 * anything - once an object is removed, it is basically dead anyways.
447 */
448object *
449object::get_owner ()
450{
451 if (!owner
452 || QUERY_FLAG (owner, FLAG_FREED)
453 || QUERY_FLAG (owner, FLAG_REMOVED))
454 owner = 0;
455
456 return owner;
457} 447}
458 448
459/* 449/*
460 * 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
461 * skill and experience objects. 451 * skill and experience objects.
… …
531 521
532 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
533 523
534 expmul = 1.0; 524 expmul = 1.0;
535 face = blank_face; 525 face = blank_face;
536 attacked_by_count = -1;
537 526
538 if (settings.casting_time) 527 if (settings.casting_time)
539 casting_time = -1; 528 casting_time = -1;
540} 529}
541 530
… …
564 553
565 op2->clone (op); 554 op2->clone (op);
566 555
567 if (is_freed) 556 if (is_freed)
568 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
569 if (is_removed) 559 if (is_removed)
570 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
571 561
572 if (op2->speed < 0) 562 if (op2->speed < 0)
573 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
… …
815 update_now = 1; 805 update_now = 1;
816 806
817 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
818 update_now = 1; 808 update_now = 1;
819 } 809 }
810
820 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
821 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
822 * that is being removed. 813 * that is being removed.
823 */ 814 */
824 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
836 827
837 if (op->more != NULL) 828 if (op->more != NULL)
838 update_object (op->more, action); 829 update_object (op->more, action);
839} 830}
840 831
841static unordered_vector<object *> mortals; 832object::vector object::mortals;
842static std::vector<object *> freed; 833object::vector object::objects; // not yet used
834object *object::first;
843 835
844void object::free_mortals () 836void object::free_mortals ()
845{ 837{
846 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847 if ((*i)->refcnt) 839 if ((*i)->refcnt)
848 ++i; // further delay freeing 840 ++i; // further delay freeing
849 else 841 else
850 { 842 {
851 freed.push_back (*i);//D
852 //delete *i; 843 delete *i;
853 mortals.erase (i); 844 mortals.erase (i);
854 } 845 }
855
856 if (mortals.size())//D
857 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
858} 846}
859 847
860object::object () 848object::object ()
861{ 849{
862 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
863 851
864 expmul = 1.0; 852 expmul = 1.0;
865 face = blank_face; 853 face = blank_face;
866 attacked_by_count = -1;
867} 854}
868 855
869object::~object () 856object::~object ()
870{ 857{
871 free_key_values (this); 858 free_key_values (this);
872} 859}
873 860
874void object::link () 861void object::link ()
875{ 862{
876 count = ++ob_count; 863 count = ++ob_count;
864 uuid = gen_uuid ();
877 865
878 prev = 0; 866 prev = 0;
879 next = objects; 867 next = object::first;
880 868
881 if (objects) 869 if (object::first)
882 objects->prev = this; 870 object::first->prev = this;
883 871
884 objects = this; 872 object::first = this;
885} 873}
886 874
887void object::unlink () 875void object::unlink ()
888{ 876{
889 count = 0; 877 if (this == object::first)
878 object::first = next;
890 879
891 /* Remove this object from the list of used objects */ 880 /* Remove this object from the list of used objects */
892 if (prev)
893 {
894 prev->next = next; 881 if (prev) prev->next = next;
882 if (next) next->prev = prev;
883
895 prev = 0; 884 prev = 0;
896 }
897
898 if (next)
899 {
900 next->prev = prev;
901 next = 0; 885 next = 0;
902 }
903
904 if (this == objects)
905 objects = next;
906} 886}
907 887
908object *object::create () 888object *object::create ()
909{ 889{
910 object *op;
911
912 if (freed.empty ())
913 op = new object; 890 object *op = new object;
914 else
915 {
916 // highly annoying, but the only way to get it stable right now
917 op = freed.back ();
918 freed.pop_back ();
919 op->~object ();
920 new ((void *) op) object;
921 }
922
923 op->link (); 891 op->link ();
924 return op; 892 return op;
925} 893}
926 894
927/* 895/*
… …
929 * 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
930 * free objects. The IS_FREED() flag is set in the object. 898 * free objects. The IS_FREED() flag is set in the object.
931 * The object must have been removed by remove_ob() first for 899 * The object must have been removed by remove_ob() first for
932 * this function to succeed. 900 * this function to succeed.
933 * 901 *
934 * 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
935 * inventory to the ground. 903 * inventory to the ground.
936 */ 904 */
937void object::free (bool free_inventory) 905void object::destroy (bool destroy_inventory)
938{ 906{
939 if (QUERY_FLAG (this, FLAG_FREED)) 907 if (QUERY_FLAG (this, FLAG_FREED))
940 return; 908 return;
941 909
942 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 910 if (QUERY_FLAG (this, FLAG_FRIENDLY))
943 remove_friendly_object (this); 911 remove_friendly_object (this);
944 912
945 if (!QUERY_FLAG (this, FLAG_REMOVED)) 913 if (!QUERY_FLAG (this, FLAG_REMOVED))
946 remove_ob (this); 914 remove ();
947 915
948 SET_FLAG (this, FLAG_FREED); 916 SET_FLAG (this, FLAG_FREED);
949 917
950 if (more) 918 if (more)
951 { 919 {
952 more->free (free_inventory); 920 more->destroy (destroy_inventory);
953 more = 0; 921 more = 0;
954 } 922 }
955 923
956 if (inv) 924 if (inv)
957 { 925 {
958 /* Only if the space blocks everything do we not process - 926 /* Only if the space blocks everything do we not process -
959 * if some form of movement is allowed, let objects 927 * if some form of movement is allowed, let objects
960 * drop on that space. 928 * drop on that space.
961 */ 929 */
962 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)
963 { 931 {
964 object *op = inv; 932 object *op = inv;
965 933
966 while (op) 934 while (op)
967 { 935 {
968 object *tmp = op->below; 936 object *tmp = op->below;
969 op->free (free_inventory); 937 op->destroy (destroy_inventory);
970 op = tmp; 938 op = tmp;
971 } 939 }
972 } 940 }
973 else 941 else
974 { /* Put objects in inventory onto this space */ 942 { /* Put objects in inventory onto this space */
… …
976 944
977 while (op) 945 while (op)
978 { 946 {
979 object *tmp = op->below; 947 object *tmp = op->below;
980 948
981 remove_ob (op); 949 op->remove ();
982 950
983 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 951 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
984 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 952 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
985 free_object (op); 953 op->destroy (0);
986 else 954 else
987 { 955 {
988 op->x = x; 956 op->x = x;
989 op->y = y; 957 op->y = y;
990 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 958 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
993 op = tmp; 961 op = tmp;
994 } 962 }
995 } 963 }
996 } 964 }
997 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
998 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;
999 993
1000 /* Remove object from the active list */ 994 /* Remove object from the active list */
1001 speed = 0; 995 speed = 0;
1002 update_ob_speed (this); 996 update_ob_speed (this);
1003 997
… …
1008 1002
1009/* 1003/*
1010 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1011 * 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)).
1012 */ 1006 */
1013
1014void 1007void
1015sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1016{ 1009{
1017 while (op != NULL) 1010 while (op != NULL)
1018 { 1011 {
1019 if (op->type == CONTAINER) 1012 if (op->type == CONTAINER)
1020 {
1021 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1013 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1022 } 1014
1023 op->carrying -= weight; 1015 op->carrying -= weight;
1024 op = op->env; 1016 op = op->env;
1025 } 1017 }
1026} 1018}
1027 1019
1028/* remove_ob(op): 1020/* op->remove ():
1029 * This function removes the object op from the linked list of objects 1021 * This function removes the object op from the linked list of objects
1030 * which it is currently tied to. When this function is done, the 1022 * which it is currently tied to. When this function is done, the
1031 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1032 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1033 * the previous environment. 1025 * the previous environment.
1034 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1035 */ 1027 */
1036
1037void 1028void
1038remove_ob (object *op) 1029object::remove ()
1039{ 1030{
1031 object *tmp, *last = 0;
1040 object * 1032 object *otmp;
1041 tmp, *
1042 last = NULL;
1043 object *
1044 otmp;
1045 1033
1046 tag_t
1047 tag;
1048 int
1049 check_walk_off; 1034 int check_walk_off;
1050 mapstruct *
1051 m;
1052 1035
1053 sint16
1054 x,
1055 y;
1056
1057 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1058 return; 1037 return;
1059 1038
1060 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1061 1040
1062 if (op->more != NULL) 1041 if (more)
1063 remove_ob (op->more); 1042 more->remove ();
1064 1043
1065 /* 1044 /*
1066 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1067 * inventory. 1046 * inventory.
1068 */ 1047 */
1069 if (op->env != NULL) 1048 if (env)
1070 { 1049 {
1071 if (op->nrof) 1050 if (nrof)
1072 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1073 else 1052 else
1074 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1075 1054
1076 /* 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
1077 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1078 * to save cpu time. 1057 * to save cpu time.
1079 */ 1058 */
1080 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))
1081 fix_player (otmp); 1060 fix_player (otmp);
1082 1061
1083 if (op->above != NULL) 1062 if (above != NULL)
1084 op->above->below = op->below; 1063 above->below = below;
1085 else 1064 else
1086 op->env->inv = op->below; 1065 env->inv = below;
1087 1066
1088 if (op->below != NULL) 1067 if (below != NULL)
1089 op->below->above = op->above; 1068 below->above = above;
1090 1069
1091 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1092 * 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
1093 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1094 */ 1073 */
1095 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1096 op->map = op->env->map; 1075 map = env->map;
1097 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1098 op->env = NULL; 1077 env = 0;
1099 } 1078 }
1100 else if (op->map) 1079 else if (map)
1101 { 1080 {
1102 x = op->x;
1103 y = op->y;
1104 m = get_map_from_coord (op->map, &x, &y);
1105
1106 if (!m)
1107 {
1108 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1109 op->map->path, op->x, op->y);
1110 /* in old days, we used to set x and y to 0 and continue.
1111 * it seems if we get into this case, something is probablye
1112 * screwed up and should be fixed.
1113 */
1114 abort ();
1115 }
1116
1117 if (op->map != m)
1118 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1119 op->map->path, m->path, op->x, op->y, x, y);
1120
1121 /* 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
1122 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1123 */ 1083 */
1124 1084
1125 /* link the object above us */ 1085 /* link the object above us */
1126 if (op->above) 1086 if (above)
1127 op->above->below = op->below; 1087 above->below = below;
1128 else 1088 else
1129 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 */
1130 1090
1131 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1132 if (op->below) 1092 if (below)
1133 op->below->above = op->above; 1093 below->above = above;
1134 else 1094 else
1135 { 1095 {
1136 /* 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
1137 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1138 * evident 1098 * evident
1139 */ 1099 */
1140 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1141 { 1101 {
1142 dump_object (op); 1102 char *dump = dump_object (this);
1143 LOG (llevError, 1103 LOG (llevError,
1144 "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);
1145 dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1146 LOG (llevError, "%s\n", errmsg); 1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1147 } 1109 }
1148 1110
1149 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1150 } 1112 }
1151 1113
1152 op->above = 0; 1114 above = 0;
1153 op->below = 0; 1115 below = 0;
1154 1116
1155 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1156 return; 1118 return;
1157 1119
1158 tag = op->count;
1159 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1160 1121
1161 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)
1162 { 1123 {
1163 /* 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
1164 * being removed. 1125 * being removed.
1165 */ 1126 */
1166 1127
1167 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1168 { 1129 {
1169 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1170 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1171 * appropriately. 1132 * appropriately.
1172 */ 1133 */
1173 if (tmp->container == op) 1134 if (tmp->container == this)
1174 { 1135 {
1175 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1176 tmp->container = NULL; 1137 tmp->container = 0;
1177 } 1138 }
1178 1139
1179 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1180 } 1141 }
1181 1142
1182 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1183 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))
1184 { 1147 {
1185 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1186 1149
1187 if (was_destroyed (op, tag)) 1150 if (destroyed ())
1188 {
1189 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 ());
1190 }
1191 } 1152 }
1192 1153
1193 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1194 1155
1195 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1196 tmp->above = NULL; 1157 tmp->above = 0;
1197 1158
1198 last = tmp; 1159 last = tmp;
1199 } 1160 }
1200 1161
1201 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1202 if (last == NULL) 1163 if (!last)
1203 { 1164 {
1204 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1205 * 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
1206 * 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
1207 * be correct anyways. 1168 * be correct anyways.
1208 */ 1169 */
1209 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1210 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1211 } 1172 }
1212 else 1173 else
1213 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1214 1175
1215 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1216 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1217 } 1178 }
1218} 1179}
1219 1180
1220/* 1181/*
1221 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1223 * This function goes through all objects below and including top, and 1184 * This function goes through all objects below and including top, and
1224 * merges op to the first matching object. 1185 * merges op to the first matching object.
1225 * If top is NULL, it is calculated. 1186 * If top is NULL, it is calculated.
1226 * Returns pointer to object if it succeded in the merge, otherwise NULL 1187 * Returns pointer to object if it succeded in the merge, otherwise NULL
1227 */ 1188 */
1228
1229object * 1189object *
1230merge_ob (object *op, object *top) 1190merge_ob (object *op, object *top)
1231{ 1191{
1232 if (!op->nrof) 1192 if (!op->nrof)
1233 return 0; 1193 return 0;
… …
1243 { 1203 {
1244 top->nrof += op->nrof; 1204 top->nrof += op->nrof;
1245 1205
1246/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1247 op->weight = 0; /* Don't want any adjustements now */ 1207 op->weight = 0; /* Don't want any adjustements now */
1248 remove_ob (op); 1208 op->remove ();
1249 free_object (op); 1209 op->destroy (0);
1250 return top; 1210 return top;
1251 } 1211 }
1252 } 1212 }
1253 1213
1254 return NULL; 1214 return 0;
1255} 1215}
1256 1216
1257/* 1217/*
1258 * 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
1259 * job preparing multi-part monsters 1219 * job preparing multi-part monsters
1260 */ 1220 */
1261object * 1221object *
1262insert_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)
1263{ 1223{
1264 object *tmp; 1224 object *tmp;
1265 1225
1266 if (op->head) 1226 if (op->head)
1267 op = op->head; 1227 op = op->head;
… …
1295 * NULL if 'op' was destroyed 1255 * NULL if 'op' was destroyed
1296 * just 'op' otherwise 1256 * just 'op' otherwise
1297 */ 1257 */
1298 1258
1299object * 1259object *
1300insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1301{ 1261{
1302 object *tmp, *top, *floor = NULL; 1262 object *tmp, *top, *floor = NULL;
1303 sint16 x, y; 1263 sint16 x, y;
1304 1264
1305 if (QUERY_FLAG (op, FLAG_FREED)) 1265 if (QUERY_FLAG (op, FLAG_FREED))
… …
1308 return NULL; 1268 return NULL;
1309 } 1269 }
1310 1270
1311 if (m == NULL) 1271 if (m == NULL)
1312 { 1272 {
1313 dump_object (op); 1273 char *dump = dump_object (op);
1314 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);
1315 return op; 1276 return op;
1316 } 1277 }
1317 1278
1318 if (out_of_map (m, op->x, op->y)) 1279 if (out_of_map (m, op->x, op->y))
1319 { 1280 {
1320 dump_object (op); 1281 char *dump = dump_object (op);
1321 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);
1322#ifdef MANY_CORES 1283#ifdef MANY_CORES
1323 /* 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
1324 * 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
1325 * improperly inserted. 1286 * improperly inserted.
1326 */ 1287 */
1327 abort (); 1288 abort ();
1328#endif 1289#endif
1290 free (dump);
1329 return op; 1291 return op;
1330 } 1292 }
1331 1293
1332 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1333 { 1295 {
1334 dump_object (op); 1296 char *dump = dump_object (op);
1335 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);
1336 return op; 1299 return op;
1337 } 1300 }
1338 1301
1339 if (op->more != NULL) 1302 if (op->more != NULL)
1340 { 1303 {
… …
1381 if (op->nrof && !(flag & INS_NO_MERGE)) 1344 if (op->nrof && !(flag & INS_NO_MERGE))
1382 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1345 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1383 if (CAN_MERGE (op, tmp)) 1346 if (CAN_MERGE (op, tmp))
1384 { 1347 {
1385 op->nrof += tmp->nrof; 1348 op->nrof += tmp->nrof;
1386 remove_ob (tmp); 1349 tmp->remove ();
1387 free_object (tmp); 1350 tmp->destroy (0);
1388 } 1351 }
1389 1352
1390 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1391 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1392 1355
… …
1581 1544
1582 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1583 { 1546 {
1584 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1585 { 1548 {
1586 remove_ob (tmp); 1549 tmp->remove ();
1587 free_object (tmp); 1550 tmp->destroy (0);
1588 } 1551 }
1589 } 1552 }
1590 1553
1591 tmp1 = arch_to_object (find_archetype (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1592 1555
1593 tmp1->x = op->x; 1556 tmp1->x = op->x;
1594 tmp1->y = op->y; 1557 tmp1->y = op->y;
1595 insert_ob_in_map (tmp1, op->map, op, 0); 1558 insert_ob_in_map (tmp1, op->map, op, 0);
1596} 1559}
… …
1618 } 1581 }
1619 1582
1620 newob = object_create_clone (orig_ob); 1583 newob = object_create_clone (orig_ob);
1621 1584
1622 if ((orig_ob->nrof -= nr) < 1) 1585 if ((orig_ob->nrof -= nr) < 1)
1623 { 1586 orig_ob->destroy (1);
1624 if (!is_removed)
1625 remove_ob (orig_ob);
1626 free_object2 (orig_ob, 1);
1627 }
1628 else if (!is_removed) 1587 else if (!is_removed)
1629 { 1588 {
1630 if (orig_ob->env != NULL) 1589 if (orig_ob->env != NULL)
1631 sub_weight (orig_ob->env, orig_ob->weight * nr); 1590 sub_weight (orig_ob->env, orig_ob->weight * nr);
1632 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1591 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1696 esrv_send_item (tmp, op); 1655 esrv_send_item (tmp, op);
1697 } 1656 }
1698 } 1657 }
1699 else 1658 else
1700 { 1659 {
1701 remove_ob (op); 1660 op->remove ();
1702 op->nrof = 0; 1661 op->nrof = 0;
1703 if (tmp) 1662 if (tmp)
1704 { 1663 {
1705 esrv_del_item (tmp->contr, op->count); 1664 esrv_del_item (tmp->contr, op->count);
1706 } 1665 }
… …
1712 1671
1713 if (i < op->nrof) 1672 if (i < op->nrof)
1714 op->nrof -= i; 1673 op->nrof -= i;
1715 else 1674 else
1716 { 1675 {
1717 remove_ob (op); 1676 op->remove ();
1718 op->nrof = 0; 1677 op->nrof = 0;
1719 } 1678 }
1720 1679
1721 /* Since we just removed op, op->above is null */ 1680 /* Since we just removed op, op->above is null */
1722 for (tmp = above; tmp != NULL; tmp = tmp->above) 1681 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1731 1690
1732 if (op->nrof) 1691 if (op->nrof)
1733 return op; 1692 return op;
1734 else 1693 else
1735 { 1694 {
1736 free_object (op); 1695 op->destroy (0);
1737 return NULL; 1696 return NULL;
1738 } 1697 }
1739} 1698}
1740 1699
1741/* 1700/*
… …
1754 op->carrying += weight; 1713 op->carrying += weight;
1755 op = op->env; 1714 op = op->env;
1756 } 1715 }
1757} 1716}
1758 1717
1718object *
1719insert_ob_in_ob (object *op, object *where)
1720{
1721 if (!where)
1722 {
1723 char *dump = dump_object (op);
1724 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1725 free (dump);
1726 return op;
1727 }
1728
1729 if (where->head)
1730 {
1731 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1732 where = where->head;
1733 }
1734
1735 return where->insert (op);
1736}
1737
1759/* 1738/*
1760 * insert_ob_in_ob(op,environment): 1739 * env->insert (op)
1761 * This function inserts the object op in the linked list 1740 * This function inserts the object op in the linked list
1762 * inside the object environment. 1741 * inside the object environment.
1763 * 1742 *
1764 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1765 * the inventory at the last position or next to other objects of the same
1766 * type.
1767 * Frank: Now sorted by type, archetype and magic!
1768 *
1769 * The function returns now pointer to inserted item, and return value can 1743 * The function returns now pointer to inserted item, and return value can
1770 * be != op, if items are merged. -Tero 1744 * be != op, if items are merged. -Tero
1771 */ 1745 */
1772 1746
1773object * 1747object *
1774insert_ob_in_ob (object *op, object *where) 1748object::insert (object *op)
1775{ 1749{
1776 object * 1750 object *tmp, *otmp;
1777 tmp, *
1778 otmp;
1779 1751
1780 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1752 if (!QUERY_FLAG (op, FLAG_REMOVED))
1781 { 1753 op->remove ();
1782 dump_object (op);
1783 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1784 return op;
1785 }
1786
1787 if (where == NULL)
1788 {
1789 dump_object (op);
1790 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1791 return op;
1792 }
1793
1794 if (where->head)
1795 {
1796 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1797 where = where->head;
1798 }
1799 1754
1800 if (op->more) 1755 if (op->more)
1801 { 1756 {
1802 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1757 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1803 return op; 1758 return op;
… …
1805 1760
1806 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1761 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1807 CLEAR_FLAG (op, FLAG_REMOVED); 1762 CLEAR_FLAG (op, FLAG_REMOVED);
1808 if (op->nrof) 1763 if (op->nrof)
1809 { 1764 {
1810 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1765 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1811 if (CAN_MERGE (tmp, op)) 1766 if (CAN_MERGE (tmp, op))
1812 { 1767 {
1813 /* return the original object and remove inserted object 1768 /* return the original object and remove inserted object
1814 (client needs the original object) */ 1769 (client needs the original object) */
1815 tmp->nrof += op->nrof; 1770 tmp->nrof += op->nrof;
1816 /* Weight handling gets pretty funky. Since we are adding to 1771 /* Weight handling gets pretty funky. Since we are adding to
1817 * tmp->nrof, we need to increase the weight. 1772 * tmp->nrof, we need to increase the weight.
1818 */ 1773 */
1819 add_weight (where, op->weight * op->nrof); 1774 add_weight (this, op->weight * op->nrof);
1820 SET_FLAG (op, FLAG_REMOVED); 1775 SET_FLAG (op, FLAG_REMOVED);
1821 free_object (op); /* free the inserted object */ 1776 op->destroy (); /* free the inserted object */
1822 op = tmp; 1777 op = tmp;
1823 remove_ob (op); /* and fix old object's links */ 1778 op->remove (); /* and fix old object's links */
1824 CLEAR_FLAG (op, FLAG_REMOVED); 1779 CLEAR_FLAG (op, FLAG_REMOVED);
1825 break; 1780 break;
1826 } 1781 }
1827 1782
1828 /* I assume combined objects have no inventory 1783 /* I assume combined objects have no inventory
1829 * We add the weight - this object could have just been removed 1784 * We add the weight - this object could have just been removed
1830 * (if it was possible to merge). calling remove_ob will subtract 1785 * (if it was possible to merge). calling remove_ob will subtract
1831 * the weight, so we need to add it in again, since we actually do 1786 * the weight, so we need to add it in again, since we actually do
1832 * the linking below 1787 * the linking below
1833 */ 1788 */
1834 add_weight (where, op->weight * op->nrof); 1789 add_weight (this, op->weight * op->nrof);
1835 } 1790 }
1836 else 1791 else
1837 add_weight (where, (op->weight + op->carrying)); 1792 add_weight (this, (op->weight + op->carrying));
1838 1793
1839 otmp = is_player_inv (where); 1794 otmp = is_player_inv (this);
1840 if (otmp && otmp->contr != NULL) 1795 if (otmp && otmp->contr)
1841 {
1842 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1796 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1843 fix_player (otmp); 1797 fix_player (otmp);
1844 }
1845 1798
1846 op->map = NULL; 1799 op->map = NULL;
1847 op->env = where; 1800 op->env = this;
1848 op->above = NULL; 1801 op->above = NULL;
1849 op->below = NULL; 1802 op->below = NULL;
1850 op->x = 0, op->y = 0; 1803 op->x = 0, op->y = 0;
1851 1804
1852 /* reset the light list and los of the players on the map */ 1805 /* reset the light list and los of the players on the map */
1853 if ((op->glow_radius != 0) && where->map) 1806 if ((op->glow_radius != 0) && map)
1854 { 1807 {
1855#ifdef DEBUG_LIGHTS 1808#ifdef DEBUG_LIGHTS
1856 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1809 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1857#endif /* DEBUG_LIGHTS */ 1810#endif /* DEBUG_LIGHTS */
1858 if (MAP_DARKNESS (where->map)) 1811 if (MAP_DARKNESS (map))
1859 update_all_los (where->map, where->x, where->y); 1812 update_all_los (map, x, y);
1860 } 1813 }
1861 1814
1862 /* Client has no idea of ordering so lets not bother ordering it here. 1815 /* Client has no idea of ordering so lets not bother ordering it here.
1863 * It sure simplifies this function... 1816 * It sure simplifies this function...
1864 */ 1817 */
1865 if (where->inv == NULL) 1818 if (!inv)
1866 where->inv = op; 1819 inv = op;
1867 else 1820 else
1868 { 1821 {
1869 op->below = where->inv; 1822 op->below = inv;
1870 op->below->above = op; 1823 op->below->above = op;
1871 where->inv = op; 1824 inv = op;
1872 } 1825 }
1826
1873 return op; 1827 return op;
1874} 1828}
1875 1829
1876/* 1830/*
1877 * Checks if any objects has a move_type that matches objects 1831 * Checks if any objects has a move_type that matches objects
… …
1895 */ 1849 */
1896 1850
1897int 1851int
1898check_move_on (object *op, object *originator) 1852check_move_on (object *op, object *originator)
1899{ 1853{
1900 object * 1854 object *tmp;
1901 tmp; 1855 maptile *m = op->map;
1902 tag_t
1903 tag;
1904 mapstruct *
1905 m = op->map;
1906 int
1907 x = op->x, y = op->y; 1856 int x = op->x, y = op->y;
1908 1857
1909 MoveType 1858 MoveType move_on, move_slow, move_block;
1910 move_on,
1911 move_slow,
1912 move_block;
1913 1859
1914 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1860 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1915 return 0; 1861 return 0;
1916
1917 tag = op->count;
1918 1862
1919 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1863 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1920 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1864 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1921 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1865 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1922 1866
… …
1983 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1927 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1984 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1928 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1985 { 1929 {
1986 move_apply (tmp, op, originator); 1930 move_apply (tmp, op, originator);
1987 1931
1988 if (was_destroyed (op, tag)) 1932 if (op->destroyed ())
1989 return 1; 1933 return 1;
1990 1934
1991 /* what the person/creature stepped onto has moved the object 1935 /* what the person/creature stepped onto has moved the object
1992 * someplace new. Don't process any further - if we did, 1936 * someplace new. Don't process any further - if we did,
1993 * have a feeling strange problems would result. 1937 * have a feeling strange problems would result.
… …
2005 * a matching archetype at the given map and coordinates. 1949 * a matching archetype at the given map and coordinates.
2006 * The first matching object is returned, or NULL if none. 1950 * The first matching object is returned, or NULL if none.
2007 */ 1951 */
2008 1952
2009object * 1953object *
2010present_arch (const archetype *at, mapstruct *m, int x, int y) 1954present_arch (const archetype *at, maptile *m, int x, int y)
2011{ 1955{
2012 object * 1956 object *
2013 tmp; 1957 tmp;
2014 1958
2015 if (m == NULL || out_of_map (m, x, y)) 1959 if (m == NULL || out_of_map (m, x, y))
… …
2028 * a matching type variable at the given map and coordinates. 1972 * a matching type variable at the given map and coordinates.
2029 * The first matching object is returned, or NULL if none. 1973 * The first matching object is returned, or NULL if none.
2030 */ 1974 */
2031 1975
2032object * 1976object *
2033present (unsigned char type, mapstruct *m, int x, int y) 1977present (unsigned char type, maptile *m, int x, int y)
2034{ 1978{
2035 object * 1979 object *
2036 tmp; 1980 tmp;
2037 1981
2038 if (out_of_map (m, x, y)) 1982 if (out_of_map (m, x, y))
… …
2178 * the archetype because that isn't correct if the monster has been 2122 * the archetype because that isn't correct if the monster has been
2179 * customized, changed states, etc. 2123 * customized, changed states, etc.
2180 */ 2124 */
2181 2125
2182int 2126int
2183find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2127find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2184{ 2128{
2185 int 2129 int
2186 i, 2130 i,
2187 index = 0, flag; 2131 index = 0, flag;
2188 static int 2132 static int
… …
2209 return -1; 2153 return -1;
2210 return altern[RANDOM () % index]; 2154 return altern[RANDOM () % index];
2211} 2155}
2212 2156
2213/* 2157/*
2214 * find_first_free_spot(archetype, mapstruct, x, y) works like 2158 * find_first_free_spot(archetype, maptile, x, y) works like
2215 * find_free_spot(), but it will search max number of squares. 2159 * find_free_spot(), but it will search max number of squares.
2216 * But it will return the first available spot, not a random choice. 2160 * But it will return the first available spot, not a random choice.
2217 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2161 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2218 */ 2162 */
2219 2163
2220int 2164int
2221find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2165find_first_free_spot (const object *ob, maptile *m, int x, int y)
2222{ 2166{
2223 int 2167 int
2224 i; 2168 i;
2225 2169
2226 for (i = 0; i < SIZEOFFREE; i++) 2170 for (i = 0; i < SIZEOFFREE; i++)
… …
2290 * because we have to know what movement the thing looking to move 2234 * because we have to know what movement the thing looking to move
2291 * there is capable of. 2235 * there is capable of.
2292 */ 2236 */
2293 2237
2294int 2238int
2295find_dir (mapstruct *m, int x, int y, object *exclude) 2239find_dir (maptile *m, int x, int y, object *exclude)
2296{ 2240{
2297 int 2241 int
2298 i, 2242 i,
2299 max = SIZEOFFREE, mflags; 2243 max = SIZEOFFREE, mflags;
2300 2244
2301 sint16 nx, ny; 2245 sint16 nx, ny;
2302 object * 2246 object *
2303 tmp; 2247 tmp;
2304 mapstruct * 2248 maptile *
2305 mp; 2249 mp;
2306 2250
2307 MoveType blocked, move_type; 2251 MoveType blocked, move_type;
2308 2252
2309 if (exclude && exclude->head) 2253 if (exclude && exclude->head)
… …
2517 * Modified to be map tile aware -.MSW 2461 * Modified to be map tile aware -.MSW
2518 */ 2462 */
2519 2463
2520 2464
2521int 2465int
2522can_see_monsterP (mapstruct *m, int x, int y, int dir) 2466can_see_monsterP (maptile *m, int x, int y, int dir)
2523{ 2467{
2524 sint16 dx, dy; 2468 sint16 dx, dy;
2525 int 2469 int
2526 mflags; 2470 mflags;
2527 2471
… …
2576 * create clone from object to another 2520 * create clone from object to another
2577 */ 2521 */
2578object * 2522object *
2579object_create_clone (object *asrc) 2523object_create_clone (object *asrc)
2580{ 2524{
2581 object *
2582 dst = NULL, *tmp, *src, *part, *prev, *item; 2525 object *dst = 0, *tmp, *src, *part, *prev, *item;
2583 2526
2584 if (!asrc) 2527 if (!asrc)
2585 return NULL; 2528 return 0;
2529
2586 src = asrc; 2530 src = asrc;
2587 if (src->head) 2531 if (src->head)
2588 src = src->head; 2532 src = src->head;
2589 2533
2590 prev = NULL; 2534 prev = 0;
2591 for (part = src; part; part = part->more) 2535 for (part = src; part; part = part->more)
2592 { 2536 {
2593 tmp = get_object (); 2537 tmp = get_object ();
2594 copy_object (part, tmp); 2538 copy_object (part, tmp);
2595 tmp->x -= src->x; 2539 tmp->x -= src->x;
2596 tmp->y -= src->y; 2540 tmp->y -= src->y;
2541
2597 if (!part->head) 2542 if (!part->head)
2598 { 2543 {
2599 dst = tmp; 2544 dst = tmp;
2600 tmp->head = NULL; 2545 tmp->head = 0;
2601 } 2546 }
2602 else 2547 else
2603 { 2548 {
2604 tmp->head = dst; 2549 tmp->head = dst;
2605 } 2550 }
2551
2606 tmp->more = NULL; 2552 tmp->more = 0;
2553
2607 if (prev) 2554 if (prev)
2608 prev->more = tmp; 2555 prev->more = tmp;
2556
2609 prev = tmp; 2557 prev = tmp;
2610 } 2558 }
2611 2559
2612 /*** copy inventory ***/
2613 for (item = src->inv; item; item = item->below) 2560 for (item = src->inv; item; item = item->below)
2614 {
2615 (void) insert_ob_in_ob (object_create_clone (item), dst); 2561 insert_ob_in_ob (object_create_clone (item), dst);
2616 }
2617 2562
2618 return dst; 2563 return dst;
2619} 2564}
2620 2565
2621/* return true if the object was destroyed, 0 otherwise */
2622int
2623was_destroyed (const object *op, tag_t old_tag)
2624{
2625 /* checking for FLAG_FREED isn't necessary, but makes this function more
2626 * robust */
2627 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2628}
2629
2630/* GROS - Creates an object using a string representing its content. */ 2566/* GROS - Creates an object using a string representing its content. */
2631
2632/* 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 */
2633
2634/* 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, */
2635
2636/* 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. */
2637
2638/* 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. */
2639
2640/* Also remember that multiparts objects are not supported for now. */ 2571/* Also remember that multiparts objects are not supported for now. */
2641 2572
2642object * 2573object *
2643load_object_str (const char *obstr) 2574load_object_str (const char *obstr)
2644{ 2575{
2645 object * 2576 object *op;
2646 op;
2647 char
2648 filename[MAX_BUF]; 2577 char filename[MAX_BUF];
2649 2578
2650 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2579 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2651 2580
2652 FILE *
2653 tempfile = fopen (filename, "w"); 2581 FILE *tempfile = fopen (filename, "w");
2654 2582
2655 if (tempfile == NULL) 2583 if (tempfile == NULL)
2656 { 2584 {
2657 LOG (llevError, "Error - Unable to access load object temp file\n"); 2585 LOG (llevError, "Error - Unable to access load object temp file\n");
2658 return NULL; 2586 return NULL;
2659 }; 2587 }
2588
2660 fprintf (tempfile, obstr); 2589 fprintf (tempfile, obstr);
2661 fclose (tempfile); 2590 fclose (tempfile);
2662 2591
2663 op = get_object (); 2592 op = get_object ();
2664 2593
… …
2678 * returns NULL if no match. 2607 * returns NULL if no match.
2679 */ 2608 */
2680object * 2609object *
2681find_obj_by_type_subtype (const object *who, int type, int subtype) 2610find_obj_by_type_subtype (const object *who, int type, int subtype)
2682{ 2611{
2683 object * 2612 object *tmp;
2684 tmp;
2685 2613
2686 for (tmp = who->inv; tmp; tmp = tmp->below) 2614 for (tmp = who->inv; tmp; tmp = tmp->below)
2687 if (tmp->type == type && tmp->subtype == subtype) 2615 if (tmp->type == type && tmp->subtype == subtype)
2688 return tmp; 2616 return tmp;
2689 2617
… …
2697 * do the desired thing. 2625 * do the desired thing.
2698 */ 2626 */
2699key_value * 2627key_value *
2700get_ob_key_link (const object *ob, const char *key) 2628get_ob_key_link (const object *ob, const char *key)
2701{ 2629{
2702 key_value * 2630 key_value *link;
2703 link;
2704 2631
2705 for (link = ob->key_values; link != NULL; link = link->next) 2632 for (link = ob->key_values; link != NULL; link = link->next)
2706 {
2707 if (link->key == key) 2633 if (link->key == key)
2708 {
2709 return link; 2634 return link;
2710 }
2711 }
2712 2635
2713 return NULL; 2636 return NULL;
2714} 2637}
2715 2638
2716/* 2639/*
… …
2721 * The returned string is shared. 2644 * The returned string is shared.
2722 */ 2645 */
2723const char * 2646const char *
2724get_ob_key_value (const object *op, const char *const key) 2647get_ob_key_value (const object *op, const char *const key)
2725{ 2648{
2726 key_value * 2649 key_value *link;
2727 link; 2650 shstr_cmp canonical_key (key);
2728 const char *
2729 canonical_key;
2730 2651
2731 canonical_key = shstr::find (key);
2732
2733 if (canonical_key == NULL) 2652 if (!canonical_key)
2734 { 2653 {
2735 /* 1. There being a field named key on any object 2654 /* 1. There being a field named key on any object
2736 * implies there'd be a shared string to find. 2655 * implies there'd be a shared string to find.
2737 * 2. Since there isn't, no object has this field. 2656 * 2. Since there isn't, no object has this field.
2738 * 3. Therefore, *this* object doesn't have this field. 2657 * 3. Therefore, *this* object doesn't have this field.
2739 */ 2658 */
2740 return NULL; 2659 return 0;
2741 } 2660 }
2742 2661
2743 /* This is copied from get_ob_key_link() above - 2662 /* This is copied from get_ob_key_link() above -
2744 * only 4 lines, and saves the function call overhead. 2663 * only 4 lines, and saves the function call overhead.
2745 */ 2664 */
2746 for (link = op->key_values; link != NULL; link = link->next) 2665 for (link = op->key_values; link; link = link->next)
2747 {
2748 if (link->key == canonical_key) 2666 if (link->key == canonical_key)
2749 {
2750 return link->value; 2667 return link->value;
2751 } 2668
2752 }
2753 return NULL; 2669 return 0;
2754} 2670}
2755 2671
2756 2672
2757/* 2673/*
2758 * Updates the canonical_key in op to value. 2674 * Updates the canonical_key in op to value.
… …
2844 shstr key_ (key); 2760 shstr key_ (key);
2845 2761
2846 return set_ob_key_value_s (op, key_, value, add_key); 2762 return set_ob_key_value_s (op, key_, value, add_key);
2847} 2763}
2848 2764
2765object::depth_iterator::depth_iterator (object *container)
2766: iterator_base (container)
2767{
2768 while (item->inv)
2769 item = item->inv;
2770}
2771
2849void 2772void
2850object::deep_iterator::next () 2773object::depth_iterator::next ()
2851{ 2774{
2852 if (item->inv)
2853 item = item->inv;
2854 else if (item->below) 2775 if (item->below)
2776 {
2855 item = item->below; 2777 item = item->below;
2778
2779 while (item->inv)
2780 item = item->inv;
2781 }
2856 else 2782 else
2857 item = item->env->below; 2783 item = item->env;
2858} 2784}
2785
2786// return a suitable string describing an objetc in enough detail to find it
2787const char *
2788object::debug_desc (char *info) const
2789{
2790 char info2[256 * 3];
2791 char *p = info;
2792
2793 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2794 count,
2795 &name,
2796 title ? " " : "",
2797 title ? (const char *)title : "");
2798
2799 if (env)
2800 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2801
2802 if (map)
2803 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2804
2805 return info;
2806}
2807
2808const char *
2809object::debug_desc () const
2810{
2811 static char info[256 * 3];
2812 return debug_desc (info);
2813}
2814

Diff Legend

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