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.112 by root, Mon Jan 8 14:11:04 2007 UTC vs.
Revision 1.121 by root, Tue Jan 23 03:17:55 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>
… …
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;
… …
660 660
661 if (op->more) 661 if (op->more)
662 update_object (op->more, action); 662 update_object (op->more, action);
663} 663}
664 664
665object *object::first;
666
667object::object () 665object::object ()
668{ 666{
669 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
670 668
671 expmul = 1.0; 669 expmul = 1.0;
672 face = blank_face; 670 face = blank_face;
673} 671}
674 672
675object::~object () 673object::~object ()
676{ 674{
675 unlink ();
676
677 free_key_values (this); 677 free_key_values (this);
678} 678}
679 679
680static int object_count; 680static int object_count;
681 681
… …
689 objects.insert (this); 689 objects.insert (this);
690} 690}
691 691
692void object::unlink () 692void object::unlink ()
693{ 693{
694 assert (index);//D 694 if (!index)
695 return;
696
695 objects.erase (this); 697 objects.erase (this);
696 refcnt_dec (); 698 refcnt_dec ();
697} 699}
698 700
699void 701void
… …
901 * environment, the x and y coordinates will be updated to 903 * environment, the x and y coordinates will be updated to
902 * the previous environment. 904 * the previous environment.
903 * Beware: This function is called from the editor as well! 905 * Beware: This function is called from the editor as well!
904 */ 906 */
905void 907void
906object::remove () 908object::remove_slow ()
907{ 909{
908 object *tmp, *last = 0; 910 object *tmp, *last = 0;
909 object *otmp; 911 object *otmp;
910 912
911 if (QUERY_FLAG (this, FLAG_REMOVED)) 913 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
959 --map->players; 961 --map->players;
960 map->touch (); 962 map->touch ();
961 } 963 }
962 964
963 map->dirty = true; 965 map->dirty = true;
966 mapspace &ms = this->ms ();
964 967
965 /* link the object above us */ 968 /* link the object above us */
966 if (above) 969 if (above)
967 above->below = below; 970 above->below = below;
968 else 971 else
969 map->at (x, y).top = below; /* we were top, set new top */ 972 ms.top = below; /* we were top, set new top */
970 973
971 /* Relink the object below us, if there is one */ 974 /* Relink the object below us, if there is one */
972 if (below) 975 if (below)
973 below->above = above; 976 below->above = above;
974 else 977 else
… …
976 /* Nothing below, which means we need to relink map object for this space 979 /* Nothing below, which means we need to relink map object for this space
977 * use translated coordinates in case some oddness with map tiling is 980 * use translated coordinates in case some oddness with map tiling is
978 * evident 981 * evident
979 */ 982 */
980 if (GET_MAP_OB (map, x, y) != this) 983 if (GET_MAP_OB (map, x, y) != this)
981 {
982 char *dump = dump_object (this);
983 LOG (llevError,
984 "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); 984 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 ());
985 free (dump);
986 dump = dump_object (GET_MAP_OB (map, x, y));
987 LOG (llevError, "%s\n", dump);
988 free (dump);
989 }
990 985
991 map->at (x, y).bot = above; /* goes on above it. */ 986 ms.bot = above; /* goes on above it. */
992 } 987 }
993 988
994 above = 0; 989 above = 0;
995 below = 0; 990 below = 0;
996 991
997 if (map->in_memory == MAP_SAVING) 992 if (map->in_memory == MAP_SAVING)
998 return; 993 return;
999 994
1000 int check_walk_off = !flag [FLAG_NO_APPLY]; 995 int check_walk_off = !flag [FLAG_NO_APPLY];
1001 996
1002 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 997 for (tmp = ms.bot; tmp; tmp = tmp->above)
1003 { 998 {
1004 /* No point updating the players look faces if he is the object 999 /* No point updating the players look faces if he is the object
1005 * being removed. 1000 * being removed.
1006 */ 1001 */
1007 1002
… …
1088 1083
1089 return 0; 1084 return 0;
1090} 1085}
1091 1086
1092/* 1087/*
1093 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1088 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1094 * job preparing multi-part monsters 1089 * job preparing multi-part monsters.
1095 */ 1090 */
1096object * 1091object *
1097insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1098{ 1093{
1099 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1127 */ 1122 */
1128object * 1123object *
1129insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1130{ 1125{
1131 object *tmp, *top, *floor = NULL; 1126 object *tmp, *top, *floor = NULL;
1132 sint16 x, y;
1133 1127
1134 if (QUERY_FLAG (op, FLAG_FREED)) 1128 if (QUERY_FLAG (op, FLAG_FREED))
1135 { 1129 {
1136 LOG (llevError, "Trying to insert freed object!\n"); 1130 LOG (llevError, "Trying to insert freed object!\n");
1137 return NULL; 1131 return NULL;
1138 } 1132 }
1133
1134 if (!QUERY_FLAG (op, FLAG_REMOVED))
1135 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1136
1137 op->remove ();
1139 1138
1140 if (!m) 1139 if (!m)
1141 { 1140 {
1142 char *dump = dump_object (op); 1141 char *dump = dump_object (op);
1143 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1142 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1158#endif 1157#endif
1159 free (dump); 1158 free (dump);
1160 return op; 1159 return op;
1161 } 1160 }
1162 1161
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 {
1165 char *dump = dump_object (op);
1166 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1167 free (dump);
1168 return op;
1169 }
1170
1171 if (op->more)
1172 {
1173 /* The part may be on a different map. */
1174
1175 object *more = op->more; 1162 if (object *more = op->more)
1176 1163 {
1177 /* We really need the caller to normalise coordinates - if
1178 * we set the map, that doesn't work if the location is within
1179 * a map and this is straddling an edge. So only if coordinate
1180 * is clear wrong do we normalise it.
1181 */
1182 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1183 more->map = get_map_from_coord (m, &more->x, &more->y);
1184 else if (!more->map)
1185 {
1186 /* For backwards compatibility - when not dealing with tiled maps,
1187 * more->map should always point to the parent.
1188 */
1189 more->map = m;
1190 }
1191
1192 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1164 if (!insert_ob_in_map (more, m, originator, flag))
1193 { 1165 {
1194 if (!op->head) 1166 if (!op->head)
1195 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1167 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1196 1168
1197 return 0; 1169 return 0;
… …
1202 1174
1203 /* Ideally, the caller figures this out. However, it complicates a lot 1175 /* Ideally, the caller figures this out. However, it complicates a lot
1204 * of areas of callers (eg, anything that uses find_free_spot would now 1176 * of areas of callers (eg, anything that uses find_free_spot would now
1205 * need extra work 1177 * need extra work
1206 */ 1178 */
1207 op->map = get_map_from_coord (m, &op->x, &op->y); 1179 if (!xy_normalise (m, op->x, op->y))
1208 x = op->x; 1180 return 0;
1209 y = op->y; 1181
1182 op->map = m;
1183 mapspace &ms = op->ms ();
1210 1184
1211 /* this has to be done after we translate the coordinates. 1185 /* this has to be done after we translate the coordinates.
1212 */ 1186 */
1213 if (op->nrof && !(flag & INS_NO_MERGE)) 1187 if (op->nrof && !(flag & INS_NO_MERGE))
1214 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1188 for (tmp = ms.bot; tmp; tmp = tmp->above)
1215 if (object::can_merge (op, tmp)) 1189 if (object::can_merge (op, tmp))
1216 { 1190 {
1217 op->nrof += tmp->nrof; 1191 op->nrof += tmp->nrof;
1218 tmp->destroy (); 1192 tmp->destroy ();
1219 } 1193 }
… …
1236 op->below = originator->below; 1210 op->below = originator->below;
1237 1211
1238 if (op->below) 1212 if (op->below)
1239 op->below->above = op; 1213 op->below->above = op;
1240 else 1214 else
1241 op->ms ().bot = op; 1215 ms.bot = op;
1242 1216
1243 /* since *below* originator, no need to update top */ 1217 /* since *below* originator, no need to update top */
1244 originator->below = op; 1218 originator->below = op;
1245 } 1219 }
1246 else 1220 else
1247 { 1221 {
1222 top = ms.bot;
1223
1248 /* If there are other objects, then */ 1224 /* If there are other objects, then */
1249 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1225 if ((!(flag & INS_MAP_LOAD)) && top)
1250 { 1226 {
1251 object *last = 0; 1227 object *last = 0;
1252 1228
1253 /* 1229 /*
1254 * If there are multiple objects on this space, we do some trickier handling. 1230 * If there are multiple objects on this space, we do some trickier handling.
… …
1260 * once we get to them. This reduces the need to traverse over all of 1236 * once we get to them. This reduces the need to traverse over all of
1261 * them when adding another one - this saves quite a bit of cpu time 1237 * them when adding another one - this saves quite a bit of cpu time
1262 * when lots of spells are cast in one area. Currently, it is presumed 1238 * when lots of spells are cast in one area. Currently, it is presumed
1263 * that flying non pickable objects are spell objects. 1239 * that flying non pickable objects are spell objects.
1264 */ 1240 */
1265 while (top) 1241 for (top = ms.bot; top; top = top->above)
1266 { 1242 {
1267 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1243 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1268 floor = top; 1244 floor = top;
1269 1245
1270 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1246 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1273 top = top->below; 1249 top = top->below;
1274 break; 1250 break;
1275 } 1251 }
1276 1252
1277 last = top; 1253 last = top;
1278 top = top->above;
1279 } 1254 }
1280 1255
1281 /* Don't want top to be NULL, so set it to the last valid object */ 1256 /* Don't want top to be NULL, so set it to the last valid object */
1282 top = last; 1257 top = last;
1283 1258
… …
1290 * Unless those objects are exits, type 66 1265 * Unless those objects are exits, type 66
1291 * If INS_ON_TOP is used, don't do this processing 1266 * If INS_ON_TOP is used, don't do this processing
1292 * Need to find the object that in fact blocks view, otherwise 1267 * Need to find the object that in fact blocks view, otherwise
1293 * stacking is a bit odd. 1268 * stacking is a bit odd.
1294 */ 1269 */
1295 if (!(flag & INS_ON_TOP) && 1270 if (!(flag & INS_ON_TOP)
1296 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1271 && ms.flags () & P_BLOCKSVIEW
1272 && (op->face && !op->face->visibility))
1297 { 1273 {
1298 for (last = top; last != floor; last = last->below) 1274 for (last = top; last != floor; last = last->below)
1299 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1275 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1300 break; 1276 break;
1277
1301 /* Check to see if we found the object that blocks view, 1278 /* Check to see if we found the object that blocks view,
1302 * and make sure we have a below pointer for it so that 1279 * and make sure we have a below pointer for it so that
1303 * we can get inserted below this one, which requires we 1280 * we can get inserted below this one, which requires we
1304 * set top to the object below us. 1281 * set top to the object below us.
1305 */ 1282 */
… …
1307 top = last->below; 1284 top = last->below;
1308 } 1285 }
1309 } /* If objects on this space */ 1286 } /* If objects on this space */
1310 1287
1311 if (flag & INS_MAP_LOAD) 1288 if (flag & INS_MAP_LOAD)
1312 top = GET_MAP_TOP (op->map, op->x, op->y); 1289 top = ms.top;
1313 1290
1314 if (flag & INS_ABOVE_FLOOR_ONLY) 1291 if (flag & INS_ABOVE_FLOOR_ONLY)
1315 top = floor; 1292 top = floor;
1316 1293
1317 /* Top is the object that our object (op) is going to get inserted above. 1294 /* Top is the object that our object (op) is going to get inserted above.
1318 */ 1295 */
1319 1296
1320 /* First object on this space */ 1297 /* First object on this space */
1321 if (!top) 1298 if (!top)
1322 { 1299 {
1323 op->above = GET_MAP_OB (op->map, op->x, op->y); 1300 op->above = ms.bot;
1324 1301
1325 if (op->above) 1302 if (op->above)
1326 op->above->below = op; 1303 op->above->below = op;
1327 1304
1328 op->below = 0; 1305 op->below = 0;
1329 op->ms ().bot = op; 1306 ms.bot = op;
1330 } 1307 }
1331 else 1308 else
1332 { /* get inserted into the stack above top */ 1309 { /* get inserted into the stack above top */
1333 op->above = top->above; 1310 op->above = top->above;
1334 1311
… …
1338 op->below = top; 1315 op->below = top;
1339 top->above = op; 1316 top->above = op;
1340 } 1317 }
1341 1318
1342 if (!op->above) 1319 if (!op->above)
1343 op->ms ().top = op; 1320 ms.top = op;
1344 } /* else not INS_BELOW_ORIGINATOR */ 1321 } /* else not INS_BELOW_ORIGINATOR */
1345 1322
1346 if (op->type == PLAYER) 1323 if (op->type == PLAYER)
1347 { 1324 {
1348 op->contr->do_los = 1; 1325 op->contr->do_los = 1;
… …
1354 1331
1355 /* If we have a floor, we know the player, if any, will be above 1332 /* If we have a floor, we know the player, if any, will be above
1356 * it, so save a few ticks and start from there. 1333 * it, so save a few ticks and start from there.
1357 */ 1334 */
1358 if (!(flag & INS_MAP_LOAD)) 1335 if (!(flag & INS_MAP_LOAD))
1359 if (object *pl = op->ms ().player ()) 1336 if (object *pl = ms.player ())
1360 if (pl->contr->ns) 1337 if (pl->contr->ns)
1361 pl->contr->ns->floorbox_update (); 1338 pl->contr->ns->floorbox_update ();
1362 1339
1363 /* If this object glows, it may affect lighting conditions that are 1340 /* If this object glows, it may affect lighting conditions that are
1364 * visible to others on this map. But update_all_los is really 1341 * visible to others on this map. But update_all_los is really
… …
1773 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1750 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1774 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1751 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1775 { 1752 {
1776 1753
1777 float 1754 float
1778 diff = tmp->move_slow_penalty * FABS (op->speed); 1755 diff = tmp->move_slow_penalty * fabs (op->speed);
1779 1756
1780 if (op->type == PLAYER) 1757 if (op->type == PLAYER)
1781 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1758 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1782 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1759 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1783 diff /= 4.0; 1760 diff /= 4.0;
… …
2165 2142
2166 return 3; 2143 return 3;
2167} 2144}
2168 2145
2169/* 2146/*
2170 * absdir(int): Returns a number between 1 and 8, which represent
2171 * the "absolute" direction of a number (it actually takes care of
2172 * "overflow" in previous calculations of a direction).
2173 */
2174
2175int
2176absdir (int d)
2177{
2178 while (d < 1)
2179 d += 8;
2180
2181 while (d > 8)
2182 d -= 8;
2183
2184 return d;
2185}
2186
2187/*
2188 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2147 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2189 * between two directions (which are expected to be absolute (see absdir()) 2148 * between two directions (which are expected to be absolute (see absdir())
2190 */ 2149 */
2191
2192int 2150int
2193dirdiff (int dir1, int dir2) 2151dirdiff (int dir1, int dir2)
2194{ 2152{
2195 int d; 2153 int d;
2196 2154
… …
2612{ 2570{
2613 char flagdesc[512]; 2571 char flagdesc[512];
2614 char info2[256 * 4]; 2572 char info2[256 * 4];
2615 char *p = info; 2573 char *p = info;
2616 2574
2617 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2575 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2618 count, uuid.seq, 2576 count, uuid.seq,
2619 &name, 2577 &name,
2620 title ? "\",title:" : "", 2578 title ? "\",title:\"" : "",
2621 title ? (const char *)title : "", 2579 title ? (const char *)title : "",
2622 flag_desc (flagdesc, 512), type); 2580 flag_desc (flagdesc, 512), type);
2623 2581
2624 if (env) 2582 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2583 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2635{ 2593{
2636 static char info[256 * 4]; 2594 static char info[256 * 4];
2637 return debug_desc (info); 2595 return debug_desc (info);
2638} 2596}
2639 2597
2598const char *
2599object::debug_desc2 () const
2600{
2601 static char info[256 * 4];
2602 return debug_desc (info);
2603}
2604

Diff Legend

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