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.102 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
… …
220 * hidden dm 220 * hidden dm
221 */ 221 */
222 if (OB_MOVE_BLOCK (ob, tmp)) 222 if (OB_MOVE_BLOCK (ob, tmp))
223 return 1; 223 return 1;
224 224
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) 225 if (tmp->flag [FLAG_ALIVE]
226 && tmp->head_ () != ob 226 && tmp->head_ () != ob
227 && tmp != ob 227 && tmp != ob
228 && tmp->type != DOOR 228 && tmp->type != DOOR
229 && !tmp->flag [FLAG_WIZ] 229 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
230 && tmp->contr->hidden)
231 return 1; 230 return 1;
232 } 231 }
233 232
234 } 233 }
235 return 0; 234 return 0;
… …
277 276
278 /* don't have object, so don't know what types would block */ 277 /* don't have object, so don't know what types would block */
279 return m1->at (sx, sy).move_block; 278 return m1->at (sx, sy).move_block;
280 } 279 }
281 280
282 for (tmp = ob->arch; tmp; tmp = tmp->more) 281 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
283 { 282 {
284 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 283 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
285 284
286 if (flag & P_OUT_OF_MAP) 285 if (flag & P_OUT_OF_MAP)
287 return P_OUT_OF_MAP; 286 return P_OUT_OF_MAP;
288 if (flag & P_IS_ALIVE) 287 if (flag & P_IS_ALIVE)
289 return P_IS_ALIVE; 288 return P_IS_ALIVE;
… …
671bool 670bool
672maptile::_load_header (object_thawer &thawer) 671maptile::_load_header (object_thawer &thawer)
673{ 672{
674 for (;;) 673 for (;;)
675 { 674 {
676 keyword kw = thawer.get_kv (); 675 thawer.next ();
677 676
678 switch (kw) 677 switch (thawer.kw)
679 { 678 {
680 case KW_msg: 679 case KW_msg:
681 thawer.get_ml (KW_endmsg, msg); 680 thawer.get_ml (KW_endmsg, msg);
682 break; 681 break;
683 682
… …
715 case KW_winddir: thawer.get (winddir); break; 714 case KW_winddir: thawer.get (winddir); break;
716 case KW_sky: thawer.get (sky); break; 715 case KW_sky: thawer.get (sky); break;
717 716
718 case KW_per_player: thawer.get (per_player); break; 717 case KW_per_player: thawer.get (per_player); break;
719 case KW_per_party: thawer.get (per_party); break; 718 case KW_per_party: thawer.get (per_party); break;
719 case KW_no_reset: thawer.get (no_reset); break;
720 720
721 case KW_region: default_region = region::find (thawer.get_str ()); break; 721 case KW_region: default_region = region::find (thawer.get_str ()); break;
722 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 722 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
723 723
724 // old names new names 724 // old names new names
… …
801 if (name) MAP_OUT (name); 801 if (name) MAP_OUT (name);
802 MAP_OUT (swap_time); 802 MAP_OUT (swap_time);
803 MAP_OUT (reset_time); 803 MAP_OUT (reset_time);
804 MAP_OUT (reset_timeout); 804 MAP_OUT (reset_timeout);
805 MAP_OUT (fixed_resettime); 805 MAP_OUT (fixed_resettime);
806 MAP_OUT (no_reset);
806 MAP_OUT (difficulty); 807 MAP_OUT (difficulty);
807 808
808 if (default_region) MAP_OUT2 (region, default_region->name); 809 if (default_region) MAP_OUT2 (region, default_region->name);
809 810
810 if (shopitems) 811 if (shopitems)
… …
870 free (regionmap), regionmap = 0; 871 free (regionmap), regionmap = 0;
871 872
872 if (spaces) 873 if (spaces)
873 { 874 {
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 875 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 while (object *op = ms->bot->head_ ()) 876 while (object *op = ms->bot)
876 { 877 {
878 op = op->head_ ();
877 op->destroy_inv (false); 879 op->destroy_inv (false);
878 op->destroy (); 880 op->destroy ();
879 } 881 }
880 882
881 sfree (spaces, size ()), spaces = 0; 883 sfree (spaces, size ()), spaces = 0;
… …
920maptile::do_destroy () 922maptile::do_destroy ()
921{ 923{
922 attachable::do_destroy (); 924 attachable::do_destroy ();
923 925
924 clear (); 926 clear ();
927}
928
929/* decay and destroy perishable items in a map */
930void
931maptile::do_decay_objects ()
932{
933 if (!spaces)
934 return;
935
936 for (mapspace *ms = spaces + size (); ms-- > spaces; )
937 for (object *above, *op = ms->bot; op; op = above)
938 {
939 above = op->above;
940
941 bool destroy = 0;
942
943 // do not decay anything above unique floor tiles (yet :)
944 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
945 break;
946
947 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
948 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
949 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
950 || QUERY_FLAG (op, FLAG_UNIQUE)
951 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
952 || QUERY_FLAG (op, FLAG_UNPAID)
953 || op->is_alive ())
954 ; // do not decay
955 else if (op->is_weapon ())
956 {
957 op->stats.dam--;
958 if (op->stats.dam < 0)
959 destroy = 1;
960 }
961 else if (op->is_armor ())
962 {
963 op->stats.ac--;
964 if (op->stats.ac < 0)
965 destroy = 1;
966 }
967 else if (op->type == FOOD)
968 {
969 op->stats.food -= rndm (5, 20);
970 if (op->stats.food < 0)
971 destroy = 1;
972 }
973 else
974 {
975 int mat = op->materials;
976
977 if (mat & M_PAPER
978 || mat & M_LEATHER
979 || mat & M_WOOD
980 || mat & M_ORGANIC
981 || mat & M_CLOTH
982 || mat & M_LIQUID
983 || (mat & M_IRON && rndm (1, 5) == 1)
984 || (mat & M_GLASS && rndm (1, 2) == 1)
985 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
986 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
987 || (mat & M_ICE && temp > 32))
988 destroy = 1;
989 }
990
991 /* adjust overall chance below */
992 if (destroy && rndm (0, 1))
993 op->destroy ();
994 }
925} 995}
926 996
927/* 997/*
928 * Updates every button on the map (by calling update_button() for them). 998 * Updates every button on the map (by calling update_button() for them).
929 */ 999 */
… …
977 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1047 if (QUERY_FLAG (op, FLAG_GENERATOR))
978 { 1048 {
979 total_exp += op->stats.exp; 1049 total_exp += op->stats.exp;
980 1050
981 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1051 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
982 total_exp += at->clone.stats.exp * 8; 1052 total_exp += at->stats.exp * 8;
983 1053
984 monster_cnt++; 1054 monster_cnt++;
985 } 1055 }
986 } 1056 }
987 1057

Diff Legend

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