Make terrain types configurable.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 8885aa0820fc2de63ab17e2ff0ae8cfa1ea42e7c..70d9994d1d5782152b9d563b8db1cb1697b85b3b 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -70,7 +70,8 @@ class Thing(ThingBase):
         largest_audible_distance = 20
         # player's don't block sound (or should they?)
         things = [t for t in self.game.things if t.type_ != 'Player']
-        dijkstra_map = DijkstraMap(things, self.game.maps, self.position,
+        sound_blockers = self.game.get_sound_blockers()
+        dijkstra_map = DijkstraMap(sound_blockers, things, self.game.maps, self.position,
                                    largest_audible_distance, self.game.get_map)
         url_limits = []
         for m in re.finditer('https?://[^\s]+', msg):
@@ -182,7 +183,8 @@ class Thing_Bottle(Thing):
         # and ThingPlayer.fov_test
         fov_map_class = self.game.map_geometry.fov_map_class
         fov_radius = 12
-        fov = fov_map_class(self.game.things, self.game.maps,
+        light_blockers = self.game.get_light_blockers()
+        fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
                             self.position, fov_radius, self.game.get_map)
         fov.init_terrain()
         visible_players = []
@@ -439,7 +441,8 @@ class ThingAnimate(Thing):
     def prepare_multiprocessible_fov_stencil(self):
         fov_map_class = self.game.map_geometry.fov_map_class
         fov_radius = 3 if self.drunk > 0 else 12
-        self._fov = fov_map_class(self.game.things, self.game.maps,
+        light_blockers = self.game.get_light_blockers()
+        self._fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
                                   self.position, fov_radius, self.game.get_map)
 
     def multiprocessible_fov_stencil(self):