… | |
… | |
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 | */ |
403 | bool |
399 | bool |
404 | maptile::_load_objects (object_thawer &thawer) |
400 | maptile::_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 | |
467 | void |
434 | void |
… | |
… | |
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 | |
489 | bool |
456 | bool |
490 | maptile::_save_objects (object_freezer &freezer, int flags) |
457 | maptile::_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 | |
535 | bool |
502 | bool |
536 | maptile::_load_objects (const char *path, bool skip_header) |
503 | maptile::_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 | |
557 | bool |
524 | bool |
558 | maptile::_save_objects (const char *path, int flags) |
525 | maptile::_save_objects (const char *path, int flags) |
559 | { |
526 | { |
… | |
… | |
568 | maptile::maptile () |
535 | maptile::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 | |
583 | maptile::maptile (int w, int h) |
549 | maptile::maptile (int w, int h) |
584 | { |
550 | { |
585 | in_memory = MAP_SWAPPED; |
551 | in_memory = MAP_SWAPPED; |
… | |
… | |
739 | { |
705 | { |
740 | keyword kw = thawer.get_kv (); |
706 | keyword kw = thawer.get_kv (); |
741 | |
707 | |
742 | switch (kw) |
708 | switch (kw) |
743 | { |
709 | { |
744 | case KW_EOF: |
|
|
745 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
|
|
746 | return false; |
|
|
747 | |
|
|
748 | case KW_end: |
|
|
749 | return true; |
|
|
750 | |
|
|
751 | default: |
|
|
752 | case KW_ERROR: |
|
|
753 | LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword); |
|
|
754 | break; |
|
|
755 | |
|
|
756 | case KW_msg: |
710 | case KW_msg: |
757 | thawer.get_ml (KW_endmsg, msg); |
711 | thawer.get_ml (KW_endmsg, msg); |
758 | break; |
712 | break; |
759 | |
713 | |
760 | case KW_lore: // CF+ extension |
714 | case KW_lore: // CF+ extension |
… | |
… | |
810 | |
764 | |
811 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
765 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
812 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
766 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
813 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
767 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
814 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
768 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
|
|
769 | |
|
|
770 | case KW_end: |
|
|
771 | return true; |
|
|
772 | |
|
|
773 | default: |
|
|
774 | if (!thawer.parse_error ("map", 0)) |
|
|
775 | return false; |
|
|
776 | break; |
815 | } |
777 | } |
816 | } |
778 | } |
817 | |
779 | |
818 | abort (); |
780 | abort (); |
819 | } |
781 | } |
… | |
… | |
1113 | void |
1075 | void |
1114 | mapspace::update_ () |
1076 | mapspace::update_ () |
1115 | { |
1077 | { |
1116 | object *tmp, *last = 0; |
1078 | object *tmp, *last = 0; |
1117 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1079 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1118 | facetile *top, *floor, *middle; |
|
|
1119 | object *top_obj, *floor_obj, *middle_obj; |
|
|
1120 | 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; |
1121 | |
1081 | |
1122 | middle = blank_face; |
1082 | //object *middle = 0; |
1123 | top = blank_face; |
1083 | //object *top = 0; |
1124 | floor = blank_face; |
1084 | //object *floor = 0; |
1125 | |
1085 | // this seems to generate better code than using locals, above |
1126 | middle_obj = 0; |
1086 | object *&top = faces_obj[0] = 0; |
1127 | top_obj = 0; |
1087 | object *&middle = faces_obj[1] = 0; |
1128 | floor_obj = 0; |
1088 | object *&floor = faces_obj[2] = 0; |
1129 | |
1089 | |
1130 | for (tmp = bot; tmp; last = tmp, tmp = tmp->above) |
1090 | for (tmp = bot; tmp; last = tmp, tmp = tmp->above) |
1131 | { |
1091 | { |
1132 | /* This could be made additive I guess (two lights better than |
1092 | /* This could be made additive I guess (two lights better than |
1133 | * 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 |
… | |
… | |
1146 | * Always put the player down for drawing. |
1106 | * Always put the player down for drawing. |
1147 | */ |
1107 | */ |
1148 | if (!tmp->invisible) |
1108 | if (!tmp->invisible) |
1149 | { |
1109 | { |
1150 | if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) |
1110 | if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) |
1151 | { |
|
|
1152 | top = tmp->face; |
|
|
1153 | top_obj = tmp; |
1111 | top = tmp; |
1154 | } |
|
|
1155 | else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1112 | else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1156 | { |
1113 | { |
1157 | /* 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, |
1158 | * so should not be visible, so we clear them. |
1115 | * so should not be visible, so we clear them. |
1159 | */ |
1116 | */ |
1160 | middle = blank_face; |
1117 | middle = 0; |
1161 | top = blank_face; |
1118 | top = 0; |
1162 | floor = tmp->face; |
|
|
1163 | floor_obj = tmp; |
1119 | floor = tmp; |
1164 | } |
1120 | } |
1165 | /* Flag anywhere have high priority */ |
1121 | /* Flag anywhere have high priority */ |
1166 | else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) |
1122 | else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) |
1167 | { |
1123 | { |
1168 | middle = tmp->face; |
|
|
1169 | |
|
|
1170 | middle_obj = tmp; |
1124 | middle = tmp; |
1171 | anywhere = 1; |
1125 | anywhere = 1; |
1172 | } |
1126 | } |
1173 | /* Find the highest visible face around. If equal |
1127 | /* Find the highest visible face around. If equal |
1174 | * visibilities, we still want the one nearer to the |
1128 | * visibilities, we still want the one nearer to the |
1175 | * top |
1129 | * top |
1176 | */ |
1130 | */ |
1177 | else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) |
1131 | else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) |
1178 | { |
|
|
1179 | middle = tmp->face; |
|
|
1180 | middle_obj = tmp; |
1132 | middle = tmp; |
1181 | } |
|
|
1182 | } |
1133 | } |
1183 | |
1134 | |
1184 | if (tmp == tmp->above) |
1135 | if (tmp == tmp->above) |
1185 | { |
1136 | { |
1186 | LOG (llevError, "Error in structure of map\n"); |
1137 | LOG (llevError, "Error in structure of map\n"); |
… | |
… | |
1221 | * middle face. This should not happen, as we already have the |
1172 | * middle face. This should not happen, as we already have the |
1222 | * else statement above so middle should not get set. OTOH, it |
1173 | * else statement above so middle should not get set. OTOH, it |
1223 | * 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. |
1224 | */ |
1175 | */ |
1225 | if (top == middle) |
1176 | if (top == middle) |
1226 | middle = blank_face; |
1177 | middle = 0; |
1227 | |
1178 | |
1228 | /* There are three posibilities at this point: |
1179 | /* There are three posibilities at this point: |
1229 | * 1) top face is set, need middle to be set. |
1180 | * 1) top face is set, need middle to be set. |
1230 | * 2) middle is set, need to set top. |
1181 | * 2) middle is set, need to set top. |
1231 | * 3) neither middle or top is set - need to set both. |
1182 | * 3) neither middle or top is set - need to set both. |
… | |
… | |
1236 | /* 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 */ |
1237 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1188 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1238 | break; |
1189 | break; |
1239 | |
1190 | |
1240 | /* If two top faces are already set, quit processing */ |
1191 | /* If two top faces are already set, quit processing */ |
1241 | if ((top != blank_face) && (middle != blank_face)) |
1192 | if (top && middle) |
1242 | break; |
1193 | break; |
1243 | |
1194 | |
1244 | /* Only show visible faces */ |
1195 | /* Only show visible faces */ |
1245 | if (!tmp->invisible) |
1196 | if (!tmp->invisible) |
1246 | { |
1197 | { |
1247 | /* Fill in top if needed */ |
1198 | /* Fill in top if needed */ |
1248 | if (top == blank_face) |
1199 | if (!top) |
1249 | { |
1200 | { |
1250 | top = tmp->face; |
|
|
1251 | top_obj = tmp; |
1201 | top = tmp; |
1252 | if (top == middle) |
1202 | if (top == middle) |
1253 | middle = blank_face; |
1203 | middle = 0; |
1254 | } |
1204 | } |
1255 | else |
1205 | else |
1256 | { |
1206 | { |
1257 | /* top is already set - we should only get here if |
1207 | /* top is already set - we should only get here if |
1258 | * middle is not set |
1208 | * middle is not set |
1259 | * |
1209 | * |
1260 | * Set the middle face and break out, since there is nothing |
1210 | * Set the middle face and break out, since there is nothing |
1261 | * more to fill in. We don't check visiblity here, since |
1211 | * more to fill in. We don't check visiblity here, since |
1262 | * |
1212 | * |
1263 | */ |
1213 | */ |
1264 | if (tmp->face != top) |
1214 | if (tmp != top) |
1265 | { |
1215 | { |
1266 | middle = tmp->face; |
|
|
1267 | middle_obj = tmp; |
1216 | middle = tmp; |
1268 | break; |
1217 | break; |
1269 | } |
1218 | } |
1270 | } |
1219 | } |
1271 | } |
1220 | } |
1272 | } |
1221 | } |
1273 | |
1222 | |
1274 | if (middle == floor) |
1223 | if (middle == floor) |
1275 | middle = blank_face; |
1224 | middle = 0; |
1276 | |
1225 | |
1277 | if (top == middle) |
1226 | if (top == middle) |
1278 | middle = blank_face; |
1227 | middle = 0; |
1279 | |
1228 | |
1280 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
1229 | #if 0 |
1281 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
1230 | faces_obj [0] = top; |
1282 | 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 | |
|
|
1236 | uint64 |
|
|
1237 | mapspace::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; |
1283 | } |
1245 | } |
1284 | |
1246 | |
1285 | /* 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 |
1286 | * 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 |
1287 | * 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 |
… | |
… | |
1574 | get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) |
1536 | get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) |
1575 | { |
1537 | { |
1576 | 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)) |
1577 | { |
1539 | { |
1578 | /* be conservative and fill in _some_ data */ |
1540 | /* be conservative and fill in _some_ data */ |
1579 | retval->distance = 100000; |
1541 | retval->distance = 10000; |
1580 | retval->distance_x = 32767; |
1542 | retval->distance_x = 10000; |
1581 | retval->distance_y = 32767; |
1543 | retval->distance_y = 10000; |
1582 | retval->direction = 0; |
1544 | retval->direction = 0; |
1583 | retval->part = 0; |
1545 | retval->part = 0; |
1584 | } |
1546 | } |
1585 | else |
1547 | else |
1586 | { |
1548 | { |
… | |
… | |
1591 | |
1553 | |
1592 | best = op1; |
1554 | best = op1; |
1593 | /* If this is multipart, find the closest part now */ |
1555 | /* If this is multipart, find the closest part now */ |
1594 | if (!(flags & 0x1) && op1->more) |
1556 | if (!(flags & 0x1) && op1->more) |
1595 | { |
1557 | { |
1596 | object *tmp; |
|
|
1597 | 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; |
1598 | |
1559 | |
1599 | /* 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 |
1600 | * distance instead of doing all that work above again |
1561 | * distance instead of doing all that work above again |
1601 | * since the distance fields we set above are positive in the |
1562 | * since the distance fields we set above are positive in the |
1602 | * same axis as is used for multipart objects, the simply arithmetic |
1563 | * same axis as is used for multipart objects, the simply arithmetic |
1603 | * below works. |
1564 | * below works. |
1604 | */ |
1565 | */ |
1605 | for (tmp = op1->more; tmp != NULL; tmp = tmp->more) |
1566 | for (object *tmp = op1->more; tmp; tmp = tmp->more) |
1606 | { |
1567 | { |
1607 | 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) + |
1608 | (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); |
1609 | if (tmpi < best_distance) |
1570 | if (tmpi < best_distance) |
1610 | { |
1571 | { |
… | |
… | |
1619 | retval->distance_y += op1->y - best->y; |
1580 | retval->distance_y += op1->y - best->y; |
1620 | } |
1581 | } |
1621 | } |
1582 | } |
1622 | |
1583 | |
1623 | retval->part = best; |
1584 | retval->part = best; |
1624 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
1585 | retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); |
1625 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1586 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1626 | } |
1587 | } |
1627 | } |
1588 | } |
1628 | |
1589 | |
1629 | /* 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 |
… | |
… | |
1697 | return default_region; |
1658 | return default_region; |
1698 | |
1659 | |
1699 | return ::region::default_region (); |
1660 | return ::region::default_region (); |
1700 | } |
1661 | } |
1701 | |
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 | */ |
|
|
1667 | object * |
|
|
1668 | maptile::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 | |