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.209 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC

… …
24#include <global.h> 24#include <global.h>
25#include <stdio.h> 25#include <stdio.h>
26#include <sys/types.h> 26#include <sys/types.h>
27#include <sys/uio.h> 27#include <sys/uio.h>
28#include <object.h> 28#include <object.h>
29#include <funcpoint.h>
30#include <sproto.h> 29#include <sproto.h>
31#include <loader.h> 30#include <loader.h>
32 31
33#include <bitset> 32#include <bitset>
34 33
… …
140 139
141/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
142static bool 141static bool
143compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
144{ 143{
145 key_value *wants_field;
146
147 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 144 /* n-squared behaviour (see kv_get), but I'm hoping both
148 * objects with lists are rare, and lists stay short. If not, use a 145 * objects with lists are rare, and lists stay short. If not, use a
149 * different structure or at least keep the lists sorted... 146 * different structure or at least keep the lists sorted...
150 */ 147 */
151 148
152 /* For each field in wants, */ 149 /* For each field in wants, */
153 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) 150 for (key_value *kv = wants->key_values; kv; kv = kv->next)
154 { 151 if (has->kv_get (kv->key) != kv->value)
155 key_value *has_field; 152 return false;
156
157 /* Look for a field in has with the same key. */
158 has_field = get_ob_key_link (has, wants_field->key);
159
160 if (!has_field)
161 return 0; /* No field with that name. */
162
163 /* Found the matching field. */
164 if (has_field->value != wants_field->value)
165 return 0; /* Values don't match, so this half of the comparison is false. */
166
167 /* If we get here, we found a match. Now for the next field in wants. */
168 }
169 153
170 /* If we get here, every field in wants has a matching field in has. */ 154 /* If we get here, every field in wants has a matching field in has. */
171 return 1; 155 return true;
172} 156}
173 157
174/* Returns TRUE if ob1 has the same key_values as ob2. */ 158/* Returns TRUE if ob1 has the same key_values as ob2. */
175static bool 159static bool
176compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_ob_value_lists (const object *ob1, const object *ob2)
177{ 161{
178 /* However, there may be fields in has which aren't partnered in wants, 162 /* However, there may be fields in has which aren't partnered in wants,
179 * so we need to run the comparison *twice*. :( 163 * so we need to run the comparison *twice*. :(
180 */ 164 */
181 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 165 return compare_ob_value_lists_one (ob1, ob2)
166 && compare_ob_value_lists_one (ob2, ob1);
182} 167}
183 168
184/* Function examines the 2 objects given to it, and returns true if 169/* Function examines the 2 objects given to it, and returns true if
185 * they can be merged together. 170 * they can be merged together.
186 * 171 *
… …
331 316
332 /* Everything passes, must be OK. */ 317 /* Everything passes, must be OK. */
333 return 1; 318 return 1;
334} 319}
335 320
321// find player who can see this object
322object *
323object::visible_to () const
324{
325 if (client_visible () && !flag [FLAG_REMOVED])
326 {
327 // see if we are in a container of sorts
328 if (env)
329 {
330 // the player inventory itself is always visible
331 if (env->type == PLAYER)
332 return env;
333
334 // else a player could have our env open
335 object *envest = env->outer_env ();
336
337 // the player itself is always on a map, so we will find him here
338 // even if our inv is in a player.
339 if (envest->is_on_map ())
340 if (object *pl = envest->ms ().player ())
341 if (pl->container == env)
342 return pl;
343 }
344 else
345 {
346 // maybe there is a player standing on the same mapspace
347 // this will catch the case where "this" is a player
348 if (object *pl = ms ().player ())
349 if (!pl->container || this == pl->container)
350 return pl;
351 }
352 }
353
354 return 0;
355}
356
336// adjust weight per container type ("of holding") 357// adjust weight per container type ("of holding")
337static sint32 358static sint32
338weight_adjust (object *op, sint32 weight) 359weight_adjust_for (object *op, sint32 weight)
339{ 360{
340 return op->type == CONTAINER 361 return op->type == CONTAINER
341 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 362 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342 : weight; 363 : weight;
343} 364}
… …
349static void 370static void
350adjust_weight (object *op, sint32 weight) 371adjust_weight (object *op, sint32 weight)
351{ 372{
352 while (op) 373 while (op)
353 { 374 {
375 // adjust by actual difference to account for rounding errors
376 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
354 weight = weight_adjust (op, weight); 377 weight = weight_adjust_for (op, op->carrying)
378 - weight_adjust_for (op, op->carrying - weight);
379
380 if (!weight)
381 return;
355 382
356 op->carrying += weight; 383 op->carrying += weight;
384
385 if (object *pl = op->visible_to ())
386 if (pl != op) // player is handled lazily
387 esrv_update_item (UPD_WEIGHT, pl, op);
388
357 op = op->env; 389 op = op->env;
358 } 390 }
359} 391}
360 392
361/* 393/*
… …
374 op->update_weight (); 406 op->update_weight ();
375 407
376 sum += op->total_weight (); 408 sum += op->total_weight ();
377 } 409 }
378 410
379 carrying = weight_adjust (this, sum); 411 sum = weight_adjust_for (this, sum);
412
413 if (sum != carrying)
414 {
415 carrying = sum;
416
417 if (object *pl = visible_to ())
418 if (pl != this) // player is handled lazily
419 esrv_update_item (UPD_WEIGHT, pl, this);
420 }
380} 421}
381 422
382/* 423/*
383 * Used by: Server DM commands: dumpbelow, dump. Some error messages. 424 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
384 */ 425 */
… …
551 } 592 }
552 593
553 op->key_values = 0; 594 op->key_values = 0;
554} 595}
555 596
556object & 597/*
557object::operator =(const object &src) 598 * copy_to first frees everything allocated by the dst object,
599 * and then copies the contents of itself into the second
600 * object, allocating what needs to be allocated. Basically, any
601 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
602 * if the first object is freed, the pointers in the new object
603 * will point at garbage.
604 */
605void
606object::copy_to (object *dst)
558{ 607{
559 bool is_freed = flag [FLAG_FREED]; 608 dst->remove ();
560 bool is_removed = flag [FLAG_REMOVED];
561
562 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
563
564 flag [FLAG_FREED] = is_freed;
565 flag [FLAG_REMOVED] = is_removed; 610 dst->flag [FLAG_REMOVED] = true;
566 611
567 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
568 if (src.key_values) 613 if (key_values)
569 { 614 {
570 key_value *tail = 0; 615 key_value *tail = 0;
571 key_values = 0; 616 dst->key_values = 0;
572 617
573 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
574 { 619 {
575 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
576 621
577 new_link->next = 0; 622 new_link->next = 0;
578 new_link->key = i->key; 623 new_link->key = i->key;
579 new_link->value = i->value; 624 new_link->value = i->value;
580 625
581 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
582 if (!key_values) 627 if (!dst->key_values)
583 { 628 {
584 key_values = new_link; 629 dst->key_values = new_link;
585 tail = new_link; 630 tail = new_link;
586 } 631 }
587 else 632 else
588 { 633 {
589 tail->next = new_link; 634 tail->next = new_link;
590 tail = new_link; 635 tail = new_link;
591 } 636 }
592 } 637 }
593 } 638 }
594}
595
596/*
597 * copy_to first frees everything allocated by the dst object,
598 * and then copies the contents of itself into the second
599 * object, allocating what needs to be allocated. Basically, any
600 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
601 * if the first object is freed, the pointers in the new object
602 * will point at garbage.
603 */
604void
605object::copy_to (object *dst)
606{
607 *dst = *this;
608 639
609 if (speed < 0) 640 if (speed < 0)
610 dst->speed_left -= rndm (); 641 dst->speed_left -= rndm ();
611 642
612 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
… …
634object * 665object *
635object::clone () 666object::clone ()
636{ 667{
637 object *neu = create (); 668 object *neu = create ();
638 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
639 return neu; 671 return neu;
640} 672}
641 673
642/* 674/*
643 * If an object with the IS_TURNABLE() flag needs to be turned due 675 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
694 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
695 */ 727 */
696void 728void
697update_object (object *op, int action) 729update_object (object *op, int action)
698{ 730{
699 if (op == NULL) 731 if (!op)
700 { 732 {
701 /* this should never happen */ 733 /* this should never happen */
702 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
703 return; 735 return;
704 } 736 }
705 737
706 if (op->env) 738 if (!op->is_on_map ())
707 { 739 {
708 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
709 * to do in this case. 741 * to do in this case.
710 */ 742 */
711 return; 743 return;
712 } 744 }
713
714 /* If the map is saving, don't do anything as everything is
715 * going to get freed anyways.
716 */
717 if (!op->map || op->map->in_memory == MAP_SAVING)
718 return;
719 745
720 /* make sure the object is within map boundaries */ 746 /* make sure the object is within map boundaries */
721 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 747 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
722 { 748 {
723 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
… …
866object::destroy_inv (bool drop_to_ground) 892object::destroy_inv (bool drop_to_ground)
867{ 893{
868 // need to check first, because the checks below might segfault 894 // need to check first, because the checks below might segfault
869 // as we might be on an invalid mapspace and crossfire code 895 // as we might be on an invalid mapspace and crossfire code
870 // is too buggy to ensure that the inventory is empty. 896 // is too buggy to ensure that the inventory is empty.
871 // corollary: if you create arrows etc. with stuff in tis inventory, 897 // corollary: if you create arrows etc. with stuff in its inventory,
872 // cf will crash below with off-map x and y 898 // cf will crash below with off-map x and y
873 if (!inv) 899 if (!inv)
874 return; 900 return;
875 901
876 /* Only if the space blocks everything do we not process - 902 /* Only if the space blocks everything do we not process -
… …
883 || map->nodrop 909 || map->nodrop
884 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
885 { 911 {
886 while (inv) 912 while (inv)
887 { 913 {
888 inv->destroy_inv (drop_to_ground); 914 inv->destroy_inv (false);
889 inv->destroy (); 915 inv->destroy ();
890 } 916 }
891 } 917 }
892 else 918 else
893 { /* Put objects in inventory onto this space */ 919 { /* Put objects in inventory onto this space */
… …
899 || op->flag [FLAG_NO_DROP] 925 || op->flag [FLAG_NO_DROP]
900 || op->type == RUNE 926 || op->type == RUNE
901 || op->type == TRAP 927 || op->type == TRAP
902 || op->flag [FLAG_IS_A_TEMPLATE] 928 || op->flag [FLAG_IS_A_TEMPLATE]
903 || op->flag [FLAG_DESTROY_ON_DEATH]) 929 || op->flag [FLAG_DESTROY_ON_DEATH])
904 op->destroy (); 930 op->destroy (true);
905 else 931 else
906 map->insert (op, x, y); 932 map->insert (op, x, y);
907 } 933 }
908 } 934 }
909} 935}
… …
913 object *op = new object; 939 object *op = new object;
914 op->link (); 940 op->link ();
915 return op; 941 return op;
916} 942}
917 943
944static struct freed_map : maptile
945{
946 freed_map ()
947 {
948 path = "<freed objects map>";
949 name = "/internal/freed_objects_map";
950 width = 3;
951 height = 3;
952 nodrop = 1;
953
954 alloc ();
955 in_memory = MAP_ACTIVE;
956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
962} freed_map; // freed objects are moved here to avoid crashes
963
918void 964void
919object::do_destroy () 965object::do_destroy ()
920{ 966{
921 attachable::do_destroy ();
922
923 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
924 remove_button_link (this); 968 remove_button_link (this);
925 969
926 if (flag [FLAG_FRIENDLY]) 970 if (flag [FLAG_FRIENDLY])
927 remove_friendly_object (this); 971 remove_friendly_object (this);
928 972
929 if (!flag [FLAG_REMOVED])
930 remove (); 973 remove ();
931 974
932 destroy_inv (true); 975 attachable::do_destroy ();
933 976
934 deactivate (); 977 deactivate ();
935 unlink (); 978 unlink ();
936 979
937 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
938 981
939 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
940 {
941 static maptile *freed_map; // freed objects are moved here to avoid crashes
942
943 if (!freed_map)
944 {
945 freed_map = new maptile;
946
947 freed_map->path = "<freed objects map>";
948 freed_map->name = "/internal/freed_objects_map";
949 freed_map->width = 3;
950 freed_map->height = 3;
951 freed_map->nodrop = 1;
952
953 freed_map->alloc ();
954 freed_map->in_memory = MAP_ACTIVE;
955 }
956
957 map = freed_map; 983 map = &freed_map;
958 x = 1; 984 x = 1;
959 y = 1; 985 y = 1;
960 }
961 986
962 if (more) 987 if (more)
963 { 988 {
964 more->destroy (); 989 more->destroy ();
965 more = 0; 990 more = 0;
… …
978object::destroy (bool destroy_inventory) 1003object::destroy (bool destroy_inventory)
979{ 1004{
980 if (destroyed ()) 1005 if (destroyed ())
981 return; 1006 return;
982 1007
1008 if (!is_head () && !head->destroyed ())
1009 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory);
1012 return;
1013 }
1014
983 if (destroy_inventory) 1015 destroy_inv (!destroy_inventory);
984 destroy_inv (false);
985 1016
986 if (is_head ()) 1017 if (is_head ())
987 if (sound_destroy) 1018 if (sound_destroy)
988 play_sound (sound_destroy); 1019 play_sound (sound_destroy);
989 else if (flag [FLAG_MONSTER]) 1020 else if (flag [FLAG_MONSTER])
… …
1003object::do_remove () 1034object::do_remove ()
1004{ 1035{
1005 object *tmp, *last = 0; 1036 object *tmp, *last = 0;
1006 object *otmp; 1037 object *otmp;
1007 1038
1008 if (QUERY_FLAG (this, FLAG_REMOVED)) 1039 if (flag [FLAG_REMOVED])
1009 return; 1040 return;
1010 1041
1011 SET_FLAG (this, FLAG_REMOVED);
1012 INVOKE_OBJECT (REMOVE, this); 1042 INVOKE_OBJECT (REMOVE, this);
1043
1044 flag [FLAG_REMOVED] = true;
1013 1045
1014 if (more) 1046 if (more)
1015 more->remove (); 1047 more->remove ();
1016 1048
1017 /* 1049 /*
1018 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1019 * inventory. 1051 * inventory.
1020 */ 1052 */
1021 if (env) 1053 if (env)
1022 { 1054 {
1055 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1056 if (object *pl = visible_to ())
1057 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059
1023 adjust_weight (env, -total_weight ()); 1060 adjust_weight (env, -total_weight ());
1024 1061
1062 // make sure cmov optimisation is applicable
1025 *(above ? &above->below : &env->inv) = below; 1063 *(above ? &above->below : &env->inv) = below;
1064 *(below ? &below->above : &above ) = above; // &above is just a dummy
1026 1065
1027 if (below) 1066 above = 0;
1028 below->above = above; 1067 below = 0;
1068 env = 0;
1029 1069
1030 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1031 * 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
1032 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1033 */ 1073 */
1034 map = env->map; 1074 map = env->map;
1035 x = env->x; 1075 x = env->x;
1036 y = env->y; 1076 y = env->y;
1037 above = 0;
1038 below = 0;
1039 env = 0;
1040 1077
1041 /* NO_FIX_PLAYER is set when a great many changes are being 1078 /* NO_FIX_PLAYER is set when a great many changes are being
1042 * made to players inventory. If set, avoiding the call 1079 * made to players inventory. If set, avoiding the call
1043 * to save cpu time. 1080 * to save cpu time.
1044 */ 1081 */
1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1082 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046 otmp->update_stats (); 1083 otmp->update_stats ();
1047 } 1084 }
1048 else if (map) 1085 else if (map)
1049 { 1086 {
1050 if (type == PLAYER)
1051 {
1052 // leaving a spot always closes any open container on the ground
1053 if (container && !container->env)
1054 // this causes spurious floorbox updates, but it ensures
1055 // that the CLOSE event is being sent.
1056 close_container ();
1057
1058 --map->players;
1059 map->touch ();
1060 }
1061
1062 map->dirty = true; 1087 map->dirty = true;
1063 mapspace &ms = this->ms (); 1088 mapspace &ms = this->ms ();
1064 1089
1090 if (object *pl = ms.player ())
1091 {
1092 if (type == PLAYER) // this == pl(!)
1093 {
1094 // leaving a spot always closes any open container on the ground
1095 if (container && !container->env)
1096 // this causes spurious floorbox updates, but it ensures
1097 // that the CLOSE event is being sent.
1098 close_container ();
1099
1100 --map->players;
1101 map->touch ();
1102 }
1103 else if (pl->container == this)
1104 {
1105 // removing a container should close it
1106 close_container ();
1107 }
1108
1109 esrv_del_item (pl->contr, count);
1110 }
1111
1065 /* link the object above us */ 1112 /* link the object above us */
1066 if (above) 1113 // re-link, make sure compiler can easily use cmove
1067 above->below = below; 1114 *(above ? &above->below : &ms.top) = below;
1068 else 1115 *(below ? &below->above : &ms.bot) = above;
1069 ms.top = below; /* we were top, set new top */
1070
1071 /* Relink the object below us, if there is one */
1072 if (below)
1073 below->above = above;
1074 else
1075 {
1076 /* Nothing below, which means we need to relink map object for this space
1077 * use translated coordinates in case some oddness with map tiling is
1078 * evident
1079 */
1080 if (GET_MAP_OB (map, x, y) != this)
1081 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1082
1083 ms.bot = above; /* goes on above it. */
1084 }
1085 1116
1086 above = 0; 1117 above = 0;
1087 below = 0; 1118 below = 0;
1088 1119
1089 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
… …
1098 * removed (most likely destroyed), update the player view 1129 * removed (most likely destroyed), update the player view
1099 * appropriately. 1130 * appropriately.
1100 */ 1131 */
1101 pl->close_container (); 1132 pl->close_container ();
1102 1133
1134 //TODO: the floorbox prev/next might need updating
1135 //esrv_del_item (pl->contr, count);
1136 //TODO: update floorbox to preserve ordering
1137 if (pl->contr->ns)
1103 pl->contr->ns->floorbox_update (); 1138 pl->contr->ns->floorbox_update ();
1104 } 1139 }
1105 1140
1106 for (tmp = ms.bot; tmp; tmp = tmp->above) 1141 for (tmp = ms.bot; tmp; tmp = tmp->above)
1107 { 1142 {
1108 /* No point updating the players look faces if he is the object 1143 /* No point updating the players look faces if he is the object
… …
1152 if (!top) 1187 if (!top)
1153 for (top = op; top && top->above; top = top->above) 1188 for (top = op; top && top->above; top = top->above)
1154 ; 1189 ;
1155 1190
1156 for (; top; top = top->below) 1191 for (; top; top = top->below)
1157 {
1158 if (top == op)
1159 continue;
1160
1161 if (object::can_merge (op, top)) 1192 if (object::can_merge (op, top))
1162 { 1193 {
1163 top->nrof += op->nrof; 1194 top->nrof += op->nrof;
1164 1195
1165/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1196 if (object *pl = top->visible_to ())
1166 op->weight = 0; /* Don't want any adjustements now */ 1197 esrv_update_item (UPD_NROF, pl, top);
1198
1199 op->weight = 0; // cancel the addition above
1200 op->carrying = 0; // must be 0 already
1201
1167 op->destroy (); 1202 op->destroy (1);
1203
1168 return top; 1204 return top;
1169 } 1205 }
1170 }
1171 1206
1172 return 0; 1207 return 0;
1173} 1208}
1174 1209
1175void 1210void
… …
1234object * 1269object *
1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236{ 1271{
1237 assert (!op->flag [FLAG_FREED]); 1272 assert (!op->flag [FLAG_FREED]);
1238 1273
1239 object *top, *floor = NULL;
1240
1241 op->remove (); 1274 op->remove ();
1242 1275
1243 /* Ideally, the caller figures this out. However, it complicates a lot 1276 /* Ideally, the caller figures this out. However, it complicates a lot
1244 * of areas of callers (eg, anything that uses find_free_spot would now 1277 * of areas of callers (eg, anything that uses find_free_spot would now
1245 * need extra work 1278 * need extra work
1246 */ 1279 */
1247 if (!xy_normalise (m, op->x, op->y)) 1280 if (!xy_normalise (m, op->x, op->y))
1248 { 1281 {
1249 op->destroy (); 1282 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1250 return 0; 1283 return 0;
1251 } 1284 }
1252 1285
1253 if (object *more = op->more) 1286 if (object *more = op->more)
1254 if (!insert_ob_in_map (more, m, originator, flag)) 1287 if (!insert_ob_in_map (more, m, originator, flag))
… …
1263 */ 1296 */
1264 if (op->nrof && !(flag & INS_NO_MERGE)) 1297 if (op->nrof && !(flag & INS_NO_MERGE))
1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1298 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266 if (object::can_merge (op, tmp)) 1299 if (object::can_merge (op, tmp))
1267 { 1300 {
1301 // TODO: we atcually want to update tmp, not op,
1302 // but some caller surely breaks when we return tmp
1303 // from here :/
1268 op->nrof += tmp->nrof; 1304 op->nrof += tmp->nrof;
1269 tmp->destroy (1); 1305 tmp->destroy (1);
1270 } 1306 }
1271 1307
1272 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1308 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
… …
1294 /* since *below* originator, no need to update top */ 1330 /* since *below* originator, no need to update top */
1295 originator->below = op; 1331 originator->below = op;
1296 } 1332 }
1297 else 1333 else
1298 { 1334 {
1335 object *top, *floor = NULL;
1336
1299 top = ms.bot; 1337 top = ms.bot;
1300 1338
1301 /* If there are other objects, then */ 1339 /* If there are other objects, then */
1302 if (top) 1340 if (top)
1303 { 1341 {
… …
1402 } 1440 }
1403 1441
1404 op->map->dirty = true; 1442 op->map->dirty = true;
1405 1443
1406 if (object *pl = ms.player ()) 1444 if (object *pl = ms.player ())
1445 //TODO: the floorbox prev/next might need updating
1446 //esrv_send_item (pl, op);
1447 //TODO: update floorbox to preserve ordering
1448 if (pl->contr->ns)
1407 pl->contr->ns->floorbox_update (); 1449 pl->contr->ns->floorbox_update ();
1408 1450
1409 /* If this object glows, it may affect lighting conditions that are 1451 /* If this object glows, it may affect lighting conditions that are
1410 * visible to others on this map. But update_all_los is really 1452 * visible to others on this map. But update_all_los is really
1411 * an inefficient way to do this, as it means los for all players 1453 * an inefficient way to do this, as it means los for all players
1412 * on the map will get recalculated. The players could very well 1454 * on the map will get recalculated. The players could very well
… …
1477 return where->env->insert (this); 1519 return where->env->insert (this);
1478 else 1520 else
1479 return where->map->insert (this, where->x, where->y, originator, flags); 1521 return where->map->insert (this, where->x, where->y, originator, flags);
1480} 1522}
1481 1523
1482// find player who can see this object
1483static object *
1484visible_to (object *op)
1485{
1486 if (!op->flag [FLAG_REMOVED])
1487 {
1488 // see if we are in a container of sorts
1489 if (object *env = op->env)
1490 {
1491 // the player inventory itself is always visible
1492 if (env->type == PLAYER)
1493 return env;
1494
1495 // else a player could have our env open
1496 env = env->outer_env ();
1497
1498 // the player itself is always on a map, so we will find him here
1499 // even if our inv is in a player.
1500 if (env->is_on_map ())
1501 if (object *pl = env->ms ().player ())
1502 if (pl->container == op->env)
1503 return pl;
1504 }
1505 else
1506 {
1507 // maybe there is a player standing on the same mapspace
1508 if (object *pl = env->ms ().player ())
1509 return pl;
1510 }
1511 }
1512
1513 return 0;
1514}
1515
1516/* 1524/*
1517 * decrease(object, number) decreases a specified number from 1525 * decrease(object, number) decreases a specified number from
1518 * the amount of an object. If the amount reaches 0, the object 1526 * the amount of an object. If the amount reaches 0, the object
1519 * is subsequently removed and freed. 1527 * is subsequently removed and freed.
1520 * 1528 *
1521 * Return value: 'op' if something is left, NULL if the amount reached 0 1529 * Return value: 'op' if something is left, NULL if the amount reached 0
1522 */ 1530 */
1523bool 1531bool
1524object::decrease (sint32 nr) 1532object::decrease (sint32 nr)
1525{ 1533{
1534 if (!nr)
1535 return true;
1536
1526 nr = min (nr, nrof); 1537 nr = min (nr, nrof);
1527 1538
1528 if (!nr)
1529 return 1;
1530
1531 nrof -= nr; 1539 nrof -= nr;
1532 1540
1533 object *visible = visible_to (this);
1534
1535 if (nrof) 1541 if (nrof)
1536 { 1542 {
1537 adjust_weight (env, -weight * nr); // carrying == 0 1543 adjust_weight (env, -weight * nr); // carrying == 0
1538 1544
1539 if (visible) 1545 if (object *pl = visible_to ())
1540 esrv_send_item (visible, this); 1546 esrv_update_item (UPD_NROF, pl, this);
1541 1547
1542 return 1; 1548 return true;
1543 } 1549 }
1544 else 1550 else
1545 { 1551 {
1546 if (visible)
1547 esrv_del_item (visible->contr, count);
1548
1549 this->destroy (1); 1552 destroy (1);
1550 return 0; 1553 return false;
1551 } 1554 }
1552} 1555}
1553 1556
1554/* 1557/*
1555 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1558 * split(ob,nr) splits up ob into two parts. The part which
1556 * is returned contains nr objects, and the remaining parts contains 1559 * is returned contains nr objects, and the remaining parts contains
1557 * the rest (or is removed and freed if that number is 0). 1560 * the rest (or is removed and returned if that number is 0).
1558 * On failure, NULL is returned, and the reason put into the 1561 * On failure, NULL is returned.
1559 * global static errmsg array.
1560 */ 1562 */
1561object * 1563object *
1562object::split (sint32 nr) 1564object::split (sint32 nr)
1563{ 1565{
1566 int have = number_of ();
1567
1564 if (nrof < nr) 1568 if (have < nr)
1565 return 0; 1569 return 0;
1566 else if (nrof == nr) 1570 else if (have == nr)
1567 { 1571 {
1568 remove (); 1572 remove ();
1569 return this; 1573 return this;
1570 } 1574 }
1571 else 1575 else
1572 { 1576 {
1573 decrease (nr); 1577 decrease (nr);
1574 1578
1575 object *op = object_create_clone (this); 1579 object *op = deep_clone ();
1576 op->nrof = nr; 1580 op->nrof = nr;
1577 return op; 1581 return op;
1578 } 1582 }
1579}
1580
1581//TODO: remove, but semantics differs from split_nr
1582object *
1583get_split_ob (object *orig_ob, uint32 nr)
1584{
1585 if (orig_ob->nrof < nr)
1586 {
1587 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1588 return 0;
1589 }
1590
1591 return orig_ob->split (nr);
1592} 1583}
1593 1584
1594object * 1585object *
1595insert_ob_in_ob (object *op, object *where) 1586insert_ob_in_ob (object *op, object *where)
1596{ 1587{
… …
1637 if (object::can_merge (tmp, op)) 1628 if (object::can_merge (tmp, op))
1638 { 1629 {
1639 /* return the original object and remove inserted object 1630 /* return the original object and remove inserted object
1640 (client needs the original object) */ 1631 (client needs the original object) */
1641 tmp->nrof += op->nrof; 1632 tmp->nrof += op->nrof;
1633
1634 if (object *pl = tmp->visible_to ())
1635 esrv_update_item (UPD_NROF, pl, tmp);
1636
1637 adjust_weight (this, op->total_weight ());
1638
1642 op->destroy (1); 1639 op->destroy (1);
1643 op = tmp; 1640 op = tmp;
1644 goto inserted; 1641 goto inserted;
1645 } 1642 }
1646 1643
… …
1658 1655
1659 inv = op; 1656 inv = op;
1660 1657
1661 op->flag [FLAG_REMOVED] = 0; 1658 op->flag [FLAG_REMOVED] = 0;
1662 1659
1660 if (object *pl = op->visible_to ())
1661 esrv_send_item (pl, op);
1662
1663 adjust_weight (this, op->total_weight ()); 1663 adjust_weight (this, op->total_weight ());
1664 1664
1665inserted: 1665inserted:
1666 /* reset the light list and los of the players on the map */ 1666 /* reset the light list and los of the players on the map */
1667 if (op->glow_radius && map && map->darkness) 1667 if (op->glow_radius && map && map->darkness)
1668 update_all_los (map, x, y); 1668 update_all_los (map, x, y);
1669 1669
1670 if (object *otmp = in_player ()) 1670 // if this is a player's inventory, update stats
1671 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1671 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1672 otmp->update_stats (); 1672 update_stats ();
1673 1673
1674 INVOKE_OBJECT (INSERT, this); 1674 INVOKE_OBJECT (INSERT, this);
1675 1675
1676 return op; 1676 return op;
1677} 1677}
… …
1805 LOG (llevError, "Present_arch called outside map.\n"); 1805 LOG (llevError, "Present_arch called outside map.\n");
1806 return NULL; 1806 return NULL;
1807 } 1807 }
1808 1808
1809 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1809 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1810 if (tmp->arch == at) 1810 if (tmp->arch->archname == at->archname)
1811 return tmp; 1811 return tmp;
1812 1812
1813 return NULL; 1813 return NULL;
1814} 1814}
1815 1815
… …
1879 * The first matching object is returned, or NULL if none. 1879 * The first matching object is returned, or NULL if none.
1880 */ 1880 */
1881object * 1881object *
1882present_arch_in_ob (const archetype *at, const object *op) 1882present_arch_in_ob (const archetype *at, const object *op)
1883{ 1883{
1884 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1884 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1885 if (tmp->arch == at) 1885 if (tmp->arch->archname == at->archname)
1886 return tmp; 1886 return tmp;
1887 1887
1888 return NULL; 1888 return NULL;
1889} 1889}
1890 1890
… …
2299 2299
2300/* 2300/*
2301 * create clone from object to another 2301 * create clone from object to another
2302 */ 2302 */
2303object * 2303object *
2304object_create_clone (object *asrc) 2304object::deep_clone ()
2305{ 2305{
2306 object *dst = 0, *tmp, *src, *prev, *item; 2306 assert (("deep_clone called on non-head object", is_head ()));
2307 2307
2308 if (!asrc) 2308 object *dst = clone ();
2309 return 0;
2310 2309
2311 src = asrc->head_ (); 2310 object *prev = dst;
2312
2313 prev = 0;
2314 for (object *part = src; part; part = part->more) 2311 for (object *part = this->more; part; part = part->more)
2315 { 2312 {
2316 tmp = part->clone (); 2313 object *tmp = part->clone ();
2317 tmp->x -= src->x;
2318 tmp->y -= src->y;
2319
2320 if (!part->head)
2321 {
2322 dst = tmp;
2323 tmp->head = 0;
2324 }
2325 else
2326 tmp->head = dst; 2314 tmp->head = dst;
2327
2328 tmp->more = 0;
2329
2330 if (prev)
2331 prev->more = tmp; 2315 prev->more = tmp;
2332
2333 prev = tmp; 2316 prev = tmp;
2334 } 2317 }
2335 2318
2336 for (item = src->inv; item; item = item->below) 2319 for (object *item = inv; item; item = item->below)
2337 insert_ob_in_ob (object_create_clone (item), dst); 2320 insert_ob_in_ob (item->deep_clone (), dst);
2338 2321
2339 return dst; 2322 return dst;
2340} 2323}
2341 2324
2342/* This returns the first object in who's inventory that 2325/* This returns the first object in who's inventory that
… …
2351 return tmp; 2334 return tmp;
2352 2335
2353 return 0; 2336 return 0;
2354} 2337}
2355 2338
2356/* If ob has a field named key, return the link from the list, 2339const shstr &
2357 * otherwise return NULL. 2340object::kv_get (const shstr &key) const
2358 *
2359 * key must be a passed in shared string - otherwise, this won't
2360 * do the desired thing.
2361 */
2362key_value *
2363get_ob_key_link (const object *ob, const char *key)
2364{ 2341{
2365 for (key_value *link = ob->key_values; link; link = link->next) 2342 for (key_value *kv = key_values; kv; kv = kv->next)
2366 if (link->key == key) 2343 if (kv->key == key)
2367 return link;
2368
2369 return 0;
2370}
2371
2372/*
2373 * Returns the value of op has an extra_field for key, or NULL.
2374 *
2375 * The argument doesn't need to be a shared string.
2376 *
2377 * The returned string is shared.
2378 */
2379const char *
2380get_ob_key_value (const object *op, const char *const key)
2381{
2382 key_value *link;
2383 shstr_cmp canonical_key (key);
2384
2385 if (!canonical_key)
2386 {
2387 /* 1. There being a field named key on any object
2388 * implies there'd be a shared string to find.
2389 * 2. Since there isn't, no object has this field.
2390 * 3. Therefore, *this* object doesn't have this field.
2391 */
2392 return 0;
2393 }
2394
2395 /* This is copied from get_ob_key_link() above -
2396 * only 4 lines, and saves the function call overhead.
2397 */
2398 for (link = op->key_values; link; link = link->next)
2399 if (link->key == canonical_key)
2400 return link->value; 2344 return kv->value;
2401 2345
2402 return 0; 2346 return shstr_null;
2403} 2347}
2404 2348
2405/* 2349void
2406 * Updates the canonical_key in op to value. 2350object::kv_set (const shstr &key, const shstr &value)
2407 *
2408 * canonical_key is a shared string (value doesn't have to be).
2409 *
2410 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2411 * keys.
2412 *
2413 * Returns TRUE on success.
2414 */
2415int
2416set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2417{ 2351{
2418 key_value *field = NULL, *last = NULL; 2352 for (key_value *kv = key_values; kv; kv = kv->next)
2419 2353 if (kv->key == key)
2420 for (field = op->key_values; field != NULL; field = field->next)
2421 {
2422 if (field->key != canonical_key)
2423 { 2354 {
2424 last = field; 2355 kv->value = value;
2425 continue; 2356 return;
2426 } 2357 }
2427 2358
2428 if (value) 2359 key_value *kv = new key_value;
2429 field->value = value; 2360
2430 else 2361 kv->next = key_values;
2362 kv->key = key;
2363 kv->value = value;
2364
2365 key_values = kv;
2366}
2367
2368void
2369object::kv_del (const shstr &key)
2370{
2371 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2372 if ((*kvp)->key == key)
2431 { 2373 {
2432 /* Basically, if the archetype has this key set, 2374 key_value *kv = *kvp;
2433 * we need to store the null value so when we save 2375 *kvp = (*kvp)->next;
2434 * it, we save the empty value so that when we load, 2376 delete kv;
2435 * we get this value back again. 2377 return;
2436 */
2437 if (get_ob_key_link (op->arch, canonical_key))
2438 field->value = 0;
2439 else
2440 {
2441 if (last)
2442 last->next = field->next;
2443 else
2444 op->key_values = field->next;
2445
2446 delete field;
2447 }
2448 } 2378 }
2449 return TRUE;
2450 }
2451 /* IF we get here, key doesn't exist */
2452
2453 /* No field, we'll have to add it. */
2454
2455 if (!add_key)
2456 return FALSE;
2457
2458 /* There isn't any good reason to store a null
2459 * value in the key/value list. If the archetype has
2460 * this key, then we should also have it, so shouldn't
2461 * be here. If user wants to store empty strings,
2462 * should pass in ""
2463 */
2464 if (value == NULL)
2465 return TRUE;
2466
2467 field = new key_value;
2468
2469 field->key = canonical_key;
2470 field->value = value;
2471 /* Usual prepend-addition. */
2472 field->next = op->key_values;
2473 op->key_values = field;
2474
2475 return TRUE;
2476}
2477
2478/*
2479 * Updates the key in op to value.
2480 *
2481 * If add_key is FALSE, this will only update existing keys,
2482 * and not add new ones.
2483 * In general, should be little reason FALSE is ever passed in for add_key
2484 *
2485 * Returns TRUE on success.
2486 */
2487int
2488set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2489{
2490 shstr key_ (key);
2491
2492 return set_ob_key_value_s (op, key_, value, add_key);
2493} 2379}
2494 2380
2495object::depth_iterator::depth_iterator (object *container) 2381object::depth_iterator::depth_iterator (object *container)
2496: iterator_base (container) 2382: iterator_base (container)
2497{ 2383{
… …
2555 &name, 2441 &name,
2556 title ? "\",title:\"" : "", 2442 title ? "\",title:\"" : "",
2557 title ? (const char *)title : "", 2443 title ? (const char *)title : "",
2558 flag_desc (flagdesc, 512), type); 2444 flag_desc (flagdesc, 512), type);
2559 2445
2560 if (!this->flag[FLAG_REMOVED] && env) 2446 if (!flag[FLAG_REMOVED] && env)
2561 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2447 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2562 2448
2563 if (map) 2449 if (map)
2564 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2450 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2565 2451
… …
2595object::open_container (object *new_container) 2481object::open_container (object *new_container)
2596{ 2482{
2597 if (container == new_container) 2483 if (container == new_container)
2598 return; 2484 return;
2599 2485
2600 if (object *old_container = container) 2486 object *old_container = container;
2487
2488 if (old_container)
2601 { 2489 {
2602 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2490 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2603 return; 2491 return;
2604 2492
2605#if 0 2493#if 0
… …
2607 if (object *closer = old_container->inv) 2495 if (object *closer = old_container->inv)
2608 if (closer->type == CLOSE_CON) 2496 if (closer->type == CLOSE_CON)
2609 closer->destroy (); 2497 closer->destroy ();
2610#endif 2498#endif
2611 2499
2500 // make sure the container is available
2501 esrv_send_item (this, old_container);
2502
2612 old_container->flag [FLAG_APPLIED] = 0; 2503 old_container->flag [FLAG_APPLIED] = false;
2613 container = 0; 2504 container = 0;
2614 2505
2506 // client needs item update to make it work, client bug requires this to be separate
2615 esrv_update_item (UPD_FLAGS, this, old_container); 2507 esrv_update_item (UPD_FLAGS, this, old_container);
2508
2616 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2509 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2617 play_sound (sound_find ("chest_close")); 2510 play_sound (sound_find ("chest_close"));
2618 } 2511 }
2619 2512
2620 if (new_container) 2513 if (new_container)
… …
2633 } 2526 }
2634#endif 2527#endif
2635 2528
2636 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2529 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2637 2530
2531 // make sure the container is available, client bug requires this to be separate
2532 esrv_send_item (this, new_container);
2533
2638 new_container->flag [FLAG_APPLIED] = 1; 2534 new_container->flag [FLAG_APPLIED] = true;
2639 container = new_container; 2535 container = new_container;
2640 2536
2537 // client needs flag change
2641 esrv_update_item (UPD_FLAGS, this, new_container); 2538 esrv_update_item (UPD_FLAGS, this, new_container);
2642 esrv_send_inventory (this, new_container); 2539 esrv_send_inventory (this, new_container);
2643 play_sound (sound_find ("chest_open")); 2540 play_sound (sound_find ("chest_open"));
2644 } 2541 }
2542// else if (!old_container->env && contr && contr->ns)
2543// contr->ns->floorbox_reset ();
2645} 2544}
2646 2545
2647object * 2546object *
2648object::force_find (const shstr name) 2547object::force_find (const shstr name)
2649{ 2548{

Diff Legend

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