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.109 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.117 by root, Thu Jan 18 16:19:34 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.
… …
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;
… …
673object::~object () 673object::~object ()
674{ 674{
675 free_key_values (this); 675 free_key_values (this);
676} 676}
677 677
678static int object_count;
679
678void object::link () 680void object::link ()
679{ 681{
682 assert (!index);//D
680 uuid = gen_uuid (); 683 uuid = gen_uuid ();
684 count = ++object_count;
681 685
682 refcnt_inc (); 686 refcnt_inc ();
683 objects.insert (this); 687 objects.insert (this);
684} 688}
685 689
686void object::unlink () 690void object::unlink ()
687{ 691{
692 assert (index);//D
688 objects.erase (this); 693 objects.erase (this);
689 refcnt_dec (); 694 refcnt_dec ();
690} 695}
691 696
692void 697void
… …
784 789
785 if (op->flag [FLAG_STARTEQUIP] 790 if (op->flag [FLAG_STARTEQUIP]
786 || op->flag [FLAG_NO_DROP] 791 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE 792 || op->type == RUNE
788 || op->type == TRAP 793 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE]) 794 || op->flag [FLAG_IS_A_TEMPLATE]
795 || op->flag [FLAG_DESTROY_ON_DEATH])
790 op->destroy (); 796 op->destroy ();
791 else 797 else
792 map->insert (op, x, y); 798 map->insert (op, x, y);
793 } 799 }
794 } 800 }
… …
802} 808}
803 809
804void 810void
805object::do_destroy () 811object::do_destroy ()
806{ 812{
813 attachable::do_destroy ();
814
807 if (flag [FLAG_IS_LINKED]) 815 if (flag [FLAG_IS_LINKED])
808 remove_button_link (this); 816 remove_button_link (this);
809 817
810 if (flag [FLAG_FRIENDLY]) 818 if (flag [FLAG_FRIENDLY])
811 remove_friendly_object (this); 819 remove_friendly_object (this);
812 820
813 if (!flag [FLAG_REMOVED]) 821 if (!flag [FLAG_REMOVED])
814 remove (); 822 remove ();
815 823
816 if (flag [FLAG_FREED]) 824 destroy_inv (true);
817 return;
818 825
819 set_speed (0); 826 deactivate ();
827 unlink ();
820 828
821 flag [FLAG_FREED] = 1; 829 flag [FLAG_FREED] = 1;
822
823 attachable::do_destroy ();
824
825 destroy_inv (true);
826 unlink ();
827 830
828 // hack to ensure that freed objects still have a valid map 831 // hack to ensure that freed objects still have a valid map
829 { 832 {
830 static maptile *freed_map; // freed objects are moved here to avoid crashes 833 static maptile *freed_map; // freed objects are moved here to avoid crashes
831 834
… …
896 * environment, the x and y coordinates will be updated to 899 * environment, the x and y coordinates will be updated to
897 * the previous environment. 900 * the previous environment.
898 * Beware: This function is called from the editor as well! 901 * Beware: This function is called from the editor as well!
899 */ 902 */
900void 903void
901object::remove () 904object::remove_slow ()
902{ 905{
903 object *tmp, *last = 0; 906 object *tmp, *last = 0;
904 object *otmp; 907 object *otmp;
905 908
906 if (QUERY_FLAG (this, FLAG_REMOVED)) 909 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
954 --map->players; 957 --map->players;
955 map->touch (); 958 map->touch ();
956 } 959 }
957 960
958 map->dirty = true; 961 map->dirty = true;
962 mapspace &ms = this->ms ();
959 963
960 /* link the object above us */ 964 /* link the object above us */
961 if (above) 965 if (above)
962 above->below = below; 966 above->below = below;
963 else 967 else
964 map->at (x, y).top = below; /* we were top, set new top */ 968 ms.top = below; /* we were top, set new top */
965 969
966 /* Relink the object below us, if there is one */ 970 /* Relink the object below us, if there is one */
967 if (below) 971 if (below)
968 below->above = above; 972 below->above = above;
969 else 973 else
… …
971 /* Nothing below, which means we need to relink map object for this space 975 /* Nothing below, which means we need to relink map object for this space
972 * use translated coordinates in case some oddness with map tiling is 976 * use translated coordinates in case some oddness with map tiling is
973 * evident 977 * evident
974 */ 978 */
975 if (GET_MAP_OB (map, x, y) != this) 979 if (GET_MAP_OB (map, x, y) != this)
976 {
977 char *dump = dump_object (this);
978 LOG (llevError,
979 "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); 980 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 ());
980 free (dump);
981 dump = dump_object (GET_MAP_OB (map, x, y));
982 LOG (llevError, "%s\n", dump);
983 free (dump);
984 }
985 981
986 map->at (x, y).bot = above; /* goes on above it. */ 982 ms.bot = above; /* goes on above it. */
987 } 983 }
988 984
989 above = 0; 985 above = 0;
990 below = 0; 986 below = 0;
991 987
992 if (map->in_memory == MAP_SAVING) 988 if (map->in_memory == MAP_SAVING)
993 return; 989 return;
994 990
995 int check_walk_off = !flag [FLAG_NO_APPLY]; 991 int check_walk_off = !flag [FLAG_NO_APPLY];
996 992
997 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 993 for (tmp = ms.bot; tmp; tmp = tmp->above)
998 { 994 {
999 /* No point updating the players look faces if he is the object 995 /* No point updating the players look faces if he is the object
1000 * being removed. 996 * being removed.
1001 */ 997 */
1002 998
… …
1083 1079
1084 return 0; 1080 return 0;
1085} 1081}
1086 1082
1087/* 1083/*
1088 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1084 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1089 * job preparing multi-part monsters 1085 * job preparing multi-part monsters.
1090 */ 1086 */
1091object * 1087object *
1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1088insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1093{ 1089{
1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1090 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1122 */ 1118 */
1123object * 1119object *
1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1120insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1125{ 1121{
1126 object *tmp, *top, *floor = NULL; 1122 object *tmp, *top, *floor = NULL;
1127 sint16 x, y;
1128 1123
1129 if (QUERY_FLAG (op, FLAG_FREED)) 1124 if (QUERY_FLAG (op, FLAG_FREED))
1130 { 1125 {
1131 LOG (llevError, "Trying to insert freed object!\n"); 1126 LOG (llevError, "Trying to insert freed object!\n");
1132 return NULL; 1127 return NULL;
1133 } 1128 }
1129
1130 if (!QUERY_FLAG (op, FLAG_REMOVED))
1131 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1132
1133 op->remove ();
1134 1134
1135 if (!m) 1135 if (!m)
1136 { 1136 {
1137 char *dump = dump_object (op); 1137 char *dump = dump_object (op);
1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1153#endif 1153#endif
1154 free (dump); 1154 free (dump);
1155 return op; 1155 return op;
1156 } 1156 }
1157 1157
1158 if (!QUERY_FLAG (op, FLAG_REMOVED))
1159 {
1160 char *dump = dump_object (op);
1161 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1162 free (dump);
1163 return op;
1164 }
1165
1166 if (op->more)
1167 {
1168 /* The part may be on a different map. */
1169
1170 object *more = op->more; 1158 if (object *more = op->more)
1171 1159 {
1172 /* We really need the caller to normalise coordinates - if
1173 * we set the map, that doesn't work if the location is within
1174 * a map and this is straddling an edge. So only if coordinate
1175 * is clear wrong do we normalise it.
1176 */
1177 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1178 more->map = get_map_from_coord (m, &more->x, &more->y);
1179 else if (!more->map)
1180 {
1181 /* For backwards compatibility - when not dealing with tiled maps,
1182 * more->map should always point to the parent.
1183 */
1184 more->map = m;
1185 }
1186
1187 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1160 if (!insert_ob_in_map (more, m, originator, flag))
1188 { 1161 {
1189 if (!op->head) 1162 if (!op->head)
1190 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1163 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1191 1164
1192 return 0; 1165 return 0;
… …
1197 1170
1198 /* Ideally, the caller figures this out. However, it complicates a lot 1171 /* Ideally, the caller figures this out. However, it complicates a lot
1199 * of areas of callers (eg, anything that uses find_free_spot would now 1172 * of areas of callers (eg, anything that uses find_free_spot would now
1200 * need extra work 1173 * need extra work
1201 */ 1174 */
1202 op->map = get_map_from_coord (m, &op->x, &op->y); 1175 if (!xy_normalise (m, op->x, op->y))
1203 x = op->x; 1176 return 0;
1204 y = op->y; 1177
1178 op->map = m;
1179 mapspace &ms = op->ms ();
1205 1180
1206 /* this has to be done after we translate the coordinates. 1181 /* this has to be done after we translate the coordinates.
1207 */ 1182 */
1208 if (op->nrof && !(flag & INS_NO_MERGE)) 1183 if (op->nrof && !(flag & INS_NO_MERGE))
1209 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1184 for (tmp = ms.bot; tmp; tmp = tmp->above)
1210 if (object::can_merge (op, tmp)) 1185 if (object::can_merge (op, tmp))
1211 { 1186 {
1212 op->nrof += tmp->nrof; 1187 op->nrof += tmp->nrof;
1213 tmp->destroy (); 1188 tmp->destroy ();
1214 } 1189 }
… …
1231 op->below = originator->below; 1206 op->below = originator->below;
1232 1207
1233 if (op->below) 1208 if (op->below)
1234 op->below->above = op; 1209 op->below->above = op;
1235 else 1210 else
1236 op->ms ().bot = op; 1211 ms.bot = op;
1237 1212
1238 /* since *below* originator, no need to update top */ 1213 /* since *below* originator, no need to update top */
1239 originator->below = op; 1214 originator->below = op;
1240 } 1215 }
1241 else 1216 else
1242 { 1217 {
1218 top = ms.bot;
1219
1243 /* If there are other objects, then */ 1220 /* If there are other objects, then */
1244 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1221 if ((!(flag & INS_MAP_LOAD)) && top)
1245 { 1222 {
1246 object *last = 0; 1223 object *last = 0;
1247 1224
1248 /* 1225 /*
1249 * If there are multiple objects on this space, we do some trickier handling. 1226 * If there are multiple objects on this space, we do some trickier handling.
… …
1255 * once we get to them. This reduces the need to traverse over all of 1232 * once we get to them. This reduces the need to traverse over all of
1256 * them when adding another one - this saves quite a bit of cpu time 1233 * them when adding another one - this saves quite a bit of cpu time
1257 * when lots of spells are cast in one area. Currently, it is presumed 1234 * when lots of spells are cast in one area. Currently, it is presumed
1258 * that flying non pickable objects are spell objects. 1235 * that flying non pickable objects are spell objects.
1259 */ 1236 */
1260 while (top) 1237 for (top = ms.bot; top; top = top->above)
1261 { 1238 {
1262 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1239 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1263 floor = top; 1240 floor = top;
1264 1241
1265 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1242 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1268 top = top->below; 1245 top = top->below;
1269 break; 1246 break;
1270 } 1247 }
1271 1248
1272 last = top; 1249 last = top;
1273 top = top->above;
1274 } 1250 }
1275 1251
1276 /* Don't want top to be NULL, so set it to the last valid object */ 1252 /* Don't want top to be NULL, so set it to the last valid object */
1277 top = last; 1253 top = last;
1278 1254
… …
1285 * Unless those objects are exits, type 66 1261 * Unless those objects are exits, type 66
1286 * If INS_ON_TOP is used, don't do this processing 1262 * If INS_ON_TOP is used, don't do this processing
1287 * Need to find the object that in fact blocks view, otherwise 1263 * Need to find the object that in fact blocks view, otherwise
1288 * stacking is a bit odd. 1264 * stacking is a bit odd.
1289 */ 1265 */
1290 if (!(flag & INS_ON_TOP) && 1266 if (!(flag & INS_ON_TOP)
1291 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1267 && ms.flags () & P_BLOCKSVIEW
1268 && (op->face && !op->face->visibility))
1292 { 1269 {
1293 for (last = top; last != floor; last = last->below) 1270 for (last = top; last != floor; last = last->below)
1294 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1271 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1295 break; 1272 break;
1273
1296 /* Check to see if we found the object that blocks view, 1274 /* Check to see if we found the object that blocks view,
1297 * and make sure we have a below pointer for it so that 1275 * and make sure we have a below pointer for it so that
1298 * we can get inserted below this one, which requires we 1276 * we can get inserted below this one, which requires we
1299 * set top to the object below us. 1277 * set top to the object below us.
1300 */ 1278 */
… …
1302 top = last->below; 1280 top = last->below;
1303 } 1281 }
1304 } /* If objects on this space */ 1282 } /* If objects on this space */
1305 1283
1306 if (flag & INS_MAP_LOAD) 1284 if (flag & INS_MAP_LOAD)
1307 top = GET_MAP_TOP (op->map, op->x, op->y); 1285 top = ms.top;
1308 1286
1309 if (flag & INS_ABOVE_FLOOR_ONLY) 1287 if (flag & INS_ABOVE_FLOOR_ONLY)
1310 top = floor; 1288 top = floor;
1311 1289
1312 /* Top is the object that our object (op) is going to get inserted above. 1290 /* Top is the object that our object (op) is going to get inserted above.
1313 */ 1291 */
1314 1292
1315 /* First object on this space */ 1293 /* First object on this space */
1316 if (!top) 1294 if (!top)
1317 { 1295 {
1318 op->above = GET_MAP_OB (op->map, op->x, op->y); 1296 op->above = ms.bot;
1319 1297
1320 if (op->above) 1298 if (op->above)
1321 op->above->below = op; 1299 op->above->below = op;
1322 1300
1323 op->below = 0; 1301 op->below = 0;
1324 op->ms ().bot = op; 1302 ms.bot = op;
1325 } 1303 }
1326 else 1304 else
1327 { /* get inserted into the stack above top */ 1305 { /* get inserted into the stack above top */
1328 op->above = top->above; 1306 op->above = top->above;
1329 1307
… …
1333 op->below = top; 1311 op->below = top;
1334 top->above = op; 1312 top->above = op;
1335 } 1313 }
1336 1314
1337 if (!op->above) 1315 if (!op->above)
1338 op->ms ().top = op; 1316 ms.top = op;
1339 } /* else not INS_BELOW_ORIGINATOR */ 1317 } /* else not INS_BELOW_ORIGINATOR */
1340 1318
1341 if (op->type == PLAYER) 1319 if (op->type == PLAYER)
1342 { 1320 {
1343 op->contr->do_los = 1; 1321 op->contr->do_los = 1;
… …
1349 1327
1350 /* If we have a floor, we know the player, if any, will be above 1328 /* If we have a floor, we know the player, if any, will be above
1351 * it, so save a few ticks and start from there. 1329 * it, so save a few ticks and start from there.
1352 */ 1330 */
1353 if (!(flag & INS_MAP_LOAD)) 1331 if (!(flag & INS_MAP_LOAD))
1354 if (object *pl = op->ms ().player ()) 1332 if (object *pl = ms.player ())
1355 if (pl->contr->ns) 1333 if (pl->contr->ns)
1356 pl->contr->ns->floorbox_update (); 1334 pl->contr->ns->floorbox_update ();
1357 1335
1358 /* If this object glows, it may affect lighting conditions that are 1336 /* If this object glows, it may affect lighting conditions that are
1359 * visible to others on this map. But update_all_los is really 1337 * visible to others on this map. But update_all_los is really
… …
2160 2138
2161 return 3; 2139 return 3;
2162} 2140}
2163 2141
2164/* 2142/*
2165 * absdir(int): Returns a number between 1 and 8, which represent
2166 * the "absolute" direction of a number (it actually takes care of
2167 * "overflow" in previous calculations of a direction).
2168 */
2169
2170int
2171absdir (int d)
2172{
2173 while (d < 1)
2174 d += 8;
2175
2176 while (d > 8)
2177 d -= 8;
2178
2179 return d;
2180}
2181
2182/*
2183 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2143 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2184 * between two directions (which are expected to be absolute (see absdir()) 2144 * between two directions (which are expected to be absolute (see absdir())
2185 */ 2145 */
2186
2187int 2146int
2188dirdiff (int dir1, int dir2) 2147dirdiff (int dir1, int dir2)
2189{ 2148{
2190 int d; 2149 int d;
2191 2150
… …
2607{ 2566{
2608 char flagdesc[512]; 2567 char flagdesc[512];
2609 char info2[256 * 4]; 2568 char info2[256 * 4];
2610 char *p = info; 2569 char *p = info;
2611 2570
2612 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2571 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2613 count, uuid.seq, 2572 count, uuid.seq,
2614 &name, 2573 &name,
2615 title ? "\",title:" : "", 2574 title ? "\",title:\"" : "",
2616 title ? (const char *)title : "", 2575 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type); 2576 flag_desc (flagdesc, 512), type);
2618 2577
2619 if (env) 2578 if (env)
2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2579 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2630{ 2589{
2631 static char info[256 * 4]; 2590 static char info[256 * 4];
2632 return debug_desc (info); 2591 return debug_desc (info);
2633} 2592}
2634 2593
2594const char *
2595object::debug_desc2 () const
2596{
2597 static char info[256 * 4];
2598 return debug_desc (info);
2599}
2600

Diff Legend

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