Skip to content

Commit d648091

Browse files
authored
Merge pull request #1168 from MageKing17/bugfix/ship_weapon-constructor
Add missing variable to ship_weapon constructor.
2 parents 2829c29 + 8c59d8f commit d648091

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

code/ship/ship.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6026,11 +6026,9 @@ void ship_weapon::clear()
60266026
primary_bank_start_ammo[i] = 0;
60276027
primary_bank_capacity[i] = 0;
60286028
primary_next_slot[i] = 0;
6029-
primary_bank_rearm_time[i] = timestamp(0);
60306029
primary_bank_fof_cooldown[i] = 0;
60316030

60326031
primary_animation_position[i] = EModelAnimationPosition::MA_POS_NOT_SET;
6033-
primary_animation_done_time[i] = 0;
60346032

60356033
primary_bank_pattern_index[i] = 0;
60366034

@@ -6052,7 +6050,8 @@ void ship_weapon::clear()
60526050
secondary_bank_start_ammo[i] = 0;
60536051
secondary_bank_capacity[i] = 0;
60546052
secondary_next_slot[i] = 0;
6055-
secondary_bank_rearm_time[i] = timestamp(0);
6053+
6054+
secondary_animation_position[i] = EModelAnimationPosition::MA_POS_NOT_SET;
60566055

60576056
secondary_bank_pattern_index[i] = 0;
60586057

@@ -6065,13 +6064,9 @@ void ship_weapon::clear()
60656064
tertiary_bank_capacity = 0;
60666065
tertiary_bank_rearm_time = timestamp(0);
60676066

6068-
last_fired_weapon_index = 0;
6069-
last_fired_weapon_signature = 0;
60706067
detonate_weapon_time = 0;
60716068
ai_class = 0;
60726069

6073-
next_tertiary_fire_stamp = timestamp(0);
6074-
60756070
last_fired_weapon_index = -1;
60766071
last_fired_weapon_signature = -1;
60776072
}

0 commit comments

Comments
 (0)