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

[int64] Windows Compile Fixes (#2155)

Browse Source 
* int64 windows aftermath

* Perl.

Co-authored-by: Kinglykrab <kinglykrab@gmail.com>
This commit is contained in:
Chris Miles 2022-05-07 23:45:52 -05:00 committed by GitHub
parent b27428a6d8
commit fd7b15abb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/lua_npc.cpp
View File

@ -192,7 +192,7 @@ int Lua_NPC::GetPrimaryFaction() {
return self->GetPrimaryFaction(); return self->GetPrimaryFaction();
} }
int Lua_NPC::GetNPCHate(Lua_Mob ent) { int64 Lua_NPC::GetNPCHate(Lua_Mob ent) {
Lua_Safe_Call_Int(); Lua_Safe_Call_Int();
return self->GetNPCHate(ent); return self->GetNPCHate(ent);
} }
@ -711,7 +711,7 @@ luabind::scope lua_register_npc() {
.def("GetMaxWp", (int(Lua_NPC::*)(void))&Lua_NPC::GetMaxWp) .def("GetMaxWp", (int(Lua_NPC::*)(void))&Lua_NPC::GetMaxWp)
.def("GetMinDMG", (uint32(Lua_NPC::*)(void))&Lua_NPC::GetMinDMG) .def("GetMinDMG", (uint32(Lua_NPC::*)(void))&Lua_NPC::GetMinDMG)
.def("GetNPCFactionID", (int(Lua_NPC::*)(void))&Lua_NPC::GetNPCFactionID) .def("GetNPCFactionID", (int(Lua_NPC::*)(void))&Lua_NPC::GetNPCFactionID)
.def("GetNPCHate", (int(Lua_NPC::*)(Lua_Mob))&Lua_NPC::GetNPCHate) .def("GetNPCHate", (int64(Lua_NPC::*)(Lua_Mob))&Lua_NPC::GetNPCHate)
.def("GetNPCSpellsID", (int(Lua_NPC::*)(void))&Lua_NPC::GetNPCSpellsID) .def("GetNPCSpellsID", (int(Lua_NPC::*)(void))&Lua_NPC::GetNPCSpellsID)
.def("GetNPCSpellsID", (int(Lua_NPC::*)(void))&Lua_NPC::GetNPCSpellsID) .def("GetNPCSpellsID", (int(Lua_NPC::*)(void))&Lua_NPC::GetNPCSpellsID)
.def("GetNPCStat", (float(Lua_NPC::*)(const char*))&Lua_NPC::GetNPCStat) .def("GetNPCStat", (float(Lua_NPC::*)(const char*))&Lua_NPC::GetNPCStat)

2
zone/lua_npc.h
View File

@ -65,7 +65,7 @@ public:
uint32 GetSp2(); uint32 GetSp2();
int GetNPCFactionID(); int GetNPCFactionID();
int GetPrimaryFaction(); int GetPrimaryFaction();
int GetNPCHate(Lua_Mob ent); int64 GetNPCHate(Lua_Mob ent);
bool IsOnHatelist(Lua_Mob ent); bool IsOnHatelist(Lua_Mob ent);
void SetNPCFactionID(int id); void SetNPCFactionID(int id);
uint32 GetMaxDMG(); uint32 GetMaxDMG();

2
zone/npc.h
View File

@ -271,7 +271,7 @@ public:
inline int32 GetPrimaryFaction() const inline int32 GetPrimaryFaction() const
{ return primary_faction; } { return primary_faction; }
int32 GetNPCHate(Mob *in_ent) int64 GetNPCHate(Mob *in_ent)
{ return hate_list.GetEntHateAmount(in_ent); } { return hate_list.GetEntHateAmount(in_ent); }
bool IsOnHatelist(Mob *p) bool IsOnHatelist(Mob *p)

2
zone/perl_npc.cpp
View File

@ -484,7 +484,7 @@ XS(XS_NPC_GetNPCHate) {
Perl_croak(aTHX_ "Usage: NPC::GetNPCHate(THIS, Mob* entity)"); // @categories Hate and Aggro Perl_croak(aTHX_ "Usage: NPC::GetNPCHate(THIS, Mob* entity)"); // @categories Hate and Aggro
{ {
NPC *THIS; NPC *THIS;
int32 RETVAL; int64 RETVAL;
dXSTARG; dXSTARG;
Mob *in_ent; Mob *in_ent;
VALIDATE_THIS_IS_NPC; VALIDATE_THIS_IS_NPC;

2
zone/special_attacks.cpp
View File

@ -2046,7 +2046,7 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell,
if (success) { if (success) {
if (hate_top && hate_top != this) { if (hate_top && hate_top != this) {
int newhate = (who->GetNPCHate(hate_top) - who->GetNPCHate(this)) + 1 + bonus_hate; int64 newhate = (who->GetNPCHate(hate_top) - who->GetNPCHate(this)) + 1 + bonus_hate;
who->CastToNPC()->AddToHateList(this, newhate); who->CastToNPC()->AddToHateList(this, newhate);
success = true; success = true;
} else { } else {