From 24d848bc545c35e9420f30c4fac7ded75072cfaa Mon Sep 17 00:00:00 2001 From: piaip Date: Sun, 20 Sep 2009 23:22:48 +0000 Subject: * merge uflag2 and uflag, and refine flag bitmask names git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4871 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mbbsd/menu.c') diff --git a/mbbsd/menu.c b/mbbsd/menu.c index 2c33f06b..7a4160f8 100644 --- a/mbbsd/menu.c +++ b/mbbsd/menu.c @@ -305,7 +305,7 @@ adbanner(int menu_index) int i = menu_index; // don't show if stat in class or user wants to skip adbanners - if (currstat == CLASS || !(cuser.uflag & ADBANNER_FLAG)) + if (currstat == CLASS || !(HasUserFlag(UF_ADBANNER))) return; // also prevent SHM busy status @@ -336,7 +336,7 @@ adbanner(int menu_index) SHM->last_usong < SHM->last_film); if (SHM->last_film > N_SYSADBANNER) { - if (cuser.uflag & ADBANNER_USONG_FLAG || !valid_usong_range) + if (HasUserFlag(UF_ADBANNER_USONG) || !valid_usong_range) i = N_SYSADBANNER + slideshow_index % (SHM->last_film+1-N_SYSADBANNER); else i = SHM->last_usong + 1 + slideshow_index % (SHM->last_film - SHM->last_usong); -- cgit v1.2.3