diff --git a/rogueviz/ads/display.cpp b/rogueviz/ads/display.cpp index 2a45ca32..29ff7337 100644 --- a/rogueviz/ads/display.cpp +++ b/rogueviz/ads/display.cpp @@ -106,7 +106,7 @@ void draw_game_cell(const cell_to_draw& cd) { if(view_proper_times) { string str = hr::format(tformat, cd.center.shift / ads_time_unit); - queuestr(shiftless(rgpushxto0(cd.center.h)), time_scale * ads_scale, str, 0xFF4040, 8); + queuestr(shiftless(rgpushxto0(cd.center.h)), time_scale, str, 0xFF4040, 8); } // need i-loop because new rocks can be created in handle_turret @@ -179,7 +179,7 @@ void draw_game_cell(const cell_to_draw& cd) { if(view_proper_times && rock.type != oParticle) { string str = hr::format(tformat, rock.pt_main.shift / ads_time_unit); - queuestr(shiftless(rgpushxto0(rock.pt_main.h)), time_scale * ads_scale, str, 0xFFFFFF, 8); + queuestr(shiftless(rgpushxto0(rock.pt_main.h)), time_scale, str, 0xFFFFFF, 8); } } @@ -227,7 +227,7 @@ void draw_game_cell(const cell_to_draw& cd) { if(view_proper_times) { string str = hr::format(tformat, (cr.shift + rock.start) / ads_time_unit); - queuestr(shiftless(rgpushxto0(cr.h)), time_scale * ads_scale, str, 0xC0C0C0, 8); + queuestr(shiftless(rgpushxto0(cr.h)), time_scale, str, 0xC0C0C0, 8); } } @@ -376,7 +376,7 @@ void view_ads_game() { if(view_proper_times) { string str = hr::format(tformat, ship_pt / ads_time_unit); - queuestr(shiftless(Id), time_scale * get_scale(), str, 0xFFFFFF, 8); + queuestr(shiftless(Id), time_scale, str, 0xFFFFFF, 8); } } } diff --git a/rogueviz/ads/ds-game.cpp b/rogueviz/ads/ds-game.cpp index 1df4c3ba..21589f73 100644 --- a/rogueviz/ads/ds-game.cpp +++ b/rogueviz/ads/ds-game.cpp @@ -609,12 +609,11 @@ void view_ds_game() { if(view_proper_times && rock.type != oParticle) { ld t = rock.pt_main.shift; - ld ds_scale = get_scale(); if(rock.type == oMainRock) t += current.shift; string str = hr::format(tformat, t / ds_time_unit); - queuestr(shiftless(sphereflip * rgpushxto0(rock.pt_main.h)), time_scale * ds_scale, str, 0xFFFF00, 8); + queuestr(shiftless(sphereflip * rgpushxto0(rock.pt_main.h)), time_scale, str, 0xFFFF00, 8); } - + if(rock.pt_main.h[2] > 0.1 && rock.life_end == HUGE_VAL) { displayed.push_back(&rock); } @@ -670,8 +669,7 @@ void view_ds_game() { if(view_proper_times) { string str = hr::format(tformat, (cr.shift + ss.start) / ds_time_unit); - ld ds_scale = get_scale(); - queuestr(shiftless(sphereflip * rgpushxto0(cr.h)), time_scale * ds_scale, str, 0xC0C0C0, 8); + queuestr(shiftless(sphereflip * rgpushxto0(cr.h)), time_scale, str, 0xC0C0C0, 8); } } @@ -699,9 +697,8 @@ void view_ds_game() { poly_outline = 0xFF; if(view_proper_times) { - ld ds_scale = get_scale(); string str = hr::format(tformat, ship_pt / ds_time_unit); - queuestr(shiftless(sphereflip), time_scale * ds_scale, str, 0xFFFFFF, 8); + queuestr(shiftless(sphereflip), time_scale, str, 0xFFFFFF, 8); } }