Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions code/weapon/shockwave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ int shockwave_create(int parent_objnum, const vec3d* pos, const shockwave_create
sw->inner_radius = sci->inner_rad;
sw->outer_radius = sci->outer_rad;
sw->damage = sci->damage;
sw->radius_curve_idx = sci->radius_curve_idx;
sw->blast = sci->blast;
sw->radius = 1.0f;
sw->pos = *pos;
Expand Down Expand Up @@ -299,8 +300,8 @@ void shockwave_move(object *shockwave_objp, float frametime)
if (sw->weapon_info_index >= 0)
wip = &Weapon_info[sw->weapon_info_index];

if (wip && wip->shockwave.radius_curve_idx >= 0) {
float val = Curves[wip->shockwave.radius_curve_idx].GetValue(sw->time_elapsed / sw->total_time);
if (sw->radius_curve_idx >= 0) {
float val = Curves[sw->radius_curve_idx].GetValue(sw->time_elapsed / sw->total_time);
sw->radius = val * sw->outer_radius;
if (sw->radius < 0.0f)
sw->radius = 0.0f;
Expand Down
1 change: 1 addition & 0 deletions code/weapon/shockwave.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ typedef struct shockwave {
SCP_vector<std::pair<int, int>> obj_sig_hitlist;
float speed, radius;
float inner_radius, outer_radius, damage;
int radius_curve_idx; // curve for radius over time, or -1 to expand at a constant speed
int weapon_info_index; // -1 if shockwave not caused by weapon
int damage_type_idx; //What type of damage this shockwave does to armor
vec3d pos;
Expand Down
Loading