From 4a1070103dfe4872f1e77de8959df30245729438 Mon Sep 17 00:00:00 2001
From: miteruzo <miteruzo@naver.com>
Date: Wed, 19 Jul 2023 12:34:34 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E6=83=85=E5=A0=B1?=
 =?UTF-8?q?=E3=81=AE=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.hsp                |  9 ++++++++-
 modules/goatoh.mod.hsp  |  5 +++++
 modules/setting.mod.hsp | 16 ++++++++++++++++
 modules/user.mod.hsp    | 30 ++++++++++++++++++++++++++++--
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/main.hsp b/main.hsp
index 5bda880..20d38ac 100644
--- a/main.hsp
+++ b/main.hsp
@@ -103,7 +103,14 @@
 
 	GMode GMODE_RGB0	; アルファあり
 
-	Show@NameDialogue
+	Auth@User
+
+	If id@User > 0 {
+		;
+	}
+	Else {
+		Show@NameDialogue
+	}
 
 	Repeat
 		ReDraw False
diff --git a/modules/goatoh.mod.hsp b/modules/goatoh.mod.hsp
index 0754d6e..b579604 100644
--- a/modules/goatoh.mod.hsp
+++ b/modules/goatoh.mod.hsp
@@ -1,3 +1,6 @@
+#ifndef __GOATOH__
+#define __GOATOH__
+
 #module \
 Goatoh
 
@@ -177,3 +180,5 @@ Interval
 
 #global
 
+#endif	; not __GOATOH__
+
diff --git a/modules/setting.mod.hsp b/modules/setting.mod.hsp
index 9f34211..a07bde2 100644
--- a/modules/setting.mod.hsp
+++ b/modules/setting.mod.hsp
@@ -1,3 +1,6 @@
+#ifndef __SETTING__
+#define __SETTING__
+
 #module \
 Setting
 
@@ -11,18 +14,26 @@ Setting
 #const USER_PASSCODE_OFFSET	(USER_ID_OFFSET + USER_ID_SIZE)
 #const USER_PASSCODE_SIZE	16
 
+; ユーザの引継ぎコード
+#const USER_INHERITANCE_CODE_OFFSET	(USER_PASSCODE_OFFSET + USER_PASSCODE_SIZE)
+#const USER_INHERITANCE_CODE_SIZE	16
+
 #deffunc local \
 Load
 	userId = 0
 	SDim userPasscode, USER_PASSCODE_SIZE
+	SDim userInheritanceCode, USER_INHERITANCE_CODE_SIZE
 
 	Exist FILE_NAME
 	If strSize < 0 {
+		Save
+
 		Return
 	}
 
 	BLoad FILE_NAME, userId, USER_ID_SIZE, USER_ID_OFFSET
 	BLoad FILE_NAME, userPasscode, USER_PASSCODE_SIZE, USER_PASSCODE_OFFSET
+	BLoad FILE_NAME, userInheritanceCode, USER_INHERITANCE_CODE_SIZE, USER_INHERITANCE_CODE_OFFSET
 
 	Return
 
@@ -30,8 +41,13 @@ Load
 Save
 	BSave FILE_NAME, userId, USER_ID_SIZE, USER_ID_OFFSET
 	BSave FILE_NAME, userPasscode, USER_PASSCODE_SIZE, USER_PASSCODE_OFFSET
+	BSave FILE_NAME, userInheritanceCode, USER_INHERITANCE_CODE_SIZE, USER_INHERITANCE_CODE_OFFSET
+
+	Load
 
 	Return
 
 #global
 
+#endif	; not __SETTING__
+
diff --git a/modules/user.mod.hsp b/modules/user.mod.hsp
index 58cc0ed..4fba1a6 100644
--- a/modules/user.mod.hsp
+++ b/modules/user.mod.hsp
@@ -1,4 +1,5 @@
 #include "./modules/http.mod.hsp"
+#include "./modules/setting.mod.hsp"
 
 
 #ifndef __USER__
@@ -8,11 +9,11 @@
 User
 
 #define CREATE_URL	(CONFIG_SERVER_URL + "/create_user.php")
-#define FETCH_URL	(CONFIG_SERVER_URL + "/fetch_user.php")
+#define AUTH_URL	(CONFIG_SERVER_URL + "/auth_user.php")
 
 #deffunc local \
 Create \
-		str	p_name,
+		str	p_name,\
 		local	l_data
 	Fetch@Http CREATE_URL + "?name=" + p_name
 
@@ -29,15 +30,40 @@ Create \
 		inheritanceCode = ""
 	}
 
+	Save@Setting
+
 	Return
 
 #deffunc local \
 Auth \
 		int	p_id,\
 		local	l_data
+	Load@Setting
+
 	id = userId@Setting
 	pass = userPasscode@Setting
 
+	If id <= 0 {
+		Return
+	}
+
+	Fetch@Http AUTH_URL + "?id=" + id + "&pass=" + pass
+
+	If status@Http = STATUS_SUCCESS@Http {
+		Split data@Http, ",", l_data
+
+		If Int (l_data.0) = 0 {
+			id = 0
+
+			Return
+		}
+
+		name = l_data.1
+	}
+	Else {
+		id = 0
+	}
+
 	Return
 
 #global