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.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
… …
784 792
785 if (op->flag [FLAG_STARTEQUIP] 793 if (op->flag [FLAG_STARTEQUIP]
786 || op->flag [FLAG_NO_DROP] 794 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE 795 || op->type == RUNE
788 || op->type == TRAP 796 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE]) 797 || op->flag [FLAG_IS_A_TEMPLATE]
798 || op->flag [FLAG_DESTROY_ON_DEATH])
790 op->destroy (); 799 op->destroy ();
791 else 800 else
792 map->insert (op, x, y); 801 map->insert (op, x, y);
793 } 802 }
794 } 803 }
… …
802} 811}
803 812
804void 813void
805object::do_destroy () 814object::do_destroy ()
806{ 815{
816 attachable::do_destroy ();
817
807 if (flag [FLAG_IS_LINKED]) 818 if (flag [FLAG_IS_LINKED])
808 remove_button_link (this); 819 remove_button_link (this);
809 820
810 if (flag [FLAG_FRIENDLY]) 821 if (flag [FLAG_FRIENDLY])
811 remove_friendly_object (this); 822 remove_friendly_object (this);
812 823
813 if (!flag [FLAG_REMOVED]) 824 if (!flag [FLAG_REMOVED])
814 remove (); 825 remove ();
815 826
816 if (flag [FLAG_FREED]) 827 destroy_inv (true);
817 return;
818 828
819 set_speed (0); 829 deactivate ();
830 unlink ();
820 831
821 flag [FLAG_FREED] = 1; 832 flag [FLAG_FREED] = 1;
822
823 attachable::do_destroy ();
824
825 destroy_inv (true);
826 unlink ();
827 833
828 // hack to ensure that freed objects still have a valid map 834 // hack to ensure that freed objects still have a valid map
829 { 835 {
830 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
831 837
… …
896 * environment, the x and y coordinates will be updated to 902 * environment, the x and y coordinates will be updated to
897 * the previous environment. 903 * the previous environment.
898 * Beware: This function is called from the editor as well! 904 * Beware: This function is called from the editor as well!
899 */ 905 */
900void 906void
901object::remove () 907object::remove_slow ()
902{ 908{
903 object *tmp, *last = 0; 909 object *tmp, *last = 0;
904 object *otmp; 910 object *otmp;
905 911
906 if (QUERY_FLAG (this, FLAG_REMOVED)) 912 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
954 --map->players; 960 --map->players;
955 map->touch (); 961 map->touch ();
956 } 962 }
957 963
958 map->dirty = true; 964 map->dirty = true;
965 mapspace &ms = this->ms ();
959 966
960 /* link the object above us */ 967 /* link the object above us */
961 if (above) 968 if (above)
962 above->below = below; 969 above->below = below;
963 else 970 else
964 map->at (x, y).top = below; /* we were top, set new top */ 971 ms.top = below; /* we were top, set new top */
965 972
966 /* Relink the object below us, if there is one */ 973 /* Relink the object below us, if there is one */
967 if (below) 974 if (below)
968 below->above = above; 975 below->above = above;
969 else 976 else
… …
971 /* 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
972 * use translated coordinates in case some oddness with map tiling is 979 * use translated coordinates in case some oddness with map tiling is
973 * evident 980 * evident
974 */ 981 */
975 if (GET_MAP_OB (map, x, y) != this) 982 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); 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 ());
980 free (dump);
981 dump = dump_object (GET_MAP_OB (map, x, y));
982 LOG (llevError, "%s\n", dump);
983 free (dump);
984 }
985 984
986 map->at (x, y).bot = above; /* goes on above it. */ 985 ms.bot = above; /* goes on above it. */
987 } 986 }
988 987
989 above = 0; 988 above = 0;
990 below = 0; 989 below = 0;
991 990
992 if (map->in_memory == MAP_SAVING) 991 if (map->in_memory == MAP_SAVING)
993 return; 992 return;
994 993
995 int check_walk_off = !flag [FLAG_NO_APPLY]; 994 int check_walk_off = !flag [FLAG_NO_APPLY];
996 995
997 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 996 for (tmp = ms.bot; tmp; tmp = tmp->above)
998 { 997 {
999 /* 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
1000 * being removed. 999 * being removed.
1001 */ 1000 */
1002 1001
… …
1083 1082
1084 return 0; 1083 return 0;
1085} 1084}
1086 1085
1087/* 1086/*
1088 * 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
1089 * job preparing multi-part monsters 1088 * job preparing multi-part monsters.
1090 */ 1089 */
1091object * 1090object *
1092insert_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)
1093{ 1092{
1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1093 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1122 */ 1121 */
1123object * 1122object *
1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1123insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1125{ 1124{
1126 object *tmp, *top, *floor = NULL; 1125 object *tmp, *top, *floor = NULL;
1127 sint16 x, y;
1128 1126
1129 if (QUERY_FLAG (op, FLAG_FREED)) 1127 if (QUERY_FLAG (op, FLAG_FREED))
1130 { 1128 {
1131 LOG (llevError, "Trying to insert freed object!\n"); 1129 LOG (llevError, "Trying to insert freed object!\n");
1132 return NULL; 1130 return NULL;
1133 } 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 ();
1134 1137
1135 if (!m) 1138 if (!m)
1136 { 1139 {
1137 char *dump = dump_object (op); 1140 char *dump = dump_object (op);
1138 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);
… …
1153#endif 1156#endif
1154 free (dump); 1157 free (dump);
1155 return op; 1158 return op;
1156 } 1159 }
1157 1160
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; 1161 if (object *more = op->more)
1171 1162 {
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) 1163 if (!insert_ob_in_map (more, m, originator, flag))
1188 { 1164 {
1189 if (!op->head) 1165 if (!op->head)
1190 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");
1191 1167
1192 return 0; 1168 return 0;
… …
1197 1173
1198 /* Ideally, the caller figures this out. However, it complicates a lot 1174 /* 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 1175 * of areas of callers (eg, anything that uses find_free_spot would now
1200 * need extra work 1176 * need extra work
1201 */ 1177 */
1202 op->map = get_map_from_coord (m, &op->x, &op->y); 1178 if (!xy_normalise (m, op->x, op->y))
1203 x = op->x; 1179 return 0;
1204 y = op->y; 1180
1181 op->map = m;
1182 mapspace &ms = op->ms ();
1205 1183
1206 /* this has to be done after we translate the coordinates. 1184 /* this has to be done after we translate the coordinates.
1207 */ 1185 */
1208 if (op->nrof && !(flag & INS_NO_MERGE)) 1186 if (op->nrof && !(flag & INS_NO_MERGE))
1209 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1187 for (tmp = ms.bot; tmp; tmp = tmp->above)
1210 if (object::can_merge (op, tmp)) 1188 if (object::can_merge (op, tmp))
1211 { 1189 {
1212 op->nrof += tmp->nrof; 1190 op->nrof += tmp->nrof;
1213 tmp->destroy (); 1191 tmp->destroy ();
1214 } 1192 }
… …
1231 op->below = originator->below; 1209 op->below = originator->below;
1232 1210
1233 if (op->below) 1211 if (op->below)
1234 op->below->above = op; 1212 op->below->above = op;
1235 else 1213 else
1236 op->ms ().bot = op; 1214 ms.bot = op;
1237 1215
1238 /* since *below* originator, no need to update top */ 1216 /* since *below* originator, no need to update top */
1239 originator->below = op; 1217 originator->below = op;
1240 } 1218 }
1241 else 1219 else
1242 { 1220 {
1221 top = ms.bot;
1222
1243 /* If there are other objects, then */ 1223 /* If there are other objects, then */
1244 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1224 if ((!(flag & INS_MAP_LOAD)) && top)
1245 { 1225 {
1246 object *last = 0; 1226 object *last = 0;
1247 1227
1248 /* 1228 /*
1249 * 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.
… …
1255 * 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
1256 * 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
1257 * 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
1258 * that flying non pickable objects are spell objects. 1238 * that flying non pickable objects are spell objects.
1259 */ 1239 */
1260 while (top) 1240 for (top = ms.bot; top; top = top->above)
1261 { 1241 {
1262 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))
1263 floor = top; 1243 floor = top;
1264 1244
1265 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))
… …
1268 top = top->below; 1248 top = top->below;
1269 break; 1249 break;
1270 } 1250 }
1271 1251
1272 last = top; 1252 last = top;
1273 top = top->above;
1274 } 1253 }
1275 1254
1276 /* 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 */
1277 top = last; 1256 top = last;
1278 1257
… …
1285 * Unless those objects are exits, type 66 1264 * Unless those objects are exits, type 66
1286 * If INS_ON_TOP is used, don't do this processing 1265 * If INS_ON_TOP is used, don't do this processing
1287 * Need to find the object that in fact blocks view, otherwise 1266 * Need to find the object that in fact blocks view, otherwise
1288 * stacking is a bit odd. 1267 * stacking is a bit odd.
1289 */ 1268 */
1290 if (!(flag & INS_ON_TOP) && 1269 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)) 1270 && ms.flags () & P_BLOCKSVIEW
1271 && (op->face && !op->face->visibility))
1292 { 1272 {
1293 for (last = top; last != floor; last = last->below) 1273 for (last = top; last != floor; last = last->below)
1294 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1274 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1295 break; 1275 break;
1276
1296 /* Check to see if we found the object that blocks view, 1277 /* Check to see if we found the object that blocks view,
1297 * 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
1298 * we can get inserted below this one, which requires we 1279 * we can get inserted below this one, which requires we
1299 * set top to the object below us. 1280 * set top to the object below us.
1300 */ 1281 */
… …
1302 top = last->below; 1283 top = last->below;
1303 } 1284 }
1304 } /* If objects on this space */ 1285 } /* If objects on this space */
1305 1286
1306 if (flag & INS_MAP_LOAD) 1287 if (flag & INS_MAP_LOAD)
1307 top = GET_MAP_TOP (op->map, op->x, op->y); 1288 top = ms.top;
1308 1289
1309 if (flag & INS_ABOVE_FLOOR_ONLY) 1290 if (flag & INS_ABOVE_FLOOR_ONLY)
1310 top = floor; 1291 top = floor;
1311 1292
1312 /* 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.
1313 */ 1294 */
1314 1295
1315 /* First object on this space */ 1296 /* First object on this space */
1316 if (!top) 1297 if (!top)
1317 { 1298 {
1318 op->above = GET_MAP_OB (op->map, op->x, op->y); 1299 op->above = ms.bot;
1319 1300
1320 if (op->above) 1301 if (op->above)
1321 op->above->below = op; 1302 op->above->below = op;
1322 1303
1323 op->below = 0; 1304 op->below = 0;
1324 op->ms ().bot = op; 1305 ms.bot = op;
1325 } 1306 }
1326 else 1307 else
1327 { /* get inserted into the stack above top */ 1308 { /* get inserted into the stack above top */
1328 op->above = top->above; 1309 op->above = top->above;
1329 1310
… …
1333 op->below = top; 1314 op->below = top;
1334 top->above = op; 1315 top->above = op;
1335 } 1316 }
1336 1317
1337 if (!op->above) 1318 if (!op->above)
1338 op->ms ().top = op; 1319 ms.top = op;
1339 } /* else not INS_BELOW_ORIGINATOR */ 1320 } /* else not INS_BELOW_ORIGINATOR */
1340 1321
1341 if (op->type == PLAYER) 1322 if (op->type == PLAYER)
1342 { 1323 {
1343 op->contr->do_los = 1; 1324 op->contr->do_los = 1;
… …
1349 1330
1350 /* 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
1351 * it, so save a few ticks and start from there. 1332 * it, so save a few ticks and start from there.
1352 */ 1333 */
1353 if (!(flag & INS_MAP_LOAD)) 1334 if (!(flag & INS_MAP_LOAD))
1354 if (object *pl = op->ms ().player ()) 1335 if (object *pl = ms.player ())
1355 if (pl->contr->ns) 1336 if (pl->contr->ns)
1356 pl->contr->ns->floorbox_update (); 1337 pl->contr->ns->floorbox_update ();
1357 1338
1358 /* If this object glows, it may affect lighting conditions that are 1339 /* If this object glows, it may affect lighting conditions that are
1359 * 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
… …
2160 2141
2161 return 3; 2142 return 3;
2162} 2143}
2163 2144
2164/* 2145/*
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 2146 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2184 * between two directions (which are expected to be absolute (see absdir()) 2147 * between two directions (which are expected to be absolute (see absdir())
2185 */ 2148 */
2186
2187int 2149int
2188dirdiff (int dir1, int dir2) 2150dirdiff (int dir1, int dir2)
2189{ 2151{
2190 int d; 2152 int d;
2191 2153
… …
2607{ 2569{
2608 char flagdesc[512]; 2570 char flagdesc[512];
2609 char info2[256 * 4]; 2571 char info2[256 * 4];
2610 char *p = info; 2572 char *p = info;
2611 2573
2612 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}",
2613 count, uuid.seq, 2575 count, uuid.seq,
2614 &name, 2576 &name,
2615 title ? "\",title:" : "", 2577 title ? "\",title:\"" : "",
2616 title ? (const char *)title : "", 2578 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type); 2579 flag_desc (flagdesc, 512), type);
2618 2580
2619 if (env) 2581 if (env)
2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2582 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2630{ 2592{
2631 static char info[256 * 4]; 2593 static char info[256 * 4];
2632 return debug_desc (info); 2594 return debug_desc (info);
2633} 2595}
2634 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