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.116 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.122 by root, Wed Jan 24 22:42:48 2007 UTC

… …
489 489
490 if (is_removed) 490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED); 491 SET_FLAG (dst, FLAG_REMOVED);
492 492
493 if (speed < 0) 493 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 494 dst->speed_left = speed_left - rndm ();
495 495
496 /* Copy over key_values, if any. */ 496 /* Copy over key_values, if any. */
497 if (key_values) 497 if (key_values)
498 { 498 {
499 key_value *tail = 0; 499 key_value *tail = 0;
… …
670 face = blank_face; 670 face = blank_face;
671} 671}
672 672
673object::~object () 673object::~object ()
674{ 674{
675 unlink ();
676
675 free_key_values (this); 677 free_key_values (this);
676} 678}
677 679
678static int object_count; 680static int object_count;
679 681
… …
687 objects.insert (this); 689 objects.insert (this);
688} 690}
689 691
690void object::unlink () 692void object::unlink ()
691{ 693{
692 assert (index);//D 694 if (!index)
695 return;
696
693 objects.erase (this); 697 objects.erase (this);
694 refcnt_dec (); 698 refcnt_dec ();
695} 699}
696 700
697void 701void
… …
771 * drop on that space. 775 * drop on that space.
772 */ 776 */
773 if (!drop_to_ground 777 if (!drop_to_ground
774 || !map 778 || !map
775 || map->in_memory != MAP_IN_MEMORY 779 || map->in_memory != MAP_IN_MEMORY
780 || map->nodrop
776 || ms ().move_block == MOVE_ALL) 781 || ms ().move_block == MOVE_ALL)
777 { 782 {
778 while (inv) 783 while (inv)
779 { 784 {
780 inv->destroy_inv (drop_to_ground); 785 inv->destroy_inv (drop_to_ground);
… …
899 * environment, the x and y coordinates will be updated to 904 * environment, the x and y coordinates will be updated to
900 * the previous environment. 905 * the previous environment.
901 * Beware: This function is called from the editor as well! 906 * Beware: This function is called from the editor as well!
902 */ 907 */
903void 908void
904object::remove () 909object::remove_slow ()
905{ 910{
906 object *tmp, *last = 0; 911 object *tmp, *last = 0;
907 object *otmp; 912 object *otmp;
908 913
909 if (QUERY_FLAG (this, FLAG_REMOVED)) 914 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
957 --map->players; 962 --map->players;
958 map->touch (); 963 map->touch ();
959 } 964 }
960 965
961 map->dirty = true; 966 map->dirty = true;
967 mapspace &ms = this->ms ();
962 968
963 /* link the object above us */ 969 /* link the object above us */
964 if (above) 970 if (above)
965 above->below = below; 971 above->below = below;
966 else 972 else
967 map->at (x, y).top = below; /* we were top, set new top */ 973 ms.top = below; /* we were top, set new top */
968 974
969 /* Relink the object below us, if there is one */ 975 /* Relink the object below us, if there is one */
970 if (below) 976 if (below)
971 below->above = above; 977 below->above = above;
972 else 978 else
… …
974 /* Nothing below, which means we need to relink map object for this space 980 /* Nothing below, which means we need to relink map object for this space
975 * use translated coordinates in case some oddness with map tiling is 981 * use translated coordinates in case some oddness with map tiling is
976 * evident 982 * evident
977 */ 983 */
978 if (GET_MAP_OB (map, x, y) != this) 984 if (GET_MAP_OB (map, x, y) != this)
979 {
980 char *dump = dump_object (this);
981 LOG (llevError,
982 "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); 985 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 ());
983 free (dump);
984 dump = dump_object (GET_MAP_OB (map, x, y));
985 LOG (llevError, "%s\n", dump);
986 free (dump);
987 }
988 986
989 map->at (x, y).bot = above; /* goes on above it. */ 987 ms.bot = above; /* goes on above it. */
990 } 988 }
991 989
992 above = 0; 990 above = 0;
993 below = 0; 991 below = 0;
994 992
995 if (map->in_memory == MAP_SAVING) 993 if (map->in_memory == MAP_SAVING)
996 return; 994 return;
997 995
998 int check_walk_off = !flag [FLAG_NO_APPLY]; 996 int check_walk_off = !flag [FLAG_NO_APPLY];
999 997
1000 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 998 for (tmp = ms.bot; tmp; tmp = tmp->above)
1001 { 999 {
1002 /* No point updating the players look faces if he is the object 1000 /* No point updating the players look faces if he is the object
1003 * being removed. 1001 * being removed.
1004 */ 1002 */
1005 1003
… …
1086 1084
1087 return 0; 1085 return 0;
1088} 1086}
1089 1087
1090/* 1088/*
1091 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1089 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1092 * job preparing multi-part monsters 1090 * job preparing multi-part monsters.
1093 */ 1091 */
1094object * 1092object *
1095insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1093insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1096{ 1094{
1097 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1095 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1125 */ 1123 */
1126object * 1124object *
1127insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1125insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1128{ 1126{
1129 object *tmp, *top, *floor = NULL; 1127 object *tmp, *top, *floor = NULL;
1130 sint16 x, y;
1131 1128
1132 if (QUERY_FLAG (op, FLAG_FREED)) 1129 if (QUERY_FLAG (op, FLAG_FREED))
1133 { 1130 {
1134 LOG (llevError, "Trying to insert freed object!\n"); 1131 LOG (llevError, "Trying to insert freed object!\n");
1135 return NULL; 1132 return NULL;
1136 } 1133 }
1134
1135 if (!QUERY_FLAG (op, FLAG_REMOVED))
1136 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1137
1138 op->remove ();
1137 1139
1138 if (!m) 1140 if (!m)
1139 { 1141 {
1140 char *dump = dump_object (op); 1142 char *dump = dump_object (op);
1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1143 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1156#endif 1158#endif
1157 free (dump); 1159 free (dump);
1158 return op; 1160 return op;
1159 } 1161 }
1160 1162
1161 if (!QUERY_FLAG (op, FLAG_REMOVED))
1162 {
1163 char *dump = dump_object (op);
1164 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1165 free (dump);
1166 return op;
1167 }
1168
1169 if (op->more)
1170 {
1171 /* The part may be on a different map. */
1172
1173 object *more = op->more; 1163 if (object *more = op->more)
1174 1164 {
1175 /* We really need the caller to normalise coordinates - if
1176 * we set the map, that doesn't work if the location is within
1177 * a map and this is straddling an edge. So only if coordinate
1178 * is clear wrong do we normalise it.
1179 */
1180 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1181 more->map = get_map_from_coord (m, &more->x, &more->y);
1182 else if (!more->map)
1183 {
1184 /* For backwards compatibility - when not dealing with tiled maps,
1185 * more->map should always point to the parent.
1186 */
1187 more->map = m;
1188 }
1189
1190 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1165 if (!insert_ob_in_map (more, m, originator, flag))
1191 { 1166 {
1192 if (!op->head) 1167 if (!op->head)
1193 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1168 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1194 1169
1195 return 0; 1170 return 0;
… …
1200 1175
1201 /* Ideally, the caller figures this out. However, it complicates a lot 1176 /* Ideally, the caller figures this out. However, it complicates a lot
1202 * of areas of callers (eg, anything that uses find_free_spot would now 1177 * of areas of callers (eg, anything that uses find_free_spot would now
1203 * need extra work 1178 * need extra work
1204 */ 1179 */
1205 op->map = get_map_from_coord (m, &op->x, &op->y); 1180 if (!xy_normalise (m, op->x, op->y))
1206 x = op->x; 1181 return 0;
1207 y = op->y; 1182
1183 op->map = m;
1184 mapspace &ms = op->ms ();
1208 1185
1209 /* this has to be done after we translate the coordinates. 1186 /* this has to be done after we translate the coordinates.
1210 */ 1187 */
1211 if (op->nrof && !(flag & INS_NO_MERGE)) 1188 if (op->nrof && !(flag & INS_NO_MERGE))
1212 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1189 for (tmp = ms.bot; tmp; tmp = tmp->above)
1213 if (object::can_merge (op, tmp)) 1190 if (object::can_merge (op, tmp))
1214 { 1191 {
1215 op->nrof += tmp->nrof; 1192 op->nrof += tmp->nrof;
1216 tmp->destroy (); 1193 tmp->destroy ();
1217 } 1194 }
… …
1234 op->below = originator->below; 1211 op->below = originator->below;
1235 1212
1236 if (op->below) 1213 if (op->below)
1237 op->below->above = op; 1214 op->below->above = op;
1238 else 1215 else
1239 op->ms ().bot = op; 1216 ms.bot = op;
1240 1217
1241 /* since *below* originator, no need to update top */ 1218 /* since *below* originator, no need to update top */
1242 originator->below = op; 1219 originator->below = op;
1243 } 1220 }
1244 else 1221 else
1245 { 1222 {
1223 top = ms.bot;
1224
1246 /* If there are other objects, then */ 1225 /* If there are other objects, then */
1247 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1226 if ((!(flag & INS_MAP_LOAD)) && top)
1248 { 1227 {
1249 object *last = 0; 1228 object *last = 0;
1250 1229
1251 /* 1230 /*
1252 * If there are multiple objects on this space, we do some trickier handling. 1231 * If there are multiple objects on this space, we do some trickier handling.
… …
1258 * once we get to them. This reduces the need to traverse over all of 1237 * once we get to them. This reduces the need to traverse over all of
1259 * them when adding another one - this saves quite a bit of cpu time 1238 * them when adding another one - this saves quite a bit of cpu time
1260 * when lots of spells are cast in one area. Currently, it is presumed 1239 * when lots of spells are cast in one area. Currently, it is presumed
1261 * that flying non pickable objects are spell objects. 1240 * that flying non pickable objects are spell objects.
1262 */ 1241 */
1263 while (top) 1242 for (top = ms.bot; top; top = top->above)
1264 { 1243 {
1265 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1244 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1266 floor = top; 1245 floor = top;
1267 1246
1268 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1247 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1271 top = top->below; 1250 top = top->below;
1272 break; 1251 break;
1273 } 1252 }
1274 1253
1275 last = top; 1254 last = top;
1276 top = top->above;
1277 } 1255 }
1278 1256
1279 /* Don't want top to be NULL, so set it to the last valid object */ 1257 /* Don't want top to be NULL, so set it to the last valid object */
1280 top = last; 1258 top = last;
1281 1259
… …
1288 * Unless those objects are exits, type 66 1266 * Unless those objects are exits, type 66
1289 * If INS_ON_TOP is used, don't do this processing 1267 * If INS_ON_TOP is used, don't do this processing
1290 * Need to find the object that in fact blocks view, otherwise 1268 * Need to find the object that in fact blocks view, otherwise
1291 * stacking is a bit odd. 1269 * stacking is a bit odd.
1292 */ 1270 */
1293 if (!(flag & INS_ON_TOP) && 1271 if (!(flag & INS_ON_TOP)
1294 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1272 && ms.flags () & P_BLOCKSVIEW
1273 && (op->face && !op->face->visibility))
1295 { 1274 {
1296 for (last = top; last != floor; last = last->below) 1275 for (last = top; last != floor; last = last->below)
1297 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1276 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1298 break; 1277 break;
1278
1299 /* Check to see if we found the object that blocks view, 1279 /* Check to see if we found the object that blocks view,
1300 * and make sure we have a below pointer for it so that 1280 * and make sure we have a below pointer for it so that
1301 * we can get inserted below this one, which requires we 1281 * we can get inserted below this one, which requires we
1302 * set top to the object below us. 1282 * set top to the object below us.
1303 */ 1283 */
… …
1305 top = last->below; 1285 top = last->below;
1306 } 1286 }
1307 } /* If objects on this space */ 1287 } /* If objects on this space */
1308 1288
1309 if (flag & INS_MAP_LOAD) 1289 if (flag & INS_MAP_LOAD)
1310 top = GET_MAP_TOP (op->map, op->x, op->y); 1290 top = ms.top;
1311 1291
1312 if (flag & INS_ABOVE_FLOOR_ONLY) 1292 if (flag & INS_ABOVE_FLOOR_ONLY)
1313 top = floor; 1293 top = floor;
1314 1294
1315 /* Top is the object that our object (op) is going to get inserted above. 1295 /* Top is the object that our object (op) is going to get inserted above.
1316 */ 1296 */
1317 1297
1318 /* First object on this space */ 1298 /* First object on this space */
1319 if (!top) 1299 if (!top)
1320 { 1300 {
1321 op->above = GET_MAP_OB (op->map, op->x, op->y); 1301 op->above = ms.bot;
1322 1302
1323 if (op->above) 1303 if (op->above)
1324 op->above->below = op; 1304 op->above->below = op;
1325 1305
1326 op->below = 0; 1306 op->below = 0;
1327 op->ms ().bot = op; 1307 ms.bot = op;
1328 } 1308 }
1329 else 1309 else
1330 { /* get inserted into the stack above top */ 1310 { /* get inserted into the stack above top */
1331 op->above = top->above; 1311 op->above = top->above;
1332 1312
… …
1336 op->below = top; 1316 op->below = top;
1337 top->above = op; 1317 top->above = op;
1338 } 1318 }
1339 1319
1340 if (!op->above) 1320 if (!op->above)
1341 op->ms ().top = op; 1321 ms.top = op;
1342 } /* else not INS_BELOW_ORIGINATOR */ 1322 } /* else not INS_BELOW_ORIGINATOR */
1343 1323
1344 if (op->type == PLAYER) 1324 if (op->type == PLAYER)
1345 { 1325 {
1346 op->contr->do_los = 1; 1326 op->contr->do_los = 1;
… …
1352 1332
1353 /* If we have a floor, we know the player, if any, will be above 1333 /* If we have a floor, we know the player, if any, will be above
1354 * it, so save a few ticks and start from there. 1334 * it, so save a few ticks and start from there.
1355 */ 1335 */
1356 if (!(flag & INS_MAP_LOAD)) 1336 if (!(flag & INS_MAP_LOAD))
1357 if (object *pl = op->ms ().player ()) 1337 if (object *pl = ms.player ())
1358 if (pl->contr->ns) 1338 if (pl->contr->ns)
1359 pl->contr->ns->floorbox_update (); 1339 pl->contr->ns->floorbox_update ();
1360 1340
1361 /* If this object glows, it may affect lighting conditions that are 1341 /* If this object glows, it may affect lighting conditions that are
1362 * visible to others on this map. But update_all_los is really 1342 * visible to others on this map. But update_all_los is really
… …
1771 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1751 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1772 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1752 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1773 { 1753 {
1774 1754
1775 float 1755 float
1776 diff = tmp->move_slow_penalty * FABS (op->speed); 1756 diff = tmp->move_slow_penalty * fabs (op->speed);
1777 1757
1778 if (op->type == PLAYER) 1758 if (op->type == PLAYER)
1779 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1759 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1780 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1760 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1781 diff /= 4.0; 1761 diff /= 4.0;
… …
2591{ 2571{
2592 char flagdesc[512]; 2572 char flagdesc[512];
2593 char info2[256 * 4]; 2573 char info2[256 * 4];
2594 char *p = info; 2574 char *p = info;
2595 2575
2596 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2576 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2597 count, uuid.seq, 2577 count, uuid.seq,
2598 &name, 2578 &name,
2599 title ? "\",title:" : "", 2579 title ? "\",title:\"" : "",
2600 title ? (const char *)title : "", 2580 title ? (const char *)title : "",
2601 flag_desc (flagdesc, 512), type); 2581 flag_desc (flagdesc, 512), type);
2602 2582
2603 if (env) 2583 if (env)
2604 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2584 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));

Diff Legend

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