From: <hei...@us...> - 2008-07-28 17:54:58
|
Revision: 1953 http://planeshift.svn.sourceforge.net/planeshift/?rev=1953&view=rev Author: heinchen Date: 2008-07-28 17:55:07 +0000 (Mon, 28 Jul 2008) Log Message: ----------- typo fix Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2008-07-28 17:36:06 UTC (rev 1952) +++ trunk/src/server/adminmanager.cpp 2008-07-28 17:55:07 UTC (rev 1953) @@ -5970,7 +5970,7 @@ if (target->GetClientNum() != me->clientnum) { psserver->SendSystemOK(target->GetClientNum(), - "%d tria was given by GM %s.", value, + "%d tria were given by GM %s.", value, source->GetActor()->GetName()); } @@ -5978,7 +5978,7 @@ if (source->GetClientNum() != me->clientnum) { psserver->SendSystemResult(source->GetClientNum(), - "%d tria was taken by %s.", value, + "%d tria were taken by %s.", value, target->GetActor()->GetName()); } return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hei...@us...> - 2008-08-31 15:06:31
|
Revision: 2140 http://planeshift.svn.sourceforge.net/planeshift/?rev=2140&view=rev Author: heinchen Date: 2008-08-31 15:06:40 +0000 (Sun, 31 Aug 2008) Log Message: ----------- removed typos Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2008-08-31 14:48:48 UTC (rev 2139) +++ trunk/src/server/adminmanager.cpp 2008-08-31 15:06:40 UTC (rev 2140) @@ -807,7 +807,7 @@ else if (subCmd == "help") { help = true; - subCmd = words[2]; // This might be help on a specefix command + subCmd = words[2]; // This might be help on a specific command } else { @@ -832,7 +832,7 @@ { // No params } - else if (subCmd == "show") // Alias for dislay + else if (subCmd == "show") // Alias for display { subCmd = "display"; } @@ -1882,7 +1882,7 @@ psSectorInfo *spawnsector = CacheManager::GetSingleton().GetSectorInfoByName(sector->QueryObject()->GetName()); if(!spawnsector) { - CPrintf(CON_ERROR,"Player is in invaild sector %s!",sector->QueryObject()->GetName()); + CPrintf(CON_ERROR,"Player is in invalid sector %s!",sector->QueryObject()->GetName()); return; } @@ -2473,7 +2473,7 @@ // Add on description resp.AppendFmt("<Description>%s</Description></Examine>",data.description.GetData()); - // Create entrance action location w/ possition info since there will be many of these + // Create entrance action location w/ position info since there will be many of these psActionLocation* actionLocation = new psActionLocation(); actionLocation->SetName(name); actionLocation->SetSectorName(sector_name.GetData()); @@ -2829,7 +2829,7 @@ } else { - psserver->SendSystemError( me->clientnum, "Stoping selected path."); + psserver->SendSystemError( me->clientnum, "Stopping selected path."); client->PathSetPath(NULL); } } @@ -2843,7 +2843,7 @@ Waypoint * wp = pathNetwork->FindNearestWaypoint(myPos,mySector,2.0,&range); if (wp) { - psserver->SendSystemInfo( me->clientnum, "Starting path, using exsisting waypoint %s(%d) at range %.2f", + psserver->SendSystemInfo( me->clientnum, "Starting path, using existing waypoint %s(%d) at range %.2f", wp->GetName(), wp->GetID(), range); } else { @@ -2904,7 +2904,7 @@ return; } - psserver->SendSystemInfo( me->clientnum, "Stoping path using exsisting waypoint %s(%d) at range %.2f", + psserver->SendSystemInfo( me->clientnum, "Stoping path using existing waypoint %s(%d) at range %.2f", wp->GetName(), wp->GetID(), range); } else { @@ -3697,7 +3697,7 @@ if ( !psserver->GetConnections()->FindAccount(masternpc->GetSuperclientID()) ) { - psserver->SendSystemError(me->clientnum, "%s's superclient is not online", basis->GetName() ); + psserver->SendSystemError(me->clientnum, "%s's super client is not online", basis->GetName() ); return; } @@ -4039,7 +4039,7 @@ target = GEMSupervisor::GetSingleton().FindItemEntity( instance_id ); if (!target) { - psserver->SendSystemError(me->clientnum,"There is no item assoviated with this action location."); + psserver->SendSystemError(me->clientnum,"There is no item associated with this action location."); return; } } @@ -4089,7 +4089,7 @@ target = GEMSupervisor::GetSingleton().FindItemEntity( instance_id ); if (!target) { - psserver->SendSystemError(me->clientnum,"There is no item assoviated with this action location."); + psserver->SendSystemError(me->clientnum,"There is no item associated with this action location."); return; } } @@ -4176,7 +4176,7 @@ target = GEMSupervisor::GetSingleton().FindItemEntity( instance_id ); if (!target) { - psserver->SendSystemError(me->clientnum,"There is no item assoviated with this action location."); + psserver->SendSystemError(me->clientnum,"There is no item associated with this action location."); return; } } @@ -4234,7 +4234,7 @@ target = GEMSupervisor::GetSingleton().FindItemEntity( instance_id ); if (!target) { - psserver->SendSystemError(me->clientnum,"There is no item assoviated with this action location."); + psserver->SendSystemError(me->clientnum,"There is no item associated with this action location."); return; } } @@ -4761,7 +4761,7 @@ } else { - // Tell GM operation was successful eventhough we don't have a list of petitions + // Tell GM operation was successful even though we don't have a list of petitions psPetitionMessage message(me->clientnum, NULL, "Successful", true, type, true); message.SendMessage(); } @@ -5090,7 +5090,7 @@ if ( error.Length() ) psserver->SendSystemError(me->clientnum,"Deletion error: %s", error.GetData() ); else - psserver->SendSystemError(me->clientnum,"Character deletion got unkown error!", error.GetData() ); + psserver->SendSystemError(me->clientnum,"Character deletion got unknown error!", error.GetData() ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2008-09-28 20:57:08
|
Revision: 2204 http://planeshift.svn.sourceforge.net/planeshift/?rev=2204&view=rev Author: weltall2 Date: 2008-09-28 20:56:56 +0000 (Sun, 28 Sep 2008) Log Message: ----------- forgot to rearrange some arguments Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2008-09-28 20:50:53 UTC (rev 2203) +++ trunk/src/server/adminmanager.cpp 2008-09-28 20:56:56 UTC (rev 2204) @@ -1239,7 +1239,7 @@ } else if (data.command == "/charlist") { - GetSiblingChars(me,msg,data,client,targetobject, duplicateActor); + GetSiblingChars(me,msg,data, targetobject, duplicateActor, client); } else if (data.command == "/crystal") { @@ -1506,7 +1506,7 @@ return found; } -void AdminManager::GetSiblingChars(MsgEntry* me,psAdminCmdMessage& msg, AdminCmdData& data,Client *client, gemObject *targetobject, bool duplicateActor) +void AdminManager::GetSiblingChars(MsgEntry* me,psAdminCmdMessage& msg, AdminCmdData& data, gemObject *targetobject, bool duplicateActor, Client *client) { if ((!data.player || !data.player.Length()) && !targetobject) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2008-11-02 12:46:40
|
Revision: 2346 http://planeshift.svn.sourceforge.net/planeshift/?rev=2346&view=rev Author: weltall2 Date: 2008-11-02 12:46:37 +0000 (Sun, 02 Nov 2008) Log Message: ----------- Added standard targetting and offline pid support to /listwarnings as part of FS#2254 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2008-11-02 12:27:16 UTC (rev 2345) +++ trunk/src/server/adminmanager.cpp 2008-11-02 12:46:37 UTC (rev 2346) @@ -1064,7 +1064,7 @@ } else if (command == "/listwarnings") { - target = words.Get(1); + player = words.Get(1); return true; } else if (command == "/target_name") //will return what would be targeted in an admin function, mostly useful with area targeting @@ -1451,7 +1451,7 @@ } else if (data.command == "/listwarnings") { - HandleListWarnings(msg, data, client, targetobject); + HandleListWarnings(msg, data, client, targetclient); } else if (data.command == "/target_name") { @@ -7833,30 +7833,29 @@ } } -void AdminManager::HandleListWarnings(psAdminCmdMessage& msg, AdminCmdData& data, Client *client, gemObject* object ) +void AdminManager::HandleListWarnings(psAdminCmdMessage& msg, AdminCmdData& data, Client *client, Client *target ) { - Client* target = NULL; AccountID accountID; + PID pid; //used when offline to allow the use of pids - if (!data.target.IsEmpty() && data.target != "target") - { - target = psserver->GetCharManager()->FindPlayerClient(data.target); - } - else if(object) - { - gemActor* targetActor = dynamic_cast<gemActor*>(object); - if (targetActor) - target = targetActor->GetClient(); - } - if(target) { accountID = target->GetAccountID(); } else { + csString query; // let's see if there's a offline character with given name - Result rs(db->Select("SELECT account_id FROM characters WHERE name='%s'", data.target.GetData())); + if (data.player.StartsWith("pid:",true) && data.player.Length() > 4) // Get player ID should happen only if offline + pid = PID(strtoul(data.player.Slice(4).GetData(), NULL, 10)); //convert the PID to something usable + + if (pid.IsValid()) // Find by player ID + query.Format("SELECT account_id FROM characters WHERE id='%u'", pid.Unbox()); + else //find by player name + query.Format("SELECT account_id FROM characters WHERE name='%s'", data.player.GetData()); + + Result rs(db->Select(query)); + if(rs.IsValid() && rs.Count() > 0) { accountID = AccountID(rs[0].GetUInt32("account_id")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2008-11-06 23:04:59
|
Revision: 2366 http://planeshift.svn.sourceforge.net/planeshift/?rev=2366&view=rev Author: weltall2 Date: 2008-11-06 23:04:53 +0000 (Thu, 06 Nov 2008) Log Message: ----------- typo fix Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2008-11-06 22:22:52 UTC (rev 2365) +++ trunk/src/server/adminmanager.cpp 2008-11-06 23:04:53 UTC (rev 2366) @@ -5206,14 +5206,14 @@ if ( data.zombie.StartsWith("pid:",true) ) // Find by player ID { zombieID = PID(strtoul(data.player.Slice(4).GetData(), NULL, 10)); - if (!zombieID.Valid()) + if (!zombieID.IsValid()) { psserver->SendSystemError(me->clientnum,"Error, bad PID"); return; } } - if (!zombieID.Valid()) // Deleting by name; verify the petitioner gave us one of their characters + if (!zombieID.IsValid()) // Deleting by name; verify the petitioner gave us one of their characters { if (data.zombie.IsEmpty() || data.requestor.IsEmpty()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2008-12-03 21:54:17
|
Revision: 2615 http://planeshift.svn.sourceforge.net/planeshift/?rev=2615&view=rev Author: weltall2 Date: 2008-12-03 21:54:13 +0000 (Wed, 03 Dec 2008) Log Message: ----------- Other instance hardcoded values changed to their defines, fixed an int used in place of INSTANCE_ID Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2008-12-03 21:33:08 UTC (rev 2614) +++ trunk/src/server/adminmanager.cpp 2008-12-03 21:54:13 UTC (rev 2615) @@ -333,7 +333,7 @@ player = words[1]; target = words[2]; - instance = 0; + instance = DEFAULT_INSTANCE; instanceValid = false; if (target == "map") @@ -1692,7 +1692,7 @@ csString name, ipAddress, securityLevel, sectorName; PID playerId; AccountID accountId; - int instance = 0; + INSTANCE_ID instance = DEFAULT_INSTANCE; float timeConnected = 0.0f, loc_x = 0.0f, loc_y = 0.0f, loc_z = 0.0f, loc_yrot = 0.0f; bool banned = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2008-12-14 11:54:09
|
Revision: 2686 http://planeshift.svn.sourceforge.net/planeshift/?rev=2686&view=rev Author: weltall2 Date: 2008-12-14 11:54:05 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Some congruency changes Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2008-12-14 11:50:01 UTC (rev 2685) +++ trunk/src/server/adminmanager.cpp 2008-12-14 11:54:05 UTC (rev 2686) @@ -1841,7 +1841,7 @@ else info.Append("is offline, "); - info.AppendFmt("at position %1.2f, %1.2f, %1.2f angle: %d in sector: %s, instance: %d, ", + info.AppendFmt("at position (%1.2f, %1.2f, %1.2f) angle: %d in sector: %s, instance: %d, ", loc_x, loc_y, loc_z, degrees, sectorName.GetData(), instance); info.AppendFmt("total time connected is %1.1f hours", timeConnected ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2008-12-23 21:14:11
|
Revision: 2757 http://planeshift.svn.sourceforge.net/planeshift/?rev=2757&view=rev Author: weltall2 Date: 2008-12-23 21:14:08 +0000 (Tue, 23 Dec 2008) Log Message: ----------- trimmed spaces/converted tabs to spaces Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2008-12-23 21:10:46 UTC (rev 2756) +++ trunk/src/server/adminmanager.cpp 2008-12-23 21:14:08 UTC (rev 2757) @@ -1678,7 +1678,7 @@ loc_x, loc_y, loc_z, degrees, sectorName.GetData(), instance); - + if ( item->GetScheduledItem() ) info.AppendFmt(", spawns with interval %d + %d max modifier", item->GetScheduledItem()->GetInterval(), @@ -6567,7 +6567,7 @@ target->GetPosition(pos, yrot, sec); instance = target->GetInstance(); } - + csString sector = sec->QueryObject()->GetName(); psSectorInfo* sectorinfo = CacheManager::GetSingleton().GetSectorInfoByName(sector); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-03 14:02:03
|
Revision: 2799 http://planeshift.svn.sourceforge.net/planeshift/?rev=2799&view=rev Author: weltall2 Date: 2009-01-03 14:01:59 +0000 (Sat, 03 Jan 2009) Log Message: ----------- removed code of a not ready function Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-03 13:39:07 UTC (rev 2798) +++ trunk/src/server/adminmanager.cpp 2009-01-03 14:01:59 UTC (rev 2799) @@ -1949,8 +1949,6 @@ gmSettings |= (1 << 8); if (client->GetActor()->givekillexp) gmSettings |= (1 << 9); - if (client->GetActor()->attackable) - gmSettings |= (1 << 10); psGMGuiMessage gmMsg(client->GetClientNum(), gmSettings); @@ -2066,7 +2064,6 @@ "infinitemana = %s\n" "instantcast = %s\n" "givekillexp = %s\n" - "attackable = %s", (actor->GetInvincibility())?"on":"off", (!actor->GetVisibility())?"on":"off", (actor->GetViewAllObjects())?"on":"off", @@ -2076,8 +2073,7 @@ (actor->questtester)?"on":"off", (actor->infinitemana)?"on":"off", (actor->instantcast)?"on":"off", - (actor->givekillexp)?"on":"off", - (actor->attackable)?"on":"off"); + (actor->givekillexp)?"on":"off"); return; } else if (data.attribute == "invincible" || data.attribute == "invincibility") @@ -2200,18 +2196,6 @@ else actor->givekillexp = onoff; } - else if (data.attribute == "attackable") - { - if (toggle) - { - actor->attackable = !actor->attackable; - onoff = actor->attackable; - } - else if (actor->attackable == onoff) - already = true; - else - actor->attackable = onoff; - } else if (!data.attribute.IsEmpty()) { psserver->SendSystemInfo(me->clientnum, "%s is not a supported attribute", data.attribute.GetData() ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-03 23:28:28
|
Revision: 2800 http://planeshift.svn.sourceforge.net/planeshift/?rev=2800&view=rev Author: weltall2 Date: 2009-01-03 23:28:24 +0000 (Sat, 03 Jan 2009) Log Message: ----------- a missing comma Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-03 14:01:59 UTC (rev 2799) +++ trunk/src/server/adminmanager.cpp 2009-01-03 23:28:24 UTC (rev 2800) @@ -2063,7 +2063,7 @@ "questtester = %s\n" "infinitemana = %s\n" "instantcast = %s\n" - "givekillexp = %s\n" + "givekillexp = %s\n", (actor->GetInvincibility())?"on":"off", (!actor->GetVisibility())?"on":"off", (actor->GetViewAllObjects())?"on":"off", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ven...@us...> - 2009-01-06 04:28:30
|
Revision: 2820 http://planeshift.svn.sourceforge.net/planeshift/?rev=2820&view=rev Author: Vengeance2001 Date: 2009-01-06 04:28:29 +0000 (Tue, 06 Jan 2009) Log Message: ----------- Fix to cheat count reporting in admin info command. Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-06 03:15:16 UTC (rev 2819) +++ trunk/src/server/adminmanager.cpp 2009-01-06 04:28:29 UTC (rev 2820) @@ -1748,6 +1748,7 @@ time_t banTimeLeft; int daysLeft = 0, hoursLeft = 0, minsLeft = 0; bool advisorBanned = false; + int cheatCount = 0; if (target) // Online { @@ -1774,6 +1775,7 @@ securityLevel.Format("%d",currSL); advisorBanned = targetclient->IsAdvisorBanned(); + cheatCount = targetclient->GetDetectedCheatCount(); } else // NPC { @@ -1866,7 +1868,7 @@ info.AppendFmt("total time connected is %1.1f hours", timeConnected ); - info.AppendFmt(" has had %d cheats flagged.", client->GetDetectedCheatCount()); + info.AppendFmt(" has had %d cheats flagged.", cheatCount); if(banned) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-14 06:41:50
|
Revision: 2881 http://planeshift.svn.sourceforge.net/planeshift/?rev=2881&view=rev Author: weltall2 Date: 2009-01-14 06:41:49 +0000 (Wed, 14 Jan 2009) Log Message: ----------- again that not ready code... Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-14 06:40:25 UTC (rev 2880) +++ trunk/src/server/adminmanager.cpp 2009-01-14 06:41:49 UTC (rev 2881) @@ -1953,8 +1953,6 @@ gmSettings |= (1 << 8); if (client->GetActor()->givekillexp) gmSettings |= (1 << 9); - if (client->GetActor()->attackable) - gmSettings |= (1 << 10); psGMGuiMessage gmMsg(client->GetClientNum(), gmSettings); @@ -2069,8 +2067,7 @@ "questtester = %s\n" "infinitemana = %s\n" "instantcast = %s\n" - "givekillexp = %s\n" - "attackable = %s", + "givekillexp = %s\n", (actor->GetInvincibility())?"on":"off", (!actor->GetVisibility())?"on":"off", (actor->GetViewAllObjects())?"on":"off", @@ -2080,8 +2077,7 @@ (actor->questtester)?"on":"off", (actor->infinitemana)?"on":"off", (actor->instantcast)?"on":"off", - (actor->givekillexp)?"on":"off", - (actor->attackable)?"on":"off"); + (actor->givekillexp)?"on":"off"); return; } else if (data.attribute == "invincible" || data.attribute == "invincibility") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-14 06:52:24
|
Revision: 2883 http://planeshift.svn.sourceforge.net/planeshift/?rev=2883&view=rev Author: weltall2 Date: 2009-01-14 06:52:19 +0000 (Wed, 14 Jan 2009) Log Message: ----------- again that not ready code... Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-14 06:42:48 UTC (rev 2882) +++ trunk/src/server/adminmanager.cpp 2009-01-14 06:52:19 UTC (rev 2883) @@ -2200,18 +2200,6 @@ else actor->givekillexp = onoff; } - else if (data.attribute == "attackable") - { - if (toggle) - { - actor->attackable = !actor->attackable; - onoff = actor->attackable; - } - else if (actor->attackable == onoff) - already = true; - else - actor->attackable = onoff; - } else if (!data.attribute.IsEmpty()) { psserver->SendSystemInfo(me->clientnum, "%s is not a supported attribute", data.attribute.GetData() ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-14 11:14:32
|
Revision: 2887 http://planeshift.svn.sourceforge.net/planeshift/?rev=2887&view=rev Author: weltall2 Date: 2009-01-14 11:14:21 +0000 (Wed, 14 Jan 2009) Log Message: ----------- Made /inspect *usable* Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-14 09:18:20 UTC (rev 2886) +++ trunk/src/server/adminmanager.cpp 2009-01-14 11:14:21 UTC (rev 2887) @@ -6615,18 +6615,16 @@ } // We got our target, now let's print it's inventory - csString message; // Dump all data formated in this + csString message; //stores the formatted item data bool npc = (target->GetClientID() == 0); - message.Format("Inventory for %s %s:\n", - npc?"NPC":"player", - target->GetName() ); + //sends the heading + psserver->SendSystemInfo(me->clientnum,"Inventory for %s %s:\nTotal weight is %d / %d\nTotal money is %d\n", + npc?"NPC":"player", target->GetName(), + (int)target->GetCharacterData()->Inventory().GetCurrentTotalWeight(), + (int)target->GetCharacterData()->Inventory().MaxWeight(), + target->GetCharacterData()->Money().GetTotal() ); - message.AppendFmt("Total weight is %d / %d\nTotal money is %d\n", - (int)target->GetCharacterData()->Inventory().GetCurrentTotalWeight(), - (int)target->GetCharacterData()->Inventory().MaxWeight(), - target->GetCharacterData()->Money().GetTotal() ); - bool found = false; // Inventory indexes start at 1. 0 is reserved for the "NULL" item. for (size_t i = 1; i < target->GetCharacterData()->Inventory().GetInventoryIndexCount(); i++) @@ -6635,7 +6633,7 @@ if (item) { found = true; - message += item->GetName(); + message = item->GetName(); message.AppendFmt(" (%d/%d)", (int)item->GetItemQuality(), (int)item->GetMaxItemQuality()); if (item->GetStackCount() > 1) message.AppendFmt(" (x%u)", item->GetStackCount()); @@ -6647,15 +6645,13 @@ message.Append(slotname); else message.AppendFmt("Bulk %d", item->GetLocInParent(true)); - message += "\n"; + + psserver->SendSystemInfo(me->clientnum,message); //sends one line per item. + //so we avoid to go over the packet limit } } if (!found) - message += "(none)\n"; - - message.Truncate(message.Length() -1); - - psserver->SendSystemInfo(me->clientnum,message); + psserver->SendSystemInfo(me->clientnum,"(none)"); } void AdminManager::RenameGuild(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client* client) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-15 09:06:21
|
Revision: 2891 http://planeshift.svn.sourceforge.net/planeshift/?rev=2891&view=rev Author: weltall2 Date: 2009-01-15 09:06:15 +0000 (Thu, 15 Jan 2009) Log Message: ----------- allow devs to deputize how they want Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-15 08:54:40 UTC (rev 2890) +++ trunk/src/server/adminmanager.cpp 2009-01-15 09:06:15 UTC (rev 2891) @@ -1954,7 +1954,6 @@ if (client->GetActor()->givekillexp) gmSettings |= (1 << 9); - psGMGuiMessage gmMsg(client->GetClientNum(), gmSettings); gmMsg.SendMessage(); } @@ -7277,7 +7276,9 @@ } // Can only set others to a max of 1 level below own level (ex: GM4 can set someone to GM3) - int maxleveltoset = client->GetSecurityLevel() - 1; + // Devs can override this + int maxleveltoset = client->GetSecurityLevel() >= GM_DEVELOPER ? + client->GetSecurityLevel() : client->GetSecurityLevel() - 1; int value; @@ -7314,9 +7315,11 @@ value = GM_LEVEL_1; else if (data.setting.StartsWith("gm",true) && data.setting.Length() == 3) value = atoi(data.setting.Slice(2,1)) + GM_LEVEL_0; + else if (data.setting == "developer") + value = GM_DEVELOPER; else { - psserver->SendSystemError(me->clientnum,"Valid settings are: player, tester, GM, or reset. GM levels may be specified: GM1, ... GM5"); + psserver->SendSystemError(me->clientnum,"Valid settings are: player, tester, GM, developer or reset. GM levels may be specified: GM1, ... GM5"); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-15 09:27:57
|
Revision: 2893 http://planeshift.svn.sourceforge.net/planeshift/?rev=2893&view=rev Author: weltall2 Date: 2009-01-15 09:27:55 +0000 (Thu, 15 Jan 2009) Log Message: ----------- removed some code for testing Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-15 09:19:51 UTC (rev 2892) +++ trunk/src/server/adminmanager.cpp 2009-01-15 09:27:55 UTC (rev 2893) @@ -8016,11 +8016,6 @@ if(targetobject) //just to be sure psserver->SendSystemInfo(client->GetClientNum(),"Targeted: %s", targetobject->GetName()); gemActor *myact = targetobject->GetActorPtr(); - if(myact && myact->GetCharacterData()) - { - myact->GetCharacterData()->SetKillExperience(10000); - printf("%d\n",myact->GetCharacterData()->GetKillExperience()); - } } void AdminManager::DisableQuest(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client *client ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-18 10:08:59
|
Revision: 2902 http://planeshift.svn.sourceforge.net/planeshift/?rev=2902&view=rev Author: weltall2 Date: 2009-01-18 10:08:56 +0000 (Sun, 18 Jan 2009) Log Message: ----------- Additional fix by kougaro for money not updating in clients Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-01-18 06:51:49 UTC (rev 2901) +++ trunk/src/server/adminmanager.cpp 2009-01-18 10:08:56 UTC (rev 2902) @@ -4047,6 +4047,7 @@ Debug4(LOG_ADMIN,me->clientnum, "Created %d %s for %s\n", quantity, data.item.GetDataSafe(), charData->GetCharName()); charData->AdjustMoney(money, false); + psserver->GetCharManager()->SendPlayerMoney(client); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-02-22 17:25:18
|
Revision: 3095 http://planeshift.svn.sourceforge.net/planeshift/?rev=3095&view=rev Author: weltall2 Date: 2009-02-22 17:25:09 +0000 (Sun, 22 Feb 2009) Log Message: ----------- wrong file Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-02-22 17:19:38 UTC (rev 3094) +++ trunk/src/server/adminmanager.cpp 2009-02-22 17:25:09 UTC (rev 3095) @@ -1051,11 +1051,6 @@ value = words.GetInt(3); return true; } - else if (command == "/forcepickup") //will pickup also no pickup items - be careful with this - - { - player = words[1]; - return true; - } return false; } @@ -1454,10 +1449,6 @@ { AssignFaction(me, msg, data, client, targetclient); } - else if (data.command == "/forcepickup") - { - ForcePickup(me, msg, data, targetobject, client); - } } void AdminManager::HandleLoadQuest(psAdminCmdMessage& msg, AdminCmdData& data, Client* client) @@ -1914,10 +1905,7 @@ gmSettings |= (1 << 8); if (client->GetActor()->givekillexp) gmSettings |= (1 << 9); - if (client->GetActor()->attackable) - gmSettings |= (1 << 10); - psGMGuiMessage gmMsg(client->GetClientNum(), gmSettings); gmMsg.SendMessage(); } @@ -2030,8 +2018,7 @@ "questtester = %s\n" "infinitemana = %s\n" "instantcast = %s\n" - "givekillexp = %s\n" - "attackable = %s", + "givekillexp = %s\n", (actor->GetInvincibility())?"on":"off", (!actor->GetVisibility())?"on":"off", (actor->GetViewAllObjects())?"on":"off", @@ -2041,8 +2028,7 @@ (actor->questtester)?"on":"off", (actor->infinitemana)?"on":"off", (actor->instantcast)?"on":"off", - (actor->givekillexp)?"on":"off", - (actor->attackable)?"on":"off"); + (actor->givekillexp)?"on":"off"); return; } else if (data.attribute == "invincible" || data.attribute == "invincibility") @@ -2165,18 +2151,6 @@ else actor->givekillexp = onoff; } - else if (data.attribute == "attackable") - { - if (toggle) - { - actor->attackable = !actor->attackable; - onoff = actor->attackable; - } - else if (actor->attackable == onoff) - already = true; - else - actor->attackable = onoff; - } else if (!data.attribute.IsEmpty()) { psserver->SendSystemInfo(me->clientnum, "%s is not a supported attribute", data.attribute.GetData() ); @@ -4849,9 +4823,6 @@ info.assignedgm = (*rs)[i][6]; info.online = (clients->Find(info.player) ? true : false); - if(!info.assignedgm.Length()) //put something in there so it looks nice - info.assignedgm = ""; - // Append to the message: petitions.Push(info); } @@ -4947,9 +4918,6 @@ info.assignedgm = (*rs)[i][6]; info.online = (clients->Find(info.player) ? true : false); - if(!info.assignedgm.Length()) //put something in there so it looks nice - info.assignedgm = ""; - // Append to the message: petitions.Push(info); } @@ -6614,7 +6582,7 @@ bool npc = (target->GetClientID() == 0); //sends the heading - psserver->SendSystemInfo(me->clientnum,"Inventory for %s %s:\nTotal weight is %d / %d\nTotal money is %d", + psserver->SendSystemInfo(me->clientnum,"Inventory for %s %s:\nTotal weight is %d / %d\nTotal money is %d\n", npc?"NPC":"player", target->GetName(), (int)target->GetCharacterData()->Inventory().GetCurrentTotalWeight(), (int)target->GetCharacterData()->Inventory().MaxWeight(), @@ -8088,15 +8056,3 @@ AdjustFactionStandingOfTarget(client->GetClientNum(), target, data.name, data.value); } - -void AdminManager::ForcePickup(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, gemObject* targetobject, Client *client ) -{ - if ((!data.player || !data.player.Length()) && !targetobject) - { - psserver->SendSystemInfo(client->GetClientNum(),"Syntax: \"/forcepickup [me/target/eid/pid/area/name]\""); - return; - } - if(targetobject) //just to be sure - psserver->SendSystemInfo(client->GetClientNum(),"Targeted: %s", targetobject->GetName()); - gemActor *myact = targetobject->GetActorPtr(); -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-03-28 09:00:16
|
Revision: 3334 http://planeshift.svn.sourceforge.net/planeshift/?rev=3334&view=rev Author: weltall2 Date: 2009-03-28 09:00:10 +0000 (Sat, 28 Mar 2009) Log Message: ----------- Escaped name of the player in /teleport ... restore and warning in /warning to avoid sql injection fixing PS#2116 - vulnerability against sql injections Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-03-27 17:00:15 UTC (rev 3333) +++ trunk/src/server/adminmanager.cpp 2009-03-28 09:00:10 UTC (rev 3334) @@ -2394,8 +2394,13 @@ return; } + + //escape the player name so it's not possible to do nasty things + csString escapedName; + db->Escape( escapedName, data.name.GetDataSafe() ); + sql.AppendFmt("update characters set loc_x=%10.2f, loc_y=%10.2f, loc_z=%10.2f, loc_yrot=%10.2f, loc_sector_id=%u, loc_instance=%u where name='%s'", - myPoint.x, myPoint.y, myPoint.z, yRot, mysectorinfo->uid, client->GetActor()->GetInstance(), data.player.GetData()); + myPoint.x, myPoint.y, myPoint.z, yRot, mysectorinfo->uid, client->GetActor()->GetInstance(), escapedName.GetDataSafe()); if (db->CommandPump(sql) != 1) { @@ -4545,8 +4550,13 @@ // This message will be in big red letters on their screen psserver->SendSystemError(target->GetClientNum(), data.reason); - db->CommandPump("INSERT INTO warnings VALUES(%u, '%s', NOW(), '%s')", target->GetAccountID().Unbox(), client->GetName(), data.reason.GetData()); + //escape the warning so it's not possible to do nasty things + csString escapedReason; + db->Escape( escapedReason, data.reason.GetDataSafe() ); + + db->CommandPump("INSERT INTO warnings VALUES(%u, '%s', NOW(), '%s')", target->GetAccountID().Unbox(), client->GetName(), escapedReason.GetDataSafe()); + psserver->SendSystemInfo(client->GetClientNum(), "You warned '%s': " + data.reason, target->GetName()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-03-28 10:43:32
|
Revision: 3335 http://planeshift.svn.sourceforge.net/planeshift/?rev=3335&view=rev Author: weltall2 Date: 2009-03-28 10:43:27 +0000 (Sat, 28 Mar 2009) Log Message: ----------- fixed a missing line for /set list Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-03-28 09:00:10 UTC (rev 3334) +++ trunk/src/server/adminmanager.cpp 2009-03-28 10:43:27 UTC (rev 3335) @@ -2030,6 +2030,7 @@ (!actor->GetFiniteInventory())?"on":"off", (actor->questtester)?"on":"off", (actor->infinitemana)?"on":"off", + (actor->instantcast)?"on":"off", (actor->givekillexp)?"on":"off", (actor->attackable)?"on":"off"); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-04-07 19:58:41
|
Revision: 3415 http://planeshift.svn.sourceforge.net/planeshift/?rev=3415&view=rev Author: weltall2 Date: 2009-04-07 19:58:39 +0000 (Tue, 07 Apr 2009) Log Message: ----------- wrong variable Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-04-07 18:25:40 UTC (rev 3414) +++ trunk/src/server/adminmanager.cpp 2009-04-07 19:58:39 UTC (rev 3415) @@ -2395,12 +2395,11 @@ return; } - //escape the player name so it's not possible to do nasty things csString escapedName; - db->Escape( escapedName, data.name.GetDataSafe() ); + db->Escape( escapedName, data.player.GetDataSafe() ); - sql.AppendFmt("update characters set loc_x=%10.2f, loc_y=%10.2f, loc_z=%10.2f, loc_yrot=%10.2f, loc_sector_id=%u, loc_instance=%u where name='%s'", + sql.AppendFmt("update characters set loc_x=%10.2f, loc_y=%10.2f, loc_z=%10.2f, loc_yrot=%10.2f, loc_sector_id=%u, loc_instance=%u where name=\"%s\"", myPoint.x, myPoint.y, myPoint.z, yRot, mysectorinfo->uid, client->GetActor()->GetInstance(), escapedName.GetDataSafe()); if (db->CommandPump(sql) != 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-04-15 08:35:57
|
Revision: 3458 http://planeshift.svn.sourceforge.net/planeshift/?rev=3458&view=rev Author: weltall2 Date: 2009-04-15 08:35:50 +0000 (Wed, 15 Apr 2009) Log Message: ----------- what is vlaid? Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-04-15 04:29:15 UTC (rev 3457) +++ trunk/src/server/adminmanager.cpp 2009-04-15 08:35:50 UTC (rev 3458) @@ -1657,9 +1657,9 @@ info += ", has flags:"; if ( flags & PSITEM_FLAG_CRAFTER_ID_IS_VALID ) - info += " 'vlaid crafter id'"; + info += " 'valid crafter id'"; if ( flags & PSITEM_FLAG_GUILD_ID_IS_VALID ) - info += " 'vlaid guild id'"; + info += " 'valid guild id'"; if ( flags & PSITEM_FLAG_UNIQUE_ITEM ) info += " 'unique'"; if ( flags & PSITEM_FLAG_USES_BASIC_ITEM ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-05-10 08:23:09
|
Revision: 3653 http://planeshift.svn.sourceforge.net/planeshift/?rev=3653&view=rev Author: weltall2 Date: 2009-05-10 08:23:06 +0000 (Sun, 10 May 2009) Log Message: ----------- Fix for PS#2480 - setskill has bad fallback defaults by setting -2 as invalid value and sending out the quick help of the function in case a value isn't specified patch by aiken Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-05-10 08:15:30 UTC (rev 3652) +++ trunk/src/server/adminmanager.cpp 2009-05-10 08:23:06 UTC (rev 3653) @@ -640,7 +640,7 @@ if (words.GetCount() >= 4) value = words.GetInt(3); else - value = 100; + value = -2; return true; } else if (command == "/set") @@ -6423,7 +6423,7 @@ void AdminManager::SetSkill(MsgEntry* me, psAdminCmdMessage& msg, AdminCmdData& data, Client* client, Client *target) { - if (data.skill.IsEmpty()) + if (data.skill.IsEmpty() || data.value == -2) { psserver->SendSystemError(me->clientnum, "Syntax: /setskill [target] [skill|'all'] [value|-1]"); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-08 07:21:46
|
Revision: 3824 http://planeshift.svn.sourceforge.net/planeshift/?rev=3824&view=rev Author: weltall2 Date: 2009-06-08 07:21:38 +0000 (Mon, 08 Jun 2009) Log Message: ----------- unfinished code Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-06-08 06:26:23 UTC (rev 3823) +++ trunk/src/server/adminmanager.cpp 2009-06-08 07:21:38 UTC (rev 3824) @@ -2510,7 +2510,7 @@ } if ( dynamic_cast<gemActor*>(subject) ) // Record old location of actor, for undo - ((gemActor*)subject)->SetPrevTeleportLocation(oldpos, oldyrot, oldsector, oldInstance); + ((gemActor*)subject)->SetPrevTeleportLocation(oldpos, oldyrot, oldsector); // Send explanations if (subject->GetClientID() != client->GetClientNum()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-14 03:44:16
|
Revision: 3844 http://planeshift.svn.sourceforge.net/planeshift/?rev=3844&view=rev Author: weltall2 Date: 2009-06-14 03:44:13 +0000 (Sun, 14 Jun 2009) Log Message: ----------- why move+setinstance when there is setposition which does the same and also saves the item? Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2009-06-13 21:18:41 UTC (rev 3843) +++ trunk/src/server/adminmanager.cpp 2009-06-14 03:44:13 UTC (rev 3844) @@ -3851,8 +3851,7 @@ } // Move the item - item->SetInstance(instance); - item->Move(pos,yrot,sector); + item->SetPosition(pos, yrot, sector, instance); // Check to see if this client has the admin level to move this spawn point if ( item->GetItem()->GetScheduledItem() && extras ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |