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.77 by root, Thu Jan 18 16:19:34 2007 UTC vs.
Revision 1.96 by root, Thu Mar 15 14:23:02 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)
501 { 468 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500) 469 if (cede_count >= 500)
504 { 470 {
505 cede_count = 0; 471 cede_count = 0;
506 coroapi::cede (); 472 coroapi::cede ();
507 } 473 }
508#endif
509 474
510 int unique = 0; 475 int unique = 0;
511 for (object *op = spaces [i].bot; op; op = op->above) 476 for (object *op = spaces [i].bot; op; op = op->above)
512 { 477 {
513 // count per-object, but cede only when modification-safe 478 // count per-object, but cede only when modification-safe
… …
520 continue; 485 continue;
521 486
522 if (unique || op->flag [FLAG_UNIQUE]) 487 if (unique || op->flag [FLAG_UNIQUE])
523 { 488 {
524 if (flags & IO_UNIQUES) 489 if (flags & IO_UNIQUES)
525 save_object (freezer, op, 1); 490 op->write (f);
526 } 491 }
527 else if (flags & IO_OBJECTS) 492 else if (flags & IO_OBJECTS)
528 save_object (freezer, op, 1); 493 op->write (f);
529 } 494 }
530 } 495 }
531 496
532 return true; 497 return true;
533} 498}
534 499
535bool 500bool
536maptile::_load_objects (const char *path, bool skip_header) 501maptile::_load_objects (const char *path, bool skip_header)
537{ 502{
538 object_thawer thawer (path); 503 object_thawer f (path);
539 504
540 if (!thawer) 505 if (!f)
541 return false; 506 return false;
507
508 f.next ();
542 509
543 if (skip_header) 510 if (skip_header)
544 for (;;) 511 for (;;)
545 { 512 {
546 keyword kw = thawer.get_kv (); 513 keyword kw = f.kw;
547 514 f.skip ();
548 if (kw == KW_end) 515 if (kw == KW_end)
549 break; 516 break;
550
551 thawer.skip_kv (kw);
552 } 517 }
553 518
554 return _load_objects (thawer); 519 return _load_objects (f);
555} 520}
556 521
557bool 522bool
558maptile::_save_objects (const char *path, int flags) 523maptile::_save_objects (const char *path, int flags)
559{ 524{
… …
568maptile::maptile () 533maptile::maptile ()
569{ 534{
570 in_memory = MAP_SWAPPED; 535 in_memory = MAP_SWAPPED;
571 536
572 /* The maps used to pick up default x and y values from the 537 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 538 * map archetype. Mimic that behaviour.
574 */ 539 */
575 width = 16; 540 width = 16;
576 height = 16; 541 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 542 timeout = 300;
579 enter_x = 0; 543 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 544 max_volume = 2000000; // 2m³
581} 545}
582 546
583maptile::maptile (int w, int h) 547maptile::maptile (int w, int h)
584{ 548{
585 in_memory = MAP_SWAPPED; 549 in_memory = MAP_SWAPPED;
… …
739 { 703 {
740 keyword kw = thawer.get_kv (); 704 keyword kw = thawer.get_kv ();
741 705
742 switch (kw) 706 switch (kw)
743 { 707 {
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: 708 case KW_msg:
757 thawer.get_ml (KW_endmsg, msg); 709 thawer.get_ml (KW_endmsg, msg);
758 break; 710 break;
759 711
760 case KW_lore: // CF+ extension 712 case KW_lore: // CF+ extension
… …
792 case KW_sky: thawer.get (sky); break; 744 case KW_sky: thawer.get (sky); break;
793 745
794 case KW_per_player: thawer.get (per_player); break; 746 case KW_per_player: thawer.get (per_player); break;
795 case KW_per_party: thawer.get (per_party); break; 747 case KW_per_party: thawer.get (per_party); break;
796 748
797 case KW_region: get_region_by_name (thawer.get_str ()); break; 749 case KW_region: default_region = region::find (thawer.get_str ()); break;
798 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 750 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
799 751
800 // old names new names 752 // old names new names
801 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 753 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
802 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 754 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
810 762
811 case KW_tile_path_1: thawer.get (tile_path [0]); break; 763 case KW_tile_path_1: thawer.get (tile_path [0]); break;
812 case KW_tile_path_2: thawer.get (tile_path [1]); break; 764 case KW_tile_path_2: thawer.get (tile_path [1]); break;
813 case KW_tile_path_3: thawer.get (tile_path [2]); break; 765 case KW_tile_path_3: thawer.get (tile_path [2]); break;
814 case KW_tile_path_4: thawer.get (tile_path [3]); break; 766 case KW_tile_path_4: thawer.get (tile_path [3]); break;
767
768 case KW_end:
769 return true;
770
771 default:
772 if (!thawer.parse_error ("map", 0))
773 return false;
774 break;
815 } 775 }
816 } 776 }
817 777
818 abort (); 778 abort ();
819} 779}
… …
871 MAP_OUT (reset_time); 831 MAP_OUT (reset_time);
872 MAP_OUT (reset_timeout); 832 MAP_OUT (reset_timeout);
873 MAP_OUT (fixed_resettime); 833 MAP_OUT (fixed_resettime);
874 MAP_OUT (difficulty); 834 MAP_OUT (difficulty);
875 835
876 if (region) MAP_OUT2 (region, region->name); 836 if (default_region) MAP_OUT2 (region, default_region->name);
877 837
878 if (shopitems) 838 if (shopitems)
879 { 839 {
880 char shop[MAX_BUF]; 840 char shop[MAX_BUF];
881 print_shop_string (this, shop); 841 print_shop_string (this, shop);
… …
932 * Remove and free all objects in the given map. 892 * Remove and free all objects in the given map.
933 */ 893 */
934void 894void
935maptile::clear () 895maptile::clear ()
936{ 896{
897 sfree (regions, size ()), regions = 0;
898 free (regionmap), regionmap = 0;
899
937 if (!spaces) 900 if (spaces)
938 return; 901 {
939
940 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 902 for (mapspace *ms = spaces + size (); ms-- > spaces; )
941 while (object *op = ms->bot) 903 while (object *op = ms->bot)
942 { 904 {
943 if (op->head) 905 if (op->head)
944 op = op->head; 906 op = op->head;
945 907
946 op->destroy_inv (false); 908 op->destroy_inv (false);
947 op->destroy (); 909 op->destroy ();
948 } 910 }
949 911
950 sfree (spaces, size ()), spaces = 0; 912 sfree (spaces, size ()), spaces = 0;
913 }
951 914
952 if (buttons) 915 if (buttons)
953 free_objectlinkpt (buttons), buttons = 0; 916 free_objectlinkpt (buttons), buttons = 0;
954} 917}
955 918
… …
1110void 1073void
1111mapspace::update_ () 1074mapspace::update_ ()
1112{ 1075{
1113 object *tmp, *last = 0; 1076 object *tmp, *last = 0;
1114 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1077 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1115 New_Face *top, *floor, *middle;
1116 object *top_obj, *floor_obj, *middle_obj;
1117 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;
1118 1079
1119 middle = blank_face; 1080 //object *middle = 0;
1120 top = blank_face; 1081 //object *top = 0;
1121 floor = blank_face; 1082 //object *floor = 0;
1122 1083 // this seems to generate better code than using locals, above
1123 middle_obj = 0; 1084 object *&top = faces_obj[0] = 0;
1124 top_obj = 0; 1085 object *&middle = faces_obj[1] = 0;
1125 floor_obj = 0; 1086 object *&floor = faces_obj[2] = 0;
1126 1087
1127 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1088 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1128 { 1089 {
1129 /* This could be made additive I guess (two lights better than 1090 /* This could be made additive I guess (two lights better than
1130 * 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
… …
1143 * Always put the player down for drawing. 1104 * Always put the player down for drawing.
1144 */ 1105 */
1145 if (!tmp->invisible) 1106 if (!tmp->invisible)
1146 { 1107 {
1147 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1108 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1148 {
1149 top = tmp->face;
1150 top_obj = tmp; 1109 top = tmp;
1151 }
1152 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1110 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1153 { 1111 {
1154 /* 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,
1155 * so should not be visible, so we clear them. 1113 * so should not be visible, so we clear them.
1156 */ 1114 */
1157 middle = blank_face; 1115 middle = 0;
1158 top = blank_face; 1116 top = 0;
1159 floor = tmp->face;
1160 floor_obj = tmp; 1117 floor = tmp;
1161 } 1118 }
1162 /* Flag anywhere have high priority */ 1119 /* Flag anywhere have high priority */
1163 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1120 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1164 { 1121 {
1165 middle = tmp->face;
1166
1167 middle_obj = tmp; 1122 middle = tmp;
1168 anywhere = 1; 1123 anywhere = 1;
1169 } 1124 }
1170 /* Find the highest visible face around. If equal 1125 /* Find the highest visible face around. If equal
1171 * visibilities, we still want the one nearer to the 1126 * visibilities, we still want the one nearer to the
1172 * top 1127 * top
1173 */ 1128 */
1174 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1129 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1175 {
1176 middle = tmp->face;
1177 middle_obj = tmp; 1130 middle = tmp;
1178 }
1179 } 1131 }
1180 1132
1181 if (tmp == tmp->above) 1133 if (tmp == tmp->above)
1182 { 1134 {
1183 LOG (llevError, "Error in structure of map\n"); 1135 LOG (llevError, "Error in structure of map\n");
… …
1218 * middle face. This should not happen, as we already have the 1170 * middle face. This should not happen, as we already have the
1219 * else statement above so middle should not get set. OTOH, it 1171 * else statement above so middle should not get set. OTOH, it
1220 * 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.
1221 */ 1173 */
1222 if (top == middle) 1174 if (top == middle)
1223 middle = blank_face; 1175 middle = 0;
1224 1176
1225 /* There are three posibilities at this point: 1177 /* There are three posibilities at this point:
1226 * 1) top face is set, need middle to be set. 1178 * 1) top face is set, need middle to be set.
1227 * 2) middle is set, need to set top. 1179 * 2) middle is set, need to set top.
1228 * 3) neither middle or top is set - need to set both. 1180 * 3) neither middle or top is set - need to set both.
… …
1233 /* 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 */
1234 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1186 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1235 break; 1187 break;
1236 1188
1237 /* If two top faces are already set, quit processing */ 1189 /* If two top faces are already set, quit processing */
1238 if ((top != blank_face) && (middle != blank_face)) 1190 if (top && middle)
1239 break; 1191 break;
1240 1192
1241 /* Only show visible faces */ 1193 /* Only show visible faces */
1242 if (!tmp->invisible) 1194 if (!tmp->invisible)
1243 { 1195 {
1244 /* Fill in top if needed */ 1196 /* Fill in top if needed */
1245 if (top == blank_face) 1197 if (!top)
1246 { 1198 {
1247 top = tmp->face;
1248 top_obj = tmp; 1199 top = tmp;
1249 if (top == middle) 1200 if (top == middle)
1250 middle = blank_face; 1201 middle = 0;
1251 } 1202 }
1252 else 1203 else
1253 { 1204 {
1254 /* top is already set - we should only get here if 1205 /* top is already set - we should only get here if
1255 * middle is not set 1206 * middle is not set
1256 * 1207 *
1257 * Set the middle face and break out, since there is nothing 1208 * Set the middle face and break out, since there is nothing
1258 * more to fill in. We don't check visiblity here, since 1209 * more to fill in. We don't check visiblity here, since
1259 * 1210 *
1260 */ 1211 */
1261 if (tmp->face != top) 1212 if (tmp != top)
1262 { 1213 {
1263 middle = tmp->face;
1264 middle_obj = tmp; 1214 middle = tmp;
1265 break; 1215 break;
1266 } 1216 }
1267 } 1217 }
1268 } 1218 }
1269 } 1219 }
1270 1220
1271 if (middle == floor) 1221 if (middle == floor)
1272 middle = blank_face; 1222 middle = 0;
1273 1223
1274 if (top == middle) 1224 if (top == middle)
1275 middle = blank_face; 1225 middle = 0;
1276 1226
1277 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1227#if 0
1278 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1228 faces_obj [0] = top;
1279 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1229 faces_obj [1] = middle;
1230 faces_obj [2] = floor;
1231#endif
1232}
1233
1234uint64
1235mapspace::volume () const
1236{
1237 uint64 vol = 0;
1238
1239 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1240 vol += op->volume ();
1241
1242 return vol;
1280} 1243}
1281 1244
1282/* this updates the orig_map->tile_map[tile_num] value after finding 1245/* this updates the orig_map->tile_map[tile_num] value after finding
1283 * the map. It also takes care of linking back the freshly found 1246 * the map. It also takes care of linking back the freshly found
1284 * maps tile_map values if it tiles back to this one. It returns 1247 * maps tile_map values if it tiles back to this one. It returns
… …
1449 1412
1450/** 1413/**
1451 * Return whether map2 is adjacent to map1. If so, store the distance from 1414 * Return whether map2 is adjacent to map1. If so, store the distance from
1452 * map1 to map2 in dx/dy. 1415 * map1 to map2 in dx/dy.
1453 */ 1416 */
1454static int 1417int
1455adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1418adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1456{ 1419{
1457 if (!map1 || !map2) 1420 if (!map1 || !map2)
1458 return 0; 1421 return 0;
1459 1422
… …
1550/* From map.c 1513/* From map.c
1551 * This is used by get_player to determine where the other 1514 * This is used by get_player to determine where the other
1552 * creature is. get_rangevector takes into account map tiling, 1515 * creature is. get_rangevector takes into account map tiling,
1553 * so you just can not look the the map coordinates and get the 1516 * so you just can not look the the map coordinates and get the
1554 * righte value. distance_x/y are distance away, which 1517 * righte value. distance_x/y are distance away, which
1555 * can be negativbe. direction is the crossfire direction scheme 1518 * can be negative. direction is the crossfire direction scheme
1556 * that the creature should head. part is the part of the 1519 * that the creature should head. part is the part of the
1557 * monster that is closest. 1520 * monster that is closest.
1558 * 1521 *
1559 * get_rangevector looks at op1 and op2, and fills in the 1522 * get_rangevector looks at op1 and op2, and fills in the
1560 * structure for op1 to get to op2. 1523 * structure for op1 to get to op2.
… …
1571get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1534get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1572{ 1535{
1573 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1536 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1574 { 1537 {
1575 /* be conservative and fill in _some_ data */ 1538 /* be conservative and fill in _some_ data */
1576 retval->distance = 100000; 1539 retval->distance = 10000;
1577 retval->distance_x = 32767; 1540 retval->distance_x = 10000;
1578 retval->distance_y = 32767; 1541 retval->distance_y = 10000;
1579 retval->direction = 0; 1542 retval->direction = 0;
1580 retval->part = 0; 1543 retval->part = 0;
1581 } 1544 }
1582 else 1545 else
1583 { 1546 {
… …
1588 1551
1589 best = op1; 1552 best = op1;
1590 /* If this is multipart, find the closest part now */ 1553 /* If this is multipart, find the closest part now */
1591 if (!(flags & 0x1) && op1->more) 1554 if (!(flags & 0x1) && op1->more)
1592 { 1555 {
1593 object *tmp;
1594 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1556 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1595 1557
1596 /* we just take the offset of the piece to head to figure 1558 /* we just take the offset of the piece to head to figure
1597 * distance instead of doing all that work above again 1559 * distance instead of doing all that work above again
1598 * since the distance fields we set above are positive in the 1560 * since the distance fields we set above are positive in the
1599 * same axis as is used for multipart objects, the simply arithmetic 1561 * same axis as is used for multipart objects, the simply arithmetic
1600 * below works. 1562 * below works.
1601 */ 1563 */
1602 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1564 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1603 { 1565 {
1604 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1566 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1605 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1567 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1606 if (tmpi < best_distance) 1568 if (tmpi < best_distance)
1607 { 1569 {
… …
1616 retval->distance_y += op1->y - best->y; 1578 retval->distance_y += op1->y - best->y;
1617 } 1579 }
1618 } 1580 }
1619 1581
1620 retval->part = best; 1582 retval->part = best;
1621 retval->distance = idistance (retval->distance_x, retval->distance_y); 1583 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1622 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1584 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1623 } 1585 }
1624} 1586}
1625 1587
1626/* this is basically the same as get_rangevector above, but instead of 1588/* this is basically the same as get_rangevector above, but instead of
… …
1631 * flags has no meaning for this function at this time - I kept it in to 1593 * flags has no meaning for this function at this time - I kept it in to
1632 * be more consistant with the above function and also in case they are needed 1594 * be more consistant with the above function and also in case they are needed
1633 * for something in the future. Also, since no object is pasted, the best 1595 * for something in the future. Also, since no object is pasted, the best
1634 * field of the rv_vector is set to NULL. 1596 * field of the rv_vector is set to NULL.
1635 */ 1597 */
1636
1637void 1598void
1638get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1599get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1639{ 1600{
1640 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1601 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1641 { 1602 {
1642 /* be conservative and fill in _some_ data */ 1603 /* be conservative and fill in _some_ data */
1643 retval->distance = 100000; 1604 retval->distance = 100000;
… …
1680 op->remove (); 1641 op->remove ();
1681 1642
1682 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1643 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1683} 1644}
1684 1645
1646region *
1647maptile::region (int x, int y) const
1648{
1649 if (regions
1650 && regionmap
1651 && !OUT_OF_REAL_MAP (this, x, y))
1652 if (struct region *reg = regionmap [regions [y * width + x]])
1653 return reg;
1654
1655 if (default_region)
1656 return default_region;
1657
1658 return ::region::default_region ();
1659}
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;
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