Skip to content

jmapgen_terrain: use string ids #83013

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

Merged
merged 1 commit into from
Oct 4, 2025
Merged

jmapgen_terrain: use string ids #83013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 ...wood/furniture_and_terrain/ore_veins.json → ...d/mining/furniture_and_terrain/veins.json
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/mapgen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3613,10 +3613,10 @@ class jmapgen_terrain : public jmapgen_piece_with_has_vehicle_collision
act_unknown, act_ignore, act_dismantle, act_erase
};
public:
mapgen_value<ter_id> id;
mapgen_value<ter_str_id> id;
jmapgen_terrain( const JsonObject &jsi, std::string_view/*context*/ ) :
jmapgen_terrain( jsi.get_member( "ter" ) ) {}
explicit jmapgen_terrain( const JsonValue &tid ) : id( mapgen_value<ter_id>( tid ) ) {}
explicit jmapgen_terrain( const JsonValue &tid ) : id( mapgen_value<ter_str_id>( tid ) ) {}

bool is_nop() const override {
return id.is_null();
Expand All @@ -3627,7 +3627,7 @@ class jmapgen_terrain : public jmapgen_piece_with_has_vehicle_collision

void apply( const mapgendata &dat, const jmapgen_int &x, const jmapgen_int &y, const jmapgen_int &z,
const std::string &context ) const override {
const ter_id &chosen_id = id.get( dat );
const ter_id &chosen_id = id.get( dat ).id();
if( chosen_id.id().is_null() ) {
return;
}
Expand Down
Loading