From 04126ad019a4708ea1b5a5f739fb85aa3e86ddc8 Mon Sep 17 00:00:00 2001
From: ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Wed, 3 Nov 2004 15:31:56 +0000
Subject: switch the words of gold/silver coin

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2307 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/merge.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/mbbsd/merge.c b/mbbsd/merge.c
index 2668d059..5e564d4e 100644
--- a/mbbsd/merge.c
+++ b/mbbsd/merge.c
@@ -23,8 +23,8 @@ m_sob()
  "      �p�G�z���ݭn, �Ъ����}.\n"
  "    -----------------------------------------------------------------\n"
  "    �S�O�m�{:\n"
- "      ���F�b���w��,�z�u���s��T���K�X���~�����|,�Фp�߿�J.\n"
- "      �s��T�����~�z���ܨ��\\��N�|�Q�}�@��ê����q������.\n"
+ "      ���F�b���w��,�z�u���s��Q���K�X���~�����|,�Фp�߿�J.\n"
+ "      �s�򦸿��~�z���ܨ��\\��N�|�Q�}�@��ê����q������.\n"
  "      �Ф��n�b�ܨ��L�{�������`�_�u, ��N�_�u�ܥb�~�H�������ϭ�.\n"
 	);
 
@@ -55,7 +55,7 @@ m_sob()
    do{
     getdata(11,0, "      �F�y���K�X:", passbuf, sizeof(passbuf), 
 		  NOECHO);
-    if(++count>=3)
+    if(++count>=10)
     {
           cuser.userlevel |= PERM_VIOLATELAW;
           cuser.vl_count++;
@@ -85,8 +85,8 @@ m_sob()
    reload_money(); 
 
    sprintf(buf, 
-           "�z���F�y�ȹ��� %10d ���⦨ Ptt ���� %9d (�ײv 22:1), \n"
-           "    �F�y������ %10d ���⬰ Ptt ���� %9d (�ײv 222105:1), \n"
+           "�z���F�y�x�M�� %10d ���⦨ Ptt ���� %9d (�ײv 22:1), \n"
+           "    �F�y���ߦ� %10d ���⬰ Ptt ���� %9d (�ײv 222105:1), \n"
            "    �즳P��  %10d �פJ��@�� %d\n",
             man.goldmoney, man.goldmoney/22, 
             man.silvermoney, man.silvermoney/222105,
@@ -163,12 +163,15 @@ m_sob()
 	      cuser.userid[0], cuser.userid);
         system(buf);
         strcat(msg, "�פJ�ӤH�H�c��ذ�(�ӤH�@�~��)\n");
-
-        strcat(fh.title, "�� �ӤH�@�~��");
-        strcat(fh.filename, "gem");
-        sprintf(fh.owner, cuser.userid);
-        sprintf(buf, "home/%c/%s/man/.DIR", cuser.userid[0], cuser.userid);
-        append_record(buf, &fh, sizeof(fh));
+        sprintf(buf,"home/%c/%s/man/gem", cuser.userid[0], cuser.userid);
+        if(dashd(buf))
+         {
+          strcat(fh.title, "�� �ӤH�@�~��");
+          strcat(fh.filename, "gem");
+          sprintf(fh.owner, cuser.userid);
+          sprintf(buf, "home/%c/%s/man/.DIR", cuser.userid[0], cuser.userid);
+          append_record(buf, &fh, sizeof(fh));
+         }
    }
    if(getans("�O�_�פJ�n�ͦW��? (�|�л\\�{���]�w, ID�i��O���P�H)? (y/N)")=='y')
    {
-- 
cgit v1.2.3