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.135 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.141 by root, Wed May 7 11:02:50 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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
… …
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
… …
642 case KW_sky: thawer.get (sky); break; 641 case KW_sky: thawer.get (sky); break;
643 642
644 case KW_per_player: thawer.get (per_player); break; 643 case KW_per_player: thawer.get (per_player); break;
645 case KW_per_party: thawer.get (per_party); break; 644 case KW_per_party: thawer.get (per_party); break;
646 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;
647 647
648 case KW_region: default_region = region::find (thawer.get_str ()); break; 648 case KW_region: default_region = region::find (thawer.get_str ()); break;
649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
650 650
651 // old names new names 651 // old names new names
… …
725 MAP_OUT (swap_time); 725 MAP_OUT (swap_time);
726 MAP_OUT (reset_time); 726 MAP_OUT (reset_time);
727 MAP_OUT (reset_timeout); 727 MAP_OUT (reset_timeout);
728 MAP_OUT (fixed_resettime); 728 MAP_OUT (fixed_resettime);
729 MAP_OUT (no_reset); 729 MAP_OUT (no_reset);
730 MAP_OUT (no_drop);
730 MAP_OUT (difficulty); 731 MAP_OUT (difficulty);
731 732
732 if (default_region) MAP_OUT2 (region, default_region->name); 733 if (default_region) MAP_OUT2 (region, default_region->name);
733 734
734 if (shopitems) 735 if (shopitems)
… …
812 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 813 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
813 head->destroy (); 814 head->destroy ();
814 } 815 }
815 } 816 }
816 817
817 sfree (spaces, size ()), spaces = 0; 818 sfree0 (spaces, size ());
818 } 819 }
819 820
820 if (buttons) 821 if (buttons)
821 free_objectlinkpt (buttons), buttons = 0; 822 free_objectlinkpt (buttons), buttons = 0;
822 823
823 sfree (regions, size ()); regions = 0; 824 sfree0 (regions, size ());
824 delete [] regionmap; regionmap = 0; 825 delete [] regionmap; regionmap = 0;
825} 826}
826 827
827void 828void
828maptile::clear_header () 829maptile::clear_header ()
… …
982 983
983 if (QUERY_FLAG (op, FLAG_GENERATOR)) 984 if (QUERY_FLAG (op, FLAG_GENERATOR))
984 { 985 {
985 total_exp += op->stats.exp; 986 total_exp += op->stats.exp;
986 987
987 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 988 if (archetype *at = op->other_arch)
989 {
988 total_exp += at->stats.exp * 8; 990 total_exp += at->stats.exp * 8;
989
990 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 }
991 } 999 }
992 } 1000 }
993 1001
994 avgexp = (double) total_exp / monster_cnt; 1002 avgexp = (double) total_exp / monster_cnt;
995 1003
… …
1065 /* This could be made additive I guess (two lights better than 1073 /* This could be made additive I guess (two lights better than
1066 * one). But if so, it shouldn't be a simple additive - 2 1074 * one). But if so, it shouldn't be a simple additive - 2
1067 * light bulbs do not illuminate twice as far as once since 1075 * light bulbs do not illuminate twice as far as once since
1068 * it is a dissapation factor that is cubed. 1076 * it is a dissapation factor that is cubed.
1069 */ 1077 */
1070 if (tmp->glow_radius > light)
1071 light = tmp->glow_radius; 1078 light = max (light, tmp->glow_radius);
1072 1079
1073 /* This call is needed in order to update objects the player 1080 /* This call is needed in order to update objects the player
1074 * is standing in that have animations (ie, grass, fire, etc). 1081 * is standing in that have animations (ie, grass, fire, etc).
1075 * However, it also causes the look window to be re-drawn 1082 * However, it also causes the look window to be re-drawn
1076 * 3 times each time the player moves, because many of the 1083 * 3 times each time the player moves, because many of the
… …
1588 1595
1589 return ::region::default_region (); 1596 return ::region::default_region ();
1590} 1597}
1591 1598
1592/* picks a random object from a style map. 1599/* picks a random object from a style map.
1593 * Redone by MSW so it should be faster and not use static
1594 * variables to generate tables.
1595 */ 1600 */
1596object * 1601object *
1597maptile::pick_random_object () const 1602maptile::pick_random_object (rand_gen &gen) const
1598{ 1603{
1599 /* while returning a null object will result in a crash, that 1604 /* while returning a null object will result in a crash, that
1600 * is actually preferable to an infinite loop. That is because 1605 * is actually preferable to an infinite loop. That is because
1601 * most servers will automatically restart in case of crash. 1606 * most servers will automatically restart in case of crash.
1602 * Change the logic on getting the random space - shouldn't make 1607 * Change the logic on getting the random space - shouldn't make
1603 * any difference, but this seems clearer to me. 1608 * any difference, but this seems clearer to me.
1604 */ 1609 */
1605 for (int i = 1000; --i;) 1610 for (int i = 1000; --i;)
1606 { 1611 {
1607 object *pick = at (rndm (width), rndm (height)).bot; 1612 object *pick = at (gen (width), gen (height)).bot;
1608 1613
1609 // do not prefer big monsters just because they are big. 1614 // do not prefer big monsters just because they are big.
1610 if (pick && pick->head_ () == pick) 1615 if (pick && pick->is_head ())
1611 return pick->head_ (); 1616 return pick->head_ ();
1612 } 1617 }
1613 1618
1614 // instead of crashing in the unlikely(?) case, try to return *something* 1619 // instead of crashing in the unlikely(?) case, try to return *something*
1615 return get_archetype ("blocked"); 1620 return archetype::find ("bug");
1616} 1621}
1617 1622
1618void 1623void
1619maptile::play_sound (faceidx sound, int x, int y) const 1624maptile::play_sound (faceidx sound, int x, int y) const
1620{ 1625{

Diff Legend

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