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.85 by root, Wed Feb 7 23:50:01 2007 UTC vs.
Revision 1.98 by root, Sat Mar 17 22:11:22 2007 UTC

… …
354{ 354{
355 if (!spaces) 355 if (!spaces)
356 return; 356 return;
357 357
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 359 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
360 { 360 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 361 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 362 if (!tmp->head && !tmp->more)
365 { 363 {
366 /* If there is nothing more to this object, this for loop 364 /* If there is nothing more to this object, this for loop
367 * won't do anything. 365 * won't do anything.
… …
389 * 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.
390 */ 388 */
391 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);
392 } 390 }
393 } 391 }
394
395 tmp = above;
396 } 392 }
397} 393}
398 394
399/* 395/*
400 * 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
401 * file pointer. 397 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 398 */
404bool 399bool
405maptile::_load_objects (object_thawer &thawer) 400maptile::_load_objects (object_thawer &f)
406{ 401{
407 int unique; 402 for (;;)
408 object *op, *prev = NULL, *last_more = NULL, *otmp;
409
410 op = object::create ();
411 op->map = this; /* To handle buttons correctly */
412
413 while (int i = load_object (thawer, op, 0))
414 { 403 {
415 /* if the archetype for the object is null, means that we 404 coroapi::cede_every (1000); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 405
417 * or editor will not be able to do anything with it either. 406 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 407 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 408 case KW_arch:
422 continue; 409 if (object *op = object::read (f, this))
423 }
424
425 switch (i)
426 { 410 {
427 case LL_NORMAL: 411 if (op->inv)
412 sum_weight (op);
413
428 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 }
429 416
430 if (op->inv) 417 continue;
431 sum_weight (op);
432 418
433 prev = op, last_more = op;
434 break;
435
436 case LL_MORE: 419 case KW_EOF:
437 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 420 return true;
438 op->head = prev, last_more->more = op, last_more = op; 421
422 default:
423 if (!f.parse_error ("map file"))
424 return false;
439 break; 425 break;
440 } 426 }
441 427
442 op = object::create (); 428 f.next ();
443 op->map = this;
444 }
445
446 op->destroy ();
447
448#if 0
449 for (i = 0; i < width; i++)
450 for (j = 0; j < height; j++)
451 {
452 unique = 0;
453 /* check for unique items, or unique squares */
454 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455 {
456 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457 unique = 1;
458
459 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
460 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461 }
462 } 429 }
463#endif
464 430
465 return true; 431 return true;
466} 432}
467 433
468void 434void
… …
486 for (object *op = ms->bot; op; op = op->above) 452 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 453 op->deactivate_recursive ();
488} 454}
489 455
490bool 456bool
491maptile::_save_objects (object_freezer &freezer, int flags) 457maptile::_save_objects (object_freezer &f, int flags)
492{ 458{
493 static int cede_count = 0; 459 coroapi::cede ();
494 460
495 if (flags & IO_HEADER) 461 if (flags & IO_HEADER)
496 _save_header (freezer); 462 _save_header (f);
497 463
498 if (!spaces) 464 if (!spaces)
499 return false; 465 return false;
500 466
501 for (int i = 0; i < size (); ++i) 467 for (int i = 0; i < size (); ++i)
502 { 468 {
503#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D 469#if 0 // disabled, there still seem to be races somewhere
470 static int cede_count = 0;
471
504 if (cede_count >= 500) 472 if (cede_count >= 500)
505 { 473 {
506 cede_count = 0; 474 cede_count = 0;
507 coroapi::cede (); 475 coroapi::cede ();
508 } 476 }
509#endif 477#endif
510 478
511 int unique = 0; 479 int unique = 0;
512 for (object *op = spaces [i].bot; op; op = op->above) 480 for (object *op = spaces [i].bot; op; op = op->above)
513 { 481 {
482#if 0
514 // count per-object, but cede only when modification-safe 483 // count per-object, but cede only when modification-safe
515 cede_count++; 484 cede_count++;
485#endif
516 486
517 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 487 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
518 unique = 1; 488 unique = 1;
519 489
520 if (!op->can_map_save ()) 490 if (!op->can_map_save ())
521 continue; 491 continue;
522 492
523 if (unique || op->flag [FLAG_UNIQUE]) 493 if (unique || op->flag [FLAG_UNIQUE])
524 { 494 {
525 if (flags & IO_UNIQUES) 495 if (flags & IO_UNIQUES)
526 save_object (freezer, op, 1); 496 op->write (f);
527 } 497 }
528 else if (flags & IO_OBJECTS) 498 else if (flags & IO_OBJECTS)
529 save_object (freezer, op, 1); 499 op->write (f);
530 } 500 }
531 } 501 }
502
503 coroapi::cede ();
532 504
533 return true; 505 return true;
534} 506}
535 507
536bool 508bool
537maptile::_load_objects (const char *path, bool skip_header) 509maptile::_load_objects (const char *path, bool skip_header)
538{ 510{
539 object_thawer thawer (path); 511 object_thawer f (path);
540 512
541 if (!thawer) 513 if (!f)
542 return false; 514 return false;
515
516 f.next ();
543 517
544 if (skip_header) 518 if (skip_header)
545 for (;;) 519 for (;;)
546 { 520 {
547 keyword kw = thawer.get_kv (); 521 keyword kw = f.kw;
548 522 f.skip ();
549 if (kw == KW_end) 523 if (kw == KW_end)
550 break; 524 break;
551
552 thawer.skip_kv (kw);
553 } 525 }
554 526
555 return _load_objects (thawer); 527 return _load_objects (f);
556} 528}
557 529
558bool 530bool
559maptile::_save_objects (const char *path, int flags) 531maptile::_save_objects (const char *path, int flags)
560{ 532{
… …
803 775
804 case KW_end: 776 case KW_end:
805 return true; 777 return true;
806 778
807 default: 779 default:
808 if (!thawer.parse_error (kw, "map", 0)) 780 if (!thawer.parse_error ("map", 0))
809 return false; 781 return false;
810 break; 782 break;
811 } 783 }
812 } 784 }
813 785
… …
1109void 1081void
1110mapspace::update_ () 1082mapspace::update_ ()
1111{ 1083{
1112 object *tmp, *last = 0; 1084 object *tmp, *last = 0;
1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1085 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; 1086 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1087
1118 middle = blank_face; 1088 //object *middle = 0;
1119 top = blank_face; 1089 //object *top = 0;
1120 floor = blank_face; 1090 //object *floor = 0;
1121 1091 // this seems to generate better code than using locals, above
1122 middle_obj = 0; 1092 object *&top = faces_obj[0] = 0;
1123 top_obj = 0; 1093 object *&middle = faces_obj[1] = 0;
1124 floor_obj = 0; 1094 object *&floor = faces_obj[2] = 0;
1125 1095
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1096 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1097 {
1128 /* This could be made additive I guess (two lights better than 1098 /* This could be made additive I guess (two lights better than
1129 * one). But if so, it shouldn't be a simple additive - 2 1099 * one). But if so, it shouldn't be a simple additive - 2
… …
1142 * Always put the player down for drawing. 1112 * Always put the player down for drawing.
1143 */ 1113 */
1144 if (!tmp->invisible) 1114 if (!tmp->invisible)
1145 { 1115 {
1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1116 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1147 {
1148 top = tmp->face;
1149 top_obj = tmp; 1117 top = tmp;
1150 }
1151 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1118 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1152 { 1119 {
1153 /* If we got a floor, that means middle and top were below it, 1120 /* If we got a floor, that means middle and top were below it,
1154 * so should not be visible, so we clear them. 1121 * so should not be visible, so we clear them.
1155 */ 1122 */
1156 middle = blank_face; 1123 middle = 0;
1157 top = blank_face; 1124 top = 0;
1158 floor = tmp->face;
1159 floor_obj = tmp; 1125 floor = tmp;
1160 } 1126 }
1161 /* Flag anywhere have high priority */ 1127 /* Flag anywhere have high priority */
1162 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1128 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1163 { 1129 {
1164 middle = tmp->face;
1165
1166 middle_obj = tmp; 1130 middle = tmp;
1167 anywhere = 1; 1131 anywhere = 1;
1168 } 1132 }
1169 /* Find the highest visible face around. If equal 1133 /* Find the highest visible face around. If equal
1170 * visibilities, we still want the one nearer to the 1134 * visibilities, we still want the one nearer to the
1171 * top 1135 * top
1172 */ 1136 */
1173 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1137 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1174 {
1175 middle = tmp->face;
1176 middle_obj = tmp; 1138 middle = tmp;
1177 }
1178 } 1139 }
1179 1140
1180 if (tmp == tmp->above) 1141 if (tmp == tmp->above)
1181 { 1142 {
1182 LOG (llevError, "Error in structure of map\n"); 1143 LOG (llevError, "Error in structure of map\n");
… …
1217 * middle face. This should not happen, as we already have the 1178 * middle face. This should not happen, as we already have the
1218 * else statement above so middle should not get set. OTOH, it 1179 * else statement above so middle should not get set. OTOH, it
1219 * may be possible for the faces to match but be different objects. 1180 * may be possible for the faces to match but be different objects.
1220 */ 1181 */
1221 if (top == middle) 1182 if (top == middle)
1222 middle = blank_face; 1183 middle = 0;
1223 1184
1224 /* There are three posibilities at this point: 1185 /* There are three posibilities at this point:
1225 * 1) top face is set, need middle to be set. 1186 * 1) top face is set, need middle to be set.
1226 * 2) middle is set, need to set top. 1187 * 2) middle is set, need to set top.
1227 * 3) neither middle or top is set - need to set both. 1188 * 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 */ 1193 /* Once we get to a floor, stop, since we already have a floor object */
1233 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1194 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1234 break; 1195 break;
1235 1196
1236 /* If two top faces are already set, quit processing */ 1197 /* If two top faces are already set, quit processing */
1237 if ((top != blank_face) && (middle != blank_face)) 1198 if (top && middle)
1238 break; 1199 break;
1239 1200
1240 /* Only show visible faces */ 1201 /* Only show visible faces */
1241 if (!tmp->invisible) 1202 if (!tmp->invisible)
1242 { 1203 {
1243 /* Fill in top if needed */ 1204 /* Fill in top if needed */
1244 if (top == blank_face) 1205 if (!top)
1245 { 1206 {
1246 top = tmp->face;
1247 top_obj = tmp; 1207 top = tmp;
1248 if (top == middle) 1208 if (top == middle)
1249 middle = blank_face; 1209 middle = 0;
1250 } 1210 }
1251 else 1211 else
1252 { 1212 {
1253 /* top is already set - we should only get here if 1213 /* top is already set - we should only get here if
1254 * middle is not set 1214 * middle is not set
1255 * 1215 *
1256 * Set the middle face and break out, since there is nothing 1216 * Set the middle face and break out, since there is nothing
1257 * more to fill in. We don't check visiblity here, since 1217 * more to fill in. We don't check visiblity here, since
1258 * 1218 *
1259 */ 1219 */
1260 if (tmp->face != top) 1220 if (tmp != top)
1261 { 1221 {
1262 middle = tmp->face;
1263 middle_obj = tmp; 1222 middle = tmp;
1264 break; 1223 break;
1265 } 1224 }
1266 } 1225 }
1267 } 1226 }
1268 } 1227 }
1269 1228
1270 if (middle == floor) 1229 if (middle == floor)
1271 middle = blank_face; 1230 middle = 0;
1272 1231
1273 if (top == middle) 1232 if (top == middle)
1274 middle = blank_face; 1233 middle = 0;
1275 1234
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1235#if 0
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1236 faces_obj [0] = top;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1237 faces_obj [1] = middle;
1238 faces_obj [2] = floor;
1239#endif
1279} 1240}
1280 1241
1281uint64 1242uint64
1282mapspace::volume () const 1243mapspace::volume () const
1283{ 1244{
… …
1581get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1542get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1582{ 1543{
1583 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1544 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1584 { 1545 {
1585 /* be conservative and fill in _some_ data */ 1546 /* be conservative and fill in _some_ data */
1586 retval->distance = 100000; 1547 retval->distance = 10000;
1587 retval->distance_x = 32767; 1548 retval->distance_x = 10000;
1588 retval->distance_y = 32767; 1549 retval->distance_y = 10000;
1589 retval->direction = 0; 1550 retval->direction = 0;
1590 retval->part = 0; 1551 retval->part = 0;
1591 } 1552 }
1592 else 1553 else
1593 { 1554 {
… …
1598 1559
1599 best = op1; 1560 best = op1;
1600 /* If this is multipart, find the closest part now */ 1561 /* If this is multipart, find the closest part now */
1601 if (!(flags & 0x1) && op1->more) 1562 if (!(flags & 0x1) && op1->more)
1602 { 1563 {
1603 object *tmp;
1604 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1564 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1605 1565
1606 /* we just take the offset of the piece to head to figure 1566 /* we just take the offset of the piece to head to figure
1607 * distance instead of doing all that work above again 1567 * distance instead of doing all that work above again
1608 * since the distance fields we set above are positive in the 1568 * since the distance fields we set above are positive in the
1609 * same axis as is used for multipart objects, the simply arithmetic 1569 * same axis as is used for multipart objects, the simply arithmetic
1610 * below works. 1570 * below works.
1611 */ 1571 */
1612 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1572 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1613 { 1573 {
1614 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1574 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1615 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1575 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1616 if (tmpi < best_distance) 1576 if (tmpi < best_distance)
1617 { 1577 {
… …
1626 retval->distance_y += op1->y - best->y; 1586 retval->distance_y += op1->y - best->y;
1627 } 1587 }
1628 } 1588 }
1629 1589
1630 retval->part = best; 1590 retval->part = best;
1631 retval->distance = idistance (retval->distance_x, retval->distance_y); 1591 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1632 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1592 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1633 } 1593 }
1634} 1594}
1635 1595
1636/* this is basically the same as get_rangevector above, but instead of 1596/* this is basically the same as get_rangevector above, but instead of
… …
1704 return default_region; 1664 return default_region;
1705 1665
1706 return ::region::default_region (); 1666 return ::region::default_region ();
1707} 1667}
1708 1668
1669/* picks a random object from a style map.
1670 * Redone by MSW so it should be faster and not use static
1671 * variables to generate tables.
1672 */
1673object *
1674maptile::pick_random_object () const
1675{
1676 /* while returning a null object will result in a crash, that
1677 * is actually preferable to an infinite loop. That is because
1678 * most servers will automatically restart in case of crash.
1679 * Change the logic on getting the random space - shouldn't make
1680 * any difference, but this seems clearer to me.
1681 */
1682 for (int i = 1000; --i;)
1683 {
1684 object *pick = at (rndm (width), rndm (height)).bot;
1709 1685
1686 // do not prefer big monsters just because they are big.
1687 if (pick && pick->head_ () == pick)
1688 return pick->head_ ();
1689 }
1690
1691 // instead of crashing in the unlikely(?) case, try to return *something*
1692 return get_archetype ("blocked");
1693}
1694

Diff Legend

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