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.72 by root, Sat Jan 13 23:06:12 2007 UTC vs.
Revision 1.96 by root, Thu Mar 15 14:23:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
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.
… …
228 229
229 } 230 }
230 return 0; 231 return 0;
231} 232}
232 233
233
234/* 234/*
235 * Returns true if the given object can't fit in the given spot. 235 * Returns true if the given object can't fit in the given spot.
236 * This is meant for multi space objects - for single space objecs, 236 * This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
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)
… …
519 continue; 485 continue;
520 486
521 if (unique || op->flag [FLAG_UNIQUE]) 487 if (unique || op->flag [FLAG_UNIQUE])
522 { 488 {
523 if (flags & IO_UNIQUES) 489 if (flags & IO_UNIQUES)
524 save_object (freezer, op, 1); 490 op->write (f);
525 } 491 }
526 else if (flags & IO_OBJECTS) 492 else if (flags & IO_OBJECTS)
527 save_object (freezer, op, 1); 493 op->write (f);
528 } 494 }
529 } 495 }
530 496
531 return true; 497 return true;
532} 498}
533 499
534bool 500bool
535maptile::_load_objects (const char *path, bool skip_header) 501maptile::_load_objects (const char *path, bool skip_header)
536{ 502{
537 object_thawer thawer (path); 503 object_thawer f (path);
538 504
539 if (!thawer) 505 if (!f)
540 return false; 506 return false;
507
508 f.next ();
541 509
542 if (skip_header) 510 if (skip_header)
543 for (;;) 511 for (;;)
544 { 512 {
545 keyword kw = thawer.get_kv (); 513 keyword kw = f.kw;
546 514 f.skip ();
547 if (kw == KW_end) 515 if (kw == KW_end)
548 break; 516 break;
549
550 thawer.skip_kv (kw);
551 } 517 }
552 518
553 return _load_objects (thawer); 519 return _load_objects (f);
554} 520}
555 521
556bool 522bool
557maptile::_save_objects (const char *path, int flags) 523maptile::_save_objects (const char *path, int flags)
558{ 524{
… …
567maptile::maptile () 533maptile::maptile ()
568{ 534{
569 in_memory = MAP_SWAPPED; 535 in_memory = MAP_SWAPPED;
570 536
571 /* 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
572 * map archetype. Mimic that behaviour. 538 * map archetype. Mimic that behaviour.
573 */ 539 */
574 width = 16; 540 width = 16;
575 height = 16; 541 height = 16;
576 reset_timeout = 0;
577 timeout = 300; 542 timeout = 300;
578 enter_x = 0; 543 max_nrof = 1000; // 1000 items of anything
579 enter_y = 0; 544 max_volume = 2000000; // 2m³
580} 545}
581 546
582maptile::maptile (int w, int h) 547maptile::maptile (int w, int h)
583{ 548{
584 in_memory = MAP_SWAPPED; 549 in_memory = MAP_SWAPPED;
… …
738 { 703 {
739 keyword kw = thawer.get_kv (); 704 keyword kw = thawer.get_kv ();
740 705
741 switch (kw) 706 switch (kw)
742 { 707 {
743 case KW_EOF:
744 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
745 return false;
746
747 case KW_end:
748 return true;
749
750 default:
751 case KW_ERROR:
752 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
753 break;
754
755 case KW_msg: 708 case KW_msg:
756 thawer.get_ml (KW_endmsg, msg); 709 thawer.get_ml (KW_endmsg, msg);
757 break; 710 break;
758 711
759 case KW_lore: // CF+ extension 712 case KW_lore: // CF+ extension
… …
791 case KW_sky: thawer.get (sky); break; 744 case KW_sky: thawer.get (sky); break;
792 745
793 case KW_per_player: thawer.get (per_player); break; 746 case KW_per_player: thawer.get (per_player); break;
794 case KW_per_party: thawer.get (per_party); break; 747 case KW_per_party: thawer.get (per_party); break;
795 748
796 case KW_region: get_region_by_name (thawer.get_str ()); break; 749 case KW_region: default_region = region::find (thawer.get_str ()); break;
797 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 750 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
798 751
799 // old names new names 752 // old names new names
800 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;
801 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;
… …
809 762
810 case KW_tile_path_1: thawer.get (tile_path [0]); break; 763 case KW_tile_path_1: thawer.get (tile_path [0]); break;
811 case KW_tile_path_2: thawer.get (tile_path [1]); break; 764 case KW_tile_path_2: thawer.get (tile_path [1]); break;
812 case KW_tile_path_3: thawer.get (tile_path [2]); break; 765 case KW_tile_path_3: thawer.get (tile_path [2]); break;
813 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;
814 } 775 }
815 } 776 }
816 777
817 abort (); 778 abort ();
818} 779}
… …
870 MAP_OUT (reset_time); 831 MAP_OUT (reset_time);
871 MAP_OUT (reset_timeout); 832 MAP_OUT (reset_timeout);
872 MAP_OUT (fixed_resettime); 833 MAP_OUT (fixed_resettime);
873 MAP_OUT (difficulty); 834 MAP_OUT (difficulty);
874 835
875 if (region) MAP_OUT2 (region, region->name); 836 if (default_region) MAP_OUT2 (region, default_region->name);
876 837
877 if (shopitems) 838 if (shopitems)
878 { 839 {
879 char shop[MAX_BUF]; 840 char shop[MAX_BUF];
880 print_shop_string (this, shop); 841 print_shop_string (this, shop);
… …
931 * Remove and free all objects in the given map. 892 * Remove and free all objects in the given map.
932 */ 893 */
933void 894void
934maptile::clear () 895maptile::clear ()
935{ 896{
897 sfree (regions, size ()), regions = 0;
898 free (regionmap), regionmap = 0;
899
936 if (!spaces) 900 if (spaces)
937 return; 901 {
938
939 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 902 for (mapspace *ms = spaces + size (); ms-- > spaces; )
940 while (object *op = ms->bot) 903 while (object *op = ms->bot)
941 { 904 {
942 if (op->head) 905 if (op->head)
943 op = op->head; 906 op = op->head;
944 907
945 op->destroy_inv (false); 908 op->destroy_inv (false);
946 op->destroy (); 909 op->destroy ();
947 } 910 }
948 911
949 sfree (spaces, size ()), spaces = 0; 912 sfree (spaces, size ()), spaces = 0;
913 }
950 914
951 if (buttons) 915 if (buttons)
952 free_objectlinkpt (buttons), buttons = 0; 916 free_objectlinkpt (buttons), buttons = 0;
953} 917}
954 918
… …
1108 */ 1072 */
1109void 1073void
1110mapspace::update_ () 1074mapspace::update_ ()
1111{ 1075{
1112 object *tmp, *last = 0; 1076 object *tmp, *last = 0;
1113 uint8 flags = 0, light = 0, anywhere = 0; 1077 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1114 New_Face *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
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;
1279} 1243}
1280 1244
1281/* 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
1282 * 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
1283 * 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
… …
1448 1412
1449/** 1413/**
1450 * 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
1451 * map1 to map2 in dx/dy. 1415 * map1 to map2 in dx/dy.
1452 */ 1416 */
1453static int 1417int
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1418adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1419{
1456 if (!map1 || !map2) 1420 if (!map1 || !map2)
1457 return 0; 1421 return 0;
1458 1422
… …
1549/* From map.c 1513/* From map.c
1550 * This is used by get_player to determine where the other 1514 * This is used by get_player to determine where the other
1551 * creature is. get_rangevector takes into account map tiling, 1515 * creature is. get_rangevector takes into account map tiling,
1552 * 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
1553 * righte value. distance_x/y are distance away, which 1517 * righte value. distance_x/y are distance away, which
1554 * can be negativbe. direction is the crossfire direction scheme 1518 * can be negative. direction is the crossfire direction scheme
1555 * that the creature should head. part is the part of the 1519 * that the creature should head. part is the part of the
1556 * monster that is closest. 1520 * monster that is closest.
1557 * 1521 *
1558 * get_rangevector looks at op1 and op2, and fills in the 1522 * get_rangevector looks at op1 and op2, and fills in the
1559 * structure for op1 to get to op2. 1523 * structure for op1 to get to op2.
… …
1570get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1534get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1571{ 1535{
1572 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))
1573 { 1537 {
1574 /* be conservative and fill in _some_ data */ 1538 /* be conservative and fill in _some_ data */
1575 retval->distance = 100000; 1539 retval->distance = 10000;
1576 retval->distance_x = 32767; 1540 retval->distance_x = 10000;
1577 retval->distance_y = 32767; 1541 retval->distance_y = 10000;
1578 retval->direction = 0; 1542 retval->direction = 0;
1579 retval->part = 0; 1543 retval->part = 0;
1580 } 1544 }
1581 else 1545 else
1582 { 1546 {
… …
1587 1551
1588 best = op1; 1552 best = op1;
1589 /* If this is multipart, find the closest part now */ 1553 /* If this is multipart, find the closest part now */
1590 if (!(flags & 0x1) && op1->more) 1554 if (!(flags & 0x1) && op1->more)
1591 { 1555 {
1592 object *tmp;
1593 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;
1594 1557
1595 /* 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
1596 * distance instead of doing all that work above again 1559 * distance instead of doing all that work above again
1597 * since the distance fields we set above are positive in the 1560 * since the distance fields we set above are positive in the
1598 * same axis as is used for multipart objects, the simply arithmetic 1561 * same axis as is used for multipart objects, the simply arithmetic
1599 * below works. 1562 * below works.
1600 */ 1563 */
1601 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1564 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1602 { 1565 {
1603 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) +
1604 (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);
1605 if (tmpi < best_distance) 1568 if (tmpi < best_distance)
1606 { 1569 {
1607 best_distance = tmpi; 1570 best_distance = tmpi;
1608 best = tmp; 1571 best = tmp;
1609 } 1572 }
1610 } 1573 }
1574
1611 if (best != op1) 1575 if (best != op1)
1612 { 1576 {
1613 retval->distance_x += op1->x - best->x; 1577 retval->distance_x += op1->x - best->x;
1614 retval->distance_y += op1->y - best->y; 1578 retval->distance_y += op1->y - best->y;
1615 } 1579 }
1616 } 1580 }
1581
1617 retval->part = best; 1582 retval->part = best;
1618 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1583 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1619 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1584 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1620 } 1585 }
1621} 1586}
1622 1587
1623/* 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
… …
1628 * 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
1629 * 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
1630 * 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
1631 * field of the rv_vector is set to NULL. 1596 * field of the rv_vector is set to NULL.
1632 */ 1597 */
1633
1634void 1598void
1635get_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)
1636{ 1600{
1637 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))
1638 { 1602 {
1639 /* be conservative and fill in _some_ data */ 1603 /* be conservative and fill in _some_ data */
1640 retval->distance = 100000; 1604 retval->distance = 100000;
… …
1647 { 1611 {
1648 retval->distance_x += op2->x - x; 1612 retval->distance_x += op2->x - x;
1649 retval->distance_y += op2->y - y; 1613 retval->distance_y += op2->y - y;
1650 1614
1651 retval->part = NULL; 1615 retval->part = NULL;
1652 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1616 retval->distance = idistance (retval->distance_x, retval->distance_y);
1653 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1617 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1654 } 1618 }
1655} 1619}
1656 1620
1657/* Returns true of op1 and op2 are effectively on the same map 1621/* Returns true of op1 and op2 are effectively on the same map
… …
1677 op->remove (); 1641 op->remove ();
1678 1642
1679 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);
1680} 1644}
1681 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