Skip to content

Commit

Permalink
Reinstate Chesterton's fence now I get what it's doing
Browse files Browse the repository at this point in the history
  • Loading branch information
Procyonae committed Dec 24, 2024
1 parent 078acbf commit d40dd53
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 0 additions & 1 deletion data/json/mapgen/map_extras/laststand.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
[ "f_null", 150 ]
]
},
"remove_vehicles": [ { "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
"place_monster": [ { "group": "GROUP_LAST_STAND", "x": [ 6, 17 ], "y": [ 6, 16 ], "chance": 100, "repeat": [ 10, 15 ] } ],
"place_loot": [ { "group": "trash", "x": [ 6, 17 ], "y": [ 6, 16 ], "repeat": [ 5, 10 ] } ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
Expand Down
6 changes: 6 additions & 0 deletions src/mapgen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5304,6 +5304,12 @@ static ret_val<void> apply_mapgen_in_phases(
const jmapgen_objects &objects, const tripoint_rel_ms &offset, const std::string &context,
bool verify = false )
{
const ret_val<void> has_vehicle_collision = objects.has_vehicle_collision( md, offset );
if( verify && !has_vehicle_collision.success() ) {

return has_vehicle_collision;
}

// We must apply all the mapgen in phases, but the mapgen is split between
// setmap_points and objects. So we have to make an outer loop over
// phases, and apply each type restricted to each phase.
Expand Down

0 comments on commit d40dd53

Please sign in to comment.