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

Jump to bottom

Upgraded Asteroid Field SEXPs #6295

Merged
merged 5 commits into from
Aug 27, 2024
Merged

Upgraded Asteroid Field SEXPs #6295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a141d51
upgrade asteroid sexps to match new asteroid field features
MjnMixael Aug 13, 2024
d308b2e
clang is a needy boy
MjnMixael Aug 13, 2024
edbb3b9
unify the sexp operators into one since there are minimal changes
MjnMixael Aug 14, 2024
a98e24f
cleanup for readability
MjnMixael Aug 15, 2024
6ac0fe8
address feedback
MjnMixael Aug 27, 2024
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
14 changes: 2 additions & 12 deletions code/asteroid/asteroid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ void remove_all_asteroids()
}

// will replace any existing asteroid or debris field with an asteroid field
void asteroid_create_asteroid_field(int num_asteroids, int field_type, int asteroid_speed, bool brown, bool blue, bool orange, vec3d o_min, vec3d o_max, bool inner_box, vec3d i_min, vec3d i_max, SCP_vector<SCP_string> targets)
void asteroid_create_asteroid_field(int num_asteroids, int field_type, int asteroid_speed, vec3d o_min, vec3d o_max, bool inner_box, vec3d i_min, vec3d i_max, SCP_vector<SCP_string> asteroid_types)
{
remove_all_asteroids();

Expand Down Expand Up @@ -740,15 +740,7 @@ void asteroid_create_asteroid_field(int num_asteroids, int field_type, int aster

Asteroid_field.field_asteroid_type.clear();

if (brown) {
Asteroid_field.field_asteroid_type.push_back("Brown");
}
if (blue) {
Asteroid_field.field_asteroid_type.push_back("Blue");
}
if (orange) {
Asteroid_field.field_asteroid_type.push_back("Orange");
}
Asteroid_field.field_asteroid_type = std::move(asteroid_types);

Asteroid_field.min_bound = o_min;
Asteroid_field.max_bound = o_max;
Expand All @@ -766,8 +758,6 @@ void asteroid_create_asteroid_field(int num_asteroids, int field_type, int aster
Asteroid_field.inner_max_bound = i_max;
}

Asteroid_field.target_names = std::move(targets);

// Only create asteroids if we have some to create
if ((!Asteroid_field.field_asteroid_type.empty()) && (num_asteroids > 0)) {
asteroid_create_all();
Expand Down
2 changes: 1 addition & 1 deletion code/asteroid/asteroid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ bool asteroid_is_within_view(vec3d *pos, float range, bool range_override = f
void asteroid_level_init();
void asteroid_level_close();
void asteroid_create_all();
void asteroid_create_asteroid_field(int num_asteroids, int field_type, int asteroid_speed, bool brown, bool blue, bool orange, vec3d o_min, vec3d o_max, bool inner_box, vec3d i_min, vec3d i_max, SCP_vector<SCP_string> targets);
void asteroid_create_asteroid_field(int num_asteroids, int field_type, int asteroid_speed, vec3d o_min, vec3d o_max, bool inner_box, vec3d i_min, vec3d i_max, SCP_vector<SCP_string> asteroid_types);
void asteroid_create_debris_field(int num_asteroids, int asteroid_speed, SCP_vector<int> debris_types, vec3d o_min, vec3d o_max, bool enhanced);
void asteroid_render(object* obj, model_draw_list* scene);
void asteroid_delete( object *asteroid_objp );
Expand Down
Loading
Loading