From: <are...@us...> - 2010-01-02 00:43:24
|
Revision: 5132 http://planeshift.svn.sourceforge.net/planeshift/?rev=5132&view=rev Author: aresilek Date: 2010-01-01 23:48:54 +0000 (Fri, 01 Jan 2010) Log Message: ----------- - Changed buddy list hide option from /buddyhide to /set target buddyhide Modified Paths: -------------- trunk/src/server/adminmanager.cpp trunk/src/server/adminmanager.h trunk/src/server/database/mysql/command_access.sql trunk/src/server/database/mysql/upgrade_schema.sql Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2010-01-01 19:06:06 UTC (rev 5131) +++ trunk/src/server/adminmanager.cpp 2010-01-01 23:48:54 UTC (rev 5132) @@ -1106,11 +1106,6 @@ } return true; } - else if (command == "/buddyhide") - { - setting = words[1]; - return true; - } else if (command == "/rndmsgtest") { text = words[1]; @@ -1522,10 +1517,6 @@ { HandleServerQuit(me, msg, data, client); } - else if (data.command == "/buddyhide") - { - BuddyListHide(me, msg, data, client); - } } void AdminManager::HandleLoadQuest(psAdminCmdMessage& msg, AdminCmdData& data, Client* client) @@ -2111,7 +2102,8 @@ "infinitemana = %s\n" "instantcast = %s\n" "givekillexp = %s\n" - "attackable = %s", + "attackable = %s\n" + "buddyhide = %s", (actor->GetInvincibility())?"on":"off", (!actor->GetVisibility())?"on":"off", (actor->GetViewAllObjects())?"on":"off", @@ -2122,7 +2114,8 @@ (actor->infinitemana)?"on":"off", (actor->instantcast)?"on":"off", (actor->givekillexp)?"on":"off", - (actor->attackable)?"on":"off"); + (actor->attackable)?"on":"off", + (actor->GetClient()->GetBuddyListHide())?"on":"off"); return; } else if (data.attribute == "invincible" || data.attribute == "invincibility") @@ -2257,6 +2250,21 @@ else actor->attackable = onoff; } + else if (data.attribute == "buddyhide") + { + if (toggle) + { + actor->GetClient()->SetBuddyListHide(!actor->GetClient()->GetBuddyListHide()); + onoff = actor->GetClient()->GetBuddyListHide(); + } + else if (actor->GetClient()->GetBuddyListHide() == onoff) + already = true; + else + actor->GetClient()->SetBuddyListHide(onoff); + + if (!already) + psserver->usermanager->NotifyPlayerBuddies(actor->GetClient(), !onoff); + } else if (!data.attribute.IsEmpty()) { psserver->SendSystemInfo(me->clientnum, "%s is not a supported attribute", data.attribute.GetData() ); @@ -8388,37 +8396,6 @@ psserver->QuitServer(data.value, client); } -void AdminManager::BuddyListHide(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client *client ) -{ - bool onoff = false; - bool toggle = false; - bool already = false; - - if (data.setting == "on") - onoff = true; - else if (data.setting == "off") - onoff = false; - else - toggle = true; - - if (toggle) - { - client->SetBuddyListHide(!client->GetBuddyListHide()); - onoff = client->GetBuddyListHide(); - } - else if (client->GetBuddyListHide() == onoff) - already = true; - else - client->SetBuddyListHide(onoff); - - if (!already) - psserver->usermanager->NotifyPlayerBuddies(client, !onoff); - - psserver->SendSystemInfo(me->clientnum, "Players %s %s see you on their buddy lists.", - (already)?"already":"now", - (onoff)?"can't":"can" ); -} - void AdminManager::RandomMessageTest(Client *client,bool sequential) { csArray<int> values; Modified: trunk/src/server/adminmanager.h =================================================================== --- trunk/src/server/adminmanager.h 2010-01-01 19:06:06 UTC (rev 5131) +++ trunk/src/server/adminmanager.h 2010-01-01 23:48:54 UTC (rev 5132) @@ -243,9 +243,6 @@ /// Set the label color for char void SetLabelColor(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client *client, gemActor * subject); - /// Hide from player buddylists - void BuddyListHide(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client *client); - /// Divorce char1 and char2, if they're married. void Divorce(MsgEntry* me, AdminCmdData& data); Modified: trunk/src/server/database/mysql/command_access.sql =================================================================== --- trunk/src/server/database/mysql/command_access.sql 2010-01-01 19:06:06 UTC (rev 5131) +++ trunk/src/server/database/mysql/command_access.sql 2010-01-01 23:48:54 UTC (rev 5132) @@ -395,12 +395,6 @@ INSERT INTO command_group_assignment VALUES( "/set", 23 ); INSERT INTO command_group_assignment VALUES( "/set", 22 ); INSERT INTO command_group_assignment VALUES( "/set", 21 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 30 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 25 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 24 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 23 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 22 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 21 ); INSERT INTO command_group_assignment VALUES( "/quest", 30 ); INSERT INTO command_group_assignment VALUES( "/quest", 25 ); INSERT INTO command_group_assignment VALUES( "/quest", 24 ); @@ -424,7 +418,6 @@ INSERT INTO command_group_assignment VALUES( "/slide", 10 ); INSERT INTO command_group_assignment VALUES( "/teleport", 10 ); INSERT INTO command_group_assignment VALUES( "/set", 10 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 10 ); INSERT INTO command_group_assignment VALUES( "quest notify", 10 ); INSERT INTO command_group_assignment VALUES( "pos extras", 10 ); INSERT INTO command_group_assignment VALUES( "default buddylisthide", 10 ); Modified: trunk/src/server/database/mysql/upgrade_schema.sql =================================================================== --- trunk/src/server/database/mysql/upgrade_schema.sql 2010-01-01 19:06:06 UTC (rev 5131) +++ trunk/src/server/database/mysql/upgrade_schema.sql 2010-01-01 23:48:54 UTC (rev 5132) @@ -1376,13 +1376,6 @@ INSERT INTO command_group_assignment VALUES( "default buddylisthide", 22 ); INSERT INTO command_group_assignment VALUES( "default buddylisthide", 21 ); INSERT INTO command_group_assignment VALUES( "default buddylisthide", 10 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 30 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 25 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 24 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 23 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 22 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 21 ); -INSERT INTO command_group_assignment VALUES( "/buddyhide", 10 ); #1235 - Talad - changed wc_statistics table This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |