From 4be09ad0c2da18d07459b7067e40c5f7f61f9aca Mon Sep 17 00:00:00 2001
From: scw <scw@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Mon, 24 May 2004 01:02:40 +0000
Subject: Make convert work without PLAY_ANGEL defined.

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2015 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 util/r2014convert.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/r2014convert.c b/util/r2014convert.c
index 7609cee4..317a4623 100644
--- a/util/r2014convert.c
+++ b/util/r2014convert.c
@@ -12,7 +12,7 @@ int main(){
 	    printf("It seems your .PASSWD file has been transfered, "
 		    "do it any way?[y/N] ");
 	    fflush(stdout);
-	    scanf(" %c", &c);
+	    scanf("%c", &c);
 	    if (c != 'y' && c != 'Y')
 		return 0;
 	} else {
@@ -41,10 +41,10 @@ int main(){
 
     while(read(orig_fd, &u, sizeof(userec_t)) == sizeof(userec_t)){
 	// clear 0x400, 0x800, and 0x3000
-	u.uflag2 &= ~(REJ_OUTTAMAIL | REJ_QUESTION | ANGEL_MASK);
+	u.uflag2 &= ~(0x400 | 0x800 | 0x3000);
 	if( u.userlevel & OLD_PERM_NOOUTMAIL )
 	    u.uflag2 |= REJ_OUTTAMAIL;
-	u.userlevel &= ~PERM_ANGEL;
+	u.userlevel &= ~000001000000;
 	bzero(u.myangel, IDLEN + 1);
 	write(new_fd, &u, sizeof(userec_t));
 	++count;
-- 
cgit v1.2.3