From: <ma...@us...> - 2014-01-04 19:37:20
|
Revision: 9201 http://sourceforge.net/p/planeshift/code/9201 Author: magodra Date: 2014-01-04 19:37:17 +0000 (Sat, 04 Jan 2014) Log Message: ----------- Fixed crash in admin manager with the /quest command when an NPC was targeted. Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-01-04 01:30:16 UTC (rev 9200) +++ trunk/src/server/adminmanager.cpp 2014-01-04 19:37:17 UTC (rev 9201) @@ -12218,12 +12218,18 @@ void AdminManager::HandleQuest(MsgEntry* me,psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { AdminCmdDataQuest* data = dynamic_cast<AdminCmdDataQuest*>(cmddata); + if(!data) + { + Error1("Failed to find AdminCmdDataQuest"); + return; + } + Client* subject = data->targetClient; Client* target = NULL; //holds the target of our query - PID pid; //used to keep player pid used *only* in offline queries - csString name; //stores the char name - if(!data->IsOnline()) //the target was empty check if it was because it's a command targetting the issuer or an offline player + PID pid; //used to keep player pid used *only* in offline queries + csString name; //stores the char name + if(!data->IsOnline()) //the target was empty check if it was because it's a command targetting the issuer or an offline player { pid = data->targetID; name = data->target; @@ -12236,6 +12242,11 @@ } else { + if(!subject) + { + psserver->SendSystemError(me->clientnum,"No target client found."); + return; + } target = subject; //all's normal just get the target name = target->GetName(); //get the name of the target for use later } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-02-05 21:02:38
|
Revision: 9245 http://sourceforge.net/p/planeshift/code/9245 Author: ralphcampbell Date: 2014-02-05 21:02:35 +0000 (Wed, 05 Feb 2014) Log Message: ----------- Limit requested securitly level, not current level Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-02-05 20:46:12 UTC (rev 9244) +++ trunk/src/server/adminmanager.cpp 2014-02-05 21:02:35 UTC (rev 9245) @@ -8964,8 +8964,8 @@ int type = client->GetSecurityLevel(); // for now consider all levels > 30 as level 30. - if(type > GM_DEVELOPER) - type = GM_DEVELOPER; + if(requestedLevel > GM_DEVELOPER) + requestedLevel = GM_DEVELOPER; if(type > 0 && requestedLevel >= 0) type = requestedLevel; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-02-06 07:14:06
|
Revision: 9250 http://sourceforge.net/p/planeshift/code/9250 Author: ralphcampbell Date: 2014-02-06 07:14:04 +0000 (Thu, 06 Feb 2014) Log Message: ----------- Revert rev 9245 and fix compiler warnings. Revision Links: -------------- http://sourceforge.net/p/planeshift/code/9245 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-02-06 06:53:28 UTC (rev 9249) +++ trunk/src/server/adminmanager.cpp 2014-02-06 07:14:04 UTC (rev 9250) @@ -8810,7 +8810,7 @@ // write back to database int result = db->CommandPump("UPDATE item_instances SET openable_locks='%s' WHERE id=%d", lstr.GetData(), keyID); - if(result == QUERY_FAILED) + if(result < 0) { Error4("Couldn't update item instance lockchange with lockID=%d keyID=%d openable_locks <%s>.",lockID, keyID, lstr.GetData()); return; @@ -8964,8 +8964,8 @@ int type = client->GetSecurityLevel(); // for now consider all levels > 30 as level 30. - if(requestedLevel > GM_DEVELOPER) - requestedLevel = GM_DEVELOPER; + if(type > GM_DEVELOPER) + type = GM_DEVELOPER; if(type > 0 && requestedLevel >= 0) type = requestedLevel; @@ -9548,7 +9548,7 @@ // Update the petition status result = db->CommandPump("UPDATE petitions SET status='Cancelled' WHERE id=%d AND player=%u", petitionID, playerID.Unbox()); - return (result != QUERY_FAILED); + return (result > 0); } bool AdminManager::ChangePetition(PID playerID, int petitionID, const char* petition) @@ -9579,7 +9579,7 @@ // Update the petition status result = db->CommandPump("UPDATE petitions SET petition=\"%s\" WHERE id=%d AND player=%u", escape.GetData(), petitionID, playerID.Unbox()); - return (result != QUERY_FAILED); + return (result > 0); } bool AdminManager::ClosePetition(PID gmID, int petitionID, const char* desc) @@ -9648,7 +9648,7 @@ int result = db->Command("INSERT INTO gm_command_log " "(account_id,gm,command,player,ex_time) " "VALUES (%u,%u,\"%s\",%u,Now())", accountID.Unbox(), gmID.Unbox(), escape.GetData(), playerID.Unbox()); - return (result <= 0); + return (result > 0); } const char* AdminManager::GetLastSQLError() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-02-20 19:21:07
|
Revision: 9280 http://sourceforge.net/p/planeshift/code/9280 Author: ralphcampbell Date: 2014-02-20 19:21:05 +0000 (Thu, 20 Feb 2014) Log Message: ----------- Fix PS#6349 - /scale command bugs Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-02-18 20:18:40 UTC (rev 9279) +++ trunk/src/server/adminmanager.cpp 2014-02-20 19:21:05 UTC (rev 9280) @@ -11928,6 +11928,12 @@ { if(data->scale) { + float scale = atof(data->scale); + if(scale < 0.01 || scale > 100.0) + { + psserver->SendSystemError(me->clientnum,"Scale can only be set between 0.01 and 100.0"); + return; + } target->GetCharacterData()->SetVariable("scale",data->scale); target->Broadcast(me->clientnum, false); target->Send(me->clientnum, false, false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-01 01:42:54
|
Revision: 9360 http://sourceforge.net/p/planeshift/code/9360 Author: ralphcampbell Date: 2014-04-01 01:42:52 +0000 (Tue, 01 Apr 2014) Log Message: ----------- Use a default scale of 1 for the /morph command. Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-03-30 19:56:57 UTC (rev 9359) +++ trunk/src/server/adminmanager.cpp 2014-04-01 01:42:52 UTC (rev 9360) @@ -2782,7 +2782,7 @@ } else { - scale = ""; + scale = "1"; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-11 18:06:30
|
Revision: 9403 http://sourceforge.net/p/planeshift/code/9403 Author: ralphcampbell Date: 2014-04-11 18:06:27 +0000 (Fri, 11 Apr 2014) Log Message: ----------- Fix CID 1139528 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-11 18:03:37 UTC (rev 9402) +++ trunk/src/server/adminmanager.cpp 2014-04-11 18:06:27 UTC (rev 9403) @@ -7031,9 +7031,8 @@ } int index; - psPathPoint* point = NULL; - if((point = pathNetwork->FindPoint(path, myPos, mySector, data->radius, index)) == NULL) + if(!pathNetwork->FindPoint(path, myPos, mySector, data->radius, index)) { psserver->SendSystemError(me->clientnum, "Found no path point near you at selected path %s.",path->GetName()); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-11 18:10:29
|
Revision: 9404 http://sourceforge.net/p/planeshift/code/9404 Author: ralphcampbell Date: 2014-04-11 18:10:26 +0000 (Fri, 11 Apr 2014) Log Message: ----------- Fix CID 1139503 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-11 18:06:27 UTC (rev 9403) +++ trunk/src/server/adminmanager.cpp 2014-04-11 18:10:26 UTC (rev 9404) @@ -4254,6 +4254,7 @@ { size_t index = 1; bool found; + factionPoints = 0; // when help is requested, return immediate if(IsHelp(words[1])) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-12 04:47:13
|
Revision: 9424 http://sourceforge.net/p/planeshift/code/9424 Author: ralphcampbell Date: 2014-04-12 04:47:10 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Fix CID 1139299 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-12 04:41:04 UTC (rev 9423) +++ trunk/src/server/adminmanager.cpp 2014-04-12 04:47:10 UTC (rev 9424) @@ -4211,6 +4211,7 @@ { size_t index = 1; bool found; + expValue = 0; // when help is requested, return immediate if(IsHelp(words[1])) @@ -12897,7 +12898,7 @@ AdminCmdDataSetKillExp* data = dynamic_cast<AdminCmdDataSetKillExp*>(cmddata); gemActor* target = data->targetActor; - if(data->expValue < 0) + if(data->expValue <= 0) { psserver->SendSystemInfo(client->GetClientNum(),"Only positive exp values are allowed."); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-12 04:55:09
|
Revision: 9425 http://sourceforge.net/p/planeshift/code/9425 Author: ralphcampbell Date: 2014-04-12 04:55:06 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Fix CID 1139296 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-12 04:47:10 UTC (rev 9424) +++ trunk/src/server/adminmanager.cpp 2014-04-12 04:55:06 UTC (rev 9425) @@ -4370,10 +4370,9 @@ if(words.GetCount() == index + 1) { if(words[index] == "ordered") - { sequential = true; - } - //text = words.GetTail(index); + else + sequential = false; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-12 04:58:21
|
Revision: 9426 http://sourceforge.net/p/planeshift/code/9426 Author: ralphcampbell Date: 2014-04-12 04:58:18 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Fix CID 1139295 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-12 04:55:06 UTC (rev 9425) +++ trunk/src/server/adminmanager.cpp 2014-04-12 04:58:18 UTC (rev 9426) @@ -3948,6 +3948,7 @@ if(words.GetCount() >= index +1) { quality = words.GetFloat(index++); + qualityMax = 0.0; // optional argument maximum quality if(words.GetCount() == index + 1) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-12 05:00:54
|
Revision: 9427 http://sourceforge.net/p/planeshift/code/9427 Author: ralphcampbell Date: 2014-04-12 05:00:52 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Fix CID 1139293 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-12 04:58:18 UTC (rev 9426) +++ trunk/src/server/adminmanager.cpp 2014-04-12 05:00:52 UTC (rev 9427) @@ -4190,9 +4190,9 @@ { questName = words[index++]; //name of the quest if(words[index] == "save") //save = save to db - { saveToDb = true; - } + else + saveToDb = false; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-12 21:04:09
|
Revision: 9438 http://sourceforge.net/p/planeshift/code/9438 Author: ralphcampbell Date: 2014-04-12 21:04:05 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Fix CID 1138913 Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-12 20:55:24 UTC (rev 9437) +++ trunk/src/server/adminmanager.cpp 2014-04-12 21:04:05 UTC (rev 9438) @@ -4668,16 +4668,21 @@ { // natoka: when meaningfull error messages are sent, this is obsolete psserver->SendSystemInfo(me->clientnum,data->GetHelpMessage()); + delete data; return; } // Security check if(me->clientnum != 0 && !IsReseting(msg.cmd) && !psserver->CheckAccess(client, data->command)) + { + delete data; return; + } if(data->help || !data->valid) { psserver->SendSystemInfo(me->clientnum, data->GetHelpMessage()); + delete data; return; } @@ -4694,6 +4699,7 @@ if(data->IsQuietInvalid()) { + delete data; return; } @@ -5005,8 +5011,7 @@ { Weather(me,msg,data,client); } - if(data) - delete data; + delete data; } void AdminManager::HandleList(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-12 21:45:02
|
Revision: 9440 http://sourceforge.net/p/planeshift/code/9440 Author: ralphcampbell Date: 2014-04-12 21:44:57 +0000 (Sat, 12 Apr 2014) Log Message: ----------- Fix CID <many> dynamic_cast result not checked Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-12 21:11:20 UTC (rev 9439) +++ trunk/src/server/adminmanager.cpp 2014-04-12 21:44:57 UTC (rev 9440) @@ -5102,7 +5102,7 @@ void AdminManager::GetSiblingChars(MsgEntry* me,psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if((!data->target || !data->target.Length()) && !data->targetObject) { @@ -5155,7 +5155,7 @@ void AdminManager::GetInfo(MsgEntry* me,psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataInfo* data = dynamic_cast<AdminCmdDataInfo*>(cmddata); + AdminCmdDataInfo* data = static_cast<AdminCmdDataInfo*>(cmddata); EID entityId; csString sectorName, regionName; @@ -5573,7 +5573,7 @@ void AdminManager::CreateHuntLocation(MsgEntry* me,psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataCrystal* data = dynamic_cast<AdminCmdDataCrystal*>(cmddata); + AdminCmdDataCrystal* data = static_cast<AdminCmdDataCrystal*>(cmddata); if(data->interval < 1 || data->random < 1) { @@ -5652,7 +5652,7 @@ void AdminManager::SetAttrib(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSet* data = dynamic_cast<AdminCmdDataSet*>(cmddata); + AdminCmdDataSet* data = static_cast<AdminCmdDataSet*>(cmddata); gemActor* actor; if(data->targetActor) @@ -5886,7 +5886,7 @@ void AdminManager::SetLabelColor(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSetLabelColor* data = dynamic_cast<AdminCmdDataSetLabelColor*>(cmddata); + AdminCmdDataSetLabelColor* data = static_cast<AdminCmdDataSetLabelColor*>(cmddata); int mask = 0; if(!data->targetActor) @@ -5935,7 +5935,7 @@ void AdminManager::Divorce(MsgEntry* me, AdminCmdData* cmddata) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); Client* divorcer = clients->Find(data->target); @@ -5974,7 +5974,7 @@ void AdminManager::ViewMarriage(MsgEntry* me, AdminCmdData* cmddata) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); bool married; csString spouse; @@ -6078,7 +6078,7 @@ void AdminManager::Teleport(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) //, gemObject* subject) { - AdminCmdDataTeleport* data = dynamic_cast<AdminCmdDataTeleport*>(cmddata); + AdminCmdDataTeleport* data = static_cast<AdminCmdDataTeleport*>(cmddata); if(data->target.IsEmpty()) { @@ -6203,7 +6203,7 @@ void AdminManager::HandleActionLocation(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataAction* data = dynamic_cast<AdminCmdDataAction*>(cmddata); + AdminCmdDataAction* data = static_cast<AdminCmdDataAction*>(cmddata); if(data->subCommand == "create_entrance") { @@ -6713,7 +6713,7 @@ void AdminManager::HandlePath(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataPath* data = dynamic_cast<AdminCmdDataPath*>(cmddata); + AdminCmdDataPath* data = static_cast<AdminCmdDataPath*>(cmddata); // Some variables needed by most functions csVector3 myPos; @@ -7733,7 +7733,7 @@ void AdminManager::HandleLocation(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataLocation* data = dynamic_cast<AdminCmdDataLocation*>(cmddata); + AdminCmdDataLocation* data = static_cast<AdminCmdDataLocation*>(cmddata); // Some variables needed by most functions csVector3 myPos; @@ -7958,7 +7958,7 @@ bool AdminManager::GetTargetOfTeleport(Client* client, psAdminCmdMessage &msg, AdminCmdData* cmddata, iSector* &targetSector, csVector3 &targetPoint, float &yRot, gemObject* subject, InstanceID &instance) { - AdminCmdDataTeleport* data = dynamic_cast<AdminCmdDataTeleport*>(cmddata); + AdminCmdDataTeleport* data = static_cast<AdminCmdDataTeleport*>(cmddata); instance = DEFAULT_INSTANCE; @@ -8090,7 +8090,7 @@ void AdminManager::Slide(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSlide* data = dynamic_cast<AdminCmdDataSlide*>(cmddata); + AdminCmdDataSlide* data = static_cast<AdminCmdDataSlide*>(cmddata); if(!data->targetObject) { @@ -8236,7 +8236,7 @@ void AdminManager::CreateNPC(MsgEntry* me,psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); gemActor* basis = data->targetActor; if(!basis || !basis->GetCharacterData()) @@ -8324,7 +8324,7 @@ void AdminManager::CreateItem(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataItem* data = dynamic_cast<AdminCmdDataItem*>(cmddata); + AdminCmdDataItem* data = static_cast<AdminCmdDataItem*>(cmddata); if(!data->target.Length()) // If no arg, load up the spawn item GUI @@ -8373,7 +8373,7 @@ void AdminManager::RunScript(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataRunScript* data = dynamic_cast<AdminCmdDataRunScript*>(cmddata); + AdminCmdDataRunScript* data = static_cast<AdminCmdDataRunScript*>(cmddata); // Find script ProgressionScript* script = psserver->GetProgressionManager()->FindScript(data->scriptName); @@ -8397,7 +8397,7 @@ void AdminManager::ModifyKey(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataKey* data = dynamic_cast<AdminCmdDataKey*>(cmddata); + AdminCmdDataKey* data = static_cast<AdminCmdDataKey*>(cmddata); // Exchange lock on targeted item // this actually removes the ability to unlock this lock from all the keys @@ -8685,7 +8685,7 @@ void AdminManager::AddRemoveLock(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client, psItem* key) { - AdminCmdDataKey* data = dynamic_cast<AdminCmdDataKey*>(cmddata); + AdminCmdDataKey* data = static_cast<AdminCmdDataKey*>(cmddata); // check if player has something targeted gemObject* target = client->GetTargetObject(); if(!target) @@ -8839,7 +8839,7 @@ void AdminManager::KillNPC(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataKillNPC* data = dynamic_cast<AdminCmdDataKillNPC*>(cmddata); + AdminCmdDataKillNPC* data = static_cast<AdminCmdDataKillNPC*>(cmddata); if(data->targetObject && data->targetObject->GetClientID()) { @@ -8900,7 +8900,7 @@ void AdminManager::Percept(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataPercept* data = dynamic_cast<AdminCmdDataPercept*>(cmddata); + AdminCmdDataPercept* data = static_cast<AdminCmdDataPercept*>(cmddata); gemNPC* target = dynamic_cast<gemNPC*>(data->targetObject); if(target && target->GetClientID() == 0) @@ -8918,7 +8918,7 @@ void AdminManager::ChangeNPCType(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataChangeNPCType* data = dynamic_cast<AdminCmdDataChangeNPCType*>(cmddata); + AdminCmdDataChangeNPCType* data = static_cast<AdminCmdDataChangeNPCType*>(cmddata); gemNPC* target = dynamic_cast<gemNPC*>(data->targetObject); if(target && target->GetClientID() == 0) @@ -8935,7 +8935,7 @@ void AdminManager::DebugNPC(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataDebugNPC* data = dynamic_cast<AdminCmdDataDebugNPC*>(cmddata); + AdminCmdDataDebugNPC* data = static_cast<AdminCmdDataDebugNPC*>(cmddata); gemNPC* target = dynamic_cast<gemNPC*>(data->targetObject); if(target && target->GetClientID() == 0) @@ -8949,7 +8949,7 @@ void AdminManager::DebugTribe(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataDebugTribe* data = dynamic_cast<AdminCmdDataDebugTribe*>(cmddata); + AdminCmdDataDebugTribe* data = static_cast<AdminCmdDataDebugTribe*>(cmddata); gemNPC* target = dynamic_cast<gemNPC*>(data->targetObject); if(target && target->GetClientID() == 0) @@ -8987,7 +8987,7 @@ void AdminManager::WarnMessage(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataTargetReason* data = dynamic_cast<AdminCmdDataTargetReason*>(cmddata); + AdminCmdDataTargetReason* data = static_cast<AdminCmdDataTargetReason*>(cmddata); if(!data->targetClient) { psserver->SendSystemError(me->clientnum, "Invalid target to warn"); @@ -9019,7 +9019,7 @@ void AdminManager::KickPlayer(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataTargetReason* data = dynamic_cast<AdminCmdDataTargetReason*>(cmddata); + AdminCmdDataTargetReason* data = static_cast<AdminCmdDataTargetReason*>(cmddata); if(!data->targetClient) { @@ -9041,7 +9041,7 @@ void AdminManager::Death(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataDeath* data = dynamic_cast<AdminCmdDataDeath*>(cmddata); + AdminCmdDataDeath* data = static_cast<AdminCmdDataDeath*>(cmddata); if(!data->targetActor) { @@ -9078,7 +9078,7 @@ void AdminManager::Impersonate(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataImpersonate* data = dynamic_cast<AdminCmdDataImpersonate*>(cmddata); + AdminCmdDataImpersonate* data = static_cast<AdminCmdDataImpersonate*>(cmddata); if(data->text.IsEmpty()) { psserver->SendSystemError(me->clientnum, "Missing text or anim name"); @@ -9137,7 +9137,7 @@ void AdminManager::MutePlayer(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(!data->targetClient) { @@ -9154,7 +9154,7 @@ void AdminManager::UnmutePlayer(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(!data->targetClient) { @@ -9171,7 +9171,7 @@ void AdminManager::HandleAddPetition(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataPetition* data = dynamic_cast<AdminCmdDataPetition*>(cmddata); + AdminCmdDataPetition* data = static_cast<AdminCmdDataPetition*>(cmddata); // Try and add the petition to the database: if(!AddPetition(client->GetPID(), (const char*)data->petition)) @@ -9667,7 +9667,7 @@ void AdminManager::DeleteCharacter(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataDeleteChar* data = dynamic_cast<AdminCmdDataDeleteChar*>(cmddata); + AdminCmdDataDeleteChar* data = static_cast<AdminCmdDataDeleteChar*>(cmddata); if(data->IsTargetType(ADMINCMD_TARGET_PLAYER)) // Deleting by name; verify the petitioner gave us one of their characters { @@ -9732,7 +9732,7 @@ void AdminManager::ChangeName(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataChangeName* data = dynamic_cast<AdminCmdDataChangeName*>(cmddata); + AdminCmdDataChangeName* data = static_cast<AdminCmdDataChangeName*>(cmddata); Client* target = NULL; if((!data->target.Length() || !data->newName.Length()) && !data->targetObject) @@ -10011,7 +10011,7 @@ void AdminManager::BanName(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(!data->target.Length()) { psserver->SendSystemError(me->clientnum, "You have to specify a name to ban"); @@ -10036,7 +10036,7 @@ void AdminManager::UnBanName(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(!psserver->GetCharManager()->IsBanned(data->target)) { @@ -10050,7 +10050,7 @@ void AdminManager::BanClient(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* client) { - AdminCmdDataBan* data = dynamic_cast<AdminCmdDataBan*>(cmddata); + AdminCmdDataBan* data = static_cast<AdminCmdDataBan*>(cmddata); const time_t year = 31536000UL; //one year should be enough const time_t twodays = (2 * 24 * 60 * 60); @@ -10158,7 +10158,7 @@ void AdminManager::UnbanClient(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* gm) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(data->IsTargetTypeUnknown()) { psserver->SendSystemError(me->clientnum, "You must specify a player name or an account name or number."); @@ -10218,7 +10218,7 @@ void AdminManager::BanAdvisor(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* gm) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(data->IsTargetTypeUnknown()) { @@ -10258,7 +10258,7 @@ void AdminManager::UnbanAdvisor(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata,Client* gm) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(data->IsTargetTypeUnknown()) { @@ -10571,7 +10571,7 @@ void AdminManager::Award(AdminCmdData* cmddata, Client* client) { - AdminCmdDataAward* data = dynamic_cast<AdminCmdDataAward*>(cmddata); + AdminCmdDataAward* data = static_cast<AdminCmdDataAward*>(cmddata); // check that there is at least one reward if(data->rewardList.rewards.GetSize() == 0) @@ -10618,13 +10618,13 @@ if(data->rewardType == psRewardData::REWARD_EXPERIENCE) { - psRewardDataExperience* rewardDataExperience = dynamic_cast<psRewardDataExperience*>(data); + psRewardDataExperience* rewardDataExperience = static_cast<psRewardDataExperience*>(data); AwardExperienceToTarget(gmClientNum, target, rewardDataExperience->expDelta); } if(data->rewardType == psRewardData::REWARD_ITEM) // award item { - psRewardDataItem* rewardDataItem = dynamic_cast<psRewardDataItem*>(data); + psRewardDataItem* rewardDataItem = static_cast<psRewardDataItem*>(data); csString text; psItemStats* stats = psserver->GetCacheManager()->GetBasicItemStatsByName(rewardDataItem->itemName); @@ -10665,13 +10665,13 @@ if(data->rewardType == psRewardData::REWARD_FACTION) // award faction { - psRewardDataFaction* rewardDataFaction = dynamic_cast<psRewardDataFaction*>(data); + psRewardDataFaction* rewardDataFaction = static_cast<psRewardDataFaction*>(data); AdjustFactionStandingOfTarget(gmClientNum, target, rewardDataFaction->factionName, rewardDataFaction->factionDelta); } if(data->rewardType == psRewardData::REWARD_SKILL) // award skill { - psRewardDataSkill* rewardDataSkill = dynamic_cast<psRewardDataSkill*>(data); + psRewardDataSkill* rewardDataSkill = static_cast<psRewardDataSkill*>(data); bool modified = false; if(rewardDataSkill->skillName == "all") // update all skills @@ -10697,7 +10697,7 @@ if(data->rewardType == psRewardData::REWARD_PRACTICE) // award skill practice { - psRewardDataPractice* rewardDataPractice = dynamic_cast<psRewardDataPractice*>(data); + psRewardDataPractice* rewardDataPractice = static_cast<psRewardDataPractice*>(data); bool modified = false; if(rewardDataPractice->skillName == "all") // update all skills @@ -10723,7 +10723,7 @@ if(data->rewardType == psRewardData::REWARD_MONEY) // award money { - psRewardDataMoney* rewardDataMoney = dynamic_cast<psRewardDataMoney*>(data); + psRewardDataMoney* rewardDataMoney = static_cast<psRewardDataMoney*>(data); bool valid = true; // determine money type @@ -10841,7 +10841,7 @@ void AdminManager::TransferItem(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataItemTarget* data = dynamic_cast<AdminCmdDataItemTarget*>(cmddata); + AdminCmdDataItemTarget* data = static_cast<AdminCmdDataItemTarget*>(cmddata); Client* source = client; Client* dest = data->targetClient; @@ -11015,7 +11015,7 @@ void AdminManager::CheckItem(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata) { - AdminCmdDataCheckItem* data = dynamic_cast<AdminCmdDataCheckItem*>(cmddata); + AdminCmdDataCheckItem* data = static_cast<AdminCmdDataCheckItem*>(cmddata); Client* targetClient = data->targetClient; if(!targetClient || !targetClient->GetCharacterData()) @@ -11084,7 +11084,7 @@ void AdminManager::FreezeClient(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(!data->targetClient) { @@ -11107,7 +11107,7 @@ void AdminManager::ThawClient(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(!data->targetClient) { psserver->SendSystemError(me->clientnum,"Invalid target for thaw"); @@ -11129,7 +11129,7 @@ void AdminManager::SetSkill(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSetSkill* data = dynamic_cast<AdminCmdDataSetSkill*>(cmddata); + AdminCmdDataSetSkill* data = static_cast<AdminCmdDataSetSkill*>(cmddata); if(!data->targetActor || (data->targetActor->GetClient() != client && !psserver->CheckAccess(client, "setskill others"))) { @@ -11268,7 +11268,7 @@ void AdminManager::UpdateRespawn(AdminCmdData* cmddata, Client* client) { - AdminCmdDataUpdateRespawn* data = dynamic_cast<AdminCmdDataUpdateRespawn*>(cmddata); + AdminCmdDataUpdateRespawn* data = static_cast<AdminCmdDataUpdateRespawn*>(cmddata); if(!data->targetActor) { psserver->SendSystemError(client->GetClientNum(),"You need to specify or target a player or NPC"); @@ -11318,7 +11318,7 @@ void AdminManager::Inspect(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(!data->targetActor) { psserver->SendSystemError(me->clientnum,"You need to specify or target a player or NPC"); @@ -11373,7 +11373,7 @@ void AdminManager::RenameGuild(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataChangeGuildName* data = dynamic_cast<AdminCmdDataChangeGuildName*>(cmddata); + AdminCmdDataChangeGuildName* data = static_cast<AdminCmdDataChangeGuildName*>(cmddata); psGuildInfo* guild = psserver->GetCacheManager()->FindGuild(data->guildName); if(!guild) { @@ -11429,7 +11429,7 @@ void AdminManager::ChangeGuildLeader(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataChangeGuildLeader* data = dynamic_cast<AdminCmdDataChangeGuildLeader*>(cmddata); + AdminCmdDataChangeGuildLeader* data = static_cast<AdminCmdDataChangeGuildLeader*>(cmddata); psGuildInfo* guild = psserver->GetCacheManager()->FindGuild(data->guildName); if(!guild) { @@ -11479,7 +11479,7 @@ void AdminManager::Thunder(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSectorTarget* data = dynamic_cast<AdminCmdDataSectorTarget*>(cmddata); + AdminCmdDataSectorTarget* data = static_cast<AdminCmdDataSectorTarget*>(cmddata); if(!data->sectorInfo->is_raining) { @@ -11498,7 +11498,7 @@ void AdminManager::Fog(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataFog* data = dynamic_cast<AdminCmdDataFog*>(cmddata); + AdminCmdDataFog* data = static_cast<AdminCmdDataFog*>(cmddata); // Queue fog @@ -11529,7 +11529,7 @@ void AdminManager::Weather(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataWeather* data = dynamic_cast<AdminCmdDataWeather*>(cmddata); + AdminCmdDataWeather* data = static_cast<AdminCmdDataWeather*>(cmddata); //check if the requested status is already set for this weather type //the same code enables and disables weather @@ -11564,7 +11564,7 @@ void AdminManager::Rain(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataWeatherEffect* data = dynamic_cast<AdminCmdDataWeatherEffect*>(cmddata); + AdminCmdDataWeatherEffect* data = static_cast<AdminCmdDataWeatherEffect*>(cmddata); if(data->particleCount < 0 || data->particleCount > WEATHER_MAX_RAIN_DROPS) { @@ -11602,7 +11602,7 @@ void AdminManager::Snow(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataWeatherEffect* data = dynamic_cast<AdminCmdDataWeatherEffect*>(cmddata); + AdminCmdDataWeatherEffect* data = static_cast<AdminCmdDataWeatherEffect*>(cmddata); if(data->particleCount < 0 || data->particleCount > WEATHER_MAX_SNOW_FALKES) { @@ -11640,7 +11640,7 @@ void AdminManager::ModifyItem(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataModify* data = dynamic_cast<AdminCmdDataModify*>(cmddata); + AdminCmdDataModify* data = static_cast<AdminCmdDataModify*>(cmddata); if(!data->targetObject) { @@ -11831,7 +11831,7 @@ #define MORPH_FAKE_ACTIVESPELL ((ActiveSpell*) 0x447) void AdminManager::Morph(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataMorph* data = dynamic_cast<AdminCmdDataMorph*>(cmddata); + AdminCmdDataMorph* data = static_cast<AdminCmdDataMorph*>(cmddata); // lists all races you can morph into if(data->subCommand == "list") @@ -11906,11 +11906,7 @@ void AdminManager::Scale(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataScale* data = dynamic_cast<AdminCmdDataScale*>(cmddata); - if (!data) - { - return; - } + AdminCmdDataScale* data = static_cast<AdminCmdDataScale*>(cmddata); // check if the target is valid if(!data->targetClient || !data->targetClient->GetActor()) @@ -11952,7 +11948,7 @@ void AdminManager::TempSecurityLevel(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataDeputize* data = dynamic_cast<AdminCmdDataDeputize*>(cmddata); + AdminCmdDataDeputize* data = static_cast<AdminCmdDataDeputize*>(cmddata); if(!data->targetClient || !data->targetClient->GetActor()) { @@ -12072,7 +12068,7 @@ void AdminManager::HandleGMEvent(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataGameMasterEvent* data = dynamic_cast<AdminCmdDataGameMasterEvent*>(cmddata); + AdminCmdDataGameMasterEvent* data = static_cast<AdminCmdDataGameMasterEvent*>(cmddata); GMEventManager* gmeventManager = psserver->GetGMEventManager(); // add new event @@ -12155,7 +12151,7 @@ void AdminManager::HandleHire(AdminCmdData* cmddata, Client* client) { - AdminCmdDataHire* data = dynamic_cast<AdminCmdDataHire*>(cmddata); + AdminCmdDataHire* data = static_cast<AdminCmdDataHire*>(cmddata); HireManager* hireManager = psserver->GetHireManager(); // add new event @@ -12240,7 +12236,7 @@ void AdminManager::HandleBadText(psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataBadText* data = dynamic_cast<AdminCmdDataBadText*>(cmddata); + AdminCmdDataBadText* data = static_cast<AdminCmdDataBadText*>(cmddata); if(!data->targetObject) { @@ -12270,7 +12266,7 @@ void AdminManager::HandleQuest(MsgEntry* me,psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataQuest* data = dynamic_cast<AdminCmdDataQuest*>(cmddata); + AdminCmdDataQuest* data = static_cast<AdminCmdDataQuest*>(cmddata); if(!data) { Error1("Failed to find AdminCmdDataQuest"); @@ -12545,7 +12541,7 @@ void AdminManager::ItemStackable(MsgEntry* me, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSetStackable* data = dynamic_cast<AdminCmdDataSetStackable*>(cmddata); + AdminCmdDataSetStackable* data = static_cast<AdminCmdDataSetStackable*>(cmddata); if(!data->targetObject) { @@ -12594,7 +12590,7 @@ void AdminManager::HandleSetQuality(psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSetQuality* data = dynamic_cast<AdminCmdDataSetQuality*>(cmddata); + AdminCmdDataSetQuality* data = static_cast<AdminCmdDataSetQuality*>(cmddata); if(!data->targetObject) { psserver->SendSystemError(client->GetClientNum(), "No target selected"); @@ -12621,7 +12617,7 @@ void AdminManager::HandleSetTrait(psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSetTrait* data = dynamic_cast<AdminCmdDataSetTrait*>(cmddata); + AdminCmdDataSetTrait* data = static_cast<AdminCmdDataSetTrait*>(cmddata); if(data->subCmd == "list") { @@ -12713,7 +12709,7 @@ void AdminManager::HandleSetItemName(psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSetItem* data = dynamic_cast<AdminCmdDataSetItem*>(cmddata); + AdminCmdDataSetItem* data = static_cast<AdminCmdDataSetItem*>(cmddata); if(!data->targetObject) { @@ -12739,7 +12735,7 @@ void AdminManager::HandleReload(psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataReload* data = dynamic_cast<AdminCmdDataReload*>(cmddata); + AdminCmdDataReload* data = static_cast<AdminCmdDataReload*>(cmddata); if(data->subCmd == "item") { @@ -12816,7 +12812,7 @@ void AdminManager::HandleListWarnings(psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataListWarnings* data = dynamic_cast<AdminCmdDataListWarnings*>(cmddata); + AdminCmdDataListWarnings* data = static_cast<AdminCmdDataListWarnings*>(cmddata); AccountID accountID; PID pid; //used when offline to allow the use of pids @@ -12844,7 +12840,7 @@ void AdminManager::CheckTarget(psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataTarget* data = dynamic_cast<AdminCmdDataTarget*>(cmddata); + AdminCmdDataTarget* data = static_cast<AdminCmdDataTarget*>(cmddata); if(!data->target.Length()) { @@ -12858,7 +12854,7 @@ void AdminManager::DisableQuest(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataDisableQuest* data = dynamic_cast<AdminCmdDataDisableQuest*>(cmddata); + AdminCmdDataDisableQuest* data = static_cast<AdminCmdDataDisableQuest*>(cmddata); psQuest* quest = psserver->GetCacheManager()->GetQuestByName(data->questName); //get the quest associated by name if(!quest) //the quest was not found @@ -12900,7 +12896,7 @@ void AdminManager::SetKillExp(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataSetKillExp* data = dynamic_cast<AdminCmdDataSetKillExp*>(cmddata); + AdminCmdDataSetKillExp* data = static_cast<AdminCmdDataSetKillExp*>(cmddata); gemActor* target = data->targetActor; if(data->expValue <= 0) @@ -12939,7 +12935,7 @@ //This is used as a wrapper for the command version of adjustfactionstanding. void AdminManager::AssignFaction(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataAssignFaction* data = dynamic_cast<AdminCmdDataAssignFaction*>(cmddata); + AdminCmdDataAssignFaction* data = static_cast<AdminCmdDataAssignFaction*>(cmddata); psRewardDataFaction rewardData(data->factionName, data->factionPoints); AwardToTarget(me->clientnum, data->targetClient, &rewardData); @@ -12947,7 +12943,7 @@ void AdminManager::HandleServerQuit(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - AdminCmdDataServerQuit* data = dynamic_cast<AdminCmdDataServerQuit*>(cmddata); + AdminCmdDataServerQuit* data = static_cast<AdminCmdDataServerQuit*>(cmddata); if(data->time < -1) { psserver->SendSystemInfo(client->GetClientNum(),"Syntax: \"/serverquit [-1/time] <Reason>\""); @@ -12965,7 +12961,7 @@ void AdminManager::HandleNPCClientQuit(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - //AdminCmdDataNPCClientQuit* data = dynamic_cast<AdminCmdDataNPCClientQuit*>(cmddata); + //AdminCmdDataNPCClientQuit* data = static_cast<AdminCmdDataNPCClientQuit*>(cmddata); psServerCommandMessage message(0, "quit"); message.Multicast(psserver->GetNPCManager()->GetSuperClients(), -1, PROX_LIST_ANY_RANGE); @@ -12976,7 +12972,7 @@ void AdminManager::HandleVersion(MsgEntry* me, psAdminCmdMessage &msg, AdminCmdData* cmddata, Client* client) { - // AdminCmdDataSimple* data = dynamic_cast<AdminCmdDataSimple*>(cmddata); + // AdminCmdDataSimple* data = static_cast<AdminCmdDataSimple*>(cmddata); psserver->SendSystemInfo(client->GetClientNum(),"Server svn version at last commit was $Rev$"); } @@ -12984,7 +12980,7 @@ void AdminManager::RandomMessageTest(AdminCmdData* cmddata, Client* client) { - AdminCmdDataRndMsgTest* data = dynamic_cast<AdminCmdDataRndMsgTest*>(cmddata); + AdminCmdDataRndMsgTest* data = static_cast<AdminCmdDataRndMsgTest*>(cmddata); csArray<int> values; for(int i=0; i<10; i++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-04-26 16:00:51
|
Revision: 9479 http://sourceforge.net/p/planeshift/code/9479 Author: ralphcampbell Date: 2014-04-26 16:00:48 +0000 (Sat, 26 Apr 2014) Log Message: ----------- Call RemoveActor() after using the item pointer. Otherwise, item is pointing to a freed object when doing '/modify remove' GM command. Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-04-26 15:35:33 UTC (rev 9478) +++ trunk/src/server/adminmanager.cpp 2014-04-26 16:00:48 UTC (rev 9479) @@ -2718,14 +2718,16 @@ csString AdminCmdDataModify::GetHelpMessage() { return "Syntax: \"" + command + " " + GetHelpMessagePartForTarget() + " <SUBCOMMAND>\"\n" - "SUBCOMMAND: intervals <interval> <intervalcap>\n" - " amount <amount>\n" - " picklevel <level>\n" - " range <range>\n" - " move <x> <y> <z> [<y>]\n" - " pickskill <skillname>\n" - " ATTRIBUTE true|false\n" - "ATTRIBUTE: " + attributeList.GetHelpMessage(); + "SUBCOMMAND:\n" + " intervals <interval> <intervalcap>\n" + " amount <amount>\n" + " picklevel <level>\n" + " range <range>\n" + " move <x> <y> <z> [<y>]\n" + " pickskill <skillname>\n" + " remove\n" + " ATTRIBUTE true|false\n" + "ATTRIBUTE:\n " + attributeList.GetHelpMessage(); } AdminCmdDataMorph::AdminCmdDataMorph(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client* client, WordArray &words) @@ -8869,7 +8871,7 @@ PID npcid = target->GetCharacterData()->GetPID(); // Remove the NPC - EntityManager::GetSingleton().RemoveActor(data->targetObject); + EntityManager::GetSingleton().RemoveActor(target); // Create the new NPC psCharacter* npcdata = psServer::CharacterLoader.LoadCharacterData(npcid,true); @@ -11667,11 +11669,9 @@ psserver->SendSystemInfo(me->clientnum,"Spawn point deleted for %s",item->GetName()); } - EntityManager::GetSingleton().RemoveActor(data->targetObject); // Remove from world psserver->SendSystemInfo(me->clientnum,"%s was removed from the world",item->GetName()); item->Destroy(); // Remove from db - delete item; - item = NULL; + EntityManager::GetSingleton().RemoveActor(data->targetObject); // Remove from world } else if(data->subCommand == "intervals" && fullModify) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2014-09-24 22:44:02
|
Revision: 9581 http://sourceforge.net/p/planeshift/code/9581 Author: joelyon Date: 2014-09-24 22:43:54 +0000 (Wed, 24 Sep 2014) Log Message: ----------- Proposed fix for bug 6550 "A GM command doesn't work anymore"; can't verify that this is the full desired resolution until it is on the dev test server. Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-09-24 18:09:29 UTC (rev 9580) +++ trunk/src/server/adminmanager.cpp 2014-09-24 22:43:54 UTC (rev 9581) @@ -2887,9 +2887,9 @@ if(words[index] == "copy") { subCommand = words[index++]; - // if parsing the word fails if(!sourcePlayer.ParseTarget(msgManager,me,msg,client,words[index])) { + // if parsing the word fails // no source specified or // target is already the clients target if((IsTargetType(ADMINCMD_TARGET_CLIENTTARGET) && sourcePlayer.IsTargetType(ADMINCMD_TARGET_CLIENTTARGET))) @@ -11163,7 +11163,7 @@ gemActor* source = NULL; psCharacter* schar = NULL; - if(data->sourcePlayer.targetClient) + if(data->sourcePlayer.targetActor) { source = data->sourcePlayer.targetActor; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2014-10-11 22:12:20
|
Revision: 9602 http://sourceforge.net/p/planeshift/code/9602 Author: joelyon Date: 2014-10-11 22:12:13 +0000 (Sat, 11 Oct 2014) Log Message: ----------- undoing proposed fix for bug 6550. problem was not well understood and will require more digging. Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-10-11 16:36:50 UTC (rev 9601) +++ trunk/src/server/adminmanager.cpp 2014-10-11 22:12:13 UTC (rev 9602) @@ -11163,7 +11163,7 @@ gemActor* source = NULL; psCharacter* schar = NULL; - if(data->sourcePlayer.targetActor) + if(data->sourcePlayer.targetClient) { source = data->sourcePlayer.targetActor; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2014-10-19 16:56:25
|
Revision: 9625 http://sourceforge.net/p/planeshift/code/9625 Author: joelyon Date: 2014-10-19 16:56:23 +0000 (Sun, 19 Oct 2014) Log Message: ----------- restoring change from 9602 to address bug 66550 - A GM command doesnt work anymore Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2014-10-19 16:36:54 UTC (rev 9624) +++ trunk/src/server/adminmanager.cpp 2014-10-19 16:56:23 UTC (rev 9625) @@ -11163,7 +11163,7 @@ gemActor* source = NULL; psCharacter* schar = NULL; - if(data->sourcePlayer.targetClient) + if(data->sourcePlayer.targetActor) { source = data->sourcePlayer.targetActor; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ve...@us...> - 2015-11-28 18:23:44
|
Revision: 9757 http://sourceforge.net/p/planeshift/code/9757 Author: venalan Date: 2015-11-28 18:23:43 +0000 (Sat, 28 Nov 2015) Log Message: ----------- typo correction Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2015-08-30 13:38:54 UTC (rev 9756) +++ trunk/src/server/adminmanager.cpp 2015-11-28 18:23:43 UTC (rev 9757) @@ -2625,7 +2625,7 @@ csString AdminCmdDataFog::GetHelpMessage() { - return "Syntax: \"" + command + " [sector] [density [r g b lenght fade]|stop]\""; + return "Syntax: \"" + command + " [sector] [density [r g b length fade]|stop]\""; } AdminCmdDataModify::AdminCmdDataModify(AdminManager* msgManager, MsgEntry* me, psAdminCmdMessage &msg, Client* client, WordArray &words) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rav...@us...> - 2016-05-08 22:05:45
|
Revision: 9932 http://sourceforge.net/p/planeshift/code/9932 Author: ravna-ps Date: 2016-05-08 22:05:42 +0000 (Sun, 08 May 2016) Log Message: ----------- Fixed a problem with /settrait list [race] [gender], which would not display "short" if "short-hair" or anything else matching its text was already in the list. It now displays all names, including potential duplicates. Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2016-05-08 12:32:14 UTC (rev 9931) +++ trunk/src/server/adminmanager.cpp 2016-05-08 22:05:42 UTC (rev 9932) @@ -12642,7 +12642,7 @@ while(ti.HasNext()) { psTrait* currTrait = ti.Next(); - if(currTrait->race == raceInfo->race && currTrait->gender == data->gender && message.Find(currTrait->name.GetData()) == (size_t)-1) + if(currTrait->race == raceInfo->race && currTrait->gender == data->gender) { message.Append(currTrait->name+", "); found = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ve...@us...> - 2016-06-04 21:58:22
|
Revision: 9949 http://sourceforge.net/p/planeshift/code/9949 Author: venalan Date: 2016-06-04 21:58:19 +0000 (Sat, 04 Jun 2016) Log Message: ----------- corrected description for PSITEM_FLAG_SECURITYLOCK so it shows correctly when using /info Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2016-06-03 22:13:24 UTC (rev 9948) +++ trunk/src/server/adminmanager.cpp 2016-06-04 21:58:19 UTC (rev 9949) @@ -5262,7 +5262,7 @@ if(flags & PSITEM_FLAG_LOCKABLE) info += " 'lockable'"; if(flags & PSITEM_FLAG_SECURITYLOCK) - info += " 'lockable'"; + info += " 'securitylockable'"; if(flags & PSITEM_FLAG_UNPICKABLE) info += " 'unpickable'"; if(flags & PSITEM_FLAG_NOPICKUP) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rav...@us...> - 2016-11-13 00:17:20
|
Revision: 9961 http://sourceforge.net/p/planeshift/code/9961 Author: ravna-ps Date: 2016-11-13 00:17:19 +0000 (Sun, 13 Nov 2016) Log Message: ----------- Changed the /settrait command to also try to match a given trait name to a trait ID like "/settrait me 5", which would try to set trait 5 to self if it is a valid trait for the race/gender. Modified Paths: -------------- trunk/src/server/adminmanager.cpp Modified: trunk/src/server/adminmanager.cpp =================================================================== --- trunk/src/server/adminmanager.cpp 2016-09-09 21:28:02 UTC (rev 9960) +++ trunk/src/server/adminmanager.cpp 2016-11-13 00:17:19 UTC (rev 9961) @@ -12680,9 +12680,13 @@ while(ti.HasNext()) { psTrait* currTrait = ti.Next(); + csString id = csString(); + id.AppendFmt("%d", currTrait->uid); if(currTrait->gender == target->GetRaceInfo()->gender && currTrait->race == target->GetRaceInfo()->race && - currTrait->name.CompareNoCase(data->traitName)) + (currTrait->name.CompareNoCase(data->traitName) || + // check if the Name is actually an ID + id.CompareNoCase(data->traitName))) { target->SetTraitForLocation(currTrait->location, currTrait); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |