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.54 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.70 by root, Tue Dec 19 05:12:52 2006 UTC

… …
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <loader.h> 33#include <loader.h>
34
35#include <bitset>
34 36
35int nrofallocobjects = 0; 37int nrofallocobjects = 0;
36static UUID uuid; 38static UUID uuid;
37const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
38 40
… …
104 _exit (1); 106 _exit (1);
105 } 107 }
106 108
107 uuid.seq = uid; 109 uuid.seq = uid;
108 write_uuid (); 110 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 112 fclose (fp);
111} 113}
112 114
113UUID 115UUID
114gen_uuid () 116gen_uuid ()
… …
183 * 185 *
184 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
187 * 189 *
188 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
189 * 191 *
190 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
191 * check weight 193 * check weight
192 */ 194 */
193 195
194bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
195{ 197{
196 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
198 return 0; 204 return 0;
199 205
200 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 209 * used to store nrof).
206 */ 210 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 222
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 225
222 226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
224 * being locked in inventory should prevent merging.
225 * 0x4 in flags3 is CLIENT_SENT
226 */
227 if ((ob1->arch != ob2->arch) ||
228 (ob1->flags[0] != ob2->flags[0]) ||
229 (ob1->flags[1] != ob2->flags[1]) ||
230 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
252 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 251 return 0;
254 252
255 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 254 * check all objects in the inventory.
257 */ 255 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 260 return 0;
263 261
264 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 264 return 0;
267 265
268 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 267 * if it is valid.
270 */ 268 */
… …
526 524
527 if (settings.casting_time) 525 if (settings.casting_time)
528 casting_time = -1; 526 casting_time = -1;
529} 527}
530 528
531void object::clone (object *destination)
532{
533 *(object_copy *)destination = *this;
534 *(object_pod *)destination = *this;
535
536 if (self || cb)
537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538}
539
540/* 529/*
541 * copy object first frees everything allocated by the second object, 530 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 531 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 532 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 533 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
545 * if the first object is freed, the pointers in the new object 534 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 535 * will point at garbage.
547 */ 536 */
548void 537void
549copy_object (object *op2, object *op) 538object::copy_to (object *dst)
550{ 539{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 540 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 541 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 542
554 op2->clone (op); 543 *(object_copy *)dst = *this;
544 *(object_pod *)dst = *this;
545
546 if (self || cb)
547 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
555 548
556 if (is_freed) 549 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 550 SET_FLAG (dst, FLAG_FREED);
551
558 if (is_removed) 552 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 553 SET_FLAG (dst, FLAG_REMOVED);
560 554
561 if (op2->speed < 0) 555 if (speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 556 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563 557
564 /* Copy over key_values, if any. */ 558 /* Copy over key_values, if any. */
565 if (op2->key_values) 559 if (key_values)
566 { 560 {
567 key_value *tail = 0; 561 key_value *tail = 0;
568 key_value *i; 562 key_value *i;
569 563
570 op->key_values = 0; 564 dst->key_values = 0;
571 565
572 for (i = op2->key_values; i; i = i->next) 566 for (i = key_values; i; i = i->next)
573 { 567 {
574 key_value *new_link = new key_value; 568 key_value *new_link = new key_value;
575 569
576 new_link->next = 0; 570 new_link->next = 0;
577 new_link->key = i->key; 571 new_link->key = i->key;
578 new_link->value = i->value; 572 new_link->value = i->value;
579 573
580 /* Try and be clever here, too. */ 574 /* Try and be clever here, too. */
581 if (!op->key_values) 575 if (!dst->key_values)
582 { 576 {
583 op->key_values = new_link; 577 dst->key_values = new_link;
584 tail = new_link; 578 tail = new_link;
585 } 579 }
586 else 580 else
587 { 581 {
588 tail->next = new_link; 582 tail->next = new_link;
589 tail = new_link; 583 tail = new_link;
590 } 584 }
591 } 585 }
592 } 586 }
593 587
594 update_ob_speed (op); 588 update_ob_speed (dst);
589}
590
591object *
592object::clone ()
593{
594 object *neu = create ();
595 copy_to (neu);
596 return neu;
595} 597}
596 598
597/* 599/*
598 * If an object with the IS_TURNABLE() flag needs to be turned due 600 * If an object with the IS_TURNABLE() flag needs to be turned due
599 * to the closest player being on the other side, this function can 601 * to the closest player being on the other side, this function can
… …
804 update_now = 1; 806 update_now = 1;
805 807
806 if ((move_slow | op->move_slow) != move_slow) 808 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1; 809 update_now = 1;
808 } 810 }
811
809 /* if the object is being removed, we can't make intelligent 812 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 813 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 814 * that is being removed.
812 */ 815 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 816 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
839 else 842 else
840 { 843 {
841 delete *i; 844 delete *i;
842 mortals.erase (i); 845 mortals.erase (i);
843 } 846 }
844
845 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
852} 847}
853 848
854object::object () 849object::object ()
855{ 850{
856 SET_FLAG (this, FLAG_REMOVED); 851 SET_FLAG (this, FLAG_REMOVED);
… …
915 910
916 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 911 if (QUERY_FLAG (this, FLAG_FRIENDLY))
917 remove_friendly_object (this); 912 remove_friendly_object (this);
918 913
919 if (!QUERY_FLAG (this, FLAG_REMOVED)) 914 if (!QUERY_FLAG (this, FLAG_REMOVED))
920 remove_ob (this); 915 remove ();
921 916
922 SET_FLAG (this, FLAG_FREED); 917 SET_FLAG (this, FLAG_FREED);
923 918
924 if (more) 919 if (more)
925 { 920 {
… …
950 945
951 while (op) 946 while (op)
952 { 947 {
953 object *tmp = op->below; 948 object *tmp = op->below;
954 949
955 remove_ob (op); 950 op->remove ();
956 951
957 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 952 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
958 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 953 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
959 free_object (op); 954 op->destroy ();
960 else 955 else
961 { 956 {
962 op->x = x; 957 op->x = x;
963 op->y = y; 958 op->y = y;
964 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 959 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
967 op = tmp; 962 op = tmp;
968 } 963 }
969 } 964 }
970 } 965 }
971 966
967 // hack to ensure that freed objects still have a valid map
968 {
969 static maptile *freed_map; // freed objects are moved here to avoid crashes
970
971 if (!freed_map)
972 {
973 freed_map = new maptile;
974
975 freed_map->name = "/internal/freed_objects_map";
976 freed_map->width = 3;
977 freed_map->height = 3;
978
979 freed_map->allocate ();
980 }
981
982 map = freed_map;
983 x = 1;
984 y = 1;
985 }
986
972 // clear those pointers that likely might have circular references to us 987 // clear those pointers that likely might have circular references to us
973 owner = 0; 988 owner = 0;
974 enemy = 0; 989 enemy = 0;
975 attacked_by = 0; 990 attacked_by = 0;
976 991
… …
988 1003
989/* 1004/*
990 * sub_weight() recursively (outwards) subtracts a number from the 1005 * sub_weight() recursively (outwards) subtracts a number from the
991 * weight of an object (and what is carried by it's environment(s)). 1006 * weight of an object (and what is carried by it's environment(s)).
992 */ 1007 */
993
994void 1008void
995sub_weight (object *op, signed long weight) 1009sub_weight (object *op, signed long weight)
996{ 1010{
997 while (op != NULL) 1011 while (op != NULL)
998 { 1012 {
… …
1002 op->carrying -= weight; 1016 op->carrying -= weight;
1003 op = op->env; 1017 op = op->env;
1004 } 1018 }
1005} 1019}
1006 1020
1007/* remove_ob(op): 1021/* op->remove ():
1008 * This function removes the object op from the linked list of objects 1022 * This function removes the object op from the linked list of objects
1009 * which it is currently tied to. When this function is done, the 1023 * which it is currently tied to. When this function is done, the
1010 * object will have no environment. If the object previously had an 1024 * object will have no environment. If the object previously had an
1011 * environment, the x and y coordinates will be updated to 1025 * environment, the x and y coordinates will be updated to
1012 * the previous environment. 1026 * the previous environment.
1013 * Beware: This function is called from the editor as well! 1027 * Beware: This function is called from the editor as well!
1014 */ 1028 */
1015
1016void 1029void
1017remove_ob (object *op) 1030object::remove ()
1018{ 1031{
1019 object *tmp, *last = 0; 1032 object *tmp, *last = 0;
1020 object *otmp; 1033 object *otmp;
1021 1034
1022 int check_walk_off; 1035 int check_walk_off;
1023 maptile *m;
1024 1036
1025 sint16 x, y;
1026
1027 if (QUERY_FLAG (op, FLAG_REMOVED)) 1037 if (QUERY_FLAG (this, FLAG_REMOVED))
1028 return; 1038 return;
1029 1039
1030 SET_FLAG (op, FLAG_REMOVED); 1040 SET_FLAG (this, FLAG_REMOVED);
1031 1041
1032 if (op->more != NULL) 1042 if (more)
1033 remove_ob (op->more); 1043 more->remove ();
1034 1044
1035 /* 1045 /*
1036 * In this case, the object to be removed is in someones 1046 * In this case, the object to be removed is in someones
1037 * inventory. 1047 * inventory.
1038 */ 1048 */
1039 if (op->env != NULL) 1049 if (env)
1040 { 1050 {
1041 if (op->nrof) 1051 if (nrof)
1042 sub_weight (op->env, op->weight * op->nrof); 1052 sub_weight (env, weight * nrof);
1043 else 1053 else
1044 sub_weight (op->env, op->weight + op->carrying); 1054 sub_weight (env, weight + carrying);
1045 1055
1046 /* NO_FIX_PLAYER is set when a great many changes are being 1056 /* NO_FIX_PLAYER is set when a great many changes are being
1047 * made to players inventory. If set, avoiding the call 1057 * made to players inventory. If set, avoiding the call
1048 * to save cpu time. 1058 * to save cpu time.
1049 */ 1059 */
1050 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1060 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1051 fix_player (otmp); 1061 fix_player (otmp);
1052 1062
1053 if (op->above != NULL) 1063 if (above != NULL)
1054 op->above->below = op->below; 1064 above->below = below;
1055 else 1065 else
1056 op->env->inv = op->below; 1066 env->inv = below;
1057 1067
1058 if (op->below != NULL) 1068 if (below != NULL)
1059 op->below->above = op->above; 1069 below->above = above;
1060 1070
1061 /* we set up values so that it could be inserted into 1071 /* we set up values so that it could be inserted into
1062 * the map, but we don't actually do that - it is up 1072 * the map, but we don't actually do that - it is up
1063 * to the caller to decide what we want to do. 1073 * to the caller to decide what we want to do.
1064 */ 1074 */
1065 op->x = op->env->x, op->y = op->env->y; 1075 x = env->x, y = env->y;
1066 op->map = op->env->map; 1076 map = env->map;
1067 op->above = NULL, op->below = NULL; 1077 above = 0, below = 0;
1068 op->env = NULL; 1078 env = 0;
1069 } 1079 }
1070 else if (op->map) 1080 else if (map)
1071 { 1081 {
1072 x = op->x;
1073 y = op->y;
1074 m = get_map_from_coord (op->map, &x, &y);
1075
1076 if (!m)
1077 {
1078 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1079 op->map->path, op->x, op->y);
1080 /* in old days, we used to set x and y to 0 and continue.
1081 * it seems if we get into this case, something is probablye
1082 * screwed up and should be fixed.
1083 */
1084 abort ();
1085 }
1086
1087 if (op->map != m)
1088 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1089 op->map->path, m->path, op->x, op->y, x, y);
1090
1091 /* Re did the following section of code - it looks like it had 1082 /* Re did the following section of code - it looks like it had
1092 * lots of logic for things we no longer care about 1083 * lots of logic for things we no longer care about
1093 */ 1084 */
1094 1085
1095 /* link the object above us */ 1086 /* link the object above us */
1096 if (op->above) 1087 if (above)
1097 op->above->below = op->below; 1088 above->below = below;
1098 else 1089 else
1099 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1090 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1100 1091
1101 /* Relink the object below us, if there is one */ 1092 /* Relink the object below us, if there is one */
1102 if (op->below) 1093 if (below)
1103 op->below->above = op->above; 1094 below->above = above;
1104 else 1095 else
1105 { 1096 {
1106 /* Nothing below, which means we need to relink map object for this space 1097 /* Nothing below, which means we need to relink map object for this space
1107 * use translated coordinates in case some oddness with map tiling is 1098 * use translated coordinates in case some oddness with map tiling is
1108 * evident 1099 * evident
1109 */ 1100 */
1110 if (GET_MAP_OB (m, x, y) != op) 1101 if (GET_MAP_OB (map, x, y) != this)
1111 { 1102 {
1112 char *dump = dump_object (op); 1103 char *dump = dump_object (this);
1113 LOG (llevError, 1104 LOG (llevError,
1114 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1105 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1115 free (dump); 1106 free (dump);
1116 dump = dump_object (GET_MAP_OB (m, x, y)); 1107 dump = dump_object (GET_MAP_OB (map, x, y));
1117 LOG (llevError, "%s\n", dump); 1108 LOG (llevError, "%s\n", dump);
1118 free (dump); 1109 free (dump);
1119 } 1110 }
1120 1111
1121 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1112 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1122 } 1113 }
1123 1114
1124 op->above = 0; 1115 above = 0;
1125 op->below = 0; 1116 below = 0;
1126 1117
1127 if (op->map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1128 return; 1119 return;
1129 1120
1130 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1121 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1131 1122
1132 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1123 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1133 { 1124 {
1134 /* No point updating the players look faces if he is the object 1125 /* No point updating the players look faces if he is the object
1135 * being removed. 1126 * being removed.
1136 */ 1127 */
1137 1128
1138 if (tmp->type == PLAYER && tmp != op) 1129 if (tmp->type == PLAYER && tmp != this)
1139 { 1130 {
1140 /* If a container that the player is currently using somehow gets 1131 /* If a container that the player is currently using somehow gets
1141 * removed (most likely destroyed), update the player view 1132 * removed (most likely destroyed), update the player view
1142 * appropriately. 1133 * appropriately.
1143 */ 1134 */
1144 if (tmp->container == op) 1135 if (tmp->container == this)
1145 { 1136 {
1146 CLEAR_FLAG (op, FLAG_APPLIED); 1137 CLEAR_FLAG (this, FLAG_APPLIED);
1147 tmp->container = NULL; 1138 tmp->container = 0;
1148 } 1139 }
1149 1140
1150 tmp->contr->socket.update_look = 1; 1141 tmp->contr->socket->floorbox_update ();
1151 } 1142 }
1152 1143
1153 /* See if player moving off should effect something */ 1144 /* See if player moving off should effect something */
1154 if (check_walk_off 1145 if (check_walk_off
1155 && ((op->move_type & tmp->move_off) 1146 && ((move_type & tmp->move_off)
1156 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1147 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1157 { 1148 {
1158 move_apply (tmp, op, NULL); 1149 move_apply (tmp, this, 0);
1159 1150
1160 if (op->destroyed ()) 1151 if (destroyed ())
1161 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1152 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162 } 1153 }
1163 1154
1164 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1155 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1165 1156
1166 if (tmp->above == tmp) 1157 if (tmp->above == tmp)
1167 tmp->above = NULL; 1158 tmp->above = 0;
1168 1159
1169 last = tmp; 1160 last = tmp;
1170 } 1161 }
1171 1162
1172 /* last == NULL of there are no objects on this space */ 1163 /* last == NULL of there are no objects on this space */
1173 if (last == NULL) 1164 if (!last)
1174 { 1165 {
1175 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1166 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1176 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1167 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1177 * those out anyways, and if there are any flags set right now, they won't 1168 * those out anyways, and if there are any flags set right now, they won't
1178 * be correct anyways. 1169 * be correct anyways.
1179 */ 1170 */
1180 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1171 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1181 update_position (op->map, op->x, op->y); 1172 update_position (map, x, y);
1182 } 1173 }
1183 else 1174 else
1184 update_object (last, UP_OBJ_REMOVE); 1175 update_object (last, UP_OBJ_REMOVE);
1185 1176
1186 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1177 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1187 update_all_los (op->map, op->x, op->y); 1178 update_all_los (map, x, y);
1188 } 1179 }
1189} 1180}
1190 1181
1191/* 1182/*
1192 * merge_ob(op,top): 1183 * merge_ob(op,top):
… …
1207 1198
1208 for (; top != NULL; top = top->below) 1199 for (; top != NULL; top = top->below)
1209 { 1200 {
1210 if (top == op) 1201 if (top == op)
1211 continue; 1202 continue;
1212 if (CAN_MERGE (op, top)) 1203
1204 if (object::can_merge (op, top))
1213 { 1205 {
1214 top->nrof += op->nrof; 1206 top->nrof += op->nrof;
1215 1207
1216/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1208/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1217 op->weight = 0; /* Don't want any adjustements now */ 1209 op->weight = 0; /* Don't want any adjustements now */
1218 remove_ob (op); 1210 op->destroy ();
1219 free_object (op);
1220 return top; 1211 return top;
1221 } 1212 }
1222 } 1213 }
1223 1214
1224 return 0; 1215 return 0;
… …
1351 1342
1352 /* this has to be done after we translate the coordinates. 1343 /* this has to be done after we translate the coordinates.
1353 */ 1344 */
1354 if (op->nrof && !(flag & INS_NO_MERGE)) 1345 if (op->nrof && !(flag & INS_NO_MERGE))
1355 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1346 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1356 if (CAN_MERGE (op, tmp)) 1347 if (object::can_merge (op, tmp))
1357 { 1348 {
1358 op->nrof += tmp->nrof; 1349 op->nrof += tmp->nrof;
1359 remove_ob (tmp); 1350 tmp->destroy ();
1360 free_object (tmp);
1361 } 1351 }
1362 1352
1363 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1364 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1365 1355
… …
1493 * it, so save a few ticks and start from there. 1483 * it, so save a few ticks and start from there.
1494 */ 1484 */
1495 if (!(flag & INS_MAP_LOAD)) 1485 if (!(flag & INS_MAP_LOAD))
1496 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1497 if (tmp->type == PLAYER) 1487 if (tmp->type == PLAYER)
1498 tmp->contr->socket.update_look = 1; 1488 tmp->contr->socket->floorbox_update ();
1499 1489
1500 /* If this object glows, it may affect lighting conditions that are 1490 /* If this object glows, it may affect lighting conditions that are
1501 * visible to others on this map. But update_all_los is really 1491 * visible to others on this map. But update_all_los is really
1502 * an inefficient way to do this, as it means los for all players 1492 * an inefficient way to do this, as it means los for all players
1503 * on the map will get recalculated. The players could very well 1493 * on the map will get recalculated. The players could very well
… …
1511 1501
1512 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1502 /* updates flags (blocked, alive, no magic, etc) for this map space */
1513 update_object (op, UP_OBJ_INSERT); 1503 update_object (op, UP_OBJ_INSERT);
1514 1504
1515 /* Don't know if moving this to the end will break anything. However, 1505 /* Don't know if moving this to the end will break anything. However,
1516 * we want to have update_look set above before calling this. 1506 * we want to have floorbox_update called before calling this.
1517 * 1507 *
1518 * check_move_on() must be after this because code called from 1508 * check_move_on() must be after this because code called from
1519 * check_move_on() depends on correct map flags (so functions like 1509 * check_move_on() depends on correct map flags (so functions like
1520 * blocked() and wall() work properly), and these flags are updated by 1510 * blocked() and wall() work properly), and these flags are updated by
1521 * update_object(). 1511 * update_object().
… …
1551 tmp1; 1541 tmp1;
1552 1542
1553 /* first search for itself and remove any old instances */ 1543 /* first search for itself and remove any old instances */
1554 1544
1555 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1556 {
1557 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1558 { 1547 tmp->destroy ();
1559 remove_ob (tmp);
1560 free_object (tmp);
1561 }
1562 }
1563 1548
1564 tmp1 = arch_to_object (archetype::find (arch_string)); 1549 tmp1 = arch_to_object (archetype::find (arch_string));
1565 1550
1566 tmp1->x = op->x; 1551 tmp1->x = op->x;
1567 tmp1->y = op->y; 1552 tmp1->y = op->y;
… …
1577 */ 1562 */
1578 1563
1579object * 1564object *
1580get_split_ob (object *orig_ob, uint32 nr) 1565get_split_ob (object *orig_ob, uint32 nr)
1581{ 1566{
1582 object * 1567 object *newob;
1583 newob;
1584 int
1585 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1568 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1586 1569
1587 if (orig_ob->nrof < nr) 1570 if (orig_ob->nrof < nr)
1588 { 1571 {
1589 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1572 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1590 return NULL; 1573 return NULL;
1591 } 1574 }
1592 1575
1593 newob = object_create_clone (orig_ob); 1576 newob = object_create_clone (orig_ob);
1594 1577
1595 if ((orig_ob->nrof -= nr) < 1) 1578 if ((orig_ob->nrof -= nr) < 1)
1596 { 1579 orig_ob->destroy (1);
1597 if (!is_removed)
1598 remove_ob (orig_ob);
1599 free_object2 (orig_ob, 1);
1600 }
1601 else if (!is_removed) 1580 else if (!is_removed)
1602 { 1581 {
1603 if (orig_ob->env != NULL) 1582 if (orig_ob->env != NULL)
1604 sub_weight (orig_ob->env, orig_ob->weight * nr); 1583 sub_weight (orig_ob->env, orig_ob->weight * nr);
1605 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1584 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1669 esrv_send_item (tmp, op); 1648 esrv_send_item (tmp, op);
1670 } 1649 }
1671 } 1650 }
1672 else 1651 else
1673 { 1652 {
1674 remove_ob (op); 1653 op->remove ();
1675 op->nrof = 0; 1654 op->nrof = 0;
1676 if (tmp) 1655 if (tmp)
1677 { 1656 {
1678 esrv_del_item (tmp->contr, op->count); 1657 esrv_del_item (tmp->contr, op->count);
1679 } 1658 }
… …
1685 1664
1686 if (i < op->nrof) 1665 if (i < op->nrof)
1687 op->nrof -= i; 1666 op->nrof -= i;
1688 else 1667 else
1689 { 1668 {
1690 remove_ob (op); 1669 op->remove ();
1691 op->nrof = 0; 1670 op->nrof = 0;
1692 } 1671 }
1693 1672
1694 /* Since we just removed op, op->above is null */ 1673 /* Since we just removed op, op->above is null */
1695 for (tmp = above; tmp != NULL; tmp = tmp->above) 1674 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1704 1683
1705 if (op->nrof) 1684 if (op->nrof)
1706 return op; 1685 return op;
1707 else 1686 else
1708 { 1687 {
1709 free_object (op); 1688 op->destroy ();
1710 return NULL; 1689 return NULL;
1711 } 1690 }
1712} 1691}
1713 1692
1714/* 1693/*
… …
1727 op->carrying += weight; 1706 op->carrying += weight;
1728 op = op->env; 1707 op = op->env;
1729 } 1708 }
1730} 1709}
1731 1710
1732/*
1733 * insert_ob_in_ob(op,environment):
1734 * This function inserts the object op in the linked list
1735 * inside the object environment.
1736 *
1737 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1738 * the inventory at the last position or next to other objects of the same
1739 * type.
1740 * Frank: Now sorted by type, archetype and magic!
1741 *
1742 * The function returns now pointer to inserted item, and return value can
1743 * be != op, if items are merged. -Tero
1744 */
1745
1746object * 1711object *
1747insert_ob_in_ob (object *op, object *where) 1712insert_ob_in_ob (object *op, object *where)
1748{ 1713{
1749 object * 1714 if (!where)
1750 tmp, *
1751 otmp;
1752
1753 if (!QUERY_FLAG (op, FLAG_REMOVED))
1754 {
1755 char *dump = dump_object (op);
1756 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757 free (dump);
1758 return op;
1759 }
1760
1761 if (where == NULL)
1762 { 1715 {
1763 char *dump = dump_object (op); 1716 char *dump = dump_object (op);
1764 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1717 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1765 free (dump); 1718 free (dump);
1766 return op; 1719 return op;
1767 } 1720 }
1768 1721
1769 if (where->head) 1722 if (where->head)
1770 { 1723 {
1771 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1724 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1772 where = where->head; 1725 where = where->head;
1773 } 1726 }
1727
1728 return where->insert (op);
1729}
1730
1731/*
1732 * env->insert (op)
1733 * This function inserts the object op in the linked list
1734 * inside the object environment.
1735 *
1736 * The function returns now pointer to inserted item, and return value can
1737 * be != op, if items are merged. -Tero
1738 */
1739
1740object *
1741object::insert (object *op)
1742{
1743 object *tmp, *otmp;
1744
1745 if (!QUERY_FLAG (op, FLAG_REMOVED))
1746 op->remove ();
1774 1747
1775 if (op->more) 1748 if (op->more)
1776 { 1749 {
1777 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1750 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1778 return op; 1751 return op;
… …
1780 1753
1781 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1754 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1782 CLEAR_FLAG (op, FLAG_REMOVED); 1755 CLEAR_FLAG (op, FLAG_REMOVED);
1783 if (op->nrof) 1756 if (op->nrof)
1784 { 1757 {
1785 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1758 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1786 if (CAN_MERGE (tmp, op)) 1759 if (object::can_merge (tmp, op))
1787 { 1760 {
1788 /* return the original object and remove inserted object 1761 /* return the original object and remove inserted object
1789 (client needs the original object) */ 1762 (client needs the original object) */
1790 tmp->nrof += op->nrof; 1763 tmp->nrof += op->nrof;
1791 /* Weight handling gets pretty funky. Since we are adding to 1764 /* Weight handling gets pretty funky. Since we are adding to
1792 * tmp->nrof, we need to increase the weight. 1765 * tmp->nrof, we need to increase the weight.
1793 */ 1766 */
1794 add_weight (where, op->weight * op->nrof); 1767 add_weight (this, op->weight * op->nrof);
1795 SET_FLAG (op, FLAG_REMOVED); 1768 SET_FLAG (op, FLAG_REMOVED);
1796 free_object (op); /* free the inserted object */ 1769 op->destroy (); /* free the inserted object */
1797 op = tmp; 1770 op = tmp;
1798 remove_ob (op); /* and fix old object's links */ 1771 op->remove (); /* and fix old object's links */
1799 CLEAR_FLAG (op, FLAG_REMOVED); 1772 CLEAR_FLAG (op, FLAG_REMOVED);
1800 break; 1773 break;
1801 } 1774 }
1802 1775
1803 /* I assume combined objects have no inventory 1776 /* I assume combined objects have no inventory
1804 * We add the weight - this object could have just been removed 1777 * We add the weight - this object could have just been removed
1805 * (if it was possible to merge). calling remove_ob will subtract 1778 * (if it was possible to merge). calling remove_ob will subtract
1806 * the weight, so we need to add it in again, since we actually do 1779 * the weight, so we need to add it in again, since we actually do
1807 * the linking below 1780 * the linking below
1808 */ 1781 */
1809 add_weight (where, op->weight * op->nrof); 1782 add_weight (this, op->weight * op->nrof);
1810 } 1783 }
1811 else 1784 else
1812 add_weight (where, (op->weight + op->carrying)); 1785 add_weight (this, (op->weight + op->carrying));
1813 1786
1814 otmp = is_player_inv (where); 1787 otmp = is_player_inv (this);
1815 if (otmp && otmp->contr != NULL) 1788 if (otmp && otmp->contr)
1816 {
1817 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1789 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1818 fix_player (otmp); 1790 fix_player (otmp);
1819 }
1820 1791
1821 op->map = NULL; 1792 op->map = NULL;
1822 op->env = where; 1793 op->env = this;
1823 op->above = NULL; 1794 op->above = NULL;
1824 op->below = NULL; 1795 op->below = NULL;
1825 op->x = 0, op->y = 0; 1796 op->x = 0, op->y = 0;
1826 1797
1827 /* reset the light list and los of the players on the map */ 1798 /* reset the light list and los of the players on the map */
1828 if ((op->glow_radius != 0) && where->map) 1799 if ((op->glow_radius != 0) && map)
1829 { 1800 {
1830#ifdef DEBUG_LIGHTS 1801#ifdef DEBUG_LIGHTS
1831 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1802 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1832#endif /* DEBUG_LIGHTS */ 1803#endif /* DEBUG_LIGHTS */
1833 if (MAP_DARKNESS (where->map)) 1804 if (MAP_DARKNESS (map))
1834 update_all_los (where->map, where->x, where->y); 1805 update_all_los (map, x, y);
1835 } 1806 }
1836 1807
1837 /* Client has no idea of ordering so lets not bother ordering it here. 1808 /* Client has no idea of ordering so lets not bother ordering it here.
1838 * It sure simplifies this function... 1809 * It sure simplifies this function...
1839 */ 1810 */
1840 if (where->inv == NULL) 1811 if (!inv)
1841 where->inv = op; 1812 inv = op;
1842 else 1813 else
1843 { 1814 {
1844 op->below = where->inv; 1815 op->below = inv;
1845 op->below->above = op; 1816 op->below->above = op;
1846 where->inv = op; 1817 inv = op;
1847 } 1818 }
1819
1848 return op; 1820 return op;
1849} 1821}
1850 1822
1851/* 1823/*
1852 * Checks if any objects has a move_type that matches objects 1824 * Checks if any objects has a move_type that matches objects
… …
2541 * create clone from object to another 2513 * create clone from object to another
2542 */ 2514 */
2543object * 2515object *
2544object_create_clone (object *asrc) 2516object_create_clone (object *asrc)
2545{ 2517{
2546 object *
2547 dst = NULL, *tmp, *src, *part, *prev, *item; 2518 object *dst = 0, *tmp, *src, *part, *prev, *item;
2548 2519
2549 if (!asrc) 2520 if (!asrc)
2550 return NULL; 2521 return 0;
2522
2551 src = asrc; 2523 src = asrc;
2552 if (src->head) 2524 if (src->head)
2553 src = src->head; 2525 src = src->head;
2554 2526
2555 prev = NULL; 2527 prev = 0;
2556 for (part = src; part; part = part->more) 2528 for (part = src; part; part = part->more)
2557 { 2529 {
2558 tmp = get_object (); 2530 tmp = part->clone ();
2559 copy_object (part, tmp);
2560 tmp->x -= src->x; 2531 tmp->x -= src->x;
2561 tmp->y -= src->y; 2532 tmp->y -= src->y;
2533
2562 if (!part->head) 2534 if (!part->head)
2563 { 2535 {
2564 dst = tmp; 2536 dst = tmp;
2565 tmp->head = NULL; 2537 tmp->head = 0;
2566 } 2538 }
2567 else 2539 else
2568 { 2540 {
2569 tmp->head = dst; 2541 tmp->head = dst;
2570 } 2542 }
2543
2571 tmp->more = NULL; 2544 tmp->more = 0;
2545
2572 if (prev) 2546 if (prev)
2573 prev->more = tmp; 2547 prev->more = tmp;
2548
2574 prev = tmp; 2549 prev = tmp;
2575 } 2550 }
2576 2551
2577 for (item = src->inv; item; item = item->below) 2552 for (item = src->inv; item; item = item->below)
2578 insert_ob_in_ob (object_create_clone (item), dst); 2553 insert_ob_in_ob (object_create_clone (item), dst);
… …
2604 } 2579 }
2605 2580
2606 fprintf (tempfile, obstr); 2581 fprintf (tempfile, obstr);
2607 fclose (tempfile); 2582 fclose (tempfile);
2608 2583
2609 op = get_object (); 2584 op = object::create ();
2610 2585
2611 object_thawer thawer (filename); 2586 object_thawer thawer (filename);
2612 2587
2613 if (thawer) 2588 if (thawer)
2614 load_object (thawer, op, 0); 2589 load_object (thawer, op, 0);

Diff Legend

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