diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-09-17 17:50:16 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-09-17 17:50:16 +0800 |
| commit | 42dd732f9f1bfe4b79c925b0e3d14a68c7312174 (patch) | |
| tree | 055b6c72b7e23d8704a2fa646b2780b176720509 /include | |
| parent | 2a83fe8bd5b10cb1b6e1b9b4f8fc76096e185456 (diff) | |
| download | pttbbs-42dd732f9f1bfe4b79c925b0e3d14a68c7312174.tar pttbbs-42dd732f9f1bfe4b79c925b0e3d14a68c7312174.tar.gz pttbbs-42dd732f9f1bfe4b79c925b0e3d14a68c7312174.tar.bz2 pttbbs-42dd732f9f1bfe4b79c925b0e3d14a68c7312174.tar.lz pttbbs-42dd732f9f1bfe4b79c925b0e3d14a68c7312174.tar.xz pttbbs-42dd732f9f1bfe4b79c925b0e3d14a68c7312174.tar.zst pttbbs-42dd732f9f1bfe4b79c925b0e3d14a68c7312174.zip | |
* move WATER_* from uflag2 to cuser.pager_ui_type (standalone variable)
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4848 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'include')
| -rw-r--r-- | include/modes.h | 7 | ||||
| -rw-r--r-- | include/pttstruct.h | 3 | ||||
| -rw-r--r-- | include/uflags.h | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/include/modes.h b/include/modes.h index 7ceb7ba9..b32698e7 100644 --- a/include/modes.h +++ b/include/modes.h @@ -200,6 +200,13 @@ #define PAGER_MODES (5) +#define PAGER_UI_ORIG 0x00000000 // was: WATER_ORIG +#define PAGER_UI_NEW 0x00000001 // was: WATER_NEW +#define PAGER_UI_OFO 0x00000002 // was: WATER_OFO +#define PAGER_UI_IS(uitype) ((cuser.pager_ui_type%PAGER_UI_TYPES) == (uitype)) +#define PAGER_UI_TYPES 0x00000003 // the types that we really support +#define PAGER_UI_TYPES_USER 0x00000002 // the types we allow user to select + /* stuff.c: show_file */ #define SHOWFILE_RAW (0x00) #define SHOWFILE_ALLOW_COLOR (0x01) // ESC [ ... m diff --git a/include/pttstruct.h b/include/pttstruct.h index a1ec4c55..3ce9ecb4 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -80,8 +80,7 @@ typedef struct userec_t { uint8_t year; /* 生日 年 */ uint8_t sex; /* 性別 */ - uint8_t unused_2; - + uint8_t pager_ui_type; /* 呼叫器界面類別 (was: WATER_*) */ uint8_t pager; /* 呼叫器狀態 */ uint8_t invisible; /* 隱形狀態 */ diff --git a/include/uflags.h b/include/uflags.h index 72a21831..4b695658 100644 --- a/include/uflags.h +++ b/include/uflags.h @@ -48,12 +48,12 @@ /* -------------------- userec_t.uflag2 (unsigned int) */ -// XXX TODO move water to standalone variable just like invisible/pager. -#define WATER_ORIG 0x00000000 -#define WATER_NEW 0x00000001 -#define WATER_OFO 0x00000002 -#define WATERMODE(mode) ((cuser.uflag2 & WATER_MASK) == mode) -#define WATER_MASK 0x00000003 /* water mask */ +// WATER_* is moved to PAGER_UI_* in modes.h +// #define WATER_ORIG 0x00000000 +// #define WATER_NEW 0x00000001 +// #define WATER_OFO 0x00000002 +// #define WATERMODE(mode) ((cuser.uflag2 & WATER_MASK) == mode) +// #define WATER_MASK 0x00000003 /* water mask */ // #define WATER_??? 0x00000004 // #define WATER_??? 0x00000008 |