summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-07-01 10:52:27 +0800
committerptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-07-01 10:52:27 +0800
commit1562021be3198239d60452a1be345e0f03ee9dab (patch)
treeb3d7db78c6972de3ae267dec6d05478a59acaa31
parent2846cb73dbb035197c88ec52d73e6267c2b6608a (diff)
downloadpttbbs-1562021be3198239d60452a1be345e0f03ee9dab.tar
pttbbs-1562021be3198239d60452a1be345e0f03ee9dab.tar.gz
pttbbs-1562021be3198239d60452a1be345e0f03ee9dab.tar.bz2
pttbbs-1562021be3198239d60452a1be345e0f03ee9dab.tar.lz
pttbbs-1562021be3198239d60452a1be345e0f03ee9dab.tar.xz
pttbbs-1562021be3198239d60452a1be345e0f03ee9dab.tar.zst
pttbbs-1562021be3198239d60452a1be345e0f03ee9dab.zip
merge the branch from ptt.fpg
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2110 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--include/fpg.h3
-rw-r--r--include/proto.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/fpg.h b/include/fpg.h
index 8014c5b4..57ae46c3 100644
--- a/include/fpg.h
+++ b/include/fpg.h
@@ -104,7 +104,8 @@ typedef struct
uschar cardfight[20];
uschar dragon[5];
PET pet;
- char left[40];
+ usint bank;
+ char left[36];
} ACCT;
struct fileheader
diff --git a/include/proto.h b/include/proto.h
index c439b708..b0307d54 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,7 @@ void setup_man(boardheader_t * board);
void delete_symbolic_link(boardheader_t *bh, int bid);
int make_symbolic_link(char *bname, int gid);
int make_symbolic_link_interactively(int gid);
-void merge_dir(char *dir1, char *dir2);
+void merge_dir(char *dir1, char *dir2, int isoutter);
/* announce */
int a_menu(char *maintitle, char *path, int lastlevel);