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.257 by root, Tue Sep 16 16:03:02 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 *
… …
201 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value 187 || ob1->value != ob2->value
203 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
204 return 0; 189 return 0;
205 190
206 /* Do not merge objects if nrof would overflow. First part checks 191 /* Do not merge objects if nrof would overflow, assume nrof
207 * for unsigned overflow (2c), second part checks whether the result 192 * is always 0 .. 2**31-1 */
208 * would fit into a 32 bit signed int, which is often used to hold 193 if (ob1->nrof > 0x7fffffff - ob2->nrof)
209 * nrof values.
210 */
211 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212 return 0; 194 return 0;
213 195
214 /* If the objects have been identified, set the BEEN_APPLIED flag. 196 /* If the objects have been identified, set the BEEN_APPLIED flag.
215 * This is to the comparison of the flags below will be OK. We 197 * This is to the comparison of the flags below will be OK. We
216 * just can't ignore the been applied or identified flags, as they 198 * just can't ignore the been applied or identified flags, as they
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 203 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 204
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 205 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 207
226 if (ob1->arch->name != ob2->arch->name 208 if (ob1->arch->archname != ob2->arch->archname
227 || ob1->name != ob2->name 209 || ob1->name != ob2->name
228 || ob1->title != ob2->title 210 || ob1->title != ob2->title
229 || ob1->msg != ob2->msg 211 || ob1->msg != ob2->msg
230 || ob1->weight != ob2->weight 212 || ob1->weight != ob2->weight
231 || ob1->attacktype != ob2->attacktype 213 || ob1->attacktype != ob2->attacktype
232 || ob1->magic != ob2->magic 214 || ob1->magic != ob2->magic
233 || ob1->slaying != ob2->slaying 215 || ob1->slaying != ob2->slaying
234 || ob1->skill != ob2->skill 216 || ob1->skill != ob2->skill
235 || ob1->value != ob2->value 217 || ob1->value != ob2->value
236 || ob1->animation_id != ob2->animation_id 218 || ob1->animation_id != ob2->animation_id
219 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
237 || ob1->client_type != ob2->client_type 220 || ob1->client_type != ob2->client_type
238 || ob1->materialname != ob2->materialname 221 || ob1->materialname != ob2->materialname
239 || ob1->lore != ob2->lore 222 || ob1->lore != ob2->lore
240 || ob1->subtype != ob2->subtype 223 || ob1->subtype != ob2->subtype
241 || ob1->move_type != ob2->move_type 224 || ob1->move_type != ob2->move_type
… …
249 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
250 return 0; 233 return 0;
251 234
252 if ((ob1->flag ^ ob2->flag) 235 if ((ob1->flag ^ ob2->flag)
253 .reset (FLAG_INV_LOCKED) 236 .reset (FLAG_INV_LOCKED)
254 .reset (FLAG_CLIENT_SENT)
255 .reset (FLAG_REMOVED) 237 .reset (FLAG_REMOVED)
256 .any ()) 238 .any ())
257 return 0; 239 return 0;
258 240
259 /* This is really a spellbook check - we should in general 241 /* This is really a spellbook check - we should in general
… …
331 313
332 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
333 return 1; 315 return 1;
334} 316}
335 317
318// find player who can see this object
319object *
320object::visible_to () const
321{
322 if (client_visible () && !flag [FLAG_REMOVED])
323 {
324 // see if we are in a container of sorts
325 if (env)
326 {
327 // the player inventory itself is always visible
328 if (env->type == PLAYER)
329 return env;
330
331 // else a player could have our env open
332 object *envest = env->outer_env ();
333
334 // the player itself is always on a map, so we will find him here
335 // even if our inv is in a player.
336 if (envest->is_on_map ())
337 if (object *pl = envest->ms ().player ())
338 if (pl->container == env)
339 return pl;
340 }
341 else
342 {
343 // maybe there is a player standing on the same mapspace
344 // this will catch the case where "this" is a player
345 if (object *pl = ms ().player ())
346 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
347 || this == pl->container)
348 return pl;
349 }
350 }
351
352 return 0;
353}
354
336// adjust weight per container type ("of holding") 355// adjust weight per container type ("of holding")
337static sint32 356static sint32
338weight_adjust (object *op, sint32 weight) 357weight_adjust_for (object *op, sint32 weight)
339{ 358{
340 return op->type == CONTAINER 359 return op->type == CONTAINER
341 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 360 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342 : weight; 361 : weight;
343} 362}
… …
349static void 368static void
350adjust_weight (object *op, sint32 weight) 369adjust_weight (object *op, sint32 weight)
351{ 370{
352 while (op) 371 while (op)
353 { 372 {
373 // adjust by actual difference to account for rounding errors
374 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
354 weight = weight_adjust (op, weight); 375 weight = weight_adjust_for (op, op->carrying)
376 - weight_adjust_for (op, op->carrying - weight);
377
378 if (!weight)
379 return;
355 380
356 op->carrying += weight; 381 op->carrying += weight;
382
383 if (object *pl = op->visible_to ())
384 if (pl != op) // player is handled lazily
385 esrv_update_item (UPD_WEIGHT, pl, op);
386
357 op = op->env; 387 op = op->env;
358 } 388 }
359} 389}
360 390
361/* 391/*
… …
374 op->update_weight (); 404 op->update_weight ();
375 405
376 sum += op->total_weight (); 406 sum += op->total_weight ();
377 } 407 }
378 408
379 carrying = weight_adjust (this, sum); 409 sum = weight_adjust_for (this, sum);
410
411 if (sum != carrying)
412 {
413 carrying = sum;
414
415 if (object *pl = visible_to ())
416 if (pl != this) // player is handled lazily
417 esrv_update_item (UPD_WEIGHT, pl, this);
418 }
380} 419}
381 420
382/* 421/*
383 * Used by: Server DM commands: dumpbelow, dump. Some error messages. 422 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
384 */ 423 */
… …
437 */ 476 */
438object * 477object *
439find_object_name (const char *str) 478find_object_name (const char *str)
440{ 479{
441 shstr_cmp str_ (str); 480 shstr_cmp str_ (str);
442 object *op;
443 481
482 if (str_)
444 for_all_objects (op) 483 for_all_objects (op)
445 if (op->name == str_) 484 if (op->name == str_)
446 break; 485 return op;
447 486
448 return op; 487 return 0;
449} 488}
450 489
451/* 490/*
452 * Sets the owner and sets the skill and exp pointers to owner's current 491 * Sets the owner and sets the skill and exp pointers to owner's current
453 * skill and experience objects. 492 * skill and experience objects.
… …
551 } 590 }
552 591
553 op->key_values = 0; 592 op->key_values = 0;
554} 593}
555 594
556object & 595/*
557object::operator =(const object &src) 596 * copy_to first frees everything allocated by the dst object,
597 * and then copies the contents of itself into the second
598 * object, allocating what needs to be allocated. Basically, any
599 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
600 * if the first object is freed, the pointers in the new object
601 * will point at garbage.
602 */
603void
604object::copy_to (object *dst)
558{ 605{
559 bool is_freed = flag [FLAG_FREED]; 606 dst->remove ();
560 bool is_removed = flag [FLAG_REMOVED];
561
562 *(object_copy *)this = src; 607 *(object_copy *)dst = *this;
563
564 flag [FLAG_FREED] = is_freed;
565 flag [FLAG_REMOVED] = is_removed; 608 dst->flag [FLAG_REMOVED] = true;
566 609
567 /* Copy over key_values, if any. */ 610 /* Copy over key_values, if any. */
568 if (src.key_values) 611 if (key_values)
569 { 612 {
570 key_value *tail = 0; 613 key_value *tail = 0;
571 key_values = 0; 614 dst->key_values = 0;
572 615
573 for (key_value *i = src.key_values; i; i = i->next) 616 for (key_value *i = key_values; i; i = i->next)
574 { 617 {
575 key_value *new_link = new key_value; 618 key_value *new_link = new key_value;
576 619
577 new_link->next = 0; 620 new_link->next = 0;
578 new_link->key = i->key; 621 new_link->key = i->key;
579 new_link->value = i->value; 622 new_link->value = i->value;
580 623
581 /* Try and be clever here, too. */ 624 /* Try and be clever here, too. */
582 if (!key_values) 625 if (!dst->key_values)
583 { 626 {
584 key_values = new_link; 627 dst->key_values = new_link;
585 tail = new_link; 628 tail = new_link;
586 } 629 }
587 else 630 else
588 { 631 {
589 tail->next = new_link; 632 tail->next = new_link;
590 tail = new_link; 633 tail = new_link;
591 } 634 }
592 } 635 }
593 } 636 }
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 637
609 if (speed < 0) 638 if (speed < 0)
610 dst->speed_left -= rndm (); 639 dst->speed_left -= rndm ();
611 640
612 dst->set_speed (dst->speed); 641 dst->activate ();
613} 642}
614 643
615void 644void
616object::instantiate () 645object::instantiate ()
617{ 646{
… …
634object * 663object *
635object::clone () 664object::clone ()
636{ 665{
637 object *neu = create (); 666 object *neu = create ();
638 copy_to (neu); 667 copy_to (neu);
668 neu->map = map; // not copied by copy_to
639 return neu; 669 return neu;
640} 670}
641 671
642/* 672/*
643 * If an object with the IS_TURNABLE() flag needs to be turned due 673 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
694 * UP_OBJ_FACE: only the objects face has changed. 724 * UP_OBJ_FACE: only the objects face has changed.
695 */ 725 */
696void 726void
697update_object (object *op, int action) 727update_object (object *op, int action)
698{ 728{
699 if (op == NULL) 729 if (!op)
700 { 730 {
701 /* this should never happen */ 731 /* this should never happen */
702 LOG (llevDebug, "update_object() called for NULL object.\n"); 732 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
703 return; 733 return;
704 } 734 }
705 735
706 if (op->env) 736 if (!op->is_on_map ())
707 { 737 {
708 /* Animation is currently handled by client, so nothing 738 /* Animation is currently handled by client, so nothing
709 * to do in this case. 739 * to do in this case.
710 */ 740 */
711 return; 741 return;
712 } 742 }
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 743
720 /* make sure the object is within map boundaries */ 744 /* 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) 745 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
722 { 746 {
723 LOG (llevError, "update_object() called for object out of map!\n"); 747 LOG (llevError, "update_object() called for object out of map!\n");
… …
742 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
743 || (m.move_on | op->move_on ) != m.move_on 767 || (m.move_on | op->move_on ) != m.move_on
744 || (m.move_off | op->move_off ) != m.move_off 768 || (m.move_off | op->move_off ) != m.move_off
745 || (m.move_slow | op->move_slow) != m.move_slow 769 || (m.move_slow | op->move_slow) != m.move_slow
746 /* This isn't perfect, but I don't expect a lot of objects to 770 /* This isn't perfect, but I don't expect a lot of objects to
747 * to have move_allow right now. 771 * have move_allow right now.
748 */ 772 */
749 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 773 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
750 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
751 m.flags_ = 0; 775 m.flags_ = 0;
752 } 776 }
… …
806{ 830{
807 /* If already on active list, don't do anything */ 831 /* If already on active list, don't do anything */
808 if (active) 832 if (active)
809 return; 833 return;
810 834
835 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
811 if (has_active_speed ()) 838 if (has_active_speed ())
812 actives.insert (this); 839 actives.insert (this);
813} 840}
814 841
815void 842void
… …
866object::destroy_inv (bool drop_to_ground) 893object::destroy_inv (bool drop_to_ground)
867{ 894{
868 // need to check first, because the checks below might segfault 895 // need to check first, because the checks below might segfault
869 // as we might be on an invalid mapspace and crossfire code 896 // as we might be on an invalid mapspace and crossfire code
870 // is too buggy to ensure that the inventory is empty. 897 // is too buggy to ensure that the inventory is empty.
871 // corollary: if you create arrows etc. with stuff in tis inventory, 898 // corollary: if you create arrows etc. with stuff in its inventory,
872 // cf will crash below with off-map x and y 899 // cf will crash below with off-map x and y
873 if (!inv) 900 if (!inv)
874 return; 901 return;
875 902
876 /* Only if the space blocks everything do we not process - 903 /* Only if the space blocks everything do we not process -
… …
878 * drop on that space. 905 * drop on that space.
879 */ 906 */
880 if (!drop_to_ground 907 if (!drop_to_ground
881 || !map 908 || !map
882 || map->in_memory != MAP_ACTIVE 909 || map->in_memory != MAP_ACTIVE
883 || map->nodrop 910 || map->no_drop
884 || ms ().move_block == MOVE_ALL) 911 || ms ().move_block == MOVE_ALL)
885 { 912 {
886 while (inv) 913 while (inv)
887 {
888 inv->destroy_inv (drop_to_ground);
889 inv->destroy (); 914 inv->destroy (true);
890 }
891 } 915 }
892 else 916 else
893 { /* Put objects in inventory onto this space */ 917 { /* Put objects in inventory onto this space */
894 while (inv) 918 while (inv)
895 { 919 {
… …
899 || op->flag [FLAG_NO_DROP] 923 || op->flag [FLAG_NO_DROP]
900 || op->type == RUNE 924 || op->type == RUNE
901 || op->type == TRAP 925 || op->type == TRAP
902 || op->flag [FLAG_IS_A_TEMPLATE] 926 || op->flag [FLAG_IS_A_TEMPLATE]
903 || op->flag [FLAG_DESTROY_ON_DEATH]) 927 || op->flag [FLAG_DESTROY_ON_DEATH])
904 op->destroy (); 928 op->destroy (true);
905 else 929 else
906 map->insert (op, x, y); 930 map->insert (op, x, y);
907 } 931 }
908 } 932 }
909} 933}
… …
913 object *op = new object; 937 object *op = new object;
914 op->link (); 938 op->link ();
915 return op; 939 return op;
916} 940}
917 941
942static struct freed_map : maptile
943{
944 freed_map ()
945 {
946 path = "<freed objects map>";
947 name = "/internal/freed_objects_map";
948 width = 3;
949 height = 3;
950 no_drop = 1;
951 no_reset = 1;
952
953 alloc ();
954 in_memory = MAP_ACTIVE;
955 }
956
957 ~freed_map ()
958 {
959 destroy ();
960 }
961} freed_map; // freed objects are moved here to avoid crashes
962
918void 963void
919object::do_destroy () 964object::do_destroy ()
920{ 965{
921 attachable::do_destroy ();
922
923 if (flag [FLAG_IS_LINKED]) 966 if (flag [FLAG_IS_LINKED])
924 remove_button_link (this); 967 remove_button_link (this);
925 968
926 if (flag [FLAG_FRIENDLY]) 969 if (flag [FLAG_FRIENDLY])
927 remove_friendly_object (this); 970 remove_friendly_object (this);
928 971
929 if (!flag [FLAG_REMOVED])
930 remove (); 972 remove ();
931 973
932 destroy_inv (true); 974 attachable::do_destroy ();
933 975
934 deactivate (); 976 deactivate ();
935 unlink (); 977 unlink ();
936 978
937 flag [FLAG_FREED] = 1; 979 flag [FLAG_FREED] = 1;
938 980
939 // hack to ensure that freed objects still have a valid map 981 // 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; 982 map = &freed_map;
958 x = 1; 983 x = 1;
959 y = 1; 984 y = 1;
960 }
961 985
962 if (more) 986 if (more)
963 { 987 {
964 more->destroy (); 988 more->destroy ();
965 more = 0; 989 more = 0;
… …
978object::destroy (bool destroy_inventory) 1002object::destroy (bool destroy_inventory)
979{ 1003{
980 if (destroyed ()) 1004 if (destroyed ())
981 return; 1005 return;
982 1006
1007 if (!is_head () && !head->destroyed ())
1008 {
1009 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1010 head->destroy (destroy_inventory);
1011 return;
1012 }
1013
983 if (destroy_inventory) 1014 destroy_inv (!destroy_inventory);
984 destroy_inv (false);
985 1015
986 if (is_head ()) 1016 if (is_head ())
987 if (sound_destroy) 1017 if (sound_destroy)
988 play_sound (sound_destroy); 1018 play_sound (sound_destroy);
989 else if (flag [FLAG_MONSTER]) 1019 else if (flag [FLAG_MONSTER])
… …
1003object::do_remove () 1033object::do_remove ()
1004{ 1034{
1005 object *tmp, *last = 0; 1035 object *tmp, *last = 0;
1006 object *otmp; 1036 object *otmp;
1007 1037
1008 if (QUERY_FLAG (this, FLAG_REMOVED)) 1038 if (flag [FLAG_REMOVED])
1009 return; 1039 return;
1010 1040
1011 SET_FLAG (this, FLAG_REMOVED);
1012 INVOKE_OBJECT (REMOVE, this); 1041 INVOKE_OBJECT (REMOVE, this);
1042
1043 flag [FLAG_REMOVED] = true;
1013 1044
1014 if (more) 1045 if (more)
1015 more->remove (); 1046 more->remove ();
1016 1047
1017 /* 1048 /*
1018 * In this case, the object to be removed is in someones 1049 * In this case, the object to be removed is in someones
1019 * inventory. 1050 * inventory.
1020 */ 1051 */
1021 if (env) 1052 if (env)
1022 { 1053 {
1054 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1055 if (object *pl = visible_to ())
1056 esrv_del_item (pl->contr, count);
1057 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058
1023 adjust_weight (env, -total_weight ()); 1059 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
1027 if (below)
1028 below->above = above;
1029 1060
1030 /* we set up values so that it could be inserted into 1061 /* we set up values so that it could be inserted into
1031 * the map, but we don't actually do that - it is up 1062 * the map, but we don't actually do that - it is up
1032 * to the caller to decide what we want to do. 1063 * to the caller to decide what we want to do.
1033 */ 1064 */
1034 map = env->map; 1065 map = env->map;
1035 x = env->x; 1066 x = env->x;
1036 y = env->y; 1067 y = env->y;
1068
1069 // make sure cmov optimisation is applicable
1070 *(above ? &above->below : &env->inv) = below;
1071 *(below ? &below->above : &above ) = above; // &above is just a dummy
1072
1037 above = 0; 1073 above = 0;
1038 below = 0; 1074 below = 0;
1039 env = 0; 1075 env = 0;
1040 1076
1041 /* NO_FIX_PLAYER is set when a great many changes are being 1077 /* NO_FIX_PLAYER is set when a great many changes are being
… …
1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1081 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046 otmp->update_stats (); 1082 otmp->update_stats ();
1047 } 1083 }
1048 else if (map) 1084 else if (map)
1049 { 1085 {
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; 1086 map->dirty = true;
1063 mapspace &ms = this->ms (); 1087 mapspace &ms = this->ms ();
1064 1088
1089 if (object *pl = ms.player ())
1090 {
1091 if (type == PLAYER) // this == pl(!)
1092 {
1093 // leaving a spot always closes any open container on the ground
1094 if (container && !container->env)
1095 // this causes spurious floorbox updates, but it ensures
1096 // that the CLOSE event is being sent.
1097 close_container ();
1098
1099 --map->players;
1100 map->touch ();
1101 }
1102 else if (pl->container == this)
1103 {
1104 // removing a container should close it
1105 close_container ();
1106 }
1107
1108 esrv_del_item (pl->contr, count);
1109 }
1110
1065 /* link the object above us */ 1111 /* link the object above us */
1066 if (above) 1112 // re-link, make sure compiler can easily use cmove
1067 above->below = below; 1113 *(above ? &above->below : &ms.top) = below;
1068 else 1114 *(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 1115
1086 above = 0; 1116 above = 0;
1087 below = 0; 1117 below = 0;
1118
1119 ms.flags_ = 0;
1088 1120
1089 if (map->in_memory == MAP_SAVING) 1121 if (map->in_memory == MAP_SAVING)
1090 return; 1122 return;
1091 1123
1092 int check_walk_off = !flag [FLAG_NO_APPLY]; 1124 int check_walk_off = !flag [FLAG_NO_APPLY];
… …
1098 * removed (most likely destroyed), update the player view 1130 * removed (most likely destroyed), update the player view
1099 * appropriately. 1131 * appropriately.
1100 */ 1132 */
1101 pl->close_container (); 1133 pl->close_container ();
1102 1134
1135 //TODO: the floorbox prev/next might need updating
1136 //esrv_del_item (pl->contr, count);
1137 //TODO: update floorbox to preserve ordering
1138 if (pl->contr->ns)
1103 pl->contr->ns->floorbox_update (); 1139 pl->contr->ns->floorbox_update ();
1104 } 1140 }
1105 1141
1106 for (tmp = ms.bot; tmp; tmp = tmp->above) 1142 for (tmp = ms.bot; tmp; tmp = tmp->above)
1107 { 1143 {
1108 /* No point updating the players look faces if he is the object 1144 /* No point updating the players look faces if he is the object
… …
1121 } 1157 }
1122 1158
1123 last = tmp; 1159 last = tmp;
1124 } 1160 }
1125 1161
1126 /* last == NULL if there are no objects on this space */
1127 //TODO: this makes little sense, why only update the topmost object?
1128 if (!last)
1129 map->at (x, y).flags_ = 0;
1130 else
1131 update_object (last, UP_OBJ_REMOVE);
1132
1133 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1162 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1134 update_all_los (map, x, y); 1163 update_all_los (map, x, y);
1135 } 1164 }
1136} 1165}
1137 1166
… …
1152 if (!top) 1181 if (!top)
1153 for (top = op; top && top->above; top = top->above) 1182 for (top = op; top && top->above; top = top->above)
1154 ; 1183 ;
1155 1184
1156 for (; top; top = top->below) 1185 for (; top; top = top->below)
1157 {
1158 if (top == op)
1159 continue;
1160
1161 if (object::can_merge (op, top)) 1186 if (object::can_merge (op, top))
1162 { 1187 {
1163 top->nrof += op->nrof; 1188 top->nrof += op->nrof;
1164 1189
1165/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1190 if (object *pl = top->visible_to ())
1166 op->weight = 0; /* Don't want any adjustements now */ 1191 esrv_update_item (UPD_NROF, pl, top);
1192
1193 op->weight = 0; // cancel the addition above
1194 op->carrying = 0; // must be 0 already
1195
1167 op->destroy (); 1196 op->destroy (1);
1197
1168 return top; 1198 return top;
1169 } 1199 }
1170 }
1171 1200
1172 return 0; 1201 return 0;
1173} 1202}
1174 1203
1175void 1204void
… …
1200 * job preparing multi-part monsters. 1229 * job preparing multi-part monsters.
1201 */ 1230 */
1202object * 1231object *
1203insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1232insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1204{ 1233{
1234 op->remove ();
1235
1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1236 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1206 { 1237 {
1207 tmp->x = x + tmp->arch->x; 1238 tmp->x = x + tmp->arch->x;
1208 tmp->y = y + tmp->arch->y; 1239 tmp->y = y + tmp->arch->y;
1209 } 1240 }
… …
1232 * just 'op' otherwise 1263 * just 'op' otherwise
1233 */ 1264 */
1234object * 1265object *
1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1266insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236{ 1267{
1237 assert (!op->flag [FLAG_FREED]); 1268 if (op->is_on_map ())
1269 {
1270 LOG (llevError, "insert_ob_in_map called for object already on map");
1271 abort ();
1272 }
1238 1273
1239 object *top, *floor = NULL; 1274 if (op->env)
1240 1275 {
1276 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1241 op->remove (); 1277 op->remove ();
1278 }
1279
1280 if (op->face && !face_info (op->face))//D TODO: remove soon
1281 {//D
1282 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1283 op->face = 1;//D
1284 }//D
1242 1285
1243 /* Ideally, the caller figures this out. However, it complicates a lot 1286 /* 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 1287 * of areas of callers (eg, anything that uses find_free_spot would now
1245 * need extra work 1288 * need extra work
1246 */ 1289 */
1247 if (!xy_normalise (m, op->x, op->y)) 1290 if (!xy_normalise (m, op->x, op->y))
1248 { 1291 {
1249 op->destroy (); 1292 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1250 return 0; 1293 return 0;
1251 } 1294 }
1252 1295
1253 if (object *more = op->more) 1296 if (object *more = op->more)
1254 if (!insert_ob_in_map (more, m, originator, flag)) 1297 if (!insert_ob_in_map (more, m, originator, flag))
… …
1263 */ 1306 */
1264 if (op->nrof && !(flag & INS_NO_MERGE)) 1307 if (op->nrof && !(flag & INS_NO_MERGE))
1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1308 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266 if (object::can_merge (op, tmp)) 1309 if (object::can_merge (op, tmp))
1267 { 1310 {
1311 // TODO: we actually want to update tmp, not op,
1312 // but some caller surely breaks when we return tmp
1313 // from here :/
1268 op->nrof += tmp->nrof; 1314 op->nrof += tmp->nrof;
1269 tmp->destroy (1); 1315 tmp->destroy (1);
1270 } 1316 }
1271 1317
1272 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1318 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
… …
1281 { 1327 {
1282 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1328 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1283 abort (); 1329 abort ();
1284 } 1330 }
1285 1331
1332 if (!originator->is_on_map ())
1333 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1334 op->debug_desc (), originator->debug_desc ());
1335
1286 op->above = originator; 1336 op->above = originator;
1287 op->below = originator->below; 1337 op->below = originator->below;
1288
1289 if (op->below)
1290 op->below->above = op;
1291 else
1292 ms.bot = op;
1293
1294 /* since *below* originator, no need to update top */
1295 originator->below = op; 1338 originator->below = op;
1339
1340 *(op->below ? &op->below->above : &ms.bot) = op;
1296 } 1341 }
1297 else 1342 else
1298 { 1343 {
1299 top = ms.bot; 1344 object *floor = 0;
1345 object *top = ms.top;
1300 1346
1301 /* If there are other objects, then */ 1347 /* If there are other objects, then */
1302 if (top) 1348 if (top)
1303 { 1349 {
1304 object *last = 0;
1305
1306 /* 1350 /*
1307 * If there are multiple objects on this space, we do some trickier handling. 1351 * If there are multiple objects on this space, we do some trickier handling.
1308 * We've already dealt with merging if appropriate. 1352 * We've already dealt with merging if appropriate.
1309 * Generally, we want to put the new object on top. But if 1353 * Generally, we want to put the new object on top. But if
1310 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1354 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1313 * once we get to them. This reduces the need to traverse over all of 1357 * once we get to them. This reduces the need to traverse over all of
1314 * them when adding another one - this saves quite a bit of cpu time 1358 * them when adding another one - this saves quite a bit of cpu time
1315 * when lots of spells are cast in one area. Currently, it is presumed 1359 * when lots of spells are cast in one area. Currently, it is presumed
1316 * that flying non pickable objects are spell objects. 1360 * that flying non pickable objects are spell objects.
1317 */ 1361 */
1318 for (top = ms.bot; top; top = top->above) 1362 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1319 { 1363 {
1320 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1364 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1321 floor = top; 1365 floor = tmp;
1322 1366
1323 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1367 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1324 { 1368 {
1325 /* We insert above top, so we want this object below this */ 1369 /* We insert above top, so we want this object below this */
1326 top = top->below; 1370 top = tmp->below;
1327 break; 1371 break;
1328 } 1372 }
1329 1373
1330 last = top; 1374 top = tmp;
1331 } 1375 }
1332
1333 /* Don't want top to be NULL, so set it to the last valid object */
1334 top = last;
1335 1376
1336 /* We let update_position deal with figuring out what the space 1377 /* We let update_position deal with figuring out what the space
1337 * looks like instead of lots of conditions here. 1378 * looks like instead of lots of conditions here.
1338 * makes things faster, and effectively the same result. 1379 * makes things faster, and effectively the same result.
1339 */ 1380 */
… …
1346 */ 1387 */
1347 if (!(flag & INS_ON_TOP) 1388 if (!(flag & INS_ON_TOP)
1348 && ms.flags () & P_BLOCKSVIEW 1389 && ms.flags () & P_BLOCKSVIEW
1349 && (op->face && !faces [op->face].visibility)) 1390 && (op->face && !faces [op->face].visibility))
1350 { 1391 {
1392 object *last;
1393
1351 for (last = top; last != floor; last = last->below) 1394 for (last = top; last != floor; last = last->below)
1352 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1395 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1353 break; 1396 break;
1354 1397
1355 /* Check to see if we found the object that blocks view, 1398 /* Check to see if we found the object that blocks view,
… …
1363 } /* If objects on this space */ 1406 } /* If objects on this space */
1364 1407
1365 if (flag & INS_ABOVE_FLOOR_ONLY) 1408 if (flag & INS_ABOVE_FLOOR_ONLY)
1366 top = floor; 1409 top = floor;
1367 1410
1368 /* Top is the object that our object (op) is going to get inserted above. 1411 // insert object above top, or bottom-most if top = 0
1369 */
1370
1371 /* First object on this space */
1372 if (!top) 1412 if (!top)
1373 { 1413 {
1414 op->below = 0;
1374 op->above = ms.bot; 1415 op->above = ms.bot;
1375
1376 if (op->above)
1377 op->above->below = op;
1378
1379 op->below = 0;
1380 ms.bot = op; 1416 ms.bot = op;
1417
1418 *(op->above ? &op->above->below : &ms.top) = op;
1381 } 1419 }
1382 else 1420 else
1383 { /* get inserted into the stack above top */ 1421 {
1384 op->above = top->above; 1422 op->above = top->above;
1385
1386 if (op->above)
1387 op->above->below = op; 1423 top->above = op;
1388 1424
1389 op->below = top; 1425 op->below = top;
1390 top->above = op; 1426 *(op->above ? &op->above->below : &ms.top) = op;
1391 } 1427 }
1392 1428 }
1393 if (!op->above)
1394 ms.top = op;
1395 } /* else not INS_BELOW_ORIGINATOR */
1396 1429
1397 if (op->type == PLAYER) 1430 if (op->type == PLAYER)
1398 { 1431 {
1399 op->contr->do_los = 1; 1432 op->contr->do_los = 1;
1400 ++op->map->players; 1433 ++op->map->players;
… …
1402 } 1435 }
1403 1436
1404 op->map->dirty = true; 1437 op->map->dirty = true;
1405 1438
1406 if (object *pl = ms.player ()) 1439 if (object *pl = ms.player ())
1440 //TODO: the floorbox prev/next might need updating
1441 //esrv_send_item (pl, op);
1442 //TODO: update floorbox to preserve ordering
1443 if (pl->contr->ns)
1407 pl->contr->ns->floorbox_update (); 1444 pl->contr->ns->floorbox_update ();
1408 1445
1409 /* If this object glows, it may affect lighting conditions that are 1446 /* If this object glows, it may affect lighting conditions that are
1410 * visible to others on this map. But update_all_los is really 1447 * 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 1448 * 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 1449 * on the map will get recalculated. The players could very well
… …
1477 return where->env->insert (this); 1514 return where->env->insert (this);
1478 else 1515 else
1479 return where->map->insert (this, where->x, where->y, originator, flags); 1516 return where->map->insert (this, where->x, where->y, originator, flags);
1480} 1517}
1481 1518
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/* 1519/*
1517 * decrease(object, number) decreases a specified number from 1520 * decrease(object, number) decreases a specified number from
1518 * the amount of an object. If the amount reaches 0, the object 1521 * the amount of an object. If the amount reaches 0, the object
1519 * is subsequently removed and freed. 1522 * is subsequently removed and freed.
1520 * 1523 *
1521 * Return value: 'op' if something is left, NULL if the amount reached 0 1524 * Return value: 'op' if something is left, NULL if the amount reached 0
1522 */ 1525 */
1523bool 1526bool
1524object::decrease (sint32 nr) 1527object::decrease (sint32 nr)
1525{ 1528{
1529 if (!nr)
1530 return true;
1531
1526 nr = min (nr, nrof); 1532 nr = min (nr, nrof);
1527 1533
1528 if (!nr) 1534 if (nrof > nr)
1529 return 1; 1535 {
1530
1531 nrof -= nr; 1536 nrof -= nr;
1532
1533 object *visible = visible_to (this);
1534
1535 if (nrof)
1536 {
1537 adjust_weight (env, -weight * nr); // carrying == 0 1537 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1538 1538
1539 if (visible) 1539 if (object *pl = visible_to ())
1540 esrv_send_item (visible, this); 1540 esrv_update_item (UPD_NROF, pl, this);
1541 1541
1542 return 1; 1542 return true;
1543 } 1543 }
1544 else 1544 else
1545 { 1545 {
1546 if (visible)
1547 esrv_del_item (visible->contr, count);
1548
1549 this->destroy (1); 1546 destroy ();
1550 return 0; 1547 return false;
1551 } 1548 }
1552} 1549}
1553 1550
1554/* 1551/*
1555 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1552 * split(ob,nr) splits up ob into two parts. The part which
1556 * is returned contains nr objects, and the remaining parts contains 1553 * is returned contains nr objects, and the remaining parts contains
1557 * the rest (or is removed and freed if that number is 0). 1554 * the rest (or is removed and returned if that number is 0).
1558 * On failure, NULL is returned, and the reason put into the 1555 * On failure, NULL is returned.
1559 * global static errmsg array.
1560 */ 1556 */
1561object * 1557object *
1562object::split (sint32 nr) 1558object::split (sint32 nr)
1563{ 1559{
1560 int have = number_of ();
1561
1564 if (nrof < nr) 1562 if (have < nr)
1565 return 0; 1563 return 0;
1566 else if (nrof == nr) 1564 else if (have == nr)
1567 { 1565 {
1568 remove (); 1566 remove ();
1569 return this; 1567 return this;
1570 } 1568 }
1571 else 1569 else
1572 { 1570 {
1573 decrease (nr); 1571 decrease (nr);
1574 1572
1575 object *op = object_create_clone (this); 1573 object *op = deep_clone ();
1576 op->nrof = nr; 1574 op->nrof = nr;
1577 return op; 1575 return op;
1578 } 1576 }
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} 1577}
1593 1578
1594object * 1579object *
1595insert_ob_in_ob (object *op, object *where) 1580insert_ob_in_ob (object *op, object *where)
1596{ 1581{
… …
1637 if (object::can_merge (tmp, op)) 1622 if (object::can_merge (tmp, op))
1638 { 1623 {
1639 /* return the original object and remove inserted object 1624 /* return the original object and remove inserted object
1640 (client needs the original object) */ 1625 (client needs the original object) */
1641 tmp->nrof += op->nrof; 1626 tmp->nrof += op->nrof;
1627
1628 if (object *pl = tmp->visible_to ())
1629 esrv_update_item (UPD_NROF, pl, tmp);
1630
1631 adjust_weight (this, op->total_weight ());
1632
1642 op->destroy (1); 1633 op->destroy (1);
1643 op = tmp; 1634 op = tmp;
1644 goto inserted; 1635 goto inserted;
1645 } 1636 }
1646 1637
… …
1658 1649
1659 inv = op; 1650 inv = op;
1660 1651
1661 op->flag [FLAG_REMOVED] = 0; 1652 op->flag [FLAG_REMOVED] = 0;
1662 1653
1654 if (object *pl = op->visible_to ())
1655 esrv_send_item (pl, op);
1656
1663 adjust_weight (this, op->total_weight ()); 1657 adjust_weight (this, op->total_weight ());
1664 1658
1665inserted: 1659inserted:
1666 /* reset the light list and los of the players on the map */ 1660 /* reset the light list and los of the players on the map */
1667 if (op->glow_radius && map && map->darkness) 1661 if (op->glow_radius && map && map->darkness)
1668 update_all_los (map, x, y); 1662 update_all_los (map, x, y);
1669 1663
1670 if (object *otmp = in_player ()) 1664 // if this is a player's inventory, update stats
1671 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1665 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1672 otmp->update_stats (); 1666 update_stats ();
1673 1667
1674 INVOKE_OBJECT (INSERT, this); 1668 INVOKE_OBJECT (INSERT, this);
1675 1669
1676 return op; 1670 return op;
1677} 1671}
… …
1805 LOG (llevError, "Present_arch called outside map.\n"); 1799 LOG (llevError, "Present_arch called outside map.\n");
1806 return NULL; 1800 return NULL;
1807 } 1801 }
1808 1802
1809 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1803 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1810 if (tmp->arch == at) 1804 if (tmp->arch->archname == at->archname)
1811 return tmp; 1805 return tmp;
1812 1806
1813 return NULL; 1807 return NULL;
1814} 1808}
1815 1809
… …
1879 * The first matching object is returned, or NULL if none. 1873 * The first matching object is returned, or NULL if none.
1880 */ 1874 */
1881object * 1875object *
1882present_arch_in_ob (const archetype *at, const object *op) 1876present_arch_in_ob (const archetype *at, const object *op)
1883{ 1877{
1884 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1878 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1885 if (tmp->arch == at) 1879 if (tmp->arch->archname == at->archname)
1886 return tmp; 1880 return tmp;
1887 1881
1888 return NULL; 1882 return NULL;
1889} 1883}
1890 1884
… …
2299 2293
2300/* 2294/*
2301 * create clone from object to another 2295 * create clone from object to another
2302 */ 2296 */
2303object * 2297object *
2304object_create_clone (object *asrc) 2298object::deep_clone ()
2305{ 2299{
2306 object *dst = 0, *tmp, *src, *prev, *item; 2300 assert (("deep_clone called on non-head object", is_head ()));
2307 2301
2308 if (!asrc) 2302 object *dst = clone ();
2309 return 0;
2310 2303
2311 src = asrc->head_ (); 2304 object *prev = dst;
2312
2313 prev = 0;
2314 for (object *part = src; part; part = part->more) 2305 for (object *part = this->more; part; part = part->more)
2315 { 2306 {
2316 tmp = part->clone (); 2307 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; 2308 tmp->head = dst;
2327
2328 tmp->more = 0;
2329
2330 if (prev)
2331 prev->more = tmp; 2309 prev->more = tmp;
2332
2333 prev = tmp; 2310 prev = tmp;
2334 } 2311 }
2335 2312
2336 for (item = src->inv; item; item = item->below) 2313 for (object *item = inv; item; item = item->below)
2337 insert_ob_in_ob (object_create_clone (item), dst); 2314 insert_ob_in_ob (item->deep_clone (), dst);
2338 2315
2339 return dst; 2316 return dst;
2340} 2317}
2341 2318
2342/* This returns the first object in who's inventory that 2319/* This returns the first object in who's inventory that
… …
2351 return tmp; 2328 return tmp;
2352 2329
2353 return 0; 2330 return 0;
2354} 2331}
2355 2332
2356/* If ob has a field named key, return the link from the list, 2333const shstr &
2357 * otherwise return NULL. 2334object::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{ 2335{
2365 for (key_value *link = ob->key_values; link; link = link->next) 2336 for (key_value *kv = key_values; kv; kv = kv->next)
2366 if (link->key == key) 2337 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; 2338 return kv->value;
2401 2339
2402 return 0; 2340 return shstr_null;
2403} 2341}
2404 2342
2405/* 2343void
2406 * Updates the canonical_key in op to value. 2344object::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{ 2345{
2418 key_value *field = NULL, *last = NULL; 2346 for (key_value *kv = key_values; kv; kv = kv->next)
2419 2347 if (kv->key == key)
2420 for (field = op->key_values; field != NULL; field = field->next)
2421 {
2422 if (field->key != canonical_key)
2423 { 2348 {
2424 last = field; 2349 kv->value = value;
2425 continue; 2350 return;
2426 } 2351 }
2427 2352
2428 if (value) 2353 key_value *kv = new key_value;
2429 field->value = value; 2354
2430 else 2355 kv->next = key_values;
2356 kv->key = key;
2357 kv->value = value;
2358
2359 key_values = kv;
2360}
2361
2362void
2363object::kv_del (const shstr &key)
2364{
2365 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2366 if ((*kvp)->key == key)
2431 { 2367 {
2432 /* Basically, if the archetype has this key set, 2368 key_value *kv = *kvp;
2433 * we need to store the null value so when we save 2369 *kvp = (*kvp)->next;
2434 * it, we save the empty value so that when we load, 2370 delete kv;
2435 * we get this value back again. 2371 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 } 2372 }
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} 2373}
2494 2374
2495object::depth_iterator::depth_iterator (object *container) 2375object::depth_iterator::depth_iterator (object *container)
2496: iterator_base (container) 2376: iterator_base (container)
2497{ 2377{
… …
2547{ 2427{
2548 char flagdesc[512]; 2428 char flagdesc[512];
2549 char info2[256 * 4]; 2429 char info2[256 * 4];
2550 char *p = info; 2430 char *p = info;
2551 2431
2552 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2432 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2553 count, 2433 count,
2554 uuid.c_str (), 2434 uuid.c_str (),
2555 &name, 2435 &name,
2556 title ? "\",title:\"" : "", 2436 title ? ",title:\"" : "",
2557 title ? (const char *)title : "", 2437 title ? (const char *)title : "",
2438 title ? "\"" : "",
2558 flag_desc (flagdesc, 512), type); 2439 flag_desc (flagdesc, 512), type);
2559 2440
2560 if (!this->flag[FLAG_REMOVED] && env) 2441 if (!flag[FLAG_REMOVED] && env)
2561 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2442 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2562 2443
2563 if (map) 2444 if (map)
2564 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2445 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2565 2446
… …
2595object::open_container (object *new_container) 2476object::open_container (object *new_container)
2596{ 2477{
2597 if (container == new_container) 2478 if (container == new_container)
2598 return; 2479 return;
2599 2480
2600 if (object *old_container = container) 2481 object *old_container = container;
2482
2483 if (old_container)
2601 { 2484 {
2602 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2485 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2603 return; 2486 return;
2604 2487
2605#if 0 2488#if 0
… …
2607 if (object *closer = old_container->inv) 2490 if (object *closer = old_container->inv)
2608 if (closer->type == CLOSE_CON) 2491 if (closer->type == CLOSE_CON)
2609 closer->destroy (); 2492 closer->destroy ();
2610#endif 2493#endif
2611 2494
2495 // make sure the container is available
2496 esrv_send_item (this, old_container);
2497
2612 old_container->flag [FLAG_APPLIED] = 0; 2498 old_container->flag [FLAG_APPLIED] = false;
2613 container = 0; 2499 container = 0;
2614 2500
2501 // client needs item update to make it work, client bug requires this to be separate
2615 esrv_update_item (UPD_FLAGS, this, old_container); 2502 esrv_update_item (UPD_FLAGS, this, old_container);
2503
2616 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2504 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2617 play_sound (sound_find ("chest_close")); 2505 play_sound (sound_find ("chest_close"));
2618 } 2506 }
2619 2507
2620 if (new_container) 2508 if (new_container)
… …
2633 } 2521 }
2634#endif 2522#endif
2635 2523
2636 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2524 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2637 2525
2526 // make sure the container is available, client bug requires this to be separate
2527 esrv_send_item (this, new_container);
2528
2638 new_container->flag [FLAG_APPLIED] = 1; 2529 new_container->flag [FLAG_APPLIED] = true;
2639 container = new_container; 2530 container = new_container;
2640 2531
2532 // client needs flag change
2641 esrv_update_item (UPD_FLAGS, this, new_container); 2533 esrv_update_item (UPD_FLAGS, this, new_container);
2642 esrv_send_inventory (this, new_container); 2534 esrv_send_inventory (this, new_container);
2643 play_sound (sound_find ("chest_open")); 2535 play_sound (sound_find ("chest_open"));
2644 } 2536 }
2537// else if (!old_container->env && contr && contr->ns)
2538// contr->ns->floorbox_reset ();
2645} 2539}
2646 2540
2647object * 2541object *
2648object::force_find (const shstr name) 2542object::force_find (const shstr name)
2649{ 2543{

Diff Legend

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