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.83 by root, Thu Feb 1 19:15:38 2007 UTC vs.
Revision 1.90 by root, Fri Feb 16 22:21:46 2007 UTC

… …
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#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 25#include <unistd.h>
26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
30 31
31#include "path.h" 32#include "path.h"
32 33
33/* 34/*
34 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
… …
67 char *endbuf; 68 char *endbuf;
68 struct stat statbuf; 69 struct stat statbuf;
69 int mode = 0; 70 int mode = 0;
70 71
71 if (prepend_dir) 72 if (prepend_dir)
72 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
73 else 74 else
74 strcpy (buf, name); 75 assign (buf, name);
75 76
76 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
79 * all the names. 80 * all the names.
… …
353{ 354{
354 if (!spaces) 355 if (!spaces)
355 return; 356 return;
356 357
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; ) 359 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
359 { 360 {
360 object *above = tmp->above;
361
362 /* already multipart - don't do anything more */ 361 /* already multipart - don't do anything more */
363 if (!tmp->head && !tmp->more) 362 if (!tmp->head && !tmp->more)
364 { 363 {
365 /* If there is nothing more to this object, this for loop 364 /* If there is nothing more to this object, this for loop
366 * won't do anything. 365 * won't do anything.
… …
388 * the coding is simpler to just to it here with each part. 387 * the coding is simpler to just to it here with each part.
389 */ 388 */
390 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
391 } 390 }
392 } 391 }
393
394 tmp = above;
395 } 392 }
396} 393}
397 394
398/* 395/*
399 * Loads (ands parses) the objects into a given map from the specified 396 * Loads (ands parses) the objects into a given map from the specified
400 * file pointer. 397 * file pointer.
401 * mapflags is the same as we get with load_original_map
402 */ 398 */
403bool 399bool
404maptile::_load_objects (object_thawer &thawer) 400maptile::_load_objects (object_thawer &f)
405{ 401{
406 int unique; 402 for (;;)
407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409 op = object::create ();
410 op->map = this; /* To handle buttons correctly */
411
412 while (int i = load_object (thawer, op, 0))
413 { 403 {
414 /* if the archetype for the object is null, means that we 404 coroapi::cede_every (1000); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 405
416 * or editor will not be able to do anything with it either. 406 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 407 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 408 case KW_arch:
421 continue; 409 if (object *op = object::read (f, this))
422 }
423
424 switch (i)
425 { 410 {
426 case LL_NORMAL: 411 if (op->inv)
412 sum_weight (op);
413
427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
415 }
428 416
429 if (op->inv) 417 continue;
430 sum_weight (op);
431 418
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 419 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 420 return true;
437 op->head = prev, last_more->more = op, last_more = op; 421
422 default:
423 if (!f.parse_error ("map file"))
424 return false;
438 break; 425 break;
439 } 426 }
440 427
441 op = object::create (); 428 f.next ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 } 429 }
462#endif
463 430
464 return true; 431 return true;
465} 432}
466 433
467void 434void
… …
485 for (object *op = ms->bot; op; op = op->above) 452 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 453 op->deactivate_recursive ();
487} 454}
488 455
489bool 456bool
490maptile::_save_objects (object_freezer &freezer, int flags) 457maptile::_save_objects (object_freezer &f, int flags)
491{ 458{
492 static int cede_count = 0; 459 static int cede_count = 0;
493 460
494 if (flags & IO_HEADER) 461 if (flags & IO_HEADER)
495 _save_header (freezer); 462 _save_header (f);
496 463
497 if (!spaces) 464 if (!spaces)
498 return false; 465 return false;
499 466
500 for (int i = 0; i < size (); ++i) 467 for (int i = 0; i < size (); ++i)
… …
520 continue; 487 continue;
521 488
522 if (unique || op->flag [FLAG_UNIQUE]) 489 if (unique || op->flag [FLAG_UNIQUE])
523 { 490 {
524 if (flags & IO_UNIQUES) 491 if (flags & IO_UNIQUES)
525 save_object (freezer, op, 1); 492 op->write (f);
526 } 493 }
527 else if (flags & IO_OBJECTS) 494 else if (flags & IO_OBJECTS)
528 save_object (freezer, op, 1); 495 op->write (f);
529 } 496 }
530 } 497 }
531 498
532 return true; 499 return true;
533} 500}
534 501
535bool 502bool
536maptile::_load_objects (const char *path, bool skip_header) 503maptile::_load_objects (const char *path, bool skip_header)
537{ 504{
538 object_thawer thawer (path); 505 object_thawer f (path);
539 506
540 if (!thawer) 507 if (!f)
541 return false; 508 return false;
509
510 f.next ();
542 511
543 if (skip_header) 512 if (skip_header)
544 for (;;) 513 for (;;)
545 { 514 {
546 keyword kw = thawer.get_kv (); 515 keyword kw = f.kw;
547 516 f.skip ();
548 if (kw == KW_end) 517 if (kw == KW_end)
549 break; 518 break;
550
551 thawer.skip_kv (kw);
552 } 519 }
553 520
554 return _load_objects (thawer); 521 return _load_objects (f);
555} 522}
556 523
557bool 524bool
558maptile::_save_objects (const char *path, int flags) 525maptile::_save_objects (const char *path, int flags)
559{ 526{
… …
568maptile::maptile () 535maptile::maptile ()
569{ 536{
570 in_memory = MAP_SWAPPED; 537 in_memory = MAP_SWAPPED;
571 538
572 /* The maps used to pick up default x and y values from the 539 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 540 * map archetype. Mimic that behaviour.
574 */ 541 */
575 width = 16; 542 width = 16;
576 height = 16; 543 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 544 timeout = 300;
579 enter_x = 0; 545 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 546 max_volume = 2000000; // 2m³
581} 547}
582 548
583maptile::maptile (int w, int h) 549maptile::maptile (int w, int h)
584{ 550{
585 in_memory = MAP_SWAPPED; 551 in_memory = MAP_SWAPPED;
… …
803 769
804 case KW_end: 770 case KW_end:
805 return true; 771 return true;
806 772
807 default: 773 default:
808 if (!thawer.parse_error (kw, "map", 0)) 774 if (!thawer.parse_error ("map", 0))
809 return false; 775 return false;
810 break; 776 break;
811 } 777 }
812 } 778 }
813 779
… …
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1242 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1243 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1244 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1279} 1245}
1280 1246
1247uint64
1248mapspace::volume () const
1249{
1250 uint64 vol = 0;
1251
1252 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1253 vol += op->volume ();
1254
1255 return vol;
1256}
1257
1281/* this updates the orig_map->tile_map[tile_num] value after finding 1258/* this updates the orig_map->tile_map[tile_num] value after finding
1282 * the map. It also takes care of linking back the freshly found 1259 * the map. It also takes care of linking back the freshly found
1283 * maps tile_map values if it tiles back to this one. It returns 1260 * maps tile_map values if it tiles back to this one. It returns
1284 * the value of orig_map->tile_map[tile_num]. 1261 * the value of orig_map->tile_map[tile_num].
1285 */ 1262 */
… …
1570get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1547get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1571{ 1548{
1572 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1549 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1573 { 1550 {
1574 /* be conservative and fill in _some_ data */ 1551 /* be conservative and fill in _some_ data */
1575 retval->distance = 100000; 1552 retval->distance = 10000;
1576 retval->distance_x = 32767; 1553 retval->distance_x = 10000;
1577 retval->distance_y = 32767; 1554 retval->distance_y = 10000;
1578 retval->direction = 0; 1555 retval->direction = 0;
1579 retval->part = 0; 1556 retval->part = 0;
1580 } 1557 }
1581 else 1558 else
1582 { 1559 {
… …
1587 1564
1588 best = op1; 1565 best = op1;
1589 /* If this is multipart, find the closest part now */ 1566 /* If this is multipart, find the closest part now */
1590 if (!(flags & 0x1) && op1->more) 1567 if (!(flags & 0x1) && op1->more)
1591 { 1568 {
1592 object *tmp;
1593 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1569 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1594 1570
1595 /* we just take the offset of the piece to head to figure 1571 /* we just take the offset of the piece to head to figure
1596 * distance instead of doing all that work above again 1572 * distance instead of doing all that work above again
1597 * since the distance fields we set above are positive in the 1573 * since the distance fields we set above are positive in the
1598 * same axis as is used for multipart objects, the simply arithmetic 1574 * same axis as is used for multipart objects, the simply arithmetic
1599 * below works. 1575 * below works.
1600 */ 1576 */
1601 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1577 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1602 { 1578 {
1603 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1579 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1604 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1580 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1605 if (tmpi < best_distance) 1581 if (tmpi < best_distance)
1606 { 1582 {
… …
1615 retval->distance_y += op1->y - best->y; 1591 retval->distance_y += op1->y - best->y;
1616 } 1592 }
1617 } 1593 }
1618 1594
1619 retval->part = best; 1595 retval->part = best;
1620 retval->distance = idistance (retval->distance_x, retval->distance_y); 1596 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1597 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1598 }
1623} 1599}
1624 1600
1625/* this is basically the same as get_rangevector above, but instead of 1601/* this is basically the same as get_rangevector above, but instead of
… …
1693 return default_region; 1669 return default_region;
1694 1670
1695 return ::region::default_region (); 1671 return ::region::default_region ();
1696} 1672}
1697 1673
1674

Diff Legend

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