Skip to content

Commit 2701544

Browse files
authored
Improve 'laser anim state add' curve output (#6773)
1 parent 4ad0158 commit 2701544

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

code/weapon/weapons.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9260,7 +9260,7 @@ void weapon_render(object* obj, model_draw_list *scene)
92609260
wp->laser_bitmap_frame += flFrametime;
92619261

92629262
if (anim_has_curve) {
9263-
framenum = fl2i(i2fl(wip->laser_bitmap.num_frames - 1) * (anim_state + anim_state_add));
9263+
framenum = fl2i((i2fl(wip->laser_bitmap.num_frames - 1) * anim_state) + anim_state_add);
92649264
} else {
92659265
framenum = bm_get_anim_frame(wip->laser_bitmap.first_frame, wp->laser_bitmap_frame, wip->laser_bitmap.total_time, true);
92669266
}
@@ -9272,7 +9272,7 @@ void weapon_render(object* obj, model_draw_list *scene)
92729272
wp->laser_headon_bitmap_frame += flFrametime;
92739273

92749274
if (anim_has_curve) {
9275-
headon_framenum = fl2i(i2fl(wip->laser_headon_bitmap.num_frames - 1) * (anim_state + anim_state_add));
9275+
headon_framenum = fl2i((i2fl(wip->laser_headon_bitmap.num_frames - 1) * anim_state) + anim_state_add);
92769276
} else {
92779277
headon_framenum = bm_get_anim_frame(wip->laser_headon_bitmap.first_frame, wp->laser_headon_bitmap_frame, wip->laser_headon_bitmap.total_time, true);
92789278
}
@@ -9357,7 +9357,7 @@ void weapon_render(object* obj, model_draw_list *scene)
93579357
wp->laser_glow_bitmap_frame -= wip->laser_glow_bitmap.total_time;
93589358

93599359
if (anim_has_curve) {
9360-
framenum = fl2i(i2fl(wip->laser_glow_bitmap.num_frames - 1) * (anim_state + anim_state_add));
9360+
framenum = fl2i((i2fl(wip->laser_glow_bitmap.num_frames - 1) * anim_state) + anim_state_add);
93619361
} else {
93629362
framenum = fl2i( (wp->laser_glow_bitmap_frame * wip->laser_glow_bitmap.num_frames) / wip->laser_glow_bitmap.total_time );
93639363
}
@@ -9378,7 +9378,7 @@ void weapon_render(object* obj, model_draw_list *scene)
93789378
wp->laser_glow_headon_bitmap_frame -= wip->laser_glow_headon_bitmap.total_time;
93799379

93809380
if (anim_has_curve) {
9381-
headon_framenum = fl2i(i2fl(wip->laser_glow_headon_bitmap.num_frames - 1) * (anim_state + anim_state_add));
9381+
headon_framenum = fl2i((i2fl(wip->laser_glow_headon_bitmap.num_frames - 1) * anim_state) + anim_state_add);
93829382
} else {
93839383
headon_framenum = fl2i((wp->laser_glow_headon_bitmap_frame * wip->laser_glow_headon_bitmap.num_frames) / wip->laser_glow_headon_bitmap.total_time);
93849384
}

0 commit comments

Comments
 (0)