Update docs

Author: NeKzor

README.md

@@ -19,7 +19,7 @@
   - [Patches](#patches)
 - [Mapping](#mapping)
  - [Start & Stop Triggers](#start--stop-triggers)
- - [Checkpoint Triggers](#checkpoint-triggers)
+ - [With Checkpoints](#with-checkpoints)
 - [Credits](#inspired-by)
 
 ## Supported Games
@@ -80,7 +80,7 @@
 - `sar_draw_timer` draws timer value
 - `sar_draw_avg` draws current average of timer
 - `sar_draw_cps` draws last checkpoint value of timer
-- `sar_draw_demo` draws current demo name
+- `sar_draw_demo` draws current name, tick and time of demo recorder
 
 ### Cheats
 - `sar_autojump` enables tick-perfect jumping on the server
@@ -101,10 +101,21 @@
   - Use `sar_timer_start` as parameter
   - Do the same for the second trigger with `sar_timer_stop`
 
-![trigger_multiple.png](trigger_multiple.png)
-
-### Checkpoint Triggers
-- TODO
+![start.png](docs/start.png)
+
+### With Checkpoints
+- Use `trigger_multiple` object for start
+  - Trigger `sar_timer_start`
+  - Trigger `sar_cps_clear`
+  - Enable checkpoint object
+- Use `trigger_multiple` object for checkpoint
+  - Trigger `sar_cps_add`
+  - Disable itself
+- Use `trigger_multiple` object for stop
+  - Trigger `sar_timer_stop`
+
+![cpstart.png](docs/cpstart.png)
+![cp1.png](docs/cp1.png)
 
 ## Inspired By
 - [SourcePauseTool](https://github.com/YaLTeR/SourcePauseTool)

docs/cp1.png

@@ -322,7 +322,7 @@ namespace Callbacks
 		void PrintCheckpoints() {
 			int cps = Timer::CheckPoints::Items.size();
 			if (cps > 0) {
-				Console::Msg("Result of %i checkpoints:\n", cps);
+				Console::Msg("Result of %i checkpoint%s:\n", cps, (cps == 1) ? "" : "s");
 			}
 			else {
 				Console::Msg("No result!\n");

docs/cpstart.png

@@ -37,8 +37,9 @@ namespace Client
 			int result = Original::Paint(thisptr);
 			if (cl_showpos.GetBool()) {
 				int m_hFont = *(int*)((uintptr_t)thisptr + Offsets::m_hFont);
-				const int start = 65;
+				const int start = 67;
 				const int factor = 10;
+				const int space = 4;
 				int level = 0;
 
 				// Session
@@ -48,7 +49,7 @@ namespace Client
 
 					char session[64];
 					snprintf(session, sizeof(session), "session: %i (%.3f)", tick, time);
-					Surface::Draw(m_hFont, 1, start + (factor * level), COL_WHITE, session);
+					Surface::Draw(m_hFont, 1, start + level * (factor + level), COL_WHITE, session);
 					level++;
 				}
 				if (sar_draw_sum.GetBool()) {
@@ -61,7 +62,7 @@ namespace Client
 					else {
 						snprintf(sum, sizeof(sum), "sum: %i (%.3f)", Summary::TotalTicks, Summary::TotalTime);
 					}
-					Surface::Draw(m_hFont, 1, start + (factor * level), COL_WHITE, sum);
+					Surface::Draw(m_hFont, 1, start + level * (factor + level), COL_WHITE, sum);
 					level++;
 				}
 				// Timer
@@ -71,26 +72,38 @@ namespace Client
 
 					char timer[64];
 					snprintf(timer, sizeof(timer), "timer: %i (%.3f)", tick, time);
-					Surface::Draw(m_hFont, 1, start + (factor * level), COL_WHITE, timer);
+					Surface::Draw(m_hFont, 1, start + level * (factor + level), COL_WHITE, timer);
 					level++;
 				}
 				if (sar_draw_avg.GetBool()) {
 					char avg[64];
 					snprintf(avg, sizeof(avg), "avg: %i (%.3f)", Timer::Average::AverageTicks, Timer::Average::AverageTime);
-					Surface::Draw(m_hFont, 1, start + (factor * level), COL_WHITE, avg);
+					Surface::Draw(m_hFont, 1, start + level * (factor + level), COL_WHITE, avg);
 					level++;
 				}
 				if (sar_draw_cps.GetBool()) {
 					char cps[64];
 					snprintf(cps, sizeof(cps), "last cp: %i (%.3f)", Timer::CheckPoints::LatestTick, Timer::CheckPoints::LatestTime);
-					Surface::Draw(m_hFont, 1, start + (factor * level), COL_WHITE, cps);
+					Surface::Draw(m_hFont, 1, start + level * (factor + level), COL_WHITE, cps);
 					level++;
 				}
 				// Demo
 				if (sar_draw_demo.GetBool()) {
 					char demo[64];
-					snprintf(demo, sizeof(demo), "demo: %s", (DemoRecorder::LastDemo.empty()) ? "-" : DemoRecorder::LastDemo.c_str());
-					Surface::Draw(m_hFont, 1, start + (factor * level), COL_WHITE, demo);
+					if (!DemoRecorder::CurrentDemo.empty()) {
+						if (*DemoRecorder::Recording && !*Engine::LoadGame) {
+							int tick = DemoRecorder::GetCurrentTick();
+							float time = tick * *Engine::IntervalPerTick;
+							snprintf(demo, sizeof(demo), "demo: %s %i (%.3f)", DemoRecorder::CurrentDemo.c_str(), tick, time);
+						}
+						else {
+							snprintf(demo, sizeof(demo), "demo: %s", DemoRecorder::CurrentDemo.c_str());
+						}
+					}
+					else {
+						snprintf(demo, sizeof(demo), "demo: -");
+					}
+					Surface::Draw(m_hFont, 1, start + level * (factor + level), COL_WHITE, demo);
 					level++;
 				}
 

trigger_multiple.png renamed to docs/start.png

@@ -14,6 +14,7 @@ namespace DemoRecorder
 	int* DemoNumber;
 	bool* Recording;
 
+	std::string CurrentDemo;
 	std::string LastDemo;
 
 	void Set(uintptr_t recorderAddr)
@@ -28,6 +29,11 @@ namespace DemoRecorder
 	{
 		return GetRecordingTick(Ptr);
 	}
+	void SetCurrentDemo()
+	{
+		CurrentDemo = std::string(DemoRecorder::DemoName);
+		if (*DemoNumber > 1) CurrentDemo += "_" + std::to_string(*DemoNumber);
+	}
 	void SetLastDemo()
 	{
 		LastDemo = std::string(DemoRecorder::DemoName);

src/SourceAutoRecord/Callbacks.hpp

@@ -161,6 +161,7 @@ namespace Engine
 		void __fastcall StartupDemoFile(void* thisptr, int edx)
 		{
 			IsRecordingDemo = true;
+			DemoRecorder::SetCurrentDemo();
 			Original::StartupDemoFile(thisptr);
 		}
 		void __cdecl ConCommandStop()
@@ -175,6 +176,7 @@ namespace Engine
 			/*if (Timer::IsRunning) {
 				Timer::Stop(Engine::GetTick());
 			}*/
+			DemoRecorder::CurrentDemo = "";
 			Original::Disconnect(thisptr, bShowMainMenu);
 		}
 		void __cdecl PlayDemo(void* thisptr)
@@ -189,7 +191,7 @@ namespace Engine
 
 			if (result && PlayerRequestedPlayback) {
 				IsPlayingDemo = true;
-				std::string file = GetDir() + "\\" + std::string(DemoPlayer::DemoName);
+				std::string file = GetDir() + std::string("\\") + std::string(DemoPlayer::DemoName);
 				Demo demo;
 				if (demo.Parse(file)) {
 					demo.Fix();

src/SourceAutoRecord/Modules/Client.hpp

@@ -89,7 +89,7 @@ namespace SAR
 			"Parses multiple demos and prints the total sum of them.\n");
 		sar_time_demo_dev = CreateFloat(
 			"sar_time_demo_dev",
-			"1",
+			"0",
 			0,
 			"Printing mode when using sar_time_demo. 0 = default, 1 = console commands, 2 = console commands & packets.\n");
 
@@ -156,28 +156,28 @@ namespace SAR
 		// Drawing
 		sar_draw_session = CreateBoolean(
 			"sar_draw_session",
-			"1",
-			"Draws info about session when using cl_showpos.\n");
+			"0",
+			"Draws current session value when using cl_showpos.\n");
 		sar_draw_sum = CreateBoolean(
 			"sar_draw_sum",
-			"1",
-			"Draws info about session's summary when using cl_showpos.\n");
+			"0",
+			"Draws summary value of sessions when using cl_showpos.\n");
 		sar_draw_timer = CreateBoolean(
 			"sar_draw_timer",
-			"1",
-			"Draws info about timer when using cl_showpos.\n");
+			"0",
+			"Draws current value of timer when using cl_showpos.\n");
 		sar_draw_avg = CreateBoolean(
 			"sar_draw_avg",
-			"1",
-			"Draws info about timer's average when using cl_showpos.\n");
+			"0",
+			"Draws calculated average of timer when using cl_showpos.\n");
 		sar_draw_cps = CreateBoolean(
 			"sar_draw_cps",
-			"1",
-			"Draws info about timer's checkpoints when using cl_showpos.\n");
+			"0",
+			"Draws latest checkpoint of timer when using cl_showpos.\n");
 		sar_draw_demo = CreateBoolean(
 			"sar_draw_demo",
-			"1",
-			"Draws info about demo recorder when using cl_showpos.\n");
+			"0",
+			"Draws name, tick and time of demo recorder when using cl_showpos.\n");
 
 		// Cheats
 		sar_autojump = CreateBoolean(