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.191 by root, Sun Apr 18 05:57:03 2010 UTC vs.
Revision 1.206 by root, Wed May 4 16:12:15 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
77 /* Make sure the coordinates are valid - they should be, as caller should 77 /* Make sure the coordinates are valid - they should be, as caller should
78 * have already checked this. 78 * have already checked this.
79 */ 79 */
80 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
81 { 81 {
82 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
83 return 1; 83 return 1;
84 } 84 }
85 85
86 mapspace &ms = m->at (sx, sy); 86 mapspace &ms = m->at (sx, sy);
87 87
… …
90 90
91 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
92 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
93 * things we need to do for players. 93 * things we need to do for players.
94 */ 94 */
95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
96 return 0; 96 return 0;
97 97
98 /* if there isn't anything alive on this space, and this space isn't 98 /* if there isn't anything alive on this space, and this space isn't
99 * otherwise blocked, we can return now. Only if there is a living 99 * otherwise blocked, we can return now. Only if there is a living
100 * creature do we need to investigate if it is part of this creature 100 * creature do we need to investigate if it is part of this creature
… …
311 case KW_arch: 311 case KW_arch:
312 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
313 { 313 {
314 // TODO: why? 314 // TODO: why?
315 if (op->inv) 315 if (op->inv)
316 {
317 op->carrying = 0;
316 op->update_weight (); 318 op->update_weight ();
319 }
317 320
318 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
319 { 322 {
320 // we insert manually because 323 // we insert manually because
321 // a) its way faster 324 // a) its way faster
… …
358} 361}
359 362
360void 363void
361maptile::activate () 364maptile::activate ()
362{ 365{
363 if (spaces) 366 if (state != MAP_INACTIVE)
367 return;
368
364 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
365 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
366 op->activate_recursive (); 371 op->activate_recursive ();
372
373 state = MAP_ACTIVE;
367} 374}
368 375
369void 376void
370maptile::deactivate () 377maptile::deactivate ()
371{ 378{
372 if (spaces) 379 if (state != MAP_ACTIVE)
380 return;
381
373 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
374 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
375 op->deactivate_recursive (); 384 op->deactivate_recursive ();
385
386 state = MAP_INACTIVE;
376} 387}
377 388
378bool 389bool
379maptile::_save_objects (object_freezer &f, int flags) 390maptile::_save_objects (object_freezer &f, int flags)
380{ 391{
… …
424} 435}
425 436
426void 437void
427maptile::init () 438maptile::init ()
428{ 439{
429 in_memory = MAP_SWAPPED; 440 state = MAP_SWAPPED;
430 441
431 /* The maps used to pick up default x and y values from the 442 /* The maps used to pick up default x and y values from the
432 * map archetype. Mimic that behaviour. 443 * map archetype. Mimic that behaviour.
433 */ 444 */
434 width = 16; 445 width = 16;
… …
559 * the map (or something equivilent) into output_string. */ 570 * the map (or something equivilent) into output_string. */
560static const char * 571static const char *
561print_shop_string (maptile *m) 572print_shop_string (maptile *m)
562{ 573{
563 static dynbuf_text buf; buf.clear (); 574 static dynbuf_text buf; buf.clear ();
575 bool first = true;
564 576
565 for (int i = 0; i < m->shopitems[0].index; i++) 577 for (int i = 0; i < m->shopitems[0].index; i++)
566 { 578 {
579 if (!first)
580 buf << ';';
581
582 first = false;
583
567 if (m->shopitems[i].typenum) 584 if (m->shopitems[i].typenum)
568 { 585 {
569 if (m->shopitems[i].strength) 586 if (m->shopitems[i].strength)
570 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 587 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
571 else 588 else
572 buf.printf ("%s;", m->shopitems[i].name); 589 buf.printf ("%s", m->shopitems[i].name);
573 } 590 }
574 else 591 else
575 { 592 {
576 if (m->shopitems[i].strength) 593 if (m->shopitems[i].strength)
577 buf.printf ("*:%d;", m->shopitems[i].strength); 594 buf.printf ("*:%d", m->shopitems[i].strength);
578 else 595 else
579 buf.printf ("*"); 596 buf.printf ("*");
580 } 597 }
581 } 598 }
582 599
… …
605 { 622 {
606 case KW_msg: 623 case KW_msg:
607 thawer.get_ml (KW_endmsg, msg); 624 thawer.get_ml (KW_endmsg, msg);
608 break; 625 break;
609 626
610 case KW_lore: // CF+ extension 627 case KW_lore: // deliantra extension
611 thawer.get_ml (KW_endlore, maplore); 628 thawer.get_ml (KW_endlore, maplore);
612 break; 629 break;
613 630
614 case KW_maplore: 631 case KW_maplore:
615 thawer.get_ml (KW_endmaplore, maplore); 632 thawer.get_ml (KW_endmaplore, maplore);
… …
638 case KW_per_player: thawer.get (per_player); break; 655 case KW_per_player: thawer.get (per_player); break;
639 case KW_per_party: thawer.get (per_party); break; 656 case KW_per_party: thawer.get (per_party); break;
640 case KW_no_reset: thawer.get (no_reset); break; 657 case KW_no_reset: thawer.get (no_reset); break;
641 case KW_no_drop: thawer.get (no_drop); break; 658 case KW_no_drop: thawer.get (no_drop); break;
642 659
643 case KW_region: default_region = region::find (thawer.get_str ()); break; 660 case KW_region: thawer.get (default_region); break;
644 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 661 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
645 662
646 // old names new names 663 // old names new names
647 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 664 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
648 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 665 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
656 673
657 case KW_tile_path_1: thawer.get (tile_path [0]); break; 674 case KW_tile_path_1: thawer.get (tile_path [0]); break;
658 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
659 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
660 case KW_tile_path_4: thawer.get (tile_path [3]); break; 677 case KW_tile_path_4: thawer.get (tile_path [3]); break;
678 case KW_tile_path_5: thawer.get (tile_path [4]); break;
679 case KW_tile_path_6: thawer.get (tile_path [5]); break;
661 680
662 case KW_ERROR: 681 case KW_ERROR:
663 set_key_text (thawer.kw_str, thawer.value); 682 set_key_text (thawer.kw_str, thawer.value);
664 break; 683 break;
665 684
… …
748 767
749 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 768 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
750 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 769 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
751 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 770 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
752 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 771 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
772 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
773 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
753 774
754 freezer.put (this); 775 freezer.put (this);
755 freezer.put (KW(end)); 776 freezer.put (KW(end));
756 777
757 return true; 778 return true;
… …
814 msg = 0; 835 msg = 0;
815 maplore = 0; 836 maplore = 0;
816 shoprace = 0; 837 shoprace = 0;
817 delete [] shopitems, shopitems = 0; 838 delete [] shopitems, shopitems = 0;
818 839
819 for (int i = 0; i < 4; i++) 840 for (int i = 0; i < TILE_NUM; i++)
820 tile_path [i] = 0; 841 tile_path [i] = 0;
821} 842}
822 843
823maptile::~maptile () 844maptile::~maptile ()
824{ 845{
… …
831 /* We need to look through all the maps and see if any maps 852 /* We need to look through all the maps and see if any maps
832 * are pointing at this one for tiling information. Since 853 * are pointing at this one for tiling information. Since
833 * tiling can be asymetric, we just can not look to see which 854 * tiling can be asymetric, we just can not look to see which
834 * maps this map tiles with and clears those. 855 * maps this map tiles with and clears those.
835 */ 856 */
836 for (int i = 0; i < 4; i++) 857 for (int i = 0; i < TILE_NUM; i++)
837 if (tile_map[i] == m) 858 if (tile_map[i] == m)
838 tile_map[i] = 0; 859 tile_map[i] = 0;
839} 860}
840 861
841void 862void
… …
1184maptile * 1205maptile *
1185maptile::tile_available (int dir, bool load) 1206maptile::tile_available (int dir, bool load)
1186{ 1207{
1187 if (tile_path[dir]) 1208 if (tile_path[dir])
1188 { 1209 {
1210 // map is there and we don't need to load it OR it's loaded => return what we have
1189 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1211 if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
1190 return tile_map[dir]; 1212 return tile_map[dir];
1191 1213
1214 // well, try to locate it then, if possible - maybe it's there already
1192 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1215 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1193 return tile_map[dir]; 1216 return tile_map[dir];
1194 } 1217 }
1195 1218
1196 return 0; 1219 return 0;
… …
1308/** 1331/**
1309 * Return whether map2 is adjacent to map1. If so, store the distance from 1332 * Return whether map2 is adjacent to map1. If so, store the distance from
1310 * map1 to map2 in dx/dy. 1333 * map1 to map2 in dx/dy.
1311 */ 1334 */
1312int 1335int
1313adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1336adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1314{ 1337{
1315 if (!map1 || !map2) 1338 if (!map1 || !map2)
1316 return 0; 1339 return 0;
1317 1340
1318 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1341 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1320 if (map1 == map2) 1343 if (map1 == map2)
1321 { 1344 {
1322 *dx = 0; 1345 *dx = 0;
1323 *dy = 0; 1346 *dy = 0;
1324 } 1347 }
1325 else if (map1->tile_map[0] == map2) 1348 else if (map1->tile_available (TILE_NORTH, false) == map2)
1326 { /* up */ 1349 {
1327 *dx = 0; 1350 *dx = 0;
1328 *dy = -map2->height; 1351 *dy = -map2->height;
1329 } 1352 }
1330 else if (map1->tile_map[1] == map2) 1353 else if (map1->tile_available (TILE_EAST , false) == map2)
1331 { /* right */ 1354 {
1332 *dx = map1->width; 1355 *dx = map1->width;
1333 *dy = 0; 1356 *dy = 0;
1334 } 1357 }
1335 else if (map1->tile_map[2] == map2) 1358 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1336 { /* down */ 1359 {
1337 *dx = 0; 1360 *dx = 0;
1338 *dy = map1->height; 1361 *dy = map1->height;
1339 } 1362 }
1340 else if (map1->tile_map[3] == map2) 1363 else if (map1->tile_available (TILE_WEST , false) == map2)
1341 { /* left */ 1364 {
1342 *dx = -map2->width; 1365 *dx = -map2->width;
1343 *dy = 0; 1366 *dy = 0;
1344 } 1367 }
1345 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1368 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1346 { /* up right */ 1369 { /* up right */
1347 *dx = map1->tile_map[0]->width; 1370 *dx = +map1->tile_map[TILE_NORTH]->width;
1348 *dy = -map1->tile_map[0]->height; 1371 *dy = -map1->tile_map[TILE_NORTH]->height;
1349 } 1372 }
1350 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1373 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1351 { /* up left */ 1374 { /* up left */
1352 *dx = -map2->width; 1375 *dx = -map2->width;
1353 *dy = -map1->tile_map[0]->height; 1376 *dy = -map1->tile_map[TILE_NORTH]->height;
1354 } 1377 }
1355 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1378 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1356 { /* right up */ 1379 { /* right up */
1357 *dx = map1->width; 1380 *dx = +map1->width;
1358 *dy = -map2->height; 1381 *dy = -map2->height;
1359 } 1382 }
1360 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1383 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1361 { /* right down */ 1384 { /* right down */
1362 *dx = map1->width; 1385 *dx = +map1->width;
1363 *dy = map1->tile_map[1]->height; 1386 *dy = +map1->tile_map[TILE_EAST]->height;
1364 } 1387 }
1365 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1388 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1366 { /* down right */ 1389 { /* down right */
1367 *dx = map1->tile_map[2]->width; 1390 *dx = +map1->tile_map[TILE_SOUTH]->width;
1368 *dy = map1->height; 1391 *dy = +map1->height;
1369 } 1392 }
1370 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1393 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1371 { /* down left */ 1394 { /* down left */
1372 *dx = -map2->width; 1395 *dx = -map2->width;
1373 *dy = map1->height; 1396 *dy = +map1->height;
1374 } 1397 }
1375 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1398 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1376 { /* left up */ 1399 { /* left up */
1377 *dx = -map1->tile_map[3]->width; 1400 *dx = -map1->tile_map[TILE_WEST]->width;
1378 *dy = -map2->height; 1401 *dy = -map2->height;
1379 } 1402 }
1380 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1403 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1381 { /* left down */ 1404 { /* left down */
1382 *dx = -map1->tile_map[3]->width; 1405 *dx = -map1->tile_map[TILE_WEST]->width;
1383 *dy = map1->tile_map[3]->height; 1406 *dy = +map1->tile_map[TILE_WEST]->height;
1384 } 1407 }
1385 else 1408 else
1386 return 0; 1409 return 0;
1387 1410
1388 return 1; 1411 return 1;
… …
1471 retval->distance_x += op1->x - best->x; 1494 retval->distance_x += op1->x - best->x;
1472 retval->distance_y += op1->y - best->y; 1495 retval->distance_y += op1->y - best->y;
1473 } 1496 }
1474 } 1497 }
1475 1498
1476 retval->part = best; 1499 retval->part = best;
1477 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1500 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1478 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1501 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1479 } 1502 }
1480} 1503}
1481 1504
1482/* this is basically the same as get_rangevector above, but instead of 1505/* this is basically the same as get_rangevector above, but instead of
1483 * the first parameter being an object, it instead is the map 1506 * the first parameter being an object, it instead is the map
… …
1488 * be more consistant with the above function and also in case they are needed 1511 * be more consistant with the above function and also in case they are needed
1489 * for something in the future. Also, since no object is pasted, the best 1512 * for something in the future. Also, since no object is pasted, the best
1490 * field of the rv_vector is set to NULL. 1513 * field of the rv_vector is set to NULL.
1491 */ 1514 */
1492void 1515void
1493get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1516get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1494{ 1517{
1495 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1518 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1496 { 1519 {
1497 /* be conservative and fill in _some_ data */ 1520 /* be conservative and fill in _some_ data */
1498 retval->distance = 100000; 1521 retval->distance = 100000;
1499 retval->distance_x = 32767; 1522 retval->distance_x = 32767;
1500 retval->distance_y = 32767; 1523 retval->distance_y = 32767;
1501 retval->direction = 0; 1524 retval->direction = 0;
1502 retval->part = 0; 1525 retval->part = 0;
1503 } 1526 }
1504 else 1527 else
1505 { 1528 {
1506 retval->distance_x += op2->x - x; 1529 retval->distance_x += op2->x - x;
1507 retval->distance_y += op2->y - y; 1530 retval->distance_y += op2->y - y;
1508 1531
1509 retval->part = 0; 1532 retval->part = 0;
1510 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1533 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1511 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1534 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1512 } 1535 }
1513} 1536}
1514 1537
1515/* Returns true of op1 and op2 are effectively on the same map 1538/* Returns true of op1 and op2 are effectively on the same map
1516 * (as related to map tiling). Note that this looks for a path from 1539 * (as related to map tiling). Note that this looks for a path from
… …
1620split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1643split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1621{ 1644{
1622 // clip to map to the left 1645 // clip to map to the left
1623 if (x0 < 0) 1646 if (x0 < 0)
1624 { 1647 {
1625 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1648 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1626 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1649 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1627 1650
1628 if (x1 < 0) // entirely to the left 1651 if (x1 < 0) // entirely to the left
1629 return; 1652 return;
1630 1653
… …
1632 } 1655 }
1633 1656
1634 // clip to map to the right 1657 // clip to map to the right
1635 if (x1 > m->width) 1658 if (x1 > m->width)
1636 { 1659 {
1637 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1660 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1638 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1661 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1639 1662
1640 if (x0 > m->width) // entirely to the right 1663 if (x0 > m->width) // entirely to the right
1641 return; 1664 return;
1642 1665
… …
1644 } 1667 }
1645 1668
1646 // clip to map above 1669 // clip to map above
1647 if (y0 < 0) 1670 if (y0 < 0)
1648 { 1671 {
1649 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1672 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1650 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1673 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1651 1674
1652 if (y1 < 0) // entirely above 1675 if (y1 < 0) // entirely above
1653 return; 1676 return;
1654 1677
… …
1656 } 1679 }
1657 1680
1658 // clip to map below 1681 // clip to map below
1659 if (y1 > m->height) 1682 if (y1 > m->height)
1660 { 1683 {
1661 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1684 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1662 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1685 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1663 1686
1664 if (y0 > m->height) // entirely below 1687 if (y0 > m->height) // entirely below
1665 return; 1688 return;
1666 1689

Diff Legend

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