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.119 by root, Fri Aug 24 00:53:54 2007 UTC vs.
Revision 1.157 by root, Thu Jan 8 19:23:44 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra 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 3 of the License, or 10 * the Free Software Foundation, either version 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h" 27#include "loader.h"
30
31#include "path.h" 28#include "path.h"
29
30sint8 maptile::outdoor_darkness;
32 31
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
35 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
36 * new values into newmap, nx, and ny. Any and all of those 35 * new values into newmap, nx, and ny. Any and all of those
… …
166 } 165 }
167 return 0; 166 return 0;
168} 167}
169 168
170/* 169/*
171 * Returns true if the given object can't fit in the given spot. 170 * Returns qthe blocking object if the given object can't fit in the given
172 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
176 * 175 *
177 * While this doesn't call out of map, the get_map_flags does. 176 * While this doesn't call out of map, the get_map_flags does.
178 * 177 *
179 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
191 * 190 *
192 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 192 * code, we need to have actual object to check its move_type
194 * against the move_block values. 193 * against the move_block values.
195 */ 194 */
196int 195bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
198{ 197{
199 archetype *tmp; 198 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
200 int flag;
201 maptile *m1;
202 sint16 sx, sy;
203
204 if (!ob)
205 {
206 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
207 if (flag & P_OUT_OF_MAP)
208 return P_OUT_OF_MAP;
209
210 /* don't have object, so don't know what types would block */
211 return m1->at (sx, sy).move_block;
212 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
213 201
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 202 if (!pos.normalise ())
215 { 203 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 204
218 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 206
220 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 208 return 1;
222 209
223 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
224 211 * (signifying non-moving objects)
225 /* find_first_free_spot() calls this function. However, often
226 * ob doesn't have any move type (when used to place exits)
227 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 212 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 213 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 215 continue;
232 216
233 /* Note it is intentional that we check ob - the movement type of the 217 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
235 */ 219 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
237 return P_NO_PASS; 221 return 1;
238 } 222 }
239 223
240 return 0; 224 return 0;
241} 225}
242 226
… …
260 244
261 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
262 tmp = next; 246 tmp = next;
263 } 247 }
264 248
265 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
266 * carrying. 250 //TODO: remove
267 */ 251 container->update_weight ();
268 sum_weight (container);
269} 252}
270 253
271void 254void
272maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
273{ 256{
… …
275 return; 258 return;
276 259
277 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 260 for (mapspace *ms = spaces + size (); ms-- > spaces; )
278 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 261 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279 tmp->flag [flag] = value; 262 tmp->flag [flag] = value;
263}
264
265void
266maptile::post_load_original ()
267{
268 if (!spaces)
269 return;
270
271 set_object_flag (FLAG_OBJ_ORIGINAL);
272
273 for (mapspace *ms = spaces + size (); ms-- > spaces; )
274 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
275 INVOKE_OBJECT (RESET, tmp);
280} 276}
281 277
282/* link_multipart_objects go through all the objects on the map looking 278/* link_multipart_objects go through all the objects on the map looking
283 * for objects whose arch says they are multipart yet according to the 279 * for objects whose arch says they are multipart yet according to the
284 * info we have, they only have the head (as would be expected when 280 * info we have, they only have the head (as would be expected when
… …
322bool 318bool
323maptile::_load_objects (object_thawer &f) 319maptile::_load_objects (object_thawer &f)
324{ 320{
325 for (;;) 321 for (;;)
326 { 322 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 323 coroapi::cede_to_tick (); // cede once in a while
328 324
329 switch (f.kw) 325 switch (f.kw)
330 { 326 {
331 case KW_arch: 327 case KW_arch:
332 if (object *op = object::read (f, this)) 328 if (object *op = object::read (f, this))
333 { 329 {
330 // TODO: why?
334 if (op->inv) 331 if (op->inv)
335 sum_weight (op); 332 op->update_weight ();
336 333
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 334 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
335 {
336 // we insert manually because
337 // a) its way faster
338 // b) we remove manually, too, and there are good reasons for that
339 // c) its correct
340 mapspace &ms = at (op->x, op->y);
341
342 op->flag [FLAG_REMOVED] = false;
343
344 op->above = 0;
345 op->below = ms.top;
346
347 if (ms.top)
348 ms.top->above = op;
349 else
350 ms.bot = op;
351
352 ms.top = op;
353 ms.flags_ = 0;
354 }
355 else
356 {
357 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
358 op->destroy ();
359 }
338 } 360 }
339 361
340 continue; 362 continue;
341 363
342 case KW_EOF: 364 case KW_EOF:
… …
383 if (!spaces) 405 if (!spaces)
384 return false; 406 return false;
385 407
386 for (int i = 0; i < size (); ++i) 408 for (int i = 0; i < size (); ++i)
387 { 409 {
388 int unique = 0; 410 bool unique = 0;
411
389 for (object *op = spaces [i].bot; op; op = op->above) 412 for (object *op = spaces [i].bot; op; op = op->above)
390 { 413 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 414 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 415
394 if (!op->can_map_save ()) 416 if (expect_false (!op->can_map_save ()))
395 continue; 417 continue;
396 418
397 if (unique || op->flag [FLAG_UNIQUE]) 419 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 420 {
399 if (flags & IO_UNIQUES) 421 if (flags & IO_UNIQUES)
400 op->write (f); 422 op->write (f);
401 } 423 }
402 else if (flags & IO_OBJECTS) 424 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 425 op->write (f);
404 } 426 }
405 } 427 }
406 428
407 coroapi::cede_to_tick (); 429 coroapi::cede_to_tick ();
408 430
409 return true; 431 return true;
410}
411
412bool
413maptile::_load_objects (const char *path, bool skip_header)
414{
415 object_thawer f (path);
416
417 if (!f)
418 return false;
419
420 f.next ();
421
422 if (skip_header)
423 for (;;)
424 {
425 keyword kw = f.kw;
426 f.skip ();
427 if (kw == KW_end)
428 break;
429 }
430
431 return _load_objects (f);
432} 432}
433 433
434bool 434bool
435maptile::_save_objects (const char *path, int flags) 435maptile::_save_objects (const char *path, int flags)
436{ 436{
… …
611bool 611bool
612maptile::_load_header (object_thawer &thawer) 612maptile::_load_header (object_thawer &thawer)
613{ 613{
614 for (;;) 614 for (;;)
615 { 615 {
616 thawer.next ();
617
618 switch (thawer.kw) 616 switch (thawer.kw)
619 { 617 {
620 case KW_msg: 618 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 619 thawer.get_ml (KW_endmsg, msg);
622 break; 620 break;
… …
656 case KW_sky: thawer.get (sky); break; 654 case KW_sky: thawer.get (sky); break;
657 655
658 case KW_per_player: thawer.get (per_player); break; 656 case KW_per_player: thawer.get (per_player); break;
659 case KW_per_party: thawer.get (per_party); break; 657 case KW_per_party: thawer.get (per_party); break;
660 case KW_no_reset: thawer.get (no_reset); break; 658 case KW_no_reset: thawer.get (no_reset); break;
659 case KW_no_drop: thawer.get (no_drop); break;
661 660
662 case KW_region: default_region = region::find (thawer.get_str ()); break; 661 case KW_region: default_region = region::find (thawer.get_str ()); break;
663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 662 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664 663
665 // old names new names 664 // old names new names
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 676 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 677 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 678 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 679
681 case KW_ERROR: 680 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 681 set_key_text (thawer.kw_str, thawer.value);
683 break; 682 break;
684 683
685 case KW_end: 684 case KW_end:
685 thawer.next ();
686 return true; 686 return true;
687 687
688 default: 688 default:
689 if (!thawer.parse_error ("map", 0)) 689 if (!thawer.parse_error ("map", 0))
690 return false; 690 return false;
691 break; 691 break;
692 } 692 }
693
694 thawer.next ();
693 } 695 }
694 696
695 abort (); 697 abort ();
696}
697
698bool
699maptile::_load_header (const char *path)
700{
701 object_thawer thawer (path);
702
703 if (!thawer)
704 return false;
705
706 return _load_header (thawer);
707} 698}
708 699
709/****************************************************************************** 700/******************************************************************************
710 * This is the start of unique map handling code 701 * This is the start of unique map handling code
711 *****************************************************************************/ 702 *****************************************************************************/
… …
723 714
724 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 715 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
725 unique = 1; 716 unique = 1;
726 717
727 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 718 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
728 {
729 op->destroy_inv (false);
730 op->destroy (); 719 op->destroy ();
731 }
732 720
733 op = above; 721 op = above;
734 } 722 }
735 } 723 }
736} 724}
… …
747 MAP_OUT (swap_time); 735 MAP_OUT (swap_time);
748 MAP_OUT (reset_time); 736 MAP_OUT (reset_time);
749 MAP_OUT (reset_timeout); 737 MAP_OUT (reset_timeout);
750 MAP_OUT (fixed_resettime); 738 MAP_OUT (fixed_resettime);
751 MAP_OUT (no_reset); 739 MAP_OUT (no_reset);
740 MAP_OUT (no_drop);
752 MAP_OUT (difficulty); 741 MAP_OUT (difficulty);
753 742
754 if (default_region) MAP_OUT2 (region, default_region->name); 743 if (default_region) MAP_OUT2 (region, default_region->name);
755 744
756 if (shopitems) 745 if (shopitems)
… …
810 * Remove and free all objects in the given map. 799 * Remove and free all objects in the given map.
811 */ 800 */
812void 801void
813maptile::clear () 802maptile::clear ()
814{ 803{
815 sfree (regions, size ()); regions = 0;
816 delete [] regionmap; regionmap = 0;
817
818 if (spaces) 804 if (spaces)
819 { 805 {
820 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 806 for (mapspace *ms = spaces + size (); ms-- > spaces; )
821 while (object *op = ms->bot) 807 while (object *op = ms->bot)
822 { 808 {
809 // manually remove, as to not trigger anything
810 if (ms->bot = op->above)
811 ms->bot->below = 0;
812
813 op->flag [FLAG_REMOVED] = true;
814
823 op = op->head_ (); 815 object *head = op->head_ ();
824 op->destroy_inv (false); 816 if (op == head)
825 op->destroy (); 817 op->destroy ();
818 else if (head->map != op->map)
819 {
820 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
821 head->destroy ();
822 }
826 } 823 }
827 824
828 sfree (spaces, size ()), spaces = 0; 825 sfree0 (spaces, size ());
829 } 826 }
830 827
831 if (buttons) 828 if (buttons)
832 free_objectlinkpt (buttons), buttons = 0; 829 free_objectlinkpt (buttons), buttons = 0;
830
831 sfree0 (regions, size ());
832 delete [] regionmap; regionmap = 0;
833} 833}
834 834
835void 835void
836maptile::clear_header () 836maptile::clear_header ()
837{ 837{
… …
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break; 890 break;
891 891
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 892 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 894 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 895 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 896 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 897 || op->is_alive ())
899 ; // do not decay 898 ; // do not decay
… …
938 op->destroy (); 937 op->destroy ();
939 } 938 }
940} 939}
941 940
942/* 941/*
943 * Updates every button on the map (by calling update_button() for them).
944 */
945void
946maptile::update_buttons ()
947{
948 for (oblinkpt *obp = buttons; obp; obp = obp->next)
949 for (objectlink *ol = obp->link; ol; ol = ol->next)
950 {
951 if (!ol->ob)
952 {
953 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
954 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
955 continue;
956 }
957
958 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
959 {
960 update_button (ol->ob);
961 break;
962 }
963 }
964}
965
966/*
967 * This routine is supposed to find out the difficulty of the map. 942 * This routine is supposed to find out the difficulty of the map.
968 * difficulty does not have a lot to do with character level, 943 * difficulty does not have a lot to do with character level,
969 * but does have a lot to do with treasure on the map. 944 * but does have a lot to do with treasure on the map.
970 * 945 *
971 * Difficulty can now be set by the map creature. If the value stored 946 * Difficulty can now be set by the map creator. If the value stored
972 * in the map is zero, then use this routine. Maps should really 947 * in the map is zero, then use this routine. Maps should really
973 * have a difficulty set than using this function - human calculation 948 * have a difficulty set rather than using this function - human calculation
974 * is much better than this functions guesswork. 949 * is much better than this function's guesswork.
975 */ 950 */
976int 951int
977maptile::estimate_difficulty () const 952maptile::estimate_difficulty () const
978{ 953{
979 long monster_cnt = 0; 954 long monster_cnt = 0;
… …
991 966
992 if (QUERY_FLAG (op, FLAG_GENERATOR)) 967 if (QUERY_FLAG (op, FLAG_GENERATOR))
993 { 968 {
994 total_exp += op->stats.exp; 969 total_exp += op->stats.exp;
995 970
996 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 971 if (archetype *at = op->other_arch)
972 {
997 total_exp += at->stats.exp * 8; 973 total_exp += at->stats.exp * 8;
998
999 monster_cnt++; 974 monster_cnt++;
975 }
976
977 for (object *inv = op->inv; inv; inv = inv->below)
978 {
979 total_exp += op->stats.exp * 8;
980 monster_cnt++;
981 }
1000 } 982 }
1001 } 983 }
1002 984
1003 avgexp = (double) total_exp / monster_cnt; 985 avgexp = (double) total_exp / monster_cnt;
1004 986
… …
1017 * postive values make it darker, negative make it brighter 999 * postive values make it darker, negative make it brighter
1018 */ 1000 */
1019int 1001int
1020maptile::change_map_light (int change) 1002maptile::change_map_light (int change)
1021{ 1003{
1022 int new_level = darkness + change;
1023
1024 /* Nothing to do */ 1004 /* Nothing to do */
1025 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1005 if (!change)
1026 return 0; 1006 return 0;
1027 1007
1028 /* inform all players on the map */ 1008 /* inform all players on the map */
1029 if (change > 0) 1009 if (change > 0)
1030 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1010 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1031 else 1011 else
1032 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1012 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1033 1013
1034 /* Do extra checking. since darkness is a unsigned value, 1014 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1035 * we need to be extra careful about negative values.
1036 * In general, the checks below are only needed if change
1037 * is not +/-1
1038 */
1039 if (new_level < 0)
1040 darkness = 0;
1041 else if (new_level >= MAX_DARKNESS)
1042 darkness = MAX_DARKNESS;
1043 else
1044 darkness = new_level;
1045 1015
1046 /* All clients need to get re-updated for the change */ 1016 /* All clients need to get re-updated for the change */
1047 update_all_map_los (this); 1017 update_all_map_los (this);
1018
1048 return 1; 1019 return 1;
1049} 1020}
1050 1021
1051/* 1022/*
1052 * This function updates various attributes about a specific space 1023 * This function updates various attributes about a specific space
… …
1055 * through, etc) 1026 * through, etc)
1056 */ 1027 */
1057void 1028void
1058mapspace::update_ () 1029mapspace::update_ ()
1059{ 1030{
1060 object *tmp, *last = 0; 1031 object *last = 0;
1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1032 uint8 flags = P_UPTODATE, anywhere = 0;
1033 sint8 light = 0;
1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1034 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1063 1035
1064 //object *middle = 0; 1036 //object *middle = 0;
1065 //object *top = 0; 1037 //object *top = 0;
1066 //object *floor = 0; 1038 //object *floor = 0;
1067 // this seems to generate better code than using locals, above 1039 // this seems to generate better code than using locals, above
1068 object *&top = faces_obj[0] = 0; 1040 object *&top = faces_obj[0] = 0;
1069 object *&middle = faces_obj[1] = 0; 1041 object *&middle = faces_obj[1] = 0;
1070 object *&floor = faces_obj[2] = 0; 1042 object *&floor = faces_obj[2] = 0;
1071 1043
1072 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1044 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1073 { 1045 {
1074 /* This could be made additive I guess (two lights better than 1046 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1075 * one). But if so, it shouldn't be a simple additive - 2
1076 * light bulbs do not illuminate twice as far as once since
1077 * it is a dissapation factor that is cubed.
1078 */
1079 if (tmp->glow_radius > light)
1080 light = tmp->glow_radius; 1047 light += tmp->glow_radius;
1081 1048
1082 /* This call is needed in order to update objects the player 1049 /* This call is needed in order to update objects the player
1083 * is standing in that have animations (ie, grass, fire, etc). 1050 * is standing in that have animations (ie, grass, fire, etc).
1084 * However, it also causes the look window to be re-drawn 1051 * However, it also causes the look window to be re-drawn
1085 * 3 times each time the player moves, because many of the 1052 * 3 times each time the player moves, because many of the
… …
1104 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1071 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1105 { 1072 {
1106 middle = tmp; 1073 middle = tmp;
1107 anywhere = 1; 1074 anywhere = 1;
1108 } 1075 }
1076
1109 /* Find the highest visible face around. If equal 1077 /* Find the highest visible face around. If equal
1110 * visibilities, we still want the one nearer to the 1078 * visibilities, we still want the one nearer to the
1111 * top 1079 * top
1112 */ 1080 */
1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1081 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1132 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1100 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1133 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1101 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1134 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1102 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1135 } 1103 }
1136 1104
1137 this->light = light; 1105 this->light = min (light, MAX_LIGHT_RADIUS);
1138 this->flags_ = flags; 1106 this->flags_ = flags;
1139 this->move_block = move_block & ~move_allow; 1107 this->move_block = move_block & ~move_allow;
1140 this->move_on = move_on; 1108 this->move_on = move_on;
1141 this->move_off = move_off; 1109 this->move_off = move_off;
1142 this->move_slow = move_slow; 1110 this->move_slow = move_slow;
… …
1162 * 1) top face is set, need middle to be set. 1130 * 1) top face is set, need middle to be set.
1163 * 2) middle is set, need to set top. 1131 * 2) middle is set, need to set top.
1164 * 3) neither middle or top is set - need to set both. 1132 * 3) neither middle or top is set - need to set both.
1165 */ 1133 */
1166 1134
1167 for (tmp = last; tmp; tmp = tmp->below) 1135 for (object *tmp = last; tmp; tmp = tmp->below)
1168 { 1136 {
1169 /* Once we get to a floor, stop, since we already have a floor object */ 1137 /* Once we get to a floor, stop, since we already have a floor object */
1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1138 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1171 break; 1139 break;
1172 1140
… …
1224 vol += op->volume (); 1192 vol += op->volume ();
1225 1193
1226 return vol; 1194 return vol;
1227} 1195}
1228 1196
1229bool 1197maptile *
1230maptile::tile_available (int dir, bool load) 1198maptile::tile_available (int dir, bool load)
1231{ 1199{
1232 if (!tile_path[dir]) 1200 if (tile_path[dir])
1233 return 0; 1201 {
1234
1235 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1202 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1236 return 1; 1203 return tile_map[dir];
1237 1204
1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1205 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1239 return 1; 1206 return tile_map[dir];
1207 }
1240 1208
1241 return 0; 1209 return 0;
1242} 1210}
1243 1211
1244/* this returns TRUE if the coordinates (x,y) are out of 1212/* this returns TRUE if the coordinates (x,y) are out of
… …
1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1326adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1359{ 1327{
1360 if (!map1 || !map2) 1328 if (!map1 || !map2)
1361 return 0; 1329 return 0;
1362 1330
1363 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1331 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1364 //fix: compare paths instead (this is likely faster, too!) 1332 //fix: compare paths instead (this is likely faster, too!)
1365 if (map1 == map2) 1333 if (map1 == map2)
1366 { 1334 {
1367 *dx = 0; 1335 *dx = 0;
1368 *dy = 0; 1336 *dy = 0;
… …
1575} 1543}
1576 1544
1577object * 1545object *
1578maptile::insert (object *op, int x, int y, object *originator, int flags) 1546maptile::insert (object *op, int x, int y, object *originator, int flags)
1579{ 1547{
1580 if (!op->flag [FLAG_REMOVED])
1581 op->remove ();
1582
1583 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1548 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1584} 1549}
1585 1550
1586region * 1551region *
1587maptile::region (int x, int y) const 1552maptile::region (int x, int y) const
… …
1597 1562
1598 return ::region::default_region (); 1563 return ::region::default_region ();
1599} 1564}
1600 1565
1601/* picks a random object from a style map. 1566/* picks a random object from a style map.
1602 * Redone by MSW so it should be faster and not use static
1603 * variables to generate tables.
1604 */ 1567 */
1605object * 1568object *
1606maptile::pick_random_object () const 1569maptile::pick_random_object (rand_gen &gen) const
1607{ 1570{
1608 /* while returning a null object will result in a crash, that 1571 /* while returning a null object will result in a crash, that
1609 * is actually preferable to an infinite loop. That is because 1572 * is actually preferable to an infinite loop. That is because
1610 * most servers will automatically restart in case of crash. 1573 * most servers will automatically restart in case of crash.
1611 * Change the logic on getting the random space - shouldn't make 1574 * Change the logic on getting the random space - shouldn't make
1612 * any difference, but this seems clearer to me. 1575 * any difference, but this seems clearer to me.
1613 */ 1576 */
1614 for (int i = 1000; --i;) 1577 for (int i = 1000; --i;)
1615 { 1578 {
1616 object *pick = at (rndm (width), rndm (height)).bot; 1579 object *pick = at (gen (width), gen (height)).bot;
1617 1580
1618 // do not prefer big monsters just because they are big. 1581 // do not prefer big monsters just because they are big.
1619 if (pick && pick->head_ () == pick) 1582 if (pick && pick->is_head ())
1620 return pick->head_ (); 1583 return pick->head_ ();
1621 } 1584 }
1622 1585
1623 // instead of crashing in the unlikely(?) case, try to return *something* 1586 // instead of crashing in the unlikely(?) case, try to return *something*
1624 return get_archetype ("blocked"); 1587 return archetype::find ("bug");
1625} 1588}
1626 1589
1627void 1590void
1628maptile::play_sound (faceidx sound, int x, int y) const 1591maptile::play_sound (faceidx sound, int x, int y) const
1629{ 1592{
1630 if (!sound) 1593 if (!sound)
1631 return; 1594 return;
1632 1595
1596 for_all_players_on_map (pl, this)
1597 if (client *ns = pl->ns)
1598 {
1599 int dx = x - pl->ob->x;
1600 int dy = y - pl->ob->y;
1601
1602 int distance = idistance (dx, dy);
1603
1604 if (distance <= MAX_SOUND_DISTANCE)
1605 ns->play_sound (sound, dx, dy);
1606 }
1607}
1608
1609void
1610maptile::say_msg (const char *msg, int x, int y) const
1611{
1633 for_all_players (pl) 1612 for_all_players (pl)
1634 if (pl->ob->map == this)
1635 if (client *ns = pl->ns) 1613 if (client *ns = pl->ns)
1636 { 1614 {
1637 int dx = x - pl->ob->x; 1615 int dx = x - pl->ob->x;
1638 int dy = y - pl->ob->y; 1616 int dy = y - pl->ob->y;
1639 1617
1640 int distance = idistance (dx, dy); 1618 int distance = idistance (dx, dy);
1641 1619
1642 if (distance <= MAX_SOUND_DISTANCE) 1620 if (distance <= MAX_SOUND_DISTANCE)
1643 ns->play_sound (sound, dx, dy); 1621 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1644 } 1622 }
1645} 1623}
1646 1624
1625static void
1626split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1627{
1628 // clip to map to the left
1629 if (x0 < 0)
1630 {
1631 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1632 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1633
1634 if (x1 < 0) // entirely to the left
1635 return;
1636
1637 x0 = 0;
1638 }
1639
1640 // clip to map to the right
1641 if (x1 > m->width)
1642 {
1643 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1644 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1645
1646 if (x0 > m->width) // entirely to the right
1647 return;
1648
1649 x1 = m->width;
1650 }
1651
1652 // clip to map above
1653 if (y0 < 0)
1654 {
1655 if (maptile *tile = m->tile_available (TILE_UP, 1))
1656 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1657
1658 if (y1 < 0) // entirely above
1659 return;
1660
1661 y0 = 0;
1662 }
1663
1664 // clip to map below
1665 if (y1 > m->height)
1666 {
1667 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1668 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1669
1670 if (y0 > m->height) // entirely below
1671 return;
1672
1673 y1 = m->height;
1674 }
1675
1676 // if we get here, the rect is within the current map
1677 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1678
1679 r->m = m;
1680 r->x0 = x0;
1681 r->y0 = y0;
1682 r->x1 = x1;
1683 r->y1 = y1;
1684 r->dx = dx;
1685 r->dy = dy;
1686}
1687
1688maprect *
1689maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1690{
1691 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1692 buf.clear ();
1693
1694 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1695
1696 // add end marker
1697 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1698 r->m = 0;
1699
1700 return (maprect *)buf.linearise ();
1701}
1702

Diff Legend

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