From f6abfc7b8e0fe86ce38113fab779127df131e1d5 Mon Sep 17 00:00:00 2001
From: Marrub <marrub--@users.noreply.github.com>
Date: Fri, 29 Sep 2017 21:50:07 -0400
Subject: [PATCH] Make place names translate

---
 .gitignore         | 1 +
 src/g_stage.c      | 4 +++-
 src/g_stage.h      | 2 +-
 src/r_draw.c       | 7 +++----
 text/place-eng.nts | 5 +++++
 text/place-jpn.nts | 4 ++++
 6 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 text/place-eng.nts
 create mode 100644 text/place-jpn.nts

diff --git a/.gitignore b/.gitignore
index 2d39f70..ab62d6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 bin
 doc
 ir
+opts
 src_crap
 data*/codedefs
 data*/fonts
diff --git a/src/g_stage.c b/src/g_stage.c
index c22a465..5901cd6 100644
--- a/src/g_stage.c
+++ b/src/g_stage.c
@@ -13,7 +13,7 @@
 
 // Extern Objects ------------------------------------------------------------|
 
-char const   *G_Place = u8"地球軌道・朝";
+__str         G_Place = s"place/default";
 unsigned long G_Time;
 
 // Static Functions ----------------------------------------------------------|
@@ -130,6 +130,8 @@ void G_Stage_Run(unsigned stagenum)
 {
    printf("Stage: Beginning stage %u.\n", stagenum);
 
+   G_Place = M_StrCreate(M_StrFmt("place/stage%u", stagenum));
+
    G_stage s = G_Stage_LoadMap(M_StrFmt("maps/stage%u.gmf0", stagenum));
    size_t i;
 
diff --git a/src/g_stage.h b/src/g_stage.h
index cacab0e..213ae28 100644
--- a/src/g_stage.h
+++ b/src/g_stage.h
@@ -41,7 +41,7 @@ typedef struct G_stage
 
 // Extern Objects ------------------------------------------------------------|
 
-extern char const   *G_Place;
+extern __str         G_Place;
 extern long unsigned G_Time;
 
 // Extern Functions ----------------------------------------------------------|
diff --git a/src/r_draw.c b/src/r_draw.c
index 6787734..2669f92 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -58,7 +58,7 @@ void R_DrawPost(ulfra delta)
 
    DGE_Font_Bind(DGE_Font_Get(s"base"));
    DGE_Draw_SetTextAlign(DGE_Align_Center, DGE_Align_Top);
-   DGE_Draw_Text(760, 20, G_Place);
+   DGE_Draw_Text(760, 20, M_StrGet(G_Place));
 
    DGE_Draw_SetTextAlign(DGE_Align_Left);
    DGE_Draw_Text(585, 70, M_StrGet(s"gui/highscore"));
@@ -68,13 +68,12 @@ void R_DrawPost(ulfra delta)
    for(int i = 0; i < G_Player_Count; i++)
    {
       DGE_Draw_SetTextAlign(DGE_Align_Left);
-      DGE_Draw_Text(585, 120 + i * 20,
-         M_StrFmt(M_StrGet(s"gui/player"), i + 1));
+      DGE_Draw_Text(585, 120 + i * 20, M_StrFmt(M_StrGet(s"gui/player"), i+1));
       DGE_Draw_SetTextAlign(DGE_Align_Right);
       DGE_Draw_Text(945, 140 + i * 20, M_StrFmt("%.15i\n%i", 0, 5));
    }
 
-   //R_drawHitboxes();
+   R_drawHitboxes();
 }
 
 // EOF
diff --git a/text/place-eng.nts b/text/place-eng.nts
new file mode 100644
index 0000000..9e0dbdb
--- /dev/null
+++ b/text/place-eng.nts
@@ -0,0 +1,5 @@
+language eng
+{
+   place/default = "Default place";
+   place/stage1 = "Low Earth Orbit - Morning";
+}
diff --git a/text/place-jpn.nts b/text/place-jpn.nts
new file mode 100644
index 0000000..5bb84ca
--- /dev/null
+++ b/text/place-jpn.nts
@@ -0,0 +1,4 @@
+language jpn
+{
+   place/stage1 = "地球軌道・朝";
+}