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.57 by root, Sun Dec 3 02:46:33 2006 UTC vs.
Revision 1.62 by root, Mon Dec 11 23:35:37 2006 UTC

… …
104 _exit (1); 104 _exit (1);
105 } 105 }
106 106
107 uuid.seq = uid; 107 uuid.seq = uid;
108 write_uuid (); 108 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 110 fclose (fp);
111} 111}
112 112
113UUID 113UUID
114gen_uuid () 114gen_uuid ()
… …
553 553
554 op2->clone (op); 554 op2->clone (op);
555 555
556 if (is_freed) 556 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
558 if (is_removed) 559 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
560 561
561 if (op2->speed < 0) 562 if (op2->speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
… …
804 update_now = 1; 805 update_now = 1;
805 806
806 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1; 808 update_now = 1;
808 } 809 }
810
809 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 813 * that is being removed.
812 */ 814 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
839 else 841 else
840 { 842 {
841 delete *i; 843 delete *i;
842 mortals.erase (i); 844 mortals.erase (i);
843 } 845 }
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} 846}
853 847
854object::object () 848object::object ()
855{ 849{
856 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
… …
1008 1002
1009/* 1003/*
1010 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
1011 * weight of an object (and what is carried by it's environment(s)). 1005 * weight of an object (and what is carried by it's environment(s)).
1012 */ 1006 */
1013
1014void 1007void
1015sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
1016{ 1009{
1017 while (op != NULL) 1010 while (op != NULL)
1018 { 1011 {
… …
1030 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1031 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1032 * the previous environment. 1025 * the previous environment.
1033 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1034 */ 1027 */
1035
1036void 1028void
1037remove_ob (object *op) 1029object::remove ()
1038{ 1030{
1039 object *tmp, *last = 0; 1031 object *tmp, *last = 0;
1040 object *otmp; 1032 object *otmp;
1041 1033
1042 int check_walk_off; 1034 int check_walk_off;
1043 maptile *m;
1044 1035
1045 sint16 x, y;
1046
1047 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1048 return; 1037 return;
1049 1038
1050 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1051 1040
1052 if (op->more != NULL) 1041 if (more)
1053 remove_ob (op->more); 1042 more->remove ();
1054 1043
1055 /* 1044 /*
1056 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1057 * inventory. 1046 * inventory.
1058 */ 1047 */
1059 if (op->env != NULL) 1048 if (env)
1060 { 1049 {
1061 if (op->nrof) 1050 if (nrof)
1062 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1063 else 1052 else
1064 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1065 1054
1066 /* NO_FIX_PLAYER is set when a great many changes are being 1055 /* NO_FIX_PLAYER is set when a great many changes are being
1067 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1068 * to save cpu time. 1057 * to save cpu time.
1069 */ 1058 */
1070 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1059 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1071 fix_player (otmp); 1060 fix_player (otmp);
1072 1061
1073 if (op->above != NULL) 1062 if (above != NULL)
1074 op->above->below = op->below; 1063 above->below = below;
1075 else 1064 else
1076 op->env->inv = op->below; 1065 env->inv = below;
1077 1066
1078 if (op->below != NULL) 1067 if (below != NULL)
1079 op->below->above = op->above; 1068 below->above = above;
1080 1069
1081 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1082 * the map, but we don't actually do that - it is up 1071 * the map, but we don't actually do that - it is up
1083 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1084 */ 1073 */
1085 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1086 op->map = op->env->map; 1075 map = env->map;
1087 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1088 op->env = NULL; 1077 env = 0;
1089 } 1078 }
1090 else if (op->map) 1079 else if (map)
1091 { 1080 {
1092 x = op->x;
1093 y = op->y;
1094 m = get_map_from_coord (op->map, &x, &y);
1095
1096 if (!m)
1097 {
1098 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1099 op->map->path, op->x, op->y);
1100 /* in old days, we used to set x and y to 0 and continue.
1101 * it seems if we get into this case, something is probablye
1102 * screwed up and should be fixed.
1103 */
1104 abort ();
1105 }
1106
1107 if (op->map != m)
1108 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1109 op->map->path, m->path, op->x, op->y, x, y);
1110
1111 /* Re did the following section of code - it looks like it had 1081 /* Re did the following section of code - it looks like it had
1112 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1113 */ 1083 */
1114 1084
1115 /* link the object above us */ 1085 /* link the object above us */
1116 if (op->above) 1086 if (above)
1117 op->above->below = op->below; 1087 above->below = below;
1118 else 1088 else
1119 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1089 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1120 1090
1121 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1122 if (op->below) 1092 if (below)
1123 op->below->above = op->above; 1093 below->above = above;
1124 else 1094 else
1125 { 1095 {
1126 /* Nothing below, which means we need to relink map object for this space 1096 /* Nothing below, which means we need to relink map object for this space
1127 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1128 * evident 1098 * evident
1129 */ 1099 */
1130 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1131 { 1101 {
1132 char *dump = dump_object (op); 1102 char *dump = dump_object (this);
1133 LOG (llevError, 1103 LOG (llevError,
1134 "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); 1104 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1135 free (dump); 1105 free (dump);
1136 dump = dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1137 LOG (llevError, "%s\n", dump); 1107 LOG (llevError, "%s\n", dump);
1138 free (dump); 1108 free (dump);
1139 } 1109 }
1140 1110
1141 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1142 } 1112 }
1143 1113
1144 op->above = 0; 1114 above = 0;
1145 op->below = 0; 1115 below = 0;
1146 1116
1147 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1148 return; 1118 return;
1149 1119
1150 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1151 1121
1152 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1122 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1153 { 1123 {
1154 /* No point updating the players look faces if he is the object 1124 /* No point updating the players look faces if he is the object
1155 * being removed. 1125 * being removed.
1156 */ 1126 */
1157 1127
1158 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1159 { 1129 {
1160 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1161 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1162 * appropriately. 1132 * appropriately.
1163 */ 1133 */
1164 if (tmp->container == op) 1134 if (tmp->container == this)
1165 { 1135 {
1166 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1167 tmp->container = NULL; 1137 tmp->container = 0;
1168 } 1138 }
1169 1139
1170 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1171 } 1141 }
1172 1142
1173 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1174 if (check_walk_off 1144 if (check_walk_off
1175 && ((op->move_type & tmp->move_off) 1145 && ((move_type & tmp->move_off)
1176 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1146 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1177 { 1147 {
1178 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1179 1149
1180 if (op->destroyed ()) 1150 if (destroyed ())
1181 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1151 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1182 } 1152 }
1183 1153
1184 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1185 1155
1186 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1187 tmp->above = NULL; 1157 tmp->above = 0;
1188 1158
1189 last = tmp; 1159 last = tmp;
1190 } 1160 }
1191 1161
1192 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1193 if (last == NULL) 1163 if (!last)
1194 { 1164 {
1195 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1196 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1166 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1197 * those out anyways, and if there are any flags set right now, they won't 1167 * those out anyways, and if there are any flags set right now, they won't
1198 * be correct anyways. 1168 * be correct anyways.
1199 */ 1169 */
1200 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1201 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1202 } 1172 }
1203 else 1173 else
1204 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1205 1175
1206 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1207 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1208 } 1178 }
1209} 1179}
1210 1180
1211/* 1181/*
1212 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1747 op->carrying += weight; 1717 op->carrying += weight;
1748 op = op->env; 1718 op = op->env;
1749 } 1719 }
1750} 1720}
1751 1721
1752/*
1753 * insert_ob_in_ob(op,environment):
1754 * This function inserts the object op in the linked list
1755 * inside the object environment.
1756 *
1757 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1758 * the inventory at the last position or next to other objects of the same
1759 * type.
1760 * Frank: Now sorted by type, archetype and magic!
1761 *
1762 * The function returns now pointer to inserted item, and return value can
1763 * be != op, if items are merged. -Tero
1764 */
1765
1766object * 1722object *
1767insert_ob_in_ob (object *op, object *where) 1723insert_ob_in_ob (object *op, object *where)
1768{ 1724{
1769 object * 1725 if (!where)
1770 tmp, *
1771 otmp;
1772
1773 if (!QUERY_FLAG (op, FLAG_REMOVED))
1774 {
1775 char *dump = dump_object (op);
1776 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1777 free (dump);
1778 return op;
1779 }
1780
1781 if (where == NULL)
1782 { 1726 {
1783 char *dump = dump_object (op); 1727 char *dump = dump_object (op);
1784 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1728 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1785 free (dump); 1729 free (dump);
1786 return op; 1730 return op;
1787 } 1731 }
1788 1732
1789 if (where->head) 1733 if (where->head)
1790 { 1734 {
1791 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1735 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1792 where = where->head; 1736 where = where->head;
1793 } 1737 }
1738
1739 return where->insert (op);
1740}
1741
1742/*
1743 * env->insert (op)
1744 * This function inserts the object op in the linked list
1745 * inside the object environment.
1746 *
1747 * The function returns now pointer to inserted item, and return value can
1748 * be != op, if items are merged. -Tero
1749 */
1750
1751object *
1752object::insert (object *op)
1753{
1754 object *tmp, *otmp;
1755
1756 if (!QUERY_FLAG (op, FLAG_REMOVED))
1757 op->remove ();
1794 1758
1795 if (op->more) 1759 if (op->more)
1796 { 1760 {
1797 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1761 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1798 return op; 1762 return op;
… …
1800 1764
1801 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1765 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1802 CLEAR_FLAG (op, FLAG_REMOVED); 1766 CLEAR_FLAG (op, FLAG_REMOVED);
1803 if (op->nrof) 1767 if (op->nrof)
1804 { 1768 {
1805 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1769 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1806 if (CAN_MERGE (tmp, op)) 1770 if (CAN_MERGE (tmp, op))
1807 { 1771 {
1808 /* return the original object and remove inserted object 1772 /* return the original object and remove inserted object
1809 (client needs the original object) */ 1773 (client needs the original object) */
1810 tmp->nrof += op->nrof; 1774 tmp->nrof += op->nrof;
1811 /* Weight handling gets pretty funky. Since we are adding to 1775 /* Weight handling gets pretty funky. Since we are adding to
1812 * tmp->nrof, we need to increase the weight. 1776 * tmp->nrof, we need to increase the weight.
1813 */ 1777 */
1814 add_weight (where, op->weight * op->nrof); 1778 add_weight (this, op->weight * op->nrof);
1815 SET_FLAG (op, FLAG_REMOVED); 1779 SET_FLAG (op, FLAG_REMOVED);
1816 free_object (op); /* free the inserted object */ 1780 op->destroy (); /* free the inserted object */
1817 op = tmp; 1781 op = tmp;
1818 remove_ob (op); /* and fix old object's links */ 1782 op->remove (); /* and fix old object's links */
1819 CLEAR_FLAG (op, FLAG_REMOVED); 1783 CLEAR_FLAG (op, FLAG_REMOVED);
1820 break; 1784 break;
1821 } 1785 }
1822 1786
1823 /* I assume combined objects have no inventory 1787 /* I assume combined objects have no inventory
1824 * We add the weight - this object could have just been removed 1788 * We add the weight - this object could have just been removed
1825 * (if it was possible to merge). calling remove_ob will subtract 1789 * (if it was possible to merge). calling remove_ob will subtract
1826 * the weight, so we need to add it in again, since we actually do 1790 * the weight, so we need to add it in again, since we actually do
1827 * the linking below 1791 * the linking below
1828 */ 1792 */
1829 add_weight (where, op->weight * op->nrof); 1793 add_weight (this, op->weight * op->nrof);
1830 } 1794 }
1831 else 1795 else
1832 add_weight (where, (op->weight + op->carrying)); 1796 add_weight (this, (op->weight + op->carrying));
1833 1797
1834 otmp = is_player_inv (where); 1798 otmp = is_player_inv (this);
1835 if (otmp && otmp->contr != NULL) 1799 if (otmp && otmp->contr)
1836 {
1837 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1800 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1838 fix_player (otmp); 1801 fix_player (otmp);
1839 }
1840 1802
1841 op->map = NULL; 1803 op->map = NULL;
1842 op->env = where; 1804 op->env = this;
1843 op->above = NULL; 1805 op->above = NULL;
1844 op->below = NULL; 1806 op->below = NULL;
1845 op->x = 0, op->y = 0; 1807 op->x = 0, op->y = 0;
1846 1808
1847 /* reset the light list and los of the players on the map */ 1809 /* reset the light list and los of the players on the map */
1848 if ((op->glow_radius != 0) && where->map) 1810 if ((op->glow_radius != 0) && map)
1849 { 1811 {
1850#ifdef DEBUG_LIGHTS 1812#ifdef DEBUG_LIGHTS
1851 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1813 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1852#endif /* DEBUG_LIGHTS */ 1814#endif /* DEBUG_LIGHTS */
1853 if (MAP_DARKNESS (where->map)) 1815 if (MAP_DARKNESS (map))
1854 update_all_los (where->map, where->x, where->y); 1816 update_all_los (map, x, y);
1855 } 1817 }
1856 1818
1857 /* Client has no idea of ordering so lets not bother ordering it here. 1819 /* Client has no idea of ordering so lets not bother ordering it here.
1858 * It sure simplifies this function... 1820 * It sure simplifies this function...
1859 */ 1821 */
1860 if (where->inv == NULL) 1822 if (!inv)
1861 where->inv = op; 1823 inv = op;
1862 else 1824 else
1863 { 1825 {
1864 op->below = where->inv; 1826 op->below = inv;
1865 op->below->above = op; 1827 op->below->above = op;
1866 where->inv = op; 1828 inv = op;
1867 } 1829 }
1830
1868 return op; 1831 return op;
1869} 1832}
1870 1833
1871/* 1834/*
1872 * Checks if any objects has a move_type that matches objects 1835 * Checks if any objects has a move_type that matches objects
… …
2561 * create clone from object to another 2524 * create clone from object to another
2562 */ 2525 */
2563object * 2526object *
2564object_create_clone (object *asrc) 2527object_create_clone (object *asrc)
2565{ 2528{
2566 object *
2567 dst = NULL, *tmp, *src, *part, *prev, *item; 2529 object *dst = 0, *tmp, *src, *part, *prev, *item;
2568 2530
2569 if (!asrc) 2531 if (!asrc)
2570 return NULL; 2532 return 0;
2533
2571 src = asrc; 2534 src = asrc;
2572 if (src->head) 2535 if (src->head)
2573 src = src->head; 2536 src = src->head;
2574 2537
2575 prev = NULL; 2538 prev = 0;
2576 for (part = src; part; part = part->more) 2539 for (part = src; part; part = part->more)
2577 { 2540 {
2578 tmp = get_object (); 2541 tmp = get_object ();
2579 copy_object (part, tmp); 2542 copy_object (part, tmp);
2580 tmp->x -= src->x; 2543 tmp->x -= src->x;
2581 tmp->y -= src->y; 2544 tmp->y -= src->y;
2545
2582 if (!part->head) 2546 if (!part->head)
2583 { 2547 {
2584 dst = tmp; 2548 dst = tmp;
2585 tmp->head = NULL; 2549 tmp->head = 0;
2586 } 2550 }
2587 else 2551 else
2588 { 2552 {
2589 tmp->head = dst; 2553 tmp->head = dst;
2590 } 2554 }
2555
2591 tmp->more = NULL; 2556 tmp->more = 0;
2557
2592 if (prev) 2558 if (prev)
2593 prev->more = tmp; 2559 prev->more = tmp;
2560
2594 prev = tmp; 2561 prev = tmp;
2595 } 2562 }
2596 2563
2597 for (item = src->inv; item; item = item->below) 2564 for (item = src->inv; item; item = item->below)
2598 insert_ob_in_ob (object_create_clone (item), dst); 2565 insert_ob_in_ob (object_create_clone (item), dst);

Diff Legend

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