From 1cee5ed2356d9e9811092f14c34bba05b445223b Mon Sep 17 00:00:00 2001 From: Padraic Date: Sun, 8 May 2011 13:59:47 -0400 Subject: [PATCH] Misc Chat Fixes IssueID #230 Signed-off-by: Rick L Bird --- src/command.c | 2 +- src/division.c | 14 +++++++------- src/extchat.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/command.c b/src/command.c index 74506f0..0c91fae 100644 --- a/src/command.c +++ b/src/command.c @@ -94,7 +94,7 @@ COMLIST commands[] = { {"@CEMIT", "NOEVAL NOISY SILENT SPOOF", cmd_cemit, CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_NOGAGGED, NULL}, {"@CHANNEL", - "LIST ADD DELETE RENAME NAME PRIVS QUIET NOISY DECOMPILE DESCRIBE CHOWN WIPE MUTE UNMUTE GAG UNGAG HIDE UNHIDE WHAT TITLE BRIEF RECALL BUFFER SET OBJECT", + "LIST ADD DELETE RENAME NAME MOGRIFIER PRIVS QUIET NOISY DECOMPILE DESCRIBE CHOWN WIPE MUTE UNMUTE GAG UNGAG HIDE UNHIDE WHAT TITLE BRIEF RECALL BUFFER SET OBJECT", cmd_channel, CMD_T_ANY | CMD_T_SWITCHES | CMD_T_EQSPLIT | CMD_T_NOGAGGED | CMD_T_RS_ARGS, NULL}, diff --git a/src/division.c b/src/division.c index 7965dfc..a0b4f7a 100644 --- a/src/division.c +++ b/src/division.c @@ -139,21 +139,21 @@ static struct powergroup_text_t predefined_powergroups[] = { /* Max Powers */ "@SU:LTE Announce Attach BCreate Boot Builder Can_NsPemit Cemit Chat Chown Combat Cron DAnnounce Division EAnnounce Empire Empower GFuncs Halt Hide Hook Idle Join Level Link Login MailAdmin Many_Attribs Modify Newpass:2 NoPay NoQuota Nuke:LTE Open:2 Pass_Locks PCreate PEmit Poll PowerGroup:LTE Privilege PrivWho Program ProgLock:lte Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search See_All See_Queue SetQuotas Site SQL_Ok Summon Tel_Thing Tel_Place", /* Auto Powers */ - "Announce Attach BCreate Boot:2 Builder Can_NsPemit Cemit Chat Chown:2 Combat Cron DAnnounce Division EAnnounce Economy Empire Empower:2 GFuncs Halt Hide Idle Join Level:1 Link Login MailAdmin:1 Many_Attribs Modify:2 Newpass:1 NoPay NoQuota Nuke:LT Open:2 Pass_Locks PCreate PEmit Poll PowerGroup:LTE Privilege PrivWho Program ProgLock:1 Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:LTE See_All Search:lte See_Queue SetQuotas Site SQL_Ok Summon Tel_Thing Tel_Place"}, + "Announce Attach BCreate Boot:2 Builder Can_NsPemit Cemit Chat:LTE Chown:2 Combat Cron DAnnounce Division EAnnounce Economy Empire Empower:2 GFuncs Halt Hide Idle Join Level:1 Link Login MailAdmin:1 Many_Attribs Modify:2 Newpass:1 NoPay NoQuota Nuke:LT Open:2 Pass_Locks PCreate PEmit Poll PowerGroup:LTE Privilege PrivWho Program ProgLock:1 Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:LTE See_All Search:lte See_Queue SetQuotas Site SQL_Ok Summon Tel_Thing Tel_Place"}, /* PowerGroup Name */ {"Admin", /* Max Powers */ - "Announce Attach BCreate Boot:1 Builder Can_NsPemit Cemit Chat Chown(LTE) Combat Cron DAnnounce Division EAnnounce Economy Empire Empower GFuncs Halt Hide Idle Join Level Link Login MailAdmin:2 Many_Attribs Modify Newpass:2 NoPay Nuke:LTE NoQuota Open:2 Pass_Locks:2 PCreate PEmit Poll Powergroup:lte Privilege PrivWho Program ProgLock:2 Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:LTE See_All See_Queue SetQuotas SQL_Ok Summon Tel_Thing Tel_Place", + "Announce Attach BCreate Boot:1 Builder Can_NsPemit Cemit Chat:LTE Chown(LTE) Combat Cron DAnnounce Division EAnnounce Economy Empire Empower GFuncs Halt Hide Idle Join Level Link Login MailAdmin:2 Many_Attribs Modify Newpass:2 NoPay Nuke:LTE NoQuota Open:2 Pass_Locks:2 PCreate PEmit Poll Powergroup:lte Privilege PrivWho Program ProgLock:2 Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:LTE See_All See_Queue SetQuotas SQL_Ok Summon Tel_Thing Tel_Place", /* Auto Powers */ - "Announce Attach:1 BCreate Builder Can_NsPemit Cemit Chat Combat Cron DAnnounce Division EAnnounce Economy Empire Empower:2 GFuncs Halt:2 Hide Idle Join Level:1 Link:2 Login Modify:2 Newpass:1 NoPay Nuke:LT NoQuota Open:2 PCreate PEmit Poll PowerGroup:LTE Program Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:2 See_All:2 See_Queue Summon:1 Tel_Thing:1 Tel_Place:2 "}, + "Announce Attach:1 BCreate Builder Can_NsPemit Cemit Chat:LTE Combat Cron DAnnounce Division EAnnounce Economy Empire Empower:2 GFuncs Halt:2 Hide Idle Join Level:1 Link:2 Login Modify:2 Newpass:1 NoPay Nuke:LT NoQuota Open:2 PCreate PEmit Poll PowerGroup:LTE Program Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:2 See_All:2 See_Queue Summon:1 Tel_Thing:1 Tel_Place:2 "}, /* PowerGroup Name */ {"EmpireHead", /* Max Powers */ - "Announce Attach:1 BCreate Boot:1 Builder Can_NsPemit Cemit Chat Combat Cron DAnnounce Division EAnnounce Economy Empower GFuncs Halt Hide Idle Join Level Link Login Many_Attribs Modify:2 Newpass:1 NoPay NoQuota Nuke:LT Open:2 Pass_Locks:2 PCreate PEmit Poll PowerGroup:LT Privilege PrivWho Program:2 Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:2 See_All:2 See_Queue SetQuotas:LTE SQL_Ok Summon Tel_Thing:2 Tel_Place:1", + "Announce Attach:1 BCreate Boot:1 Builder Can_NsPemit Cemit Chat:LTE Combat Cron DAnnounce Division EAnnounce Economy Empower GFuncs Halt Hide Idle Join Level Link Login Many_Attribs Modify:2 Newpass:1 NoPay NoQuota Nuke:LT Open:2 Pass_Locks:2 PCreate PEmit Poll PowerGroup:LT Privilege PrivWho Program:2 Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:2 See_All:2 See_Queue SetQuotas:LTE SQL_Ok Summon Tel_Thing:2 Tel_Place:1", /* Auto Powers */ - "Announce Attach:1 BCreate Boot:1 Builder Cemit Chat DAnnounce Division EAnnounce Empower:1 Halt:1 Hide Idle Join:2 Level:1 Link:1 Login Modify:2 Newpass:1 NoPay NoQuota Open:2 Pass_Locks PCreate PEmit:1 Poll PowerGroup:LT PrivWho Program:2 Pueblo_Send Quota Queue Remote RPChat RPEmit Search:1 See_Queue SetQuotas:1 Summon:1 Tel_Thing:1 Tel_Place:2 "}, + "Announce Attach:1 BCreate Boot:1 Builder Cemit Chat:LTE DAnnounce Division EAnnounce Empower:1 Halt:1 Hide Idle Join:2 Level:1 Link:1 Login Modify:2 Newpass:1 NoPay NoQuota Open:2 Pass_Locks PCreate PEmit:1 Poll PowerGroup:LT PrivWho Program:2 Pueblo_Send Quota Queue Remote RPChat RPEmit Search:1 See_Queue SetQuotas:1 Summon:1 Tel_Thing:1 Tel_Place:2 "}, /* PowerGroup Name */ {"EmpireAdmin", @@ -164,14 +164,14 @@ static struct powergroup_text_t predefined_powergroups[] = { /* PowerGroup Name */ {"Builder", /* Max Powers */ - "Builder Cemit Chat Combat DAnnounce Division EAnnounce Economy Empower GFuncs Halt Hide Idle Join Level Link Login Many_Attribs Modify:2 NoPay NoQuota Open:2 PCreate PEmit Poll PrivWho Program:2 Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:2 See_All:2 See_Queue Space Summon Tel_Thing:2 Tel_Place:2", + "Builder Cemit Chat:LTE Combat DAnnounce Division EAnnounce Economy Empower GFuncs Halt Hide Idle Join Level Link Login Many_Attribs Modify:2 NoPay NoQuota Open:2 PCreate PEmit Poll PrivWho Program:2 Pueblo_Send Quota Queue RCACHE Remote RPChat RPEmit RPTel Search:2 See_All:2 See_Queue Space Summon Tel_Thing:2 Tel_Place:2", /* Auto Powers */ "Builder Hide Idle Join:2 Level:LT Login NoPay NoQuota Open:LTE PEmit:LT Poll Program:LTE Pueblo_Send Quota Queue RPChat RPEmit See_Queue Tel_Thing:LT Tel_Place:2"}, /* PowerGroup Name */ {"Player", /* Max Powers */ - "Builder Chat Combat Hide Idle Login NoPay PEmit Poll RPChat RPEmit Summon Join", + "Builder Chat:LTE Combat Hide Idle Login NoPay PEmit Poll RPChat RPEmit Summon Join", /* Auto Powers */ "RPChat RPEmit"}, /* end of powers */ diff --git a/src/extchat.c b/src/extchat.c index 507d82a..b4be613 100644 --- a/src/extchat.c +++ b/src/extchat.c @@ -536,7 +536,7 @@ load_labeled_chanusers(PENNFILE *fp, CHAN *ch) /* But be sure to read (and discard) the player's info */ do_log(LT_ERR, 0, 0, T("Bad object #%d removed from channel %s"), player, ChanName(ch)); - db_read_this_labeled_int(fp, "type", &n); + db_read_this_labeled_int(fp, "flags", &n); db_read_this_labeled_string(fp, "title", &tmp); ChanNumUsers(ch) -= 1; } @@ -3353,9 +3353,7 @@ COMMAND(cmd_cemit) COMMAND(cmd_channel) { - if (switches) - do_channel(player, arg_left, args_right[1], switches); - else if (SW_ISSET(sw, SWITCH_LIST)) + if (SW_ISSET(sw, SWITCH_LIST)) do_channel_list(player, arg_left); else if (SW_ISSET(sw, SWITCH_ADD)) do_chan_admin(player, arg_left, args_right[1], 0); @@ -3397,7 +3395,9 @@ COMMAND(cmd_channel) do_chan_what(player, arg_left); else if (SW_ISSET(sw, SWITCH_BUFFER)) do_chan_buffer(player, arg_left, args_right[1]); - else + else if (switches) + do_channel(player, arg_left, args_right[1], switches); + else do_channel(player, arg_left, NULL, args_right[1]); } -- 2.30.2