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 | |
27 | |
29 | #include "loader.h" |
28 | #include "loader.h" |
30 | |
29 | |
31 | #include "path.h" |
30 | #include "path.h" |
32 | |
31 | |
… | |
… | |
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 | */ |
196 | int |
195 | bool |
197 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
196 | object::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 | |
271 | void |
254 | void |
272 | maptile::set_object_flag (int flag, int value) |
255 | maptile::set_object_flag (int flag, int value) |
273 | { |
256 | { |
… | |
… | |
322 | bool |
305 | bool |
323 | maptile::_load_objects (object_thawer &f) |
306 | maptile::_load_objects (object_thawer &f) |
324 | { |
307 | { |
325 | for (;;) |
308 | for (;;) |
326 | { |
309 | { |
327 | coroapi::cede_to_tick_every (100); // cede once in a while |
310 | coroapi::cede_to_tick (); // cede once in a while |
328 | |
311 | |
329 | switch (f.kw) |
312 | switch (f.kw) |
330 | { |
313 | { |
331 | case KW_arch: |
314 | case KW_arch: |
332 | if (object *op = object::read (f, this)) |
315 | if (object *op = object::read (f, this)) |
333 | { |
316 | { |
|
|
317 | // TODO: why? |
334 | if (op->inv) |
318 | if (op->inv) |
335 | sum_weight (op); |
319 | op->update_weight (); |
336 | |
320 | |
337 | insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
321 | if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) |
|
|
322 | { |
|
|
323 | // we insert manually because |
|
|
324 | // a) its way faster |
|
|
325 | // b) we remove manually, too, and there are good reasons for that |
|
|
326 | // c) its correct |
|
|
327 | mapspace &ms = at (op->x, op->y); |
|
|
328 | |
|
|
329 | op->flag [FLAG_REMOVED] = false; |
|
|
330 | |
|
|
331 | op->above = 0; |
|
|
332 | op->below = ms.top; |
|
|
333 | |
|
|
334 | if (ms.top) |
|
|
335 | ms.top->above = op; |
|
|
336 | else |
|
|
337 | ms.bot = op; |
|
|
338 | |
|
|
339 | ms.top = op; |
|
|
340 | ms.flags_ = 0; |
|
|
341 | } |
|
|
342 | else |
|
|
343 | { |
|
|
344 | f.parse_warn (format ("object %s out of range", op->debug_desc ())); |
|
|
345 | op->destroy (); |
|
|
346 | } |
338 | } |
347 | } |
339 | |
348 | |
340 | continue; |
349 | continue; |
341 | |
350 | |
342 | case KW_EOF: |
351 | case KW_EOF: |
… | |
… | |
405 | } |
414 | } |
406 | |
415 | |
407 | coroapi::cede_to_tick (); |
416 | coroapi::cede_to_tick (); |
408 | |
417 | |
409 | return true; |
418 | return true; |
410 | } |
|
|
411 | |
|
|
412 | bool |
|
|
413 | maptile::_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 | } |
419 | } |
433 | |
420 | |
434 | bool |
421 | bool |
435 | maptile::_save_objects (const char *path, int flags) |
422 | maptile::_save_objects (const char *path, int flags) |
436 | { |
423 | { |
… | |
… | |
611 | bool |
598 | bool |
612 | maptile::_load_header (object_thawer &thawer) |
599 | maptile::_load_header (object_thawer &thawer) |
613 | { |
600 | { |
614 | for (;;) |
601 | for (;;) |
615 | { |
602 | { |
616 | thawer.next (); |
|
|
617 | |
|
|
618 | switch (thawer.kw) |
603 | switch (thawer.kw) |
619 | { |
604 | { |
620 | case KW_msg: |
605 | case KW_msg: |
621 | thawer.get_ml (KW_endmsg, msg); |
606 | thawer.get_ml (KW_endmsg, msg); |
622 | break; |
607 | break; |
… | |
… | |
656 | case KW_sky: thawer.get (sky); break; |
641 | case KW_sky: thawer.get (sky); break; |
657 | |
642 | |
658 | case KW_per_player: thawer.get (per_player); break; |
643 | case KW_per_player: thawer.get (per_player); break; |
659 | case KW_per_party: thawer.get (per_party); break; |
644 | case KW_per_party: thawer.get (per_party); break; |
660 | case KW_no_reset: thawer.get (no_reset); break; |
645 | case KW_no_reset: thawer.get (no_reset); break; |
|
|
646 | case KW_no_drop: thawer.get (no_drop); break; |
661 | |
647 | |
662 | case KW_region: default_region = region::find (thawer.get_str ()); break; |
648 | case KW_region: default_region = region::find (thawer.get_str ()); break; |
663 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
649 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
664 | |
650 | |
665 | // old names new names |
651 | // old names new names |
… | |
… | |
677 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
663 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
678 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
664 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
679 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
665 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
680 | |
666 | |
681 | case KW_ERROR: |
667 | case KW_ERROR: |
682 | set_key (thawer.kw_str, thawer.value); |
668 | set_key_text (thawer.kw_str, thawer.value); |
683 | break; |
669 | break; |
684 | |
670 | |
685 | case KW_end: |
671 | case KW_end: |
|
|
672 | thawer.next (); |
686 | return true; |
673 | return true; |
687 | |
674 | |
688 | default: |
675 | default: |
689 | if (!thawer.parse_error ("map", 0)) |
676 | if (!thawer.parse_error ("map", 0)) |
690 | return false; |
677 | return false; |
691 | break; |
678 | break; |
692 | } |
679 | } |
|
|
680 | |
|
|
681 | thawer.next (); |
693 | } |
682 | } |
694 | |
683 | |
695 | abort (); |
684 | abort (); |
696 | } |
|
|
697 | |
|
|
698 | bool |
|
|
699 | maptile::_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 | } |
685 | } |
708 | |
686 | |
709 | /****************************************************************************** |
687 | /****************************************************************************** |
710 | * This is the start of unique map handling code |
688 | * This is the start of unique map handling code |
711 | *****************************************************************************/ |
689 | *****************************************************************************/ |
… | |
… | |
747 | MAP_OUT (swap_time); |
725 | MAP_OUT (swap_time); |
748 | MAP_OUT (reset_time); |
726 | MAP_OUT (reset_time); |
749 | MAP_OUT (reset_timeout); |
727 | MAP_OUT (reset_timeout); |
750 | MAP_OUT (fixed_resettime); |
728 | MAP_OUT (fixed_resettime); |
751 | MAP_OUT (no_reset); |
729 | MAP_OUT (no_reset); |
|
|
730 | MAP_OUT (no_drop); |
752 | MAP_OUT (difficulty); |
731 | MAP_OUT (difficulty); |
753 | |
732 | |
754 | if (default_region) MAP_OUT2 (region, default_region->name); |
733 | if (default_region) MAP_OUT2 (region, default_region->name); |
755 | |
734 | |
756 | if (shopitems) |
735 | if (shopitems) |
… | |
… | |
810 | * Remove and free all objects in the given map. |
789 | * Remove and free all objects in the given map. |
811 | */ |
790 | */ |
812 | void |
791 | void |
813 | maptile::clear () |
792 | maptile::clear () |
814 | { |
793 | { |
815 | sfree (regions, size ()); regions = 0; |
|
|
816 | delete [] regionmap; regionmap = 0; |
|
|
817 | |
|
|
818 | if (spaces) |
794 | if (spaces) |
819 | { |
795 | { |
820 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
796 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
821 | while (object *op = ms->bot) |
797 | while (object *op = ms->bot) |
822 | { |
798 | { |
|
|
799 | // manually remove, as to not trigger anything |
|
|
800 | if (ms->bot = op->above) |
|
|
801 | ms->bot->below = 0; |
|
|
802 | |
|
|
803 | op->flag [FLAG_REMOVED] = true; |
|
|
804 | |
823 | op = op->head_ (); |
805 | object *head = op->head_ (); |
|
|
806 | if (op == head) |
|
|
807 | { |
824 | op->destroy_inv (false); |
808 | op->destroy_inv (false); |
825 | op->destroy (); |
809 | op->destroy (); |
|
|
810 | } |
|
|
811 | else if (head->map != op->map) |
|
|
812 | { |
|
|
813 | LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); |
|
|
814 | head->destroy (); |
|
|
815 | } |
826 | } |
816 | } |
827 | |
817 | |
828 | sfree (spaces, size ()), spaces = 0; |
818 | sfree0 (spaces, size ()); |
829 | } |
819 | } |
830 | |
820 | |
831 | if (buttons) |
821 | if (buttons) |
832 | free_objectlinkpt (buttons), buttons = 0; |
822 | free_objectlinkpt (buttons), buttons = 0; |
|
|
823 | |
|
|
824 | sfree0 (regions, size ()); |
|
|
825 | delete [] regionmap; regionmap = 0; |
833 | } |
826 | } |
834 | |
827 | |
835 | void |
828 | void |
836 | maptile::clear_header () |
829 | maptile::clear_header () |
837 | { |
830 | { |
… | |
… | |
889 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
882 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
890 | break; |
883 | break; |
891 | |
884 | |
892 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) |
885 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) |
893 | || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) |
886 | || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) |
894 | || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) |
|
|
895 | || QUERY_FLAG (op, FLAG_UNIQUE) |
887 | || QUERY_FLAG (op, FLAG_UNIQUE) |
896 | || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) |
888 | || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) |
897 | || QUERY_FLAG (op, FLAG_UNPAID) |
889 | || QUERY_FLAG (op, FLAG_UNPAID) |
898 | || op->is_alive ()) |
890 | || op->is_alive ()) |
899 | ; // do not decay |
891 | ; // do not decay |
… | |
… | |
991 | |
983 | |
992 | if (QUERY_FLAG (op, FLAG_GENERATOR)) |
984 | if (QUERY_FLAG (op, FLAG_GENERATOR)) |
993 | { |
985 | { |
994 | total_exp += op->stats.exp; |
986 | total_exp += op->stats.exp; |
995 | |
987 | |
996 | if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) |
988 | if (archetype *at = op->other_arch) |
|
|
989 | { |
997 | total_exp += at->stats.exp * 8; |
990 | total_exp += at->stats.exp * 8; |
998 | |
|
|
999 | monster_cnt++; |
991 | monster_cnt++; |
|
|
992 | } |
|
|
993 | |
|
|
994 | for (object *inv = op->inv; inv; inv = inv->below) |
|
|
995 | { |
|
|
996 | total_exp += op->stats.exp * 8; |
|
|
997 | monster_cnt++; |
|
|
998 | } |
1000 | } |
999 | } |
1001 | } |
1000 | } |
1002 | |
1001 | |
1003 | avgexp = (double) total_exp / monster_cnt; |
1002 | avgexp = (double) total_exp / monster_cnt; |
1004 | |
1003 | |
… | |
… | |
1043 | else |
1042 | else |
1044 | darkness = new_level; |
1043 | darkness = new_level; |
1045 | |
1044 | |
1046 | /* All clients need to get re-updated for the change */ |
1045 | /* All clients need to get re-updated for the change */ |
1047 | update_all_map_los (this); |
1046 | update_all_map_los (this); |
|
|
1047 | |
1048 | return 1; |
1048 | return 1; |
1049 | } |
1049 | } |
1050 | |
1050 | |
1051 | /* |
1051 | /* |
1052 | * This function updates various attributes about a specific space |
1052 | * This function updates various attributes about a specific space |
… | |
… | |
1055 | * through, etc) |
1055 | * through, etc) |
1056 | */ |
1056 | */ |
1057 | void |
1057 | void |
1058 | mapspace::update_ () |
1058 | mapspace::update_ () |
1059 | { |
1059 | { |
1060 | object *tmp, *last = 0; |
1060 | object *last = 0; |
1061 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1061 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1062 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1062 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1063 | |
1063 | |
1064 | //object *middle = 0; |
1064 | //object *middle = 0; |
1065 | //object *top = 0; |
1065 | //object *top = 0; |
… | |
… | |
1067 | // this seems to generate better code than using locals, above |
1067 | // this seems to generate better code than using locals, above |
1068 | object *&top = faces_obj[0] = 0; |
1068 | object *&top = faces_obj[0] = 0; |
1069 | object *&middle = faces_obj[1] = 0; |
1069 | object *&middle = faces_obj[1] = 0; |
1070 | object *&floor = faces_obj[2] = 0; |
1070 | object *&floor = faces_obj[2] = 0; |
1071 | |
1071 | |
1072 | for (tmp = bot; tmp; last = tmp, tmp = tmp->above) |
1072 | for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) |
1073 | { |
1073 | { |
1074 | /* This could be made additive I guess (two lights better than |
1074 | /* This could be made additive I guess (two lights better than |
1075 | * one). But if so, it shouldn't be a simple additive - 2 |
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 |
1076 | * light bulbs do not illuminate twice as far as once since |
1077 | * it is a dissapation factor that is cubed. |
1077 | * it is a dissapation factor that is cubed. |
1078 | */ |
1078 | */ |
1079 | if (tmp->glow_radius > light) |
|
|
1080 | light = tmp->glow_radius; |
1079 | light = max (light, tmp->glow_radius); |
1081 | |
1080 | |
1082 | /* This call is needed in order to update objects the player |
1081 | /* This call is needed in order to update objects the player |
1083 | * is standing in that have animations (ie, grass, fire, etc). |
1082 | * is standing in that have animations (ie, grass, fire, etc). |
1084 | * However, it also causes the look window to be re-drawn |
1083 | * However, it also causes the look window to be re-drawn |
1085 | * 3 times each time the player moves, because many of the |
1084 | * 3 times each time the player moves, because many of the |
… | |
… | |
1162 | * 1) top face is set, need middle to be set. |
1161 | * 1) top face is set, need middle to be set. |
1163 | * 2) middle is set, need to set top. |
1162 | * 2) middle is set, need to set top. |
1164 | * 3) neither middle or top is set - need to set both. |
1163 | * 3) neither middle or top is set - need to set both. |
1165 | */ |
1164 | */ |
1166 | |
1165 | |
1167 | for (tmp = last; tmp; tmp = tmp->below) |
1166 | for (object *tmp = last; tmp; tmp = tmp->below) |
1168 | { |
1167 | { |
1169 | /* Once we get to a floor, stop, since we already have a floor object */ |
1168 | /* Once we get to a floor, stop, since we already have a floor object */ |
1170 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1169 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1171 | break; |
1170 | break; |
1172 | |
1171 | |
… | |
… | |
1230 | maptile::tile_available (int dir, bool load) |
1229 | maptile::tile_available (int dir, bool load) |
1231 | { |
1230 | { |
1232 | if (!tile_path[dir]) |
1231 | if (!tile_path[dir]) |
1233 | return 0; |
1232 | return 0; |
1234 | |
1233 | |
1235 | if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) |
1234 | if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) |
1236 | return 1; |
1235 | return 1; |
1237 | |
1236 | |
1238 | if ((tile_map[dir] = find_async (tile_path[dir], this, load))) |
1237 | if ((tile_map[dir] = find_async (tile_path[dir], this, load))) |
1239 | return 1; |
1238 | return 1; |
1240 | |
1239 | |
… | |
… | |
1575 | } |
1574 | } |
1576 | |
1575 | |
1577 | object * |
1576 | object * |
1578 | maptile::insert (object *op, int x, int y, object *originator, int flags) |
1577 | maptile::insert (object *op, int x, int y, object *originator, int flags) |
1579 | { |
1578 | { |
1580 | if (!op->flag [FLAG_REMOVED]) |
|
|
1581 | op->remove (); |
|
|
1582 | |
|
|
1583 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
1579 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
1584 | } |
1580 | } |
1585 | |
1581 | |
1586 | region * |
1582 | region * |
1587 | maptile::region (int x, int y) const |
1583 | maptile::region (int x, int y) const |
… | |
… | |
1597 | |
1593 | |
1598 | return ::region::default_region (); |
1594 | return ::region::default_region (); |
1599 | } |
1595 | } |
1600 | |
1596 | |
1601 | /* picks a random object from a style map. |
1597 | /* 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 | */ |
1598 | */ |
1605 | object * |
1599 | object * |
1606 | maptile::pick_random_object () const |
1600 | maptile::pick_random_object (rand_gen &gen) const |
1607 | { |
1601 | { |
1608 | /* while returning a null object will result in a crash, that |
1602 | /* while returning a null object will result in a crash, that |
1609 | * is actually preferable to an infinite loop. That is because |
1603 | * is actually preferable to an infinite loop. That is because |
1610 | * most servers will automatically restart in case of crash. |
1604 | * most servers will automatically restart in case of crash. |
1611 | * Change the logic on getting the random space - shouldn't make |
1605 | * Change the logic on getting the random space - shouldn't make |
1612 | * any difference, but this seems clearer to me. |
1606 | * any difference, but this seems clearer to me. |
1613 | */ |
1607 | */ |
1614 | for (int i = 1000; --i;) |
1608 | for (int i = 1000; --i;) |
1615 | { |
1609 | { |
1616 | object *pick = at (rndm (width), rndm (height)).bot; |
1610 | object *pick = at (gen (width), gen (height)).bot; |
1617 | |
1611 | |
1618 | // do not prefer big monsters just because they are big. |
1612 | // do not prefer big monsters just because they are big. |
1619 | if (pick && pick->head_ () == pick) |
1613 | if (pick && pick->is_head ()) |
1620 | return pick->head_ (); |
1614 | return pick->head_ (); |
1621 | } |
1615 | } |
1622 | |
1616 | |
1623 | // instead of crashing in the unlikely(?) case, try to return *something* |
1617 | // instead of crashing in the unlikely(?) case, try to return *something* |
1624 | return get_archetype ("blocked"); |
1618 | return archetype::find ("bug"); |
1625 | } |
1619 | } |
1626 | |
1620 | |
1627 | void |
1621 | void |
1628 | maptile::play_sound (faceidx sound, int x, int y) const |
1622 | maptile::play_sound (faceidx sound, int x, int y) const |
1629 | { |
1623 | { |