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.84 by root, Mon Feb 5 01:24:45 2007 UTC vs.
Revision 1.95 by root, Thu Mar 15 13:19:37 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.
… …
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
… …
1109void 1075void
1110mapspace::update_ () 1076mapspace::update_ ()
1111{ 1077{
1112 object *tmp, *last = 0; 1078 object *tmp, *last = 0;
1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1079 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1114 facetile *top, *floor, *middle;
1115 object *top_obj, *floor_obj, *middle_obj;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1080 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1081
1118 middle = blank_face; 1082 //object *middle = 0;
1119 top = blank_face; 1083 //object *top = 0;
1120 floor = blank_face; 1084 //object *floor = 0;
1121 1085 // this seems to generate better code than using locals, above
1122 middle_obj = 0; 1086 object *&top = faces_obj[0] = 0;
1123 top_obj = 0; 1087 object *&middle = faces_obj[1] = 0;
1124 floor_obj = 0; 1088 object *&floor = faces_obj[2] = 0;
1125 1089
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1090 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1091 {
1128 /* This could be made additive I guess (two lights better than 1092 /* This could be made additive I guess (two lights better than
1129 * one). But if so, it shouldn't be a simple additive - 2 1093 * one). But if so, it shouldn't be a simple additive - 2
… …
1142 * Always put the player down for drawing. 1106 * Always put the player down for drawing.
1143 */ 1107 */
1144 if (!tmp->invisible) 1108 if (!tmp->invisible)
1145 { 1109 {
1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1110 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1147 {
1148 top = tmp->face;
1149 top_obj = tmp; 1111 top = tmp;
1150 }
1151 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1112 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1152 { 1113 {
1153 /* If we got a floor, that means middle and top were below it, 1114 /* If we got a floor, that means middle and top were below it,
1154 * so should not be visible, so we clear them. 1115 * so should not be visible, so we clear them.
1155 */ 1116 */
1156 middle = blank_face; 1117 middle = 0;
1157 top = blank_face; 1118 top = 0;
1158 floor = tmp->face;
1159 floor_obj = tmp; 1119 floor = tmp;
1160 } 1120 }
1161 /* Flag anywhere have high priority */ 1121 /* Flag anywhere have high priority */
1162 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1122 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1163 { 1123 {
1164 middle = tmp->face;
1165
1166 middle_obj = tmp; 1124 middle = tmp;
1167 anywhere = 1; 1125 anywhere = 1;
1168 } 1126 }
1169 /* Find the highest visible face around. If equal 1127 /* Find the highest visible face around. If equal
1170 * visibilities, we still want the one nearer to the 1128 * visibilities, we still want the one nearer to the
1171 * top 1129 * top
1172 */ 1130 */
1173 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1131 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1174 {
1175 middle = tmp->face;
1176 middle_obj = tmp; 1132 middle = tmp;
1177 }
1178 } 1133 }
1179 1134
1180 if (tmp == tmp->above) 1135 if (tmp == tmp->above)
1181 { 1136 {
1182 LOG (llevError, "Error in structure of map\n"); 1137 LOG (llevError, "Error in structure of map\n");
… …
1217 * middle face. This should not happen, as we already have the 1172 * middle face. This should not happen, as we already have the
1218 * else statement above so middle should not get set. OTOH, it 1173 * else statement above so middle should not get set. OTOH, it
1219 * may be possible for the faces to match but be different objects. 1174 * may be possible for the faces to match but be different objects.
1220 */ 1175 */
1221 if (top == middle) 1176 if (top == middle)
1222 middle = blank_face; 1177 middle = 0;
1223 1178
1224 /* There are three posibilities at this point: 1179 /* There are three posibilities at this point:
1225 * 1) top face is set, need middle to be set. 1180 * 1) top face is set, need middle to be set.
1226 * 2) middle is set, need to set top. 1181 * 2) middle is set, need to set top.
1227 * 3) neither middle or top is set - need to set both. 1182 * 3) neither middle or top is set - need to set both.
… …
1232 /* Once we get to a floor, stop, since we already have a floor object */ 1187 /* Once we get to a floor, stop, since we already have a floor object */
1233 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1188 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1234 break; 1189 break;
1235 1190
1236 /* If two top faces are already set, quit processing */ 1191 /* If two top faces are already set, quit processing */
1237 if ((top != blank_face) && (middle != blank_face)) 1192 if (top && middle)
1238 break; 1193 break;
1239 1194
1240 /* Only show visible faces */ 1195 /* Only show visible faces */
1241 if (!tmp->invisible) 1196 if (!tmp->invisible)
1242 { 1197 {
1243 /* Fill in top if needed */ 1198 /* Fill in top if needed */
1244 if (top == blank_face) 1199 if (!top)
1245 { 1200 {
1246 top = tmp->face;
1247 top_obj = tmp; 1201 top = tmp;
1248 if (top == middle) 1202 if (top == middle)
1249 middle = blank_face; 1203 middle = 0;
1250 } 1204 }
1251 else 1205 else
1252 { 1206 {
1253 /* top is already set - we should only get here if 1207 /* top is already set - we should only get here if
1254 * middle is not set 1208 * middle is not set
1255 * 1209 *
1256 * Set the middle face and break out, since there is nothing 1210 * Set the middle face and break out, since there is nothing
1257 * more to fill in. We don't check visiblity here, since 1211 * more to fill in. We don't check visiblity here, since
1258 * 1212 *
1259 */ 1213 */
1260 if (tmp->face != top) 1214 if (tmp != top)
1261 { 1215 {
1262 middle = tmp->face;
1263 middle_obj = tmp; 1216 middle = tmp;
1264 break; 1217 break;
1265 } 1218 }
1266 } 1219 }
1267 } 1220 }
1268 } 1221 }
1269 1222
1270 if (middle == floor) 1223 if (middle == floor)
1271 middle = blank_face; 1224 middle = 0;
1272 1225
1273 if (top == middle) 1226 if (top == middle)
1274 middle = blank_face; 1227 middle = 0;
1275 1228
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1229#if 0
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1230 faces_obj [0] = top;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1231 faces_obj [1] = middle;
1232 faces_obj [2] = floor;
1233#endif
1234}
1235
1236uint64
1237mapspace::volume () const
1238{
1239 uint64 vol = 0;
1240
1241 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1242 vol += op->volume ();
1243
1244 return vol;
1279} 1245}
1280 1246
1281/* this updates the orig_map->tile_map[tile_num] value after finding 1247/* 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 1248 * 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 1249 * maps tile_map values if it tiles back to this one. It returns
… …
1570get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1536get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1571{ 1537{
1572 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1538 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1573 { 1539 {
1574 /* be conservative and fill in _some_ data */ 1540 /* be conservative and fill in _some_ data */
1575 retval->distance = 100000; 1541 retval->distance = 10000;
1576 retval->distance_x = 32767; 1542 retval->distance_x = 10000;
1577 retval->distance_y = 32767; 1543 retval->distance_y = 10000;
1578 retval->direction = 0; 1544 retval->direction = 0;
1579 retval->part = 0; 1545 retval->part = 0;
1580 } 1546 }
1581 else 1547 else
1582 { 1548 {
… …
1587 1553
1588 best = op1; 1554 best = op1;
1589 /* If this is multipart, find the closest part now */ 1555 /* If this is multipart, find the closest part now */
1590 if (!(flags & 0x1) && op1->more) 1556 if (!(flags & 0x1) && op1->more)
1591 { 1557 {
1592 object *tmp;
1593 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1558 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1594 1559
1595 /* we just take the offset of the piece to head to figure 1560 /* we just take the offset of the piece to head to figure
1596 * distance instead of doing all that work above again 1561 * distance instead of doing all that work above again
1597 * since the distance fields we set above are positive in the 1562 * since the distance fields we set above are positive in the
1598 * same axis as is used for multipart objects, the simply arithmetic 1563 * same axis as is used for multipart objects, the simply arithmetic
1599 * below works. 1564 * below works.
1600 */ 1565 */
1601 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1566 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1602 { 1567 {
1603 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1568 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); 1569 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1605 if (tmpi < best_distance) 1570 if (tmpi < best_distance)
1606 { 1571 {
… …
1615 retval->distance_y += op1->y - best->y; 1580 retval->distance_y += op1->y - best->y;
1616 } 1581 }
1617 } 1582 }
1618 1583
1619 retval->part = best; 1584 retval->part = best;
1620 retval->distance = idistance (retval->distance_x, retval->distance_y); 1585 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1586 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1587 }
1623} 1588}
1624 1589
1625/* this is basically the same as get_rangevector above, but instead of 1590/* this is basically the same as get_rangevector above, but instead of
… …
1693 return default_region; 1658 return default_region;
1694 1659
1695 return ::region::default_region (); 1660 return ::region::default_region ();
1696} 1661}
1697 1662
1663/* picks a random object from a style map.
1664 * Redone by MSW so it should be faster and not use static
1665 * variables to generate tables.
1666 */
1667object *
1668maptile::pick_random_object () const
1669{
1670 /* while returning a null object will result in a crash, that
1671 * is actually preferable to an infinite loop. That is because
1672 * most servers will automatically restart in case of crash.
1673 * Change the logic on getting the random space - shouldn't make
1674 * any difference, but this seems clearer to me.
1675 */
1676 for (int i = 1000; --i;)
1677 {
1678 object *pick = at (rndm (width), rndm (height)).bot;
1679
1680 // do not prefer big monsters just because they are big.
1681 if (pick && pick->head_ () == pick)
1682 return pick->head_ ();
1683 }
1684
1685 // instead of crashing in the unlikely(?) case, try to return *something*
1686 return get_archetype ("blocked");
1687}
1688

Diff Legend

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