missing commit

git-svn-id: http://opensvn.csie.org/pttbbs/branches/scw.angel@1992 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

4 files changed, 24 insertions, 3 deletions

diff --git a/include/modes.h b/include/modes.h
index 16d23754..42c81d66 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -153,4 +153,15 @@ enum {STRIP_ALL = 0, ONLY_COLOR, NO_RELOAD};
 #define SIG_CHC         4
 #define SIG_DARK        5
 
+/* talk.c ¤¤ªº¼Ò¦¡ */
+#define WATERBALL_GENERAL 0
+#define WATERBALL_PREEDIT 1
+#define WATERBALL_ALOHA   2
+#define WATERBALL_SYSOP   3
+#define WATERBALL_CONFIRM 4
+#ifdef PLAY_ANGEL
+#define WATERBALL_ANGEL   5
+#define WATERBALL_ANSWER  6
+#endif
+
 #endif
diff --git a/include/proto.h b/include/proto.h
index 816c81c4..90f093fb 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -455,7 +455,7 @@ char *genpasswd(char *pw);
 
 /* screen */
 void move(int y, int x);
-void outs(char *str);
+void outs(const char *str);
 void clrtoeol(void);
 void clear(void);
 void refresh(void);
@@ -468,13 +468,13 @@ void redoscr(void);
 void clrtoline(int line);
 void standout(void);
 void standend(void);
-int edit_outs(char *text);
+int edit_outs(const char *text);
 void outch(unsigned char c);
 void rscroll(void);
 void scroll(void);
 void getyx(int *y, int *x);
 void initscr(void);
-void out_lines(char *str, int line);
+void out_lines(const char *str, int line);
 
 /* stuff */
 #define isprint2(ch) ((ch & 0x80) || isprint(ch))
@@ -580,6 +580,7 @@ int call_in(userinfo_t *uentp, int fri_stat);
 int make_connection_to_somebody(userinfo_t *uin, int timeout);
 int t_changeangel(void);
 void CallAngel(void);
+int t_switchangel(void);
 
 /* tmpjack */
 int reg_barbq(void);
diff --git a/include/pttstruct.h b/include/pttstruct.h
index 89135e89..06e21f43 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -237,6 +237,13 @@ typedef struct {
 #define FAVGMAX    32             /* Max groups of Myfavorite */
 #define FAVGSLEN    8		  /* Max Length of Description String */
 
+#ifdef PLAY_ANGEL
+/* values of msgque_t::msgmode */
+#define MSG_GENERAL   0
+#define MSG_FROMANGEL 1
+#define MSG_TOANGEL   2
+#endif
+
 typedef struct msgque_t {
     pid_t   pid;
     char    userid[IDLEN + 1];
@@ -253,6 +260,7 @@ typedef struct userinfo_t {
     unsigned char   active;         /* When allocated this field is true */
     unsigned char   invisible;      /* Used by cloaking function in Xyz menu */
     unsigned char   sockactive;     /* Used to coordinate talk requests */
+    unsigned char   being_angel;
     unsigned int    userlevel;
     unsigned char   mode;           /* UL/DL, Talk Mode, Chat Mode, ... */
     unsigned char   pager;          /* pager toggle, YEA, or NA */
diff --git a/util/AngelConvert.c b/util/AngelConvert.c
index a4829e5c..04b4ac09 100644
--- a/util/AngelConvert.c
+++ b/util/AngelConvert.c
@@ -24,6 +24,7 @@ int main(){
 	u.uflag2 &= 0x03ff; // clear 0x400 and 0x1000
 	if( u.userlevel & OLD_PERM_NOOUTMAIL )
 	    u.uflag2 |= REJ_OUTTAMAIL;
+	u.uflag2 |= BEING_ANGEL;
 	u.userlevel &= ~PERM_ANGEL;
 	bzero(u.myangel, IDLEN + 1);
 	write(new_fd, &u, sizeof(userec_t));