X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Round.pas;h=db3f95df93d8c2fc9e04193a979db1af6014b216;hb=46822cbb30a2bc643fdb53335c4f6af85c878421;hp=fd155512b56c3384d0b4b87320190c1678e88573;hpb=6bc9c2ee4ee2223627dfbc00782092275e9b9158;p=gikonavigoeson%2Fgikonavi.git

diff --git a/Round.pas b/Round.pas
index fd15551..db3f95d 100644
--- a/Round.pas
+++ b/Round.pas
@@ -57,7 +57,7 @@ type
 implementation
 
 uses
-	Giko, BoardGroup, RoundData, Math;
+	Giko, BoardGroup, RoundData, Math, GikoDataModule;
 
 {$R *.DFM}
 
@@ -71,20 +71,20 @@ var
 	RoundItem: TRoundItem;
 begin
 {$IF Defined(FRCRND) }
-	Giko.GikoForm.LoginAction.Checked := true; // “®ìŽŽŒ±—p“r
+	GikoDM.LoginAction.Checked := true; // “®ìŽŽŒ±—p“r
 {$IFEND}
 
 {$IFNDEF LOOSENUP}	//„‰ñ§ŒÀ‚ðŠÉ‚߂邱‚Æ‚É‚µ‚Ä‚½‚ç{$ELSE}‚Ì•û‚ðŽg‚¤
-	if not Giko.GikoForm.LoginAction.Checked then begin
+	if not GikoDM.LoginAction.Checked then begin
 		if GikoSys.Setting.UserID <> '' then begin
 			msg := 'ƒƒOƒCƒ“‚µ‚È‚¢‚Ə„‰ñ‚͏o—ˆ‚Ü‚¹‚ñ' + #13#10
 				+ '¡ƒƒOƒCƒ“‚µ‚Ü‚·‚©';
 			if MsgBox(Handle, msg, 'Šm”F', MB_YESNO or MB_ICONQUESTION or MB_DEFBUTTON2) <> IDYES then begin
 				Exit;
 			end;
-			Giko.GikoForm.LoginAction.Execute;
+			GikoDM.LoginAction.Execute;
 		end;
-		if not Giko.GikoForm.LoginAction.Checked then begin
+		if not GikoDM.LoginAction.Checked then begin
 			msg := 'ƒƒOƒCƒ“‚µ‚È‚¢‚Ə„‰ñ‚͏o—ˆ‚Ü‚¹‚ñ';
 			MsgBox(Handle, msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP);
 			Exit;
@@ -92,18 +92,18 @@ begin
 	end;
 {$ELSE}
 	//‹K§‚ðŠÉ‚ß‚½‚Ù‚¤‚́AƒXƒŒˆê——‚̂ݏ„‰ñ‰Â”\
-	if not Giko.GikoForm.LoginAction.Checked then begin
+	if not GikoDM.LoginAction.Checked then begin
 		if GikoSys.Setting.UserID <> '' then begin
 			msg := 'ƒƒOƒCƒ“‚µ‚È‚¢‚ƃXƒŒƒbƒh‚̏„‰ñ‚͏o—ˆ‚Ü‚¹‚ñ' + #13#10
 				+ '¡ƒƒOƒCƒ“‚µ‚Ü‚·‚©';
 			if MsgBox(Handle, msg, 'Šm”F', MB_YESNO or MB_ICONQUESTION or MB_DEFBUTTON2) <> IDYES then begin
 				Exit;
 			end;
-			Giko.GikoForm.LoginAction.Execute;
+			GikoDM.LoginAction.Execute;
 		end;
 	end;
 	//œ‚È‚µ„‰ñ‚Í15•ªˆÈã‚ÌŠÔŠu‚ð•K—v‚Æ‚·‚é
-	if not Giko.GikoForm.LoginAction.Checked then begin
+	if not GikoDM.LoginAction.Checked then begin
 		if CompareTime(GikoForm.LastRoundTime, Now, 30) then begin
 			msg := 'ˆê“x„‰ñ‚·‚é‚Æ‚R‚O•ªŠÔ„‰ñ‚͏o—ˆ‚Ü‚¹‚ñ';
 			MsgBox(Handle, msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP);
@@ -122,7 +122,7 @@ begin
 
 {$IFNDEF LOOSENUP}
 	//œ‚È‚µ„‰ñ‚Í‚P“x‚É100ŒÂ‚Ü‚Å‚É‚·‚é
-	if not Giko.GikoForm.LoginAction.Checked then begin
+	if not GikoDM.LoginAction.Checked then begin
 		if cnt > 100 then begin
 			msg := '‚P‚O‚OŒÂˆÈã‚͈ê“x‚ɏ„‰ñ‚Å‚«‚Ü‚¹‚ñ';
 			MsgBox(Handle, msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP);
@@ -153,7 +153,7 @@ begin
 		if not RoundItem.BoolData then Continue;
 {$IFDEF LOOSENUP}
 		//œ‚È‚µ„‰ñ‚̓XƒŒƒbƒh‚Í‚Å‚«‚È‚¢‚±‚Æ‚É‚·‚é
-		if not Giko.GikoForm.LoginAction.Checked then begin
+		if not GikoDM.LoginAction.Checked then begin
 			msg := 'ƒƒOƒCƒ“‚µ‚È‚¢‚ƃXƒŒƒbƒh‚̏„‰ñ‚Í‚Å‚«‚Ü‚¹‚ñB';
 			MsgBox(Handle, msg, 'ƒGƒ‰[', MB_OK or MB_ICONSTOP);
 			break;