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.108 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.111 by elmex, Thu Jul 12 18:28:09 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <unistd.h> 24#include <unistd.h>
… …
356{ 355{
357 if (!spaces) 356 if (!spaces)
358 return; 357 return;
359 358
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 359 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 360 {
361 object *op = ms->bot;
362 while (op)
362 { 363 {
363 /* already multipart - don't do anything more */ 364 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 365 if (op->head_ () == op && !op->more && op->arch->more)
365 { 366 {
366 op->remove (); 367 op->remove ();
367 op->expand_tail (); 368 op->expand_tail ();
369
370 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
371 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
372 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
368 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 373 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
374
375 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
376 // so we have to reset the iteration through the mapspace
369 } 377 }
378 else
379 op = op->above;
370 } 380 }
381 }
371} 382}
372 383
373/* 384/*
374 * Loads (ands parses) the objects into a given map from the specified 385 * Loads (ands parses) the objects into a given map from the specified
375 * file pointer. 386 * file pointer.
… …
714 case KW_winddir: thawer.get (winddir); break; 725 case KW_winddir: thawer.get (winddir); break;
715 case KW_sky: thawer.get (sky); break; 726 case KW_sky: thawer.get (sky); break;
716 727
717 case KW_per_player: thawer.get (per_player); break; 728 case KW_per_player: thawer.get (per_player); break;
718 case KW_per_party: thawer.get (per_party); break; 729 case KW_per_party: thawer.get (per_party); break;
730 case KW_no_reset: thawer.get (no_reset); break;
719 731
720 case KW_region: default_region = region::find (thawer.get_str ()); break; 732 case KW_region: default_region = region::find (thawer.get_str ()); break;
721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 733 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
722 734
723 // old names new names 735 // old names new names
… …
800 if (name) MAP_OUT (name); 812 if (name) MAP_OUT (name);
801 MAP_OUT (swap_time); 813 MAP_OUT (swap_time);
802 MAP_OUT (reset_time); 814 MAP_OUT (reset_time);
803 MAP_OUT (reset_timeout); 815 MAP_OUT (reset_timeout);
804 MAP_OUT (fixed_resettime); 816 MAP_OUT (fixed_resettime);
817 MAP_OUT (no_reset);
805 MAP_OUT (difficulty); 818 MAP_OUT (difficulty);
806 819
807 if (default_region) MAP_OUT2 (region, default_region->name); 820 if (default_region) MAP_OUT2 (region, default_region->name);
808 821
809 if (shopitems) 822 if (shopitems)
… …
920maptile::do_destroy () 933maptile::do_destroy ()
921{ 934{
922 attachable::do_destroy (); 935 attachable::do_destroy ();
923 936
924 clear (); 937 clear ();
938}
939
940/* decay and destroy perishable items in a map */
941void
942maptile::do_decay_objects ()
943{
944 if (!spaces)
945 return;
946
947 for (mapspace *ms = spaces + size (); ms-- > spaces; )
948 for (object *above, *op = ms->bot; op; op = above)
949 {
950 above = op->above;
951
952 bool destroy = 0;
953
954 // do not decay anything above unique floor tiles (yet :)
955 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
956 break;
957
958 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
959 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
960 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
961 || QUERY_FLAG (op, FLAG_UNIQUE)
962 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
963 || QUERY_FLAG (op, FLAG_UNPAID)
964 || op->is_alive ())
965 ; // do not decay
966 else if (op->is_weapon ())
967 {
968 op->stats.dam--;
969 if (op->stats.dam < 0)
970 destroy = 1;
971 }
972 else if (op->is_armor ())
973 {
974 op->stats.ac--;
975 if (op->stats.ac < 0)
976 destroy = 1;
977 }
978 else if (op->type == FOOD)
979 {
980 op->stats.food -= rndm (5, 20);
981 if (op->stats.food < 0)
982 destroy = 1;
983 }
984 else
985 {
986 int mat = op->materials;
987
988 if (mat & M_PAPER
989 || mat & M_LEATHER
990 || mat & M_WOOD
991 || mat & M_ORGANIC
992 || mat & M_CLOTH
993 || mat & M_LIQUID
994 || (mat & M_IRON && rndm (1, 5) == 1)
995 || (mat & M_GLASS && rndm (1, 2) == 1)
996 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
997 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
998 || (mat & M_ICE && temp > 32))
999 destroy = 1;
1000 }
1001
1002 /* adjust overall chance below */
1003 if (destroy && rndm (0, 1))
1004 op->destroy ();
1005 }
925} 1006}
926 1007
927/* 1008/*
928 * Updates every button on the map (by calling update_button() for them). 1009 * Updates every button on the map (by calling update_button() for them).
929 */ 1010 */

Diff Legend

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