From e443776eb7025c569df22f801965f0ec84798e35 Mon Sep 17 00:00:00 2001
From: jack <jack@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 2 May 2004 21:58:08 +0000
Subject: merge trunk to branches and corrected confliction

git-svn-id: http://opensvn.csie.org/pttbbs/branches/Jaky.i18n@1919 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/chc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mbbsd/chc.c')

diff --git a/mbbsd/chc.c b/mbbsd/chc.c
index 0788b96f..b5bd8696 100644
--- a/mbbsd/chc.c
+++ b/mbbsd/chc.c
@@ -552,14 +552,14 @@ hisplay(int s, chcusr_t *user1, chcusr_t *user2, board_t board, board_t tmpbrd)
 	if (chc_lefttime < 0) {
 	    chc_lefttime = 0;
 
-	    /* to make him break out igetkey() */
+	    /* to make him break out igetch() */
 	    chc_from.r = -2;
 	    chc_broadcast_send(act_list, board);
 	}
 	chc_drawline(board, user1, user2, TIME_ROW);
 	move(1, 0);
 	oflush();
-	switch (igetkey()) {
+	switch (igetch()) {
 	case 'q':
 	    endgame = 2;
 	    endturn = 1;
@@ -630,7 +630,7 @@ myplay(int s, chcusr_t *user1, chcusr_t *user2, board_t board, board_t tmpbrd)
 	chc_drawline(board, user1, user2, TIME_ROW);
 	chc_movecur(chc_cursor.r, chc_cursor.c);
 	oflush();
-	ch = igetkey();
+	ch = igetch();
 	chc_lefttime = CHC_TIMEOUT - (now - start_time);
 	if (chc_lefttime < 0)
 	    ch = 'q';
-- 
cgit v1.2.3