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.195 by root, Wed Apr 21 06:42:33 2010 UTC vs.
Revision 1.200 by root, Fri May 7 19:46:18 2010 UTC

… …
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
… …
559 * the map (or something equivilent) into output_string. */ 562 * the map (or something equivilent) into output_string. */
560static const char * 563static const char *
561print_shop_string (maptile *m) 564print_shop_string (maptile *m)
562{ 565{
563 static dynbuf_text buf; buf.clear (); 566 static dynbuf_text buf; buf.clear ();
567 bool first = true;
564 568
565 for (int i = 0; i < m->shopitems[0].index; i++) 569 for (int i = 0; i < m->shopitems[0].index; i++)
566 { 570 {
571 if (!first)
572 buf << ';';
573
574 first = false;
575
567 if (m->shopitems[i].typenum) 576 if (m->shopitems[i].typenum)
568 { 577 {
569 if (m->shopitems[i].strength) 578 if (m->shopitems[i].strength)
570 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 579 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
571 else 580 else
572 buf.printf ("%s;", m->shopitems[i].name); 581 buf.printf ("%s", m->shopitems[i].name);
573 } 582 }
574 else 583 else
575 { 584 {
576 if (m->shopitems[i].strength) 585 if (m->shopitems[i].strength)
577 buf.printf ("*:%d;", m->shopitems[i].strength); 586 buf.printf ("*:%d", m->shopitems[i].strength);
578 else 587 else
579 buf.printf ("*"); 588 buf.printf ("*");
580 } 589 }
581 } 590 }
582 591
… …
638 case KW_per_player: thawer.get (per_player); break; 647 case KW_per_player: thawer.get (per_player); break;
639 case KW_per_party: thawer.get (per_party); break; 648 case KW_per_party: thawer.get (per_party); break;
640 case KW_no_reset: thawer.get (no_reset); break; 649 case KW_no_reset: thawer.get (no_reset); break;
641 case KW_no_drop: thawer.get (no_drop); break; 650 case KW_no_drop: thawer.get (no_drop); break;
642 651
643 case KW_region: default_region = region::find (thawer.get_str ()); break; 652 case KW_region: thawer.get (default_region); break;
644 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 653 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
645 654
646 // old names new names 655 // old names new names
647 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 656 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; 657 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
1308/** 1317/**
1309 * Return whether map2 is adjacent to map1. If so, store the distance from 1318 * Return whether map2 is adjacent to map1. If so, store the distance from
1310 * map1 to map2 in dx/dy. 1319 * map1 to map2 in dx/dy.
1311 */ 1320 */
1312int 1321int
1313adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1322adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1314{ 1323{
1315 if (!map1 || !map2) 1324 if (!map1 || !map2)
1316 return 0; 1325 return 0;
1317 1326
1318 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1327 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1320 if (map1 == map2) 1329 if (map1 == map2)
1321 { 1330 {
1322 *dx = 0; 1331 *dx = 0;
1323 *dy = 0; 1332 *dy = 0;
1324 } 1333 }
1325 else if (map1->tile_map[0] == map2) 1334 else if (map1->tile_available (0, false) == map2)
1326 { /* up */ 1335 { /* up */
1327 *dx = 0; 1336 *dx = 0;
1328 *dy = -map2->height; 1337 *dy = -map2->height;
1329 } 1338 }
1330 else if (map1->tile_map[1] == map2) 1339 else if (map1->tile_available (1, false) == map2)
1331 { /* right */ 1340 { /* right */
1332 *dx = map1->width; 1341 *dx = map1->width;
1333 *dy = 0; 1342 *dy = 0;
1334 } 1343 }
1335 else if (map1->tile_map[2] == map2) 1344 else if (map1->tile_available (2, false) == map2)
1336 { /* down */ 1345 { /* down */
1337 *dx = 0; 1346 *dx = 0;
1338 *dy = map1->height; 1347 *dy = map1->height;
1339 } 1348 }
1340 else if (map1->tile_map[3] == map2) 1349 else if (map1->tile_available (3, false) == map2)
1341 { /* left */ 1350 { /* left */
1342 *dx = -map2->width; 1351 *dx = -map2->width;
1343 *dy = 0; 1352 *dy = 0;
1344 } 1353 }
1345 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1354 else if (map1->tile_map[0] && map1->tile_map[0]->tile_available (1, false) == map2)
1346 { /* up right */ 1355 { /* up right */
1347 *dx = map1->tile_map[0]->width; 1356 *dx = map1->tile_map[0]->width;
1348 *dy = -map1->tile_map[0]->height; 1357 *dy = -map1->tile_map[0]->height;
1349 } 1358 }
1350 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1359 else if (map1->tile_map[0] && map1->tile_map[0]->tile_available (3, false) == map2)
1351 { /* up left */ 1360 { /* up left */
1352 *dx = -map2->width; 1361 *dx = -map2->width;
1353 *dy = -map1->tile_map[0]->height; 1362 *dy = -map1->tile_map[0]->height;
1354 } 1363 }
1355 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1364 else if (map1->tile_map[1] && map1->tile_map[1]->tile_available (0, false) == map2)
1356 { /* right up */ 1365 { /* right up */
1357 *dx = map1->width; 1366 *dx = map1->width;
1358 *dy = -map2->height; 1367 *dy = -map2->height;
1359 } 1368 }
1360 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1369 else if (map1->tile_map[1] && map1->tile_map[1]->tile_available (2, false) == map2)
1361 { /* right down */ 1370 { /* right down */
1362 *dx = map1->width; 1371 *dx = map1->width;
1363 *dy = map1->tile_map[1]->height; 1372 *dy = map1->tile_map[1]->height;
1364 } 1373 }
1365 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1374 else if (map1->tile_map[2] && map1->tile_map[2]->tile_available (1, false) == map2)
1366 { /* down right */ 1375 { /* down right */
1367 *dx = map1->tile_map[2]->width; 1376 *dx = map1->tile_map[2]->width;
1368 *dy = map1->height; 1377 *dy = map1->height;
1369 } 1378 }
1370 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1379 else if (map1->tile_map[2] && map1->tile_map[2]->tile_available (3, false) == map2)
1371 { /* down left */ 1380 { /* down left */
1372 *dx = -map2->width; 1381 *dx = -map2->width;
1373 *dy = map1->height; 1382 *dy = map1->height;
1374 } 1383 }
1375 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1384 else if (map1->tile_map[3] && map1->tile_map[3]->tile_available (0, false) == map2)
1376 { /* left up */ 1385 { /* left up */
1377 *dx = -map1->tile_map[3]->width; 1386 *dx = -map1->tile_map[3]->width;
1378 *dy = -map2->height; 1387 *dy = -map2->height;
1379 } 1388 }
1380 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1389 else if (map1->tile_map[3] && map1->tile_map[3]->tile_available (2, false) == map2)
1381 { /* left down */ 1390 { /* left down */
1382 *dx = -map1->tile_map[3]->width; 1391 *dx = -map1->tile_map[3]->width;
1383 *dy = map1->tile_map[3]->height; 1392 *dy = map1->tile_map[3]->height;
1384 } 1393 }
1385 else 1394 else
… …
1488 * be more consistant with the above function and also in case they are needed 1497 * 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 1498 * for something in the future. Also, since no object is pasted, the best
1490 * field of the rv_vector is set to NULL. 1499 * field of the rv_vector is set to NULL.
1491 */ 1500 */
1492void 1501void
1493get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1502get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1494{ 1503{
1495 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1504 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1496 { 1505 {
1497 /* be conservative and fill in _some_ data */ 1506 /* be conservative and fill in _some_ data */
1498 retval->distance = 100000; 1507 retval->distance = 100000;

Diff Legend

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