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.86 by root, Thu Feb 15 15:43:36 2007 UTC vs.
Revision 1.96 by root, Thu Mar 15 14:23:02 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 static int cede_count = 0;
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
504 if (cede_count >= 500) 469 if (cede_count >= 500)
505 { 470 {
506 cede_count = 0; 471 cede_count = 0;
507 coroapi::cede (); 472 coroapi::cede ();
508 } 473 }
509#endif
510 474
511 int unique = 0; 475 int unique = 0;
512 for (object *op = spaces [i].bot; op; op = op->above) 476 for (object *op = spaces [i].bot; op; op = op->above)
513 { 477 {
514 // count per-object, but cede only when modification-safe 478 // count per-object, but cede only when modification-safe
… …
521 continue; 485 continue;
522 486
523 if (unique || op->flag [FLAG_UNIQUE]) 487 if (unique || op->flag [FLAG_UNIQUE])
524 { 488 {
525 if (flags & IO_UNIQUES) 489 if (flags & IO_UNIQUES)
526 save_object (freezer, op, 1); 490 op->write (f);
527 } 491 }
528 else if (flags & IO_OBJECTS) 492 else if (flags & IO_OBJECTS)
529 save_object (freezer, op, 1); 493 op->write (f);
530 } 494 }
531 } 495 }
532 496
533 return true; 497 return true;
534} 498}
535 499
536bool 500bool
537maptile::_load_objects (const char *path, bool skip_header) 501maptile::_load_objects (const char *path, bool skip_header)
538{ 502{
539 object_thawer thawer (path); 503 object_thawer f (path);
540 504
541 if (!thawer) 505 if (!f)
542 return false; 506 return false;
507
508 f.next ();
543 509
544 if (skip_header) 510 if (skip_header)
545 for (;;) 511 for (;;)
546 { 512 {
547 keyword kw = thawer.get_kv (); 513 keyword kw = f.kw;
548 514 f.skip ();
549 if (kw == KW_end) 515 if (kw == KW_end)
550 break; 516 break;
551
552 thawer.skip_kv (kw);
553 } 517 }
554 518
555 return _load_objects (thawer); 519 return _load_objects (f);
556} 520}
557 521
558bool 522bool
559maptile::_save_objects (const char *path, int flags) 523maptile::_save_objects (const char *path, int flags)
560{ 524{
… …
803 767
804 case KW_end: 768 case KW_end:
805 return true; 769 return true;
806 770
807 default: 771 default:
808 if (!thawer.parse_error (kw, "map", 0)) 772 if (!thawer.parse_error ("map", 0))
809 return false; 773 return false;
810 break; 774 break;
811 } 775 }
812 } 776 }
813 777
… …
1109void 1073void
1110mapspace::update_ () 1074mapspace::update_ ()
1111{ 1075{
1112 object *tmp, *last = 0; 1076 object *tmp, *last = 0;
1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1077 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; 1078 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1079
1118 middle = blank_face; 1080 //object *middle = 0;
1119 top = blank_face; 1081 //object *top = 0;
1120 floor = blank_face; 1082 //object *floor = 0;
1121 1083 // this seems to generate better code than using locals, above
1122 middle_obj = 0; 1084 object *&top = faces_obj[0] = 0;
1123 top_obj = 0; 1085 object *&middle = faces_obj[1] = 0;
1124 floor_obj = 0; 1086 object *&floor = faces_obj[2] = 0;
1125 1087
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1088 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1089 {
1128 /* This could be made additive I guess (two lights better than 1090 /* This could be made additive I guess (two lights better than
1129 * one). But if so, it shouldn't be a simple additive - 2 1091 * one). But if so, it shouldn't be a simple additive - 2
… …
1142 * Always put the player down for drawing. 1104 * Always put the player down for drawing.
1143 */ 1105 */
1144 if (!tmp->invisible) 1106 if (!tmp->invisible)
1145 { 1107 {
1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1108 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1147 {
1148 top = tmp->face;
1149 top_obj = tmp; 1109 top = tmp;
1150 }
1151 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1110 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1152 { 1111 {
1153 /* If we got a floor, that means middle and top were below it, 1112 /* If we got a floor, that means middle and top were below it,
1154 * so should not be visible, so we clear them. 1113 * so should not be visible, so we clear them.
1155 */ 1114 */
1156 middle = blank_face; 1115 middle = 0;
1157 top = blank_face; 1116 top = 0;
1158 floor = tmp->face;
1159 floor_obj = tmp; 1117 floor = tmp;
1160 } 1118 }
1161 /* Flag anywhere have high priority */ 1119 /* Flag anywhere have high priority */
1162 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1120 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1163 { 1121 {
1164 middle = tmp->face;
1165
1166 middle_obj = tmp; 1122 middle = tmp;
1167 anywhere = 1; 1123 anywhere = 1;
1168 } 1124 }
1169 /* Find the highest visible face around. If equal 1125 /* Find the highest visible face around. If equal
1170 * visibilities, we still want the one nearer to the 1126 * visibilities, we still want the one nearer to the
1171 * top 1127 * top
1172 */ 1128 */
1173 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1129 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1174 {
1175 middle = tmp->face;
1176 middle_obj = tmp; 1130 middle = tmp;
1177 }
1178 } 1131 }
1179 1132
1180 if (tmp == tmp->above) 1133 if (tmp == tmp->above)
1181 { 1134 {
1182 LOG (llevError, "Error in structure of map\n"); 1135 LOG (llevError, "Error in structure of map\n");
… …
1217 * middle face. This should not happen, as we already have the 1170 * middle face. This should not happen, as we already have the
1218 * else statement above so middle should not get set. OTOH, it 1171 * else statement above so middle should not get set. OTOH, it
1219 * may be possible for the faces to match but be different objects. 1172 * may be possible for the faces to match but be different objects.
1220 */ 1173 */
1221 if (top == middle) 1174 if (top == middle)
1222 middle = blank_face; 1175 middle = 0;
1223 1176
1224 /* There are three posibilities at this point: 1177 /* There are three posibilities at this point:
1225 * 1) top face is set, need middle to be set. 1178 * 1) top face is set, need middle to be set.
1226 * 2) middle is set, need to set top. 1179 * 2) middle is set, need to set top.
1227 * 3) neither middle or top is set - need to set both. 1180 * 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 */ 1185 /* Once we get to a floor, stop, since we already have a floor object */
1233 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1186 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1234 break; 1187 break;
1235 1188
1236 /* If two top faces are already set, quit processing */ 1189 /* If two top faces are already set, quit processing */
1237 if ((top != blank_face) && (middle != blank_face)) 1190 if (top && middle)
1238 break; 1191 break;
1239 1192
1240 /* Only show visible faces */ 1193 /* Only show visible faces */
1241 if (!tmp->invisible) 1194 if (!tmp->invisible)
1242 { 1195 {
1243 /* Fill in top if needed */ 1196 /* Fill in top if needed */
1244 if (top == blank_face) 1197 if (!top)
1245 { 1198 {
1246 top = tmp->face;
1247 top_obj = tmp; 1199 top = tmp;
1248 if (top == middle) 1200 if (top == middle)
1249 middle = blank_face; 1201 middle = 0;
1250 } 1202 }
1251 else 1203 else
1252 { 1204 {
1253 /* top is already set - we should only get here if 1205 /* top is already set - we should only get here if
1254 * middle is not set 1206 * middle is not set
1255 * 1207 *
1256 * Set the middle face and break out, since there is nothing 1208 * Set the middle face and break out, since there is nothing
1257 * more to fill in. We don't check visiblity here, since 1209 * more to fill in. We don't check visiblity here, since
1258 * 1210 *
1259 */ 1211 */
1260 if (tmp->face != top) 1212 if (tmp != top)
1261 { 1213 {
1262 middle = tmp->face;
1263 middle_obj = tmp; 1214 middle = tmp;
1264 break; 1215 break;
1265 } 1216 }
1266 } 1217 }
1267 } 1218 }
1268 } 1219 }
1269 1220
1270 if (middle == floor) 1221 if (middle == floor)
1271 middle = blank_face; 1222 middle = 0;
1272 1223
1273 if (top == middle) 1224 if (top == middle)
1274 middle = blank_face; 1225 middle = 0;
1275 1226
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1227#if 0
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1228 faces_obj [0] = top;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1229 faces_obj [1] = middle;
1230 faces_obj [2] = floor;
1231#endif
1279} 1232}
1280 1233
1281uint64 1234uint64
1282mapspace::volume () const 1235mapspace::volume () const
1283{ 1236{
… …
1703 return default_region; 1656 return default_region;
1704 1657
1705 return ::region::default_region (); 1658 return ::region::default_region ();
1706} 1659}
1707 1660
1661/* picks a random object from a style map.
1662 * Redone by MSW so it should be faster and not use static
1663 * variables to generate tables.
1664 */
1665object *
1666maptile::pick_random_object () const
1667{
1668 /* while returning a null object will result in a crash, that
1669 * is actually preferable to an infinite loop. That is because
1670 * most servers will automatically restart in case of crash.
1671 * Change the logic on getting the random space - shouldn't make
1672 * any difference, but this seems clearer to me.
1673 */
1674 for (int i = 1000; --i;)
1675 {
1676 object *pick = at (rndm (width), rndm (height)).bot;
1708 1677
1678 // do not prefer big monsters just because they are big.
1679 if (pick && pick->head_ () == pick)
1680 return pick->head_ ();
1681 }
1682
1683 // instead of crashing in the unlikely(?) case, try to return *something*
1684 return get_archetype ("blocked");
1685}
1686

Diff Legend

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