Index: /trunk/nv/stl/handle.hh
===================================================================
--- /trunk/nv/stl/handle.hh	(revision 495)
+++ /trunk/nv/stl/handle.hh	(revision 496)
@@ -78,10 +78,10 @@
 	public:
 
-		typedef HANDLE handle;
+		typedef HANDLE handle_type;
 		typedef typename HANDLE::value_type value_type;
 
 		handle_manager() : m_first_free( NONE ), m_last_free( NONE ) {}
 
-		handle create_handle()
+		handle_type create_handle()
 		{
 			typedef handle_operator<HANDLE> hop;
@@ -93,5 +93,5 @@
 		}
 
-		void free_handle( handle h )
+		void free_handle( handle_type h )
 		{
 			value_type index = h.index();
@@ -108,5 +108,5 @@
 		}
 
-		bool is_valid( handle h ) const
+		bool is_valid( handle_type h ) const
 		{
 			typedef handle_operator<HANDLE> hop;
@@ -149,5 +149,5 @@
 	{
 	public:
-		typedef HANDLE              handle;
+		typedef HANDLE              handle_type;
 		typedef TINDEX              index_type;
 		packed_index_table() {}
@@ -157,5 +157,5 @@
 		}
 
-		index_type insert( handle h )
+		index_type insert( handle_type h )
 		{
 			NV_ASSERT( !exists( h ), "Reinserting handle!" );
@@ -167,5 +167,5 @@
 		}
 
-		bool exists( handle h )
+		bool exists( handle_type h )
 		{
 			if ( h.is_nil() || h.index() >= m_indexes.size() ) return false;
@@ -173,5 +173,5 @@
 		}
 
-		index_type get( handle h )
+		index_type get( handle_type h )
 		{
 			if ( h.is_nil() || h.index() >= m_indexes.size() ) return -1;
@@ -179,5 +179,5 @@
 		}
 
-		index_type get( handle h ) const
+		index_type get( handle_type h ) const
 		{
 			if ( h.is_nil() || h.index() >= m_indexes.size() ) return -1;
@@ -185,10 +185,10 @@
 		}
 
-		index_type remove_swap( handle h )
+		index_type remove_swap( handle_type h )
 		{
 			if ( h.is_nil() || h.index() >= m_indexes.size() || m_indexes[h.index()] == -1 )
 				return -1;
-			handle     swap_handle = m_handles.back();
-			index_type dead_eindex = m_indexes[h.index()];
+			handle_type swap_handle = m_handles.back();
+			index_type  dead_eindex = m_indexes[h.index()];
 			if ( dead_eindex != static_cast<index_type>( m_handles.size() - 1 ) )
 			{
@@ -209,5 +209,5 @@
 		}
 
-		handle get_handle( index_type i ) const { return m_handles[unsigned( i )]; }
+		handle_type get_handle( index_type i ) const { return m_handles[unsigned( i )]; }
 
 		size_t size() const { return m_handles.size(); }
@@ -225,6 +225,6 @@
 		}
 
-		vector< handle >     m_handles;
-		vector< index_type > m_indexes;
+		vector< handle_type > m_handles;
+		vector< index_type >  m_indexes;
 	};
 
Index: /trunk/src/rogue/fov_recursive_shadowcasting.cc
===================================================================
--- /trunk/src/rogue/fov_recursive_shadowcasting.cc	(revision 495)
+++ /trunk/src/rogue/fov_recursive_shadowcasting.cc	(revision 496)
@@ -59,5 +59,5 @@
 				bool transparent = m_map->is_transparent( c );
 
-				if ( dx*dx+dy*dy <= m_radius2 && (m_light_walls || transparent)) 
+				if ( dx*dx+dy*dy <= (m_radius2+1) && (m_light_walls || transparent)) 
 				{
 					m_map->set_visible( c, true );