From 60887e54df314d3011548e5cf2c5b2342130290c Mon Sep 17 00:00:00 2001
From: Edgaru089 <sjs333@outlook.com>
Date: Tue, 23 Apr 2024 15:20:02 +0800
Subject: [PATCH] Fix compiling on MSVC again

---
 JacksEscape.vcxproj         |  3 +++
 JacksEscape.vcxproj.filters |  9 +++++++++
 app_render.cpp              | 11 ++++-------
 render_util.cpp             | 23 +++++++++++++++++++++++
 render_util.h               |  3 +++
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/JacksEscape.vcxproj b/JacksEscape.vcxproj
index 8260e8e..a9e0293 100644
--- a/JacksEscape.vcxproj
+++ b/JacksEscape.vcxproj
@@ -132,6 +132,7 @@
     <ClInclude Include="app.h" />
     <ClInclude Include="camera.h" />
     <ClInclude Include="entity.h" />
+    <ClInclude Include="gametime.h" />
     <ClInclude Include="input.h" />
     <ClInclude Include="mapper_misc.h" />
     <ClInclude Include="particle.h" />
@@ -153,9 +154,11 @@
   <ItemGroup>
     <ClCompile Include="app.c" />
     <ClCompile Include="app_debug.c" />
+    <ClCompile Include="app_file.c" />
     <ClCompile Include="app_render.cpp" />
     <ClCompile Include="camera.c" />
     <ClCompile Include="entity.c" />
+    <ClCompile Include="gametime.c" />
     <ClCompile Include="input.c" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="mapper_misc.c" />
diff --git a/JacksEscape.vcxproj.filters b/JacksEscape.vcxproj.filters
index c1bc3fa..6f9ce54 100644
--- a/JacksEscape.vcxproj.filters
+++ b/JacksEscape.vcxproj.filters
@@ -78,6 +78,9 @@
     <ClInclude Include="render_component.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="gametime.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="util\queue.c">
@@ -155,5 +158,11 @@
     <ClCompile Include="render_component.c">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="gametime.c">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="app_file.c">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/app_render.cpp b/app_render.cpp
index c576002..9d19e5a 100644
--- a/app_render.cpp
+++ b/app_render.cpp
@@ -175,15 +175,12 @@ void app_Render(App *app) {
 	settextcolor(RGB(255, 255, 255));
 
 	// If paused, display a text
-	if (app->paused) {
-		RECT rect = {.left = SCREEN_WIDTH / 2 - 10, .top = 100, .right = SCREEN_WIDTH / 2 + 10, .bottom = 200};
-		drawtext("Game Paused", &rect, DT_CENTER | DT_NOCLIP);
-	}
-	if (abs(app->timescale - 1.0) > EPS) {
-		RECT rect = {.left = SCREEN_WIDTH / 2 - 10, .top = 50, .right = SCREEN_WIDTH / 2 + 10, .bottom = 150};
+	if (app->paused)
+		render_DrawTextEx("Game Paused", box2(SCREEN_WIDTH / 2 - 10, 100, 20, 100), DT_CENTER | DT_NOCLIP);
+	if (1.0 - app->timescale > EPS) {
 		char buf[128];
 		snprintf(buf, sizeof(buf), "*** TIMESCALE %.2lf ***", app->timescale);
-		drawtext(buf, &rect, DT_CENTER | DT_NOCLIP);
+		render_DrawTextEx(buf, box2(SCREEN_WIDTH / 2 - 10, 50, 20, 100), DT_CENTER | DT_NOCLIP);
 	}
 }
 }
diff --git a/render_util.cpp b/render_util.cpp
index d7abddc..d14f839 100644
--- a/render_util.cpp
+++ b/render_util.cpp
@@ -54,6 +54,29 @@ void render_DrawText(int x, int y, const char *str) {
 	}
 }
 
+void render_DrawTextEx(const char *str, Box2 rect, unsigned int flags) {
+	if (!tbuf)
+		tbuf = vector_Create(sizeof(NCHAR));
+
+	const NCHAR zero = 0;
+	vector_Clear(tbuf);
+	int len = strlen(str);
+	for (int i = 0; i < len; i++) {
+		NCHAR c = (NCHAR)str[i];
+		vector_Push(tbuf, &c);
+	}
+
+	if (vector_Size(tbuf) > 0) {
+		vector_Push(tbuf, &zero);
+		RECT r;
+		r.left = (int)round(rect.lefttop.x);
+		r.top  = (int)round(rect.lefttop.y);
+		r.right = (int)round(rect.lefttop.x + rect.size.x);
+		r.bottom = (int)round(rect.lefttop.y + rect.size.y);
+		drawtext((LPCTSTR)vector_Data(tbuf), &r, flags);
+	}
+}
+
 
 const FillMode render_ModeDefault = {
 	.rop2     = R2_COPYPEN,
diff --git a/render_util.h b/render_util.h
index 077cf18..d6aa991 100644
--- a/render_util.h
+++ b/render_util.h
@@ -17,6 +17,9 @@ extern "C" {
 // for newlines.
 void render_DrawText(int x, int y, const char *str);
 
+// A warpper around drawtext().
+void render_DrawTextEx(const char *str, Box2 rect, unsigned int flags);
+
 
 // Fill modes.
 typedef struct {