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

Optionally accept precise OMT coordinates in debug "Teleport - to specific overmap" function #79343

Merged
merged 6 commits into from
Jan 30, 2025
Merged

Optionally accept precise OMT coordinates in debug "Teleport - to specific overmap" function #79343

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e334af
Change teleport_overmap to optionally accept major and minor coordina…
Stu33 Jan 20, 2025
ee6f3c8
Update src/debug_menu.cpp
Maleclypse Jan 29, 2025
bcd48e2
Update src/debug_menu.cpp
Maleclypse Jan 29, 2025
5aa034c
Fix clang-tidy errors.
Stu33 Jan 29, 2025
5bf6122
Use emplace_back properly without the redundant temporary.
Stu33 Jan 29, 2025
dad5db8
Whitespace adjustment from the github-actions bot.
Stu33 Jan 29, 2025
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
30 changes: 22 additions & 8 deletions src/debug_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1791,21 +1791,35 @@ static void teleport_overmap( bool specific_coordinates = false )
coord_strings.size() );
return;
}
std::vector<int> coord_ints;
std::vector<std::pair<int, int>> coord_ints;
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
for( const std::string &coord_string : coord_strings ) {
ret_val<int> parsed_coord = try_parse_integer<int>( coord_string, true );
const std::vector<std::string> coord_parts = string_split( coord_string, '\'' );
if( coord_parts.empty() || coord_parts.size() > 2 ) {
popup( _( "Error interpreting teleport target: "
"expected an integer or two integers separated by \'; got %s" ), coord_string );
return;
}
ret_val<int> parsed_coord = try_parse_integer<int>( coord_parts[0], true );
if( !parsed_coord.success() ) {
popup( _( "Error interpreting teleport target: %s" ), parsed_coord.str() );
return;
}
coord_ints.push_back( parsed_coord.value() );
int major_coord = parsed_coord.value();
int minor_coord = 0;
if( coord_parts.size() >= 2 ) {
ret_val<int> parsed_coord2 = try_parse_integer<int>( coord_parts[1], true );
if( !parsed_coord2.success() ) {
popup( _( "Error interpreting teleport target: %s" ), parsed_coord2.str() );
return;
}
minor_coord = parsed_coord2.value();
}
coord_ints.emplace_back( major_coord, minor_coord );
}
cata_assert( coord_ints.size() >= 2 );
tripoint coord;
coord.x = coord_ints[0];
coord.y = coord_ints[1];
coord.z = coord_ints.size() >= 3 ? coord_ints[2] : 0;
where = tripoint_abs_omt( OMAPX * coord.x, OMAPY * coord.y, coord.z );
where = tripoint_abs_omt( OMAPX * coord_ints[0].first + coord_ints[0].second,
OMAPY * coord_ints[1].first + coord_ints[1].second,
( coord_ints.size() >= 3 ? coord_ints[2].first : 0 ) );
} else {
const std::optional<tripoint_rel_ms> dir_ = choose_direction(
_( "Where is the desired overmap?" ) );
Expand Down
Loading