Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize inbounds #27825

Merged
merged 3 commits into from
Jan 24, 2019
Merged

Optimize inbounds #27825

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b872857
Add reactir flag to vehicle part bitfield.
kevingranade Jan 24, 2019
de1c45c
Optimize inbounds checks.
kevingranade Jan 24, 2019
40966af
Update src/map.cpp
ZhilkinSerg Jan 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update src/map.cpp 
Co-Authored-By: kevingranade <kevin.granade@gmail.com>
  • Loading branch information
@ZhilkinSerg @kevingranade
ZhilkinSerg and kevingranade authored Jan 24, 2019
commit 40966af99969f97aecafdcb1007b12fef057a552
2 changes: 1 addition & 1 deletion src/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7228,7 +7228,7 @@ const std::vector<tripoint> &map::trap_locations( const trap_id type ) const
bool map::inbounds( const tripoint &p ) const
{
constexpr tripoint map_boundary_min( 0, 0, -OVERMAP_DEPTH );
constexpr tripoint map_boundary_max( SEEY * MAPSIZE, SEEX * MAPSIZE, OVERMAP_HEIGHT );
constexpr tripoint map_boundary_max( MAPSIZE_Y, MAPSIZE_X, OVERMAP_HEIGHT );
constexpr tripoint map_clearance_min( tripoint_zero );
constexpr tripoint map_clearance_max( 1, 1, 0 );

Expand Down