pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-16 05:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add SetGMStatus to LUA, cleanup unused variable, cleanup naming of new function added to Client class, remove unneeded return on void function. (#1471)

Browse Source 
* Fix issue #1469 - remove unused variable in perl_client

* Add SetGMStatus to LUA, clean up naming in client.cpp to be consistent with the perl/lua naming, remove unneeded return in void function

* Delete PERL_CLIENT.ipch
This commit is contained in:
E Spause 2021-07-26 13:03:17 -04:00 committed by GitHub
parent 8696ba398b
commit 792a3b1443
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/client.cpp
View File

@ -10241,9 +10241,7 @@ void Client::RemoveItem(uint32 item_id, uint32 quantity)
} }
} }
void Client::SetAdminStatus(int newStatus) { void Client::SetGMStatus(int newStatus) {
if (this->Admin() != newStatus) if (this->Admin() != newStatus)
database.UpdateGMStatus(this->AccountID(), newStatus); database.UpdateGMStatus(this->AccountID(), newStatus);
return;
} }

2
zone/client.h
View File

@ -1523,7 +1523,7 @@ public:
void LoadAccountFlags(); void LoadAccountFlags();
void SetAccountFlag(std::string flag, std::string val); void SetAccountFlag(std::string flag, std::string val);
std::string GetAccountFlag(std::string flag); std::string GetAccountFlag(std::string flag);
void SetAdminStatus(int newStatus); void SetGMStatus(int newStatus);
float GetDamageMultiplier(EQ::skills::SkillType how_long_has_this_been_missing); float GetDamageMultiplier(EQ::skills::SkillType how_long_has_this_been_missing);
void Consume(const EQ::ItemData *item, uint8 type, int16 slot, bool auto_consume); void Consume(const EQ::ItemData *item, uint8 type, int16 slot, bool auto_consume);
void PlayMP3(const char* fname); void PlayMP3(const char* fname);

8
zone/lua_client.cpp
View File

@ -2158,6 +2158,11 @@ void Lua_Client::RemoveItem(uint32 item_id, uint32 quantity) {
return self->RemoveItem(item_id, quantity); return self->RemoveItem(item_id, quantity);
} }
void Lua_Client::SetGMStatus(uint32 newStatus) {
Lua_Safe_Call_Void();
return self->SetGMStatus(newStatus);
}
luabind::scope lua_register_client() { luabind::scope lua_register_client() {
return luabind::class_<Lua_Client, Lua_Mob>("Client") return luabind::class_<Lua_Client, Lua_Mob>("Client")
.def(luabind::constructor<>()) .def(luabind::constructor<>())
@ -2525,7 +2530,8 @@ luabind::scope lua_register_client() {
.def("SendToInstance", (void(Lua_Client::*)(std::string,std::string,uint32,float,float,float,float,std::string,uint32))&Lua_Client::SendToInstance) .def("SendToInstance", (void(Lua_Client::*)(std::string,std::string,uint32,float,float,float,float,std::string,uint32))&Lua_Client::SendToInstance)
.def("CountItem", (int(Lua_Client::*)(uint32))&Lua_Client::CountItem) .def("CountItem", (int(Lua_Client::*)(uint32))&Lua_Client::CountItem)
.def("RemoveItem", (void(Lua_Client::*)(uint32))&Lua_Client::RemoveItem) .def("RemoveItem", (void(Lua_Client::*)(uint32))&Lua_Client::RemoveItem)
.def("RemoveItem", (void(Lua_Client::*)(uint32,uint32))&Lua_Client::RemoveItem); .def("RemoveItem", (void(Lua_Client::*)(uint32,uint32))&Lua_Client::RemoveItem)
.def("SetGMStatus", (void(Lua_Client::*)(int32))& Lua_Client::SetGMStatus);
} }
luabind::scope lua_register_inventory_where() { luabind::scope lua_register_inventory_where() {

1
zone/lua_client.h
View File

@ -370,6 +370,7 @@ public:
int CountItem(uint32 item_id); int CountItem(uint32 item_id);
void RemoveItem(uint32 item_id); void RemoveItem(uint32 item_id);
void RemoveItem(uint32 item_id, uint32 quantity); void RemoveItem(uint32 item_id, uint32 quantity);
void SetGMStatus(uint32 newStatus);
void SetPrimaryWeaponOrnamentation(uint32 model_id); void SetPrimaryWeaponOrnamentation(uint32 model_id);
void SetSecondaryWeaponOrnamentation(uint32 model_id); void SetSecondaryWeaponOrnamentation(uint32 model_id);

3
zone/perl_client.cpp
View File

@ -3420,10 +3420,9 @@ XS(XS_Client_SetGMStatus) {
Perl_croak(aTHX_ "Usage: Client::SetGMStatus(THIS, int newStatus)"); // @categories Script Utility Perl_croak(aTHX_ "Usage: Client::SetGMStatus(THIS, int newStatus)"); // @categories Script Utility
{ {
Client *THIS; Client *THIS;
uint32 accID = THIS->AccountID();
int newStatus = (int)SvIV(ST(1)); int newStatus = (int)SvIV(ST(1));
VALIDATE_THIS_IS_CLIENT; VALIDATE_THIS_IS_CLIENT;
THIS->SetAdminStatus(newStatus); THIS->SetGMStatus(newStatus);
THIS->UpdateAdmin(true); THIS->UpdateAdmin(true);
} }
XSRETURN_EMPTY; XSRETURN_EMPTY;