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.146 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.153 by root, Tue Dec 23 06:58:23 2008 UTC

… …
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27#include "loader.h" 27#include "loader.h"
28#include "path.h" 28#include "path.h"
29
30sint8 maptile::outdoor_darkness;
29 31
30/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
31 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
32 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
33 * 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
… …
712 714
713 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))
714 unique = 1; 716 unique = 1;
715 717
716 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 718 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
717 {
718 op->destroy_inv (false);
719 op->destroy (); 719 op->destroy ();
720 }
721 720
722 op = above; 721 op = above;
723 } 722 }
724 } 723 }
725} 724}
… …
813 812
814 op->flag [FLAG_REMOVED] = true; 813 op->flag [FLAG_REMOVED] = true;
815 814
816 object *head = op->head_ (); 815 object *head = op->head_ ();
817 if (op == head) 816 if (op == head)
818 {
819 op->destroy_inv (false);
820 op->destroy (); 817 op->destroy ();
821 }
822 else if (head->map != op->map) 818 else if (head->map != op->map)
823 { 819 {
824 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 820 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
825 head->destroy (); 821 head->destroy ();
826 } 822 }
… …
969/* 965/*
970 * This routine is supposed to find out the difficulty of the map. 966 * This routine is supposed to find out the difficulty of the map.
971 * difficulty does not have a lot to do with character level, 967 * difficulty does not have a lot to do with character level,
972 * but does have a lot to do with treasure on the map. 968 * but does have a lot to do with treasure on the map.
973 * 969 *
974 * Difficulty can now be set by the map creature. If the value stored 970 * Difficulty can now be set by the map creator. If the value stored
975 * in the map is zero, then use this routine. Maps should really 971 * in the map is zero, then use this routine. Maps should really
976 * have a difficulty set than using this function - human calculation 972 * have a difficulty set rather than using this function - human calculation
977 * is much better than this functions guesswork. 973 * is much better than this function's guesswork.
978 */ 974 */
979int 975int
980maptile::estimate_difficulty () const 976maptile::estimate_difficulty () const
981{ 977{
982 long monster_cnt = 0; 978 long monster_cnt = 0;
… …
1067 */ 1063 */
1068void 1064void
1069mapspace::update_ () 1065mapspace::update_ ()
1070{ 1066{
1071 object *last = 0; 1067 object *last = 0;
1072 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1068 uint8 flags = P_UPTODATE, anywhere = 0;
1069 sint8 light = 0;
1073 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1070 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1074 1071
1075 //object *middle = 0; 1072 //object *middle = 0;
1076 //object *top = 0; 1073 //object *top = 0;
1077 //object *floor = 0; 1074 //object *floor = 0;
… …
1080 object *&middle = faces_obj[1] = 0; 1077 object *&middle = faces_obj[1] = 0;
1081 object *&floor = faces_obj[2] = 0; 1078 object *&floor = faces_obj[2] = 0;
1082 1079
1083 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1080 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1084 { 1081 {
1085 /* This could be made additive I guess (two lights better than 1082 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1086 * one). But if so, it shouldn't be a simple additive - 2
1087 * light bulbs do not illuminate twice as far as once since
1088 * it is a dissapation factor that is cubed.
1089 */
1090 light = max (light, tmp->glow_radius); 1083 light += tmp->glow_radius;
1091 1084
1092 /* This call is needed in order to update objects the player 1085 /* This call is needed in order to update objects the player
1093 * is standing in that have animations (ie, grass, fire, etc). 1086 * is standing in that have animations (ie, grass, fire, etc).
1094 * However, it also causes the look window to be re-drawn 1087 * However, it also causes the look window to be re-drawn
1095 * 3 times each time the player moves, because many of the 1088 * 3 times each time the player moves, because many of the
… …
1143 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1136 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1144 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1137 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1145 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1138 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1146 } 1139 }
1147 1140
1148 this->light = light; 1141 this->light = min (light, MAX_LIGHT_RADIUS);
1149 this->flags_ = flags; 1142 this->flags_ = flags;
1150 this->move_block = move_block & ~move_allow; 1143 this->move_block = move_block & ~move_allow;
1151 this->move_on = move_on; 1144 this->move_on = move_on;
1152 this->move_off = move_off; 1145 this->move_off = move_off;
1153 this->move_slow = move_slow; 1146 this->move_slow = move_slow;
… …
1634maptile::play_sound (faceidx sound, int x, int y) const 1627maptile::play_sound (faceidx sound, int x, int y) const
1635{ 1628{
1636 if (!sound) 1629 if (!sound)
1637 return; 1630 return;
1638 1631
1639 for_all_players (pl) 1632 for_all_players_on_map (pl, this)
1640 if (pl->ob->map == this)
1641 if (client *ns = pl->ns) 1633 if (client *ns = pl->ns)
1642 { 1634 {
1643 int dx = x - pl->ob->x; 1635 int dx = x - pl->ob->x;
1644 int dy = y - pl->ob->y; 1636 int dy = y - pl->ob->y;
1645 1637
1646 int distance = idistance (dx, dy); 1638 int distance = idistance (dx, dy);
1647 1639
1648 if (distance <= MAX_SOUND_DISTANCE) 1640 if (distance <= MAX_SOUND_DISTANCE)
1649 ns->play_sound (sound, dx, dy); 1641 ns->play_sound (sound, dx, dy);
1650 } 1642 }
1651} 1643}
1652 1644

Diff Legend

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