pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-26 13:42:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused opcode that has a terrible name

Browse Source
This commit is contained in:
KimLS 2021-01-21 13:39:33 -08:00
parent e1e93a9a48
commit 5ed47b5e50
3 changed files with 1846 additions and 1822 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/emu_oplist.h
View File

@ -1,8 +1,6 @@
// system use // system use
N(OP_ExploreUnknown), N(OP_ExploreUnknown),
// start (please add new opcodes in descending order and re-order any name changes where applicable) // start (please add new opcodes in descending order and re-order any name changes where applicable)
N(OP_0x0193),
N(OP_0x0347),
N(OP_AAAction), N(OP_AAAction),
N(OP_AAExpUpdate), N(OP_AAExpUpdate),
N(OP_AcceptNewTask), N(OP_AcceptNewTask),

45
zone/client_packet.cpp
View File

@ -116,7 +116,6 @@ void MapOpcodes()
ConnectingOpcodes[OP_ZoneEntry] = &Client::Handle_Connect_OP_ZoneEntry; ConnectingOpcodes[OP_ZoneEntry] = &Client::Handle_Connect_OP_ZoneEntry;
// connected opcode handler assignments: // connected opcode handler assignments:
ConnectedOpcodes[OP_0x0193] = &Client::Handle_0x0193;
ConnectedOpcodes[OP_AAAction] = &Client::Handle_OP_AAAction; ConnectedOpcodes[OP_AAAction] = &Client::Handle_OP_AAAction;
ConnectedOpcodes[OP_AcceptNewTask] = &Client::Handle_OP_AcceptNewTask; ConnectedOpcodes[OP_AcceptNewTask] = &Client::Handle_OP_AcceptNewTask;
ConnectedOpcodes[OP_AdventureInfoRequest] = &Client::Handle_OP_AdventureInfoRequest; ConnectedOpcodes[OP_AdventureInfoRequest] = &Client::Handle_OP_AdventureInfoRequest;
@ -1169,10 +1168,6 @@ void Client::Handle_Connect_OP_WorldObjectsSent(const EQApplicationPacket *app)
void Client::Handle_Connect_OP_ZoneComplete(const EQApplicationPacket* app) void Client::Handle_Connect_OP_ZoneComplete(const EQApplicationPacket* app)
{ {
auto outapp = new EQApplicationPacket(OP_0x0347, 0);
QueuePacket(outapp);
safe_delete(outapp);
return;
} }
void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket* app) void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket* app)
@ -1368,7 +1363,8 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
int client_max_level = 0; int client_max_level = 0;
if (RuleB(Character, PerCharacterQglobalMaxLevel)) { if (RuleB(Character, PerCharacterQglobalMaxLevel)) {
client_max_level = GetCharMaxLevelFromQGlobal(); client_max_level = GetCharMaxLevelFromQGlobal();
} else if (RuleB(Character, PerCharacterBucketMaxLevel)) { }
else if (RuleB(Character, PerCharacterBucketMaxLevel)) {
client_max_level = GetCharMaxLevelFromBucket(); client_max_level = GetCharMaxLevelFromBucket();
} }
SetClientMaxLevel(client_max_level); SetClientMaxLevel(client_max_level);
@ -1761,16 +1757,6 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
return; return;
} }
// connected opcode handlers
void Client::Handle_0x0193(const EQApplicationPacket *app)
{
// Not sure what this opcode does. It started being sent when OP_ClientUpdate was
// changed to pump OP_ClientUpdate back out instead of OP_MobUpdate
// 2 bytes: 00 00
return;
}
void Client::Handle_OP_AAAction(const EQApplicationPacket* app) void Client::Handle_OP_AAAction(const EQApplicationPacket* app)
{ {
LogAA("Received OP_AAAction"); LogAA("Received OP_AAAction");
@ -2918,10 +2904,12 @@ void Client::Handle_OP_Assist(const EQApplicationPacket *app)
if (new_target && (GetGM() || if (new_target && (GetGM() ||
Distance(m_Position, assistee->GetPosition()) <= TARGETING_RANGE)) { Distance(m_Position, assistee->GetPosition()) <= TARGETING_RANGE)) {
eid->entity_id = new_target->GetID(); eid->entity_id = new_target->GetID();
} else { }
else {
eid->entity_id = 0; eid->entity_id = 0;
} }
} else { }
else {
eid->entity_id = 0; eid->entity_id = 0;
} }
} }
@ -4677,7 +4665,8 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
if (gm_hide_me) { if (gm_hide_me) {
entity_list.QueueClientsStatus(this, outapp, true, Admin(), 255); entity_list.QueueClientsStatus(this, outapp, true, Admin(), 255);
} else { }
else {
entity_list.QueueCloseClients(this, outapp, true, RuleI(Range, ClientPositionUpdates), nullptr, true); entity_list.QueueCloseClients(this, outapp, true, RuleI(Range, ClientPositionUpdates), nullptr, true);
} }
@ -4688,7 +4677,8 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
if (raid) { if (raid) {
raid->QueueClients(this, outapp, true, true, (RuleI(Range, ClientPositionUpdates) * -1)); raid->QueueClients(this, outapp, true, true, (RuleI(Range, ClientPositionUpdates) * -1));
} else if (group) { }
else if (group) {
group->QueueClients(this, outapp, true, true, (RuleI(Range, ClientPositionUpdates) * -1)); group->QueueClients(this, outapp, true, true, (RuleI(Range, ClientPositionUpdates) * -1));
} }
@ -10196,7 +10186,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
target->SayString(PET_LEADERIS, owner->GetCleanName()); target->SayString(PET_LEADERIS, owner->GetCleanName());
else else
target->SayString(I_FOLLOW_NOONE); target->SayString(I_FOLLOW_NOONE);
} else if (mypet) { }
else if (mypet) {
mypet->SayString(PET_LEADERIS, GetName()); mypet->SayString(PET_LEADERIS, GetName());
} }
} }
@ -10560,7 +10551,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (m_ClientVersionBit & EQ::versions::maskUFAndLater) { if (m_ClientVersionBit & EQ::versions::maskUFAndLater) {
MessageString(Chat::PetResponse, PET_ON_GHOLD); MessageString(Chat::PetResponse, PET_ON_GHOLD);
mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG); mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG);
} else { }
else {
mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD); mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
} }
mypet->SetGHeld(true); mypet->SetGHeld(true);
@ -10575,7 +10567,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (m_ClientVersionBit & EQ::versions::maskUFAndLater) { if (m_ClientVersionBit & EQ::versions::maskUFAndLater) {
MessageString(Chat::PetResponse, PET_ON_GHOLD); MessageString(Chat::PetResponse, PET_ON_GHOLD);
mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG); mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG);
} else { }
else {
mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD); mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
} }
mypet->SetGHeld(true); mypet->SetGHeld(true);
@ -10688,7 +10681,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
if (mypet->IsPetStop()) { if (mypet->IsPetStop()) {
mypet->SetPetStop(false); mypet->SetPetStop(false);
} else { }
else {
mypet->SetPetStop(true); mypet->SetPetStop(true);
mypet->StopNavigation(); mypet->StopNavigation();
mypet->SetTarget(nullptr); mypet->SetTarget(nullptr);
@ -10732,7 +10726,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (mypet->IsPetRegroup()) { if (mypet->IsPetRegroup()) {
mypet->SetPetRegroup(false); mypet->SetPetRegroup(false);
mypet->SayString(this, Chat::PetResponse, PET_OFF_REGROUPING); mypet->SayString(this, Chat::PetResponse, PET_OFF_REGROUPING);
} else { }
else {
mypet->SetPetRegroup(true); mypet->SetPetRegroup(true);
mypet->SetTarget(nullptr); mypet->SetTarget(nullptr);
mypet->SayString(this, Chat::PetResponse, PET_ON_REGROUPING); mypet->SayString(this, Chat::PetResponse, PET_ON_REGROUPING);

93
zone/lua_general.cpp
View File

@ -90,14 +90,16 @@ void unload_encounter(std::string name) {
while (iter != elist.end()) { while (iter != elist.end()) {
if ((*iter).encounter_name.compare(name) == 0) { if ((*iter).encounter_name.compare(name) == 0) {
iter = elist.erase(iter); iter = elist.erase(iter);
} else { }
else {
++iter; ++iter;
} }
} }
if (elist.size() == 0) { if (elist.size() == 0) {
lua_encounter_events_registered.erase(liter++); lua_encounter_events_registered.erase(liter++);
} else { }
else {
++liter; ++liter;
} }
} }
@ -157,7 +159,8 @@ void register_event(std::string package_name, std::string name, int evt, luabind
std::list<lua_registered_event> elist; std::list<lua_registered_event> elist;
elist.push_back(e); elist.push_back(e);
lua_encounter_events_registered[package_name] = elist; lua_encounter_events_registered[package_name] = elist;
} else { }
else {
std::list<lua_registered_event>& elist = liter->second; std::list<lua_registered_event>& elist = liter->second;
elist.push_back(e); elist.push_back(e);
} }
@ -598,9 +601,11 @@ void lua_task_selector(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
cur_value = luabind::object_cast<int>(cur); cur_value = luabind::object_cast<int>(cur);
} catch(luabind::cast_failed &) {
} }
} else { catch (luabind::cast_failed&) {
}
}
else {
count = i - 1; count = i - 1;
break; break;
} }
@ -628,9 +633,11 @@ void lua_enable_task(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
cur_value = luabind::object_cast<int>(cur); cur_value = luabind::object_cast<int>(cur);
} catch(luabind::cast_failed &) {
} }
} else { catch (luabind::cast_failed&) {
}
}
else {
count = i - 1; count = i - 1;
break; break;
} }
@ -655,9 +662,11 @@ void lua_disable_task(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
cur_value = luabind::object_cast<int>(cur); cur_value = luabind::object_cast<int>(cur);
} catch(luabind::cast_failed &) {
} }
} else { catch (luabind::cast_failed&) {
}
}
else {
count = i - 1; count = i - 1;
break; break;
} }
@ -1715,10 +1724,12 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
spawn2_id = luabind::object_cast<uint32>(cur); spawn2_id = luabind::object_cast<uint32>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
return; return;
} }
} else { }
else {
return; return;
} }
@ -1726,10 +1737,12 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
spawngroup_id = luabind::object_cast<uint32>(cur); spawngroup_id = luabind::object_cast<uint32>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
return; return;
} }
} else { }
else {
return; return;
} }
@ -1737,10 +1750,12 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
x = luabind::object_cast<float>(cur); x = luabind::object_cast<float>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
return; return;
} }
} else { }
else {
return; return;
} }
@ -1748,10 +1763,12 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
y = luabind::object_cast<float>(cur); y = luabind::object_cast<float>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
return; return;
} }
} else { }
else {
return; return;
} }
@ -1759,10 +1776,12 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
z = luabind::object_cast<float>(cur); z = luabind::object_cast<float>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
return; return;
} }
} else { }
else {
return; return;
} }
@ -1770,10 +1789,12 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
heading = luabind::object_cast<float>(cur); heading = luabind::object_cast<float>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
return; return;
} }
} else { }
else {
return; return;
} }
@ -1781,10 +1802,12 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
respawn = luabind::object_cast<uint32>(cur); respawn = luabind::object_cast<uint32>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
return; return;
} }
} else { }
else {
return; return;
} }
@ -1792,10 +1815,12 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
variance = luabind::object_cast<uint32>(cur); variance = luabind::object_cast<uint32>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
return; return;
} }
} else { }
else {
return; return;
} }
@ -1803,7 +1828,8 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
timeleft = luabind::object_cast<uint32>(cur); timeleft = luabind::object_cast<uint32>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
} }
} }
@ -1811,7 +1837,8 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
grid = luabind::object_cast<uint32>(cur); grid = luabind::object_cast<uint32>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
} }
} }
@ -1819,7 +1846,8 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
condition_id = luabind::object_cast<int>(cur); condition_id = luabind::object_cast<int>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
} }
} }
@ -1827,7 +1855,8 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
condition_min_value = luabind::object_cast<int>(cur); condition_min_value = luabind::object_cast<int>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
} }
} }
@ -1835,7 +1864,8 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
enabled = luabind::object_cast<bool>(cur); enabled = luabind::object_cast<bool>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
} }
} }
@ -1843,7 +1873,8 @@ void lua_add_spawn_point(luabind::adl::object table) {
if (luabind::type(cur) != LUA_TNIL) { if (luabind::type(cur) != LUA_TNIL) {
try { try {
animation = luabind::object_cast<int>(cur); animation = luabind::object_cast<int>(cur);
} catch(luabind::cast_failed &) { }
catch (luabind::cast_failed&) {
} }
} }