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.110 by root, Sun Jan 7 23:12:03 2007 UTC vs.
Revision 1.119 by root, Fri Jan 19 18:06:51 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28#include <global.h> 28#include <global.h>
… …
395 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
396 */ 396 */
397object * 397object *
398find_object (tag_t i) 398find_object (tag_t i)
399{ 399{
400 return ((unsigned int)i) < objects.size () 400 for_all_objects (op)
401 ? objects [i] 401 if (op->count == i)
402 : 0; 402 return op;
403
404 return 0;
403} 405}
404 406
405/* 407/*
406 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
… …
487 489
488 if (is_removed) 490 if (is_removed)
489 SET_FLAG (dst, FLAG_REMOVED); 491 SET_FLAG (dst, FLAG_REMOVED);
490 492
491 if (speed < 0) 493 if (speed < 0)
492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 494 dst->speed_left = speed_left - rndm ();
493 495
494 /* Copy over key_values, if any. */ 496 /* Copy over key_values, if any. */
495 if (key_values) 497 if (key_values)
496 { 498 {
497 key_value *tail = 0; 499 key_value *tail = 0;
… …
658 660
659 if (op->more) 661 if (op->more)
660 update_object (op->more, action); 662 update_object (op->more, action);
661} 663}
662 664
663object *object::first;
664
665object::object () 665object::object ()
666{ 666{
667 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
668 668
669 expmul = 1.0; 669 expmul = 1.0;
670 face = blank_face; 670 face = blank_face;
671} 671}
672 672
673object::~object () 673object::~object ()
674{ 674{
675 if (index)
676 unlink ();
677
675 free_key_values (this); 678 free_key_values (this);
676} 679}
677 680
681static int object_count;
682
678void object::link () 683void object::link ()
679{ 684{
685 assert (!index);//D
680 uuid = gen_uuid (); 686 uuid = gen_uuid ();
687 count = ++object_count;
681 688
682 refcnt_inc (); 689 refcnt_inc ();
683 objects.insert (this); 690 objects.insert (this);
684} 691}
685 692
686void object::unlink () 693void object::unlink ()
687{ 694{
695 assert (index);//D
688 objects.erase (this); 696 objects.erase (this);
689 refcnt_dec (); 697 refcnt_dec ();
690} 698}
691 699
692void 700void
… …
803} 811}
804 812
805void 813void
806object::do_destroy () 814object::do_destroy ()
807{ 815{
816 attachable::do_destroy ();
817
808 if (flag [FLAG_IS_LINKED]) 818 if (flag [FLAG_IS_LINKED])
809 remove_button_link (this); 819 remove_button_link (this);
810 820
811 if (flag [FLAG_FRIENDLY]) 821 if (flag [FLAG_FRIENDLY])
812 remove_friendly_object (this); 822 remove_friendly_object (this);
813 823
814 if (!flag [FLAG_REMOVED]) 824 if (!flag [FLAG_REMOVED])
815 remove (); 825 remove ();
816 826
817 if (flag [FLAG_FREED]) 827 destroy_inv (true);
818 return;
819 828
820 set_speed (0); 829 deactivate ();
830 unlink ();
821 831
822 flag [FLAG_FREED] = 1; 832 flag [FLAG_FREED] = 1;
823
824 attachable::do_destroy ();
825
826 destroy_inv (true);
827 unlink ();
828 833
829 // hack to ensure that freed objects still have a valid map 834 // hack to ensure that freed objects still have a valid map
830 { 835 {
831 static maptile *freed_map; // freed objects are moved here to avoid crashes 836 static maptile *freed_map; // freed objects are moved here to avoid crashes
832 837
… …
897 * environment, the x and y coordinates will be updated to 902 * environment, the x and y coordinates will be updated to
898 * the previous environment. 903 * the previous environment.
899 * Beware: This function is called from the editor as well! 904 * Beware: This function is called from the editor as well!
900 */ 905 */
901void 906void
902object::remove () 907object::remove_slow ()
903{ 908{
904 object *tmp, *last = 0; 909 object *tmp, *last = 0;
905 object *otmp; 910 object *otmp;
906 911
907 if (QUERY_FLAG (this, FLAG_REMOVED)) 912 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
955 --map->players; 960 --map->players;
956 map->touch (); 961 map->touch ();
957 } 962 }
958 963
959 map->dirty = true; 964 map->dirty = true;
965 mapspace &ms = this->ms ();
960 966
961 /* link the object above us */ 967 /* link the object above us */
962 if (above) 968 if (above)
963 above->below = below; 969 above->below = below;
964 else 970 else
965 map->at (x, y).top = below; /* we were top, set new top */ 971 ms.top = below; /* we were top, set new top */
966 972
967 /* Relink the object below us, if there is one */ 973 /* Relink the object below us, if there is one */
968 if (below) 974 if (below)
969 below->above = above; 975 below->above = above;
970 else 976 else
… …
972 /* Nothing below, which means we need to relink map object for this space 978 /* Nothing below, which means we need to relink map object for this space
973 * use translated coordinates in case some oddness with map tiling is 979 * use translated coordinates in case some oddness with map tiling is
974 * evident 980 * evident
975 */ 981 */
976 if (GET_MAP_OB (map, x, y) != this) 982 if (GET_MAP_OB (map, x, y) != this)
977 {
978 char *dump = dump_object (this);
979 LOG (llevError,
980 "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); 983 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 ());
981 free (dump);
982 dump = dump_object (GET_MAP_OB (map, x, y));
983 LOG (llevError, "%s\n", dump);
984 free (dump);
985 }
986 984
987 map->at (x, y).bot = above; /* goes on above it. */ 985 ms.bot = above; /* goes on above it. */
988 } 986 }
989 987
990 above = 0; 988 above = 0;
991 below = 0; 989 below = 0;
992 990
993 if (map->in_memory == MAP_SAVING) 991 if (map->in_memory == MAP_SAVING)
994 return; 992 return;
995 993
996 int check_walk_off = !flag [FLAG_NO_APPLY]; 994 int check_walk_off = !flag [FLAG_NO_APPLY];
997 995
998 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 996 for (tmp = ms.bot; tmp; tmp = tmp->above)
999 { 997 {
1000 /* No point updating the players look faces if he is the object 998 /* No point updating the players look faces if he is the object
1001 * being removed. 999 * being removed.
1002 */ 1000 */
1003 1001
… …
1084 1082
1085 return 0; 1083 return 0;
1086} 1084}
1087 1085
1088/* 1086/*
1089 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1087 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1090 * job preparing multi-part monsters 1088 * job preparing multi-part monsters.
1091 */ 1089 */
1092object * 1090object *
1093insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1091insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1094{ 1092{
1095 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1093 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1123 */ 1121 */
1124object * 1122object *
1125insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1123insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1126{ 1124{
1127 object *tmp, *top, *floor = NULL; 1125 object *tmp, *top, *floor = NULL;
1128 sint16 x, y;
1129 1126
1130 if (QUERY_FLAG (op, FLAG_FREED)) 1127 if (QUERY_FLAG (op, FLAG_FREED))
1131 { 1128 {
1132 LOG (llevError, "Trying to insert freed object!\n"); 1129 LOG (llevError, "Trying to insert freed object!\n");
1133 return NULL; 1130 return NULL;
1134 } 1131 }
1132
1133 if (!QUERY_FLAG (op, FLAG_REMOVED))
1134 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1135
1136 op->remove ();
1135 1137
1136 if (!m) 1138 if (!m)
1137 { 1139 {
1138 char *dump = dump_object (op); 1140 char *dump = dump_object (op);
1139 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1154#endif 1156#endif
1155 free (dump); 1157 free (dump);
1156 return op; 1158 return op;
1157 } 1159 }
1158 1160
1159 if (!QUERY_FLAG (op, FLAG_REMOVED))
1160 {
1161 char *dump = dump_object (op);
1162 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1163 free (dump);
1164 return op;
1165 }
1166
1167 if (op->more)
1168 {
1169 /* The part may be on a different map. */
1170
1171 object *more = op->more; 1161 if (object *more = op->more)
1172 1162 {
1173 /* We really need the caller to normalise coordinates - if
1174 * we set the map, that doesn't work if the location is within
1175 * a map and this is straddling an edge. So only if coordinate
1176 * is clear wrong do we normalise it.
1177 */
1178 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1179 more->map = get_map_from_coord (m, &more->x, &more->y);
1180 else if (!more->map)
1181 {
1182 /* For backwards compatibility - when not dealing with tiled maps,
1183 * more->map should always point to the parent.
1184 */
1185 more->map = m;
1186 }
1187
1188 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1163 if (!insert_ob_in_map (more, m, originator, flag))
1189 { 1164 {
1190 if (!op->head) 1165 if (!op->head)
1191 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1166 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1192 1167
1193 return 0; 1168 return 0;
… …
1198 1173
1199 /* Ideally, the caller figures this out. However, it complicates a lot 1174 /* Ideally, the caller figures this out. However, it complicates a lot
1200 * of areas of callers (eg, anything that uses find_free_spot would now 1175 * of areas of callers (eg, anything that uses find_free_spot would now
1201 * need extra work 1176 * need extra work
1202 */ 1177 */
1203 op->map = get_map_from_coord (m, &op->x, &op->y); 1178 if (!xy_normalise (m, op->x, op->y))
1204 x = op->x; 1179 return 0;
1205 y = op->y; 1180
1181 op->map = m;
1182 mapspace &ms = op->ms ();
1206 1183
1207 /* this has to be done after we translate the coordinates. 1184 /* this has to be done after we translate the coordinates.
1208 */ 1185 */
1209 if (op->nrof && !(flag & INS_NO_MERGE)) 1186 if (op->nrof && !(flag & INS_NO_MERGE))
1210 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1187 for (tmp = ms.bot; tmp; tmp = tmp->above)
1211 if (object::can_merge (op, tmp)) 1188 if (object::can_merge (op, tmp))
1212 { 1189 {
1213 op->nrof += tmp->nrof; 1190 op->nrof += tmp->nrof;
1214 tmp->destroy (); 1191 tmp->destroy ();
1215 } 1192 }
… …
1232 op->below = originator->below; 1209 op->below = originator->below;
1233 1210
1234 if (op->below) 1211 if (op->below)
1235 op->below->above = op; 1212 op->below->above = op;
1236 else 1213 else
1237 op->ms ().bot = op; 1214 ms.bot = op;
1238 1215
1239 /* since *below* originator, no need to update top */ 1216 /* since *below* originator, no need to update top */
1240 originator->below = op; 1217 originator->below = op;
1241 } 1218 }
1242 else 1219 else
1243 { 1220 {
1221 top = ms.bot;
1222
1244 /* If there are other objects, then */ 1223 /* If there are other objects, then */
1245 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1224 if ((!(flag & INS_MAP_LOAD)) && top)
1246 { 1225 {
1247 object *last = 0; 1226 object *last = 0;
1248 1227
1249 /* 1228 /*
1250 * If there are multiple objects on this space, we do some trickier handling. 1229 * If there are multiple objects on this space, we do some trickier handling.
… …
1256 * once we get to them. This reduces the need to traverse over all of 1235 * once we get to them. This reduces the need to traverse over all of
1257 * them when adding another one - this saves quite a bit of cpu time 1236 * them when adding another one - this saves quite a bit of cpu time
1258 * when lots of spells are cast in one area. Currently, it is presumed 1237 * when lots of spells are cast in one area. Currently, it is presumed
1259 * that flying non pickable objects are spell objects. 1238 * that flying non pickable objects are spell objects.
1260 */ 1239 */
1261 while (top) 1240 for (top = ms.bot; top; top = top->above)
1262 { 1241 {
1263 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1242 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1264 floor = top; 1243 floor = top;
1265 1244
1266 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1245 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1269 top = top->below; 1248 top = top->below;
1270 break; 1249 break;
1271 } 1250 }
1272 1251
1273 last = top; 1252 last = top;
1274 top = top->above;
1275 } 1253 }
1276 1254
1277 /* Don't want top to be NULL, so set it to the last valid object */ 1255 /* Don't want top to be NULL, so set it to the last valid object */
1278 top = last; 1256 top = last;
1279 1257
… …
1286 * Unless those objects are exits, type 66 1264 * Unless those objects are exits, type 66
1287 * If INS_ON_TOP is used, don't do this processing 1265 * If INS_ON_TOP is used, don't do this processing
1288 * Need to find the object that in fact blocks view, otherwise 1266 * Need to find the object that in fact blocks view, otherwise
1289 * stacking is a bit odd. 1267 * stacking is a bit odd.
1290 */ 1268 */
1291 if (!(flag & INS_ON_TOP) && 1269 if (!(flag & INS_ON_TOP)
1292 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1270 && ms.flags () & P_BLOCKSVIEW
1271 && (op->face && !op->face->visibility))
1293 { 1272 {
1294 for (last = top; last != floor; last = last->below) 1273 for (last = top; last != floor; last = last->below)
1295 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1274 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1296 break; 1275 break;
1276
1297 /* Check to see if we found the object that blocks view, 1277 /* Check to see if we found the object that blocks view,
1298 * and make sure we have a below pointer for it so that 1278 * and make sure we have a below pointer for it so that
1299 * we can get inserted below this one, which requires we 1279 * we can get inserted below this one, which requires we
1300 * set top to the object below us. 1280 * set top to the object below us.
1301 */ 1281 */
… …
1303 top = last->below; 1283 top = last->below;
1304 } 1284 }
1305 } /* If objects on this space */ 1285 } /* If objects on this space */
1306 1286
1307 if (flag & INS_MAP_LOAD) 1287 if (flag & INS_MAP_LOAD)
1308 top = GET_MAP_TOP (op->map, op->x, op->y); 1288 top = ms.top;
1309 1289
1310 if (flag & INS_ABOVE_FLOOR_ONLY) 1290 if (flag & INS_ABOVE_FLOOR_ONLY)
1311 top = floor; 1291 top = floor;
1312 1292
1313 /* Top is the object that our object (op) is going to get inserted above. 1293 /* Top is the object that our object (op) is going to get inserted above.
1314 */ 1294 */
1315 1295
1316 /* First object on this space */ 1296 /* First object on this space */
1317 if (!top) 1297 if (!top)
1318 { 1298 {
1319 op->above = GET_MAP_OB (op->map, op->x, op->y); 1299 op->above = ms.bot;
1320 1300
1321 if (op->above) 1301 if (op->above)
1322 op->above->below = op; 1302 op->above->below = op;
1323 1303
1324 op->below = 0; 1304 op->below = 0;
1325 op->ms ().bot = op; 1305 ms.bot = op;
1326 } 1306 }
1327 else 1307 else
1328 { /* get inserted into the stack above top */ 1308 { /* get inserted into the stack above top */
1329 op->above = top->above; 1309 op->above = top->above;
1330 1310
… …
1334 op->below = top; 1314 op->below = top;
1335 top->above = op; 1315 top->above = op;
1336 } 1316 }
1337 1317
1338 if (!op->above) 1318 if (!op->above)
1339 op->ms ().top = op; 1319 ms.top = op;
1340 } /* else not INS_BELOW_ORIGINATOR */ 1320 } /* else not INS_BELOW_ORIGINATOR */
1341 1321
1342 if (op->type == PLAYER) 1322 if (op->type == PLAYER)
1343 { 1323 {
1344 op->contr->do_los = 1; 1324 op->contr->do_los = 1;
… …
1350 1330
1351 /* If we have a floor, we know the player, if any, will be above 1331 /* If we have a floor, we know the player, if any, will be above
1352 * it, so save a few ticks and start from there. 1332 * it, so save a few ticks and start from there.
1353 */ 1333 */
1354 if (!(flag & INS_MAP_LOAD)) 1334 if (!(flag & INS_MAP_LOAD))
1355 if (object *pl = op->ms ().player ()) 1335 if (object *pl = ms.player ())
1356 if (pl->contr->ns) 1336 if (pl->contr->ns)
1357 pl->contr->ns->floorbox_update (); 1337 pl->contr->ns->floorbox_update ();
1358 1338
1359 /* If this object glows, it may affect lighting conditions that are 1339 /* If this object glows, it may affect lighting conditions that are
1360 * visible to others on this map. But update_all_los is really 1340 * visible to others on this map. But update_all_los is really
… …
2161 2141
2162 return 3; 2142 return 3;
2163} 2143}
2164 2144
2165/* 2145/*
2166 * absdir(int): Returns a number between 1 and 8, which represent
2167 * the "absolute" direction of a number (it actually takes care of
2168 * "overflow" in previous calculations of a direction).
2169 */
2170
2171int
2172absdir (int d)
2173{
2174 while (d < 1)
2175 d += 8;
2176
2177 while (d > 8)
2178 d -= 8;
2179
2180 return d;
2181}
2182
2183/*
2184 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2146 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2185 * between two directions (which are expected to be absolute (see absdir()) 2147 * between two directions (which are expected to be absolute (see absdir())
2186 */ 2148 */
2187
2188int 2149int
2189dirdiff (int dir1, int dir2) 2150dirdiff (int dir1, int dir2)
2190{ 2151{
2191 int d; 2152 int d;
2192 2153
… …
2608{ 2569{
2609 char flagdesc[512]; 2570 char flagdesc[512];
2610 char info2[256 * 4]; 2571 char info2[256 * 4];
2611 char *p = info; 2572 char *p = info;
2612 2573
2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2574 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2614 count, uuid.seq, 2575 count, uuid.seq,
2615 &name, 2576 &name,
2616 title ? "\",title:" : "", 2577 title ? "\",title:\"" : "",
2617 title ? (const char *)title : "", 2578 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type); 2579 flag_desc (flagdesc, 512), type);
2619 2580
2620 if (env) 2581 if (env)
2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2582 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2631{ 2592{
2632 static char info[256 * 4]; 2593 static char info[256 * 4];
2633 return debug_desc (info); 2594 return debug_desc (info);
2634} 2595}
2635 2596
2597const char *
2598object::debug_desc2 () const
2599{
2600 static char info[256 * 4];
2601 return debug_desc (info);
2602}
2603

Diff Legend

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