From fd0bebe7a68f0ff2a4a3a3aa90fc81bc28ee3e66 Mon Sep 17 00:00:00 2001
From: victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Tue, 9 Sep 2003 06:10:51 +0000
Subject: merge from my branch   merge chc_*.c to chc.c   merge gomo1.c into
 gomo.c   add new feature to chc

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1171 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 include/bbs.h       | 1 +
 include/modes.h     | 5 -----
 include/proto.h     | 8 ++++----
 include/pttstruct.h | 9 ---------
 4 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'include')

diff --git a/include/bbs.h b/include/bbs.h
index 71a3332f..666d30c7 100644
--- a/include/bbs.h
+++ b/include/bbs.h
@@ -60,6 +60,7 @@
 #include "common.h"
 #include "perm.h"
 #include "modes.h"
+#include "chc.h"
 #include "proto.h"
 #include "gomo.h"
 
diff --git a/include/modes.h b/include/modes.h
index a70e7047..8321fc8b 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -97,11 +97,6 @@
 #define REEDIT		79
 #define BLOGGING        80
 
-/* 象棋 */
-#define CHC_VERSUS	0	/* 雙人 */
-#define CHC_WATCH	1	/* 觀棋 */
-#define CHC_PERSONAL	2	/* 打譜 */
-
 /* menu.c 中的模式 */
 #define QUIT    0x666           /* Return value to abort recursive functions */
 #define XEASY   0x333           /* Return value to un-redraw screen */
diff --git a/include/proto.h b/include/proto.h
index 5c287dd1..d1e51a48 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -218,10 +218,6 @@ int ticket(int bid);
 /* gomo */
 int gomoku(int fd);
 
-/* gomo1 */
-int getstyle(int x, int y, int color, int limit);
-int chkwin(int style, int limit);
-
 /* guess */
 int guess_main();
 
@@ -292,6 +288,9 @@ void add_distinct(char *fname, char *line);
 void show_last_call_in(int save);
 int dosearchuser(char *userid);
 void u_exit(char *mode);
+void talk_request(int sig);
+int reply_connection_request(userinfo_t *uip);
+void my_talk(userinfo_t * uin, int fri_stat, char defact);
 
 /* menu */
 void showtitle(char *title, char *mid);
@@ -492,6 +491,7 @@ int login_friend_online();
 int isvisible_uid(int tuid);
 int friend_stat(userinfo_t *me, userinfo_t * ui);
 int call_in(userinfo_t *uentp, int fri_stat);
+int make_connection_to_somebody(userinfo_t *uin, int timeout);
 
 /* tmpjack */
 int reg_barbq();
diff --git a/include/pttstruct.h b/include/pttstruct.h
index 1cb59f85..991b2154 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -424,13 +424,4 @@ typedef struct
     time_t  chrono;
     int     recno;
 } TagItem;
-
-/* 象棋 */
-typedef struct chcusr_t{
-    char    userid[IDLEN + 1];
-    int     uid;
-    int	    win;
-    int     lose;
-    int     tie;
-} chcusr_t;
 #endif
-- 
cgit v1.2.3