ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.116 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.121 by root, Sat Aug 25 22:19:26 2007 UTC

… …
383 if (!spaces) 383 if (!spaces)
384 return false; 384 return false;
385 385
386 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
387 { 387 {
388 int unique = 0; 388 bool unique = 0;
389
389 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
390 { 391 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 393
394 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
395 continue; 395 continue;
396 396
397 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 398 {
399 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
400 op->write (f); 400 op->write (f);
401 } 401 }
402 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 403 op->write (f);
404 } 404 }
405 } 405 }
406 406
407 coroapi::cede_to_tick (); 407 coroapi::cede_to_tick ();
… …
1224 vol += op->volume (); 1224 vol += op->volume ();
1225 1225
1226 return vol; 1226 return vol;
1227} 1227}
1228 1228
1229/* this updates the orig_map->tile_map[tile_num] value after finding 1229bool
1230 * the map. It also takes care of linking back the freshly found 1230maptile::tile_available (int dir, bool load)
1231 * maps tile_map values if it tiles back to this one. It returns
1232 * the value of orig_map->tile_map[tile_num].
1233 */
1234static inline maptile *
1235find_and_link (maptile *orig_map, int tile_num)
1236{ 1231{
1237 maptile *mp = orig_map->tile_map [tile_num]; 1232 if (!tile_path[dir])
1233 return 0;
1238 1234
1239 if (!mp) 1235 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1240 { 1236 return 1;
1241 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1242 1237
1243 if (!mp) 1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1244 { 1239 return 1;
1245 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1246 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1247 &orig_map->tile_path[tile_num], &orig_map->path);
1248 mp = new maptile (1, 1);
1249 mp->alloc ();
1250 mp->in_memory = MAP_IN_MEMORY;
1251 }
1252 }
1253 1240
1254 int dest_tile = (tile_num + 2) % 4;
1255
1256 orig_map->tile_map [tile_num] = mp;
1257
1258 // optimisation: back-link map to origin map if euclidean
1259 //TODO: non-euclidean maps MUST GO
1260 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1261 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1262
1263 return mp; 1241 return 0;
1264}
1265
1266static inline void
1267load_and_link (maptile *orig_map, int tile_num)
1268{
1269 find_and_link (orig_map, tile_num)->load_sync ();
1270} 1242}
1271 1243
1272/* this returns TRUE if the coordinates (x,y) are out of 1244/* this returns TRUE if the coordinates (x,y) are out of
1273 * map m. This function also takes into account any 1245 * map m. This function also takes into account any
1274 * tiling considerations, loading adjacant maps as needed. 1246 * tiling considerations, loading adjacant maps as needed.
… …
1287 if (!m) 1259 if (!m)
1288 return 0; 1260 return 0;
1289 1261
1290 if (x < 0) 1262 if (x < 0)
1291 { 1263 {
1292 if (!m->tile_path[3]) 1264 if (!m->tile_available (3))
1293 return 1; 1265 return 1;
1294 1266
1295 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1296 find_and_link (m, 3);
1297
1298 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1267 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1299 } 1268 }
1300 1269
1301 if (x >= m->width) 1270 if (x >= m->width)
1302 { 1271 {
1303 if (!m->tile_path[1]) 1272 if (!m->tile_available (1))
1304 return 1; 1273 return 1;
1305 1274
1306 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1307 find_and_link (m, 1);
1308
1309 return out_of_map (m->tile_map[1], x - m->width, y); 1275 return out_of_map (m->tile_map[1], x - m->width, y);
1310 } 1276 }
1311 1277
1312 if (y < 0) 1278 if (y < 0)
1313 { 1279 {
1314 if (!m->tile_path[0]) 1280 if (!m->tile_available (0))
1315 return 1; 1281 return 1;
1316 1282
1317 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1318 find_and_link (m, 0);
1319
1320 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1283 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1321 } 1284 }
1322 1285
1323 if (y >= m->height) 1286 if (y >= m->height)
1324 { 1287 {
1325 if (!m->tile_path[2]) 1288 if (!m->tile_available (2))
1326 return 1; 1289 return 1;
1327
1328 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1329 find_and_link (m, 2);
1330 1290
1331 return out_of_map (m->tile_map[2], x, y - m->height); 1291 return out_of_map (m->tile_map[2], x, y - m->height);
1332 } 1292 }
1333 1293
1334 /* Simple case - coordinates are within this local 1294 /* Simple case - coordinates are within this local
… …
1348maptile * 1308maptile *
1349maptile::xy_find (sint16 &x, sint16 &y) 1309maptile::xy_find (sint16 &x, sint16 &y)
1350{ 1310{
1351 if (x < 0) 1311 if (x < 0)
1352 { 1312 {
1353 if (!tile_path[3]) 1313 if (!tile_available (3))
1354 return 0; 1314 return 0;
1355 1315
1356 find_and_link (this, 3);
1357 x += tile_map[3]->width; 1316 x += tile_map[3]->width;
1358 return tile_map[3]->xy_find (x, y); 1317 return tile_map[3]->xy_find (x, y);
1359 } 1318 }
1360 1319
1361 if (x >= width) 1320 if (x >= width)
1362 { 1321 {
1363 if (!tile_path[1]) 1322 if (!tile_available (1))
1364 return 0; 1323 return 0;
1365 1324
1366 find_and_link (this, 1);
1367 x -= width; 1325 x -= width;
1368 return tile_map[1]->xy_find (x, y); 1326 return tile_map[1]->xy_find (x, y);
1369 } 1327 }
1370 1328
1371 if (y < 0) 1329 if (y < 0)
1372 { 1330 {
1373 if (!tile_path[0]) 1331 if (!tile_available (0))
1374 return 0; 1332 return 0;
1375 1333
1376 find_and_link (this, 0);
1377 y += tile_map[0]->height; 1334 y += tile_map[0]->height;
1378 return tile_map[0]->xy_find (x, y); 1335 return tile_map[0]->xy_find (x, y);
1379 } 1336 }
1380 1337
1381 if (y >= height) 1338 if (y >= height)
1382 { 1339 {
1383 if (!tile_path[2]) 1340 if (!tile_available (2))
1384 return 0; 1341 return 0;
1385 1342
1386 find_and_link (this, 2);
1387 y -= height; 1343 y -= height;
1388 return tile_map[2]->xy_find (x, y); 1344 return tile_map[2]->xy_find (x, y);
1389 } 1345 }
1390 1346
1391 /* Simple case - coordinates are within this local 1347 /* Simple case - coordinates are within this local
… …
1402adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1403{ 1359{
1404 if (!map1 || !map2) 1360 if (!map1 || !map2)
1405 return 0; 1361 return 0;
1406 1362
1407 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1363 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1408 //fix: compare paths instead (this is likely faster, too!) 1364 //fix: compare paths instead (this is likely faster, too!)
1409 if (map1 == map2) 1365 if (map1 == map2)
1410 { 1366 {
1411 *dx = 0; 1367 *dx = 0;
1412 *dy = 0; 1368 *dy = 0;

Diff Legend

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