Fix automatic sprite rotation for non-linear overmap tiles

src/om_direction.h

@@ -29,6 +29,7 @@ const size_t size = all.size();
 const std::array<std::string, 4> all_suffixes = {{ "_north", "_east", "_south", "_west" }};
 const std::string invalid_dir_suffix;
 const std::array<int, 4> all_cw_rotations = {{ 0, 1, 2, 3 }};
+const std::array<int, 4> all_ccw_rotations = { { 0, 3, 2, 1 } };
 const int invalid_dir_rotations = 0;
 
 /** Returns directional suffix associated with the value, e.g. _north or _west. */
@@ -51,6 +52,16 @@ constexpr int get_num_cw_rotations( type dir )
     }
 }
 
+/** Returns number of counterclockwise rotations needed to reach this direction from 'north'. */
+constexpr int get_num_ccw_rotations( type dir )
+{
+    if( dir == type::invalid ) {
+        return invalid_dir_rotations;
+    } else {
+        return all_ccw_rotations[static_cast<size_t>( dir )];
+    }
+}
+
 /** Number of bits needed to store directions. */
 const size_t bits = static_cast<size_t>( -1 ) >> ( CHAR_BIT *sizeof( size_t ) - size );
 

src/overmap.cpp

@@ -791,7 +791,7 @@ void oter_t::get_rotation_and_subtile( int &rotation, int &subtile ) const
         rotation = t.rotation;
         subtile = t.subtile;
     } else if( is_rotatable() ) {
-        rotation = static_cast<int>( get_dir() );
+        rotation = om_direction::get_num_ccw_rotations( get_dir() );
         subtile = -1;
     } else {
         rotation = 0;