Skip to content
This repository was archived by the owner on Dec 12, 2022. It is now read-only.

Commit 1d6c8a4

Browse files
committed
Fix strings
1 parent 8d5aab3 commit 1d6c8a4

3 files changed

Lines changed: 25 additions & 14 deletions

File tree

src/SourceAutoRecord/Callbacks.hpp

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,24 +196,35 @@ namespace Callbacks
196196
void PrintSummary()
197197
{
198198
int sessions = Summary::Items.size();
199-
if (sessions == 0)
199+
if (Summary::IsRunning && sessions == 0) {
200200
Console::Msg("Summary of this session:\n");
201-
else
202-
Console::Msg("Summary of %i session%s:\n", sessions, (sessions == 1) ? "" : "s");
201+
}
202+
else if (Summary::IsRunning && sessions > 0) {
203+
Console::Msg("Summary of %i sessions:\n", sessions + 1);
204+
}
205+
else if (sessions > 0) {
206+
Console::Msg("Summary of %i session%s:\n", sessions, sessions == 1 ? "" : "s");
207+
}
208+
else {
209+
Console::Msg("There's no result of a summary!\n");
210+
return;
211+
}
203212

204-
for (size_t i = 0; i < sessions; i++) {
213+
for (size_t i = 0; i < Summary::Items.size(); i++) {
205214
Console::Msg("%s -> ", Summary::Items[i].Map);
206215
Console::Msg("%i ticks", Summary::Items[i].Ticks);
207-
Console::Msg("(%.3fs)\n", Summary::Items[i].Time);
216+
Console::Msg("(%.3f)\n", Summary::Items[i].Time);
208217
}
209218

210219
if (Summary::IsRunning) {
211220
Console::ColorMsg(COL_YELLOW, "%s -> ", *Engine::Mapname);
212-
Console::ColorMsg(COL_YELLOW, "%i ticks", Engine::GetTick());
213-
Console::ColorMsg(COL_YELLOW, "(%.3fs)\n", Engine::GetTime());
221+
Console::ColorMsg(COL_YELLOW, "%i ticks ", Engine::GetTick());
222+
Console::ColorMsg(COL_YELLOW, "(%.3f)\n", Engine::GetTime());
214223
Console::Msg("---------------\n");
215-
Console::Msg("Total Ticks: %i\n", Summary::TotalTicks + Engine::GetTick());
216-
Console::Msg("Total Time: %.3f\n", Summary::TotalTime + Engine::GetTime());
224+
Console::Msg("Total Ticks: %i ", Summary::TotalTicks);
225+
Console::ColorMsg(COL_YELLOW, "(%i)\n", Summary::TotalTicks + Engine::GetTick());
226+
Console::Msg("Total Time: %.3f ", Summary::TotalTime);
227+
Console::ColorMsg(COL_YELLOW, "(%.3f)\n", Summary::TotalTime + Engine::GetTime());
217228
}
218229
else {
219230
Console::Msg("---------------\n");

src/SourceAutoRecord/Modules/Client.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ namespace Client
2525

2626
if (Summary::IsRunning) {
2727
if (sar_sum_during_session.GetBool()) {
28-
snprintf(ticks, sizeof(ticks), "ticks: %i (%.3fs) | total: %i (%.3f)", tick, time, Summary::TotalTicks + tick, Summary::TotalTime + time);
28+
snprintf(ticks, sizeof(ticks), "ticks: %i (%.3f) | total: %i (%.3f)", tick, time, Summary::TotalTicks + tick, Summary::TotalTime + time);
2929
}
3030
else {
31-
snprintf(ticks, sizeof(ticks), "ticks: %i (%.3fs) | total: %i (%.3f)", tick, time, Summary::TotalTicks, Summary::TotalTime);
31+
snprintf(ticks, sizeof(ticks), "ticks: %i (%.3f) | total: %i (%.3f)", tick, time, Summary::TotalTicks, Summary::TotalTime);
3232
}
3333
}
3434
else {
35-
snprintf(ticks, sizeof(ticks), "ticks: %i (%.3fs)", tick, time);
35+
snprintf(ticks, sizeof(ticks), "ticks: %i (%.3f)", tick, time);
3636
}
3737

3838
Surface::Draw(ShowPosFont, 1, 65, COL_WHITE, ticks);

src/SourceAutoRecord/Modules/Engine.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ namespace Engine
130130
int tick = Engine::GetTick();
131131

132132
if (tick != 0)
133-
Console::ColorMsg(COL_YELLOW, "Session: %i ticks (%.3fs)\n", tick, GetTime());
133+
Console::ColorMsg(COL_YELLOW, "Session: %i ticks (%.3f)\n", tick, GetTime());
134134

135135
if (Summary::IsRunning) {
136136
Summary::Add(tick, GetTime(), *Mapname);
137-
Console::ColorMsg(COL_YELLOW, "Total: %i ticks (%.3fs)\n", Summary::TotalTicks, Summary::TotalTime);
137+
Console::ColorMsg(COL_YELLOW, "Total: %i ticks (%.3f)\n", Summary::TotalTicks, Summary::TotalTime);
138138
}
139139
}
140140
if (IsRecordingDemo) {

0 commit comments

Comments
 (0)