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