Fix most CI problems (#328)

Thanks to H0zen at 23daeb6a0d for helping comments.
This commit is contained in:
Rochet2
2020-09-15 21:38:35 +03:00
committed by GitHub
parent 2a6663f6d7
commit 5f28a2fc82
5 changed files with 61 additions and 53 deletions

View File

@@ -62,7 +62,7 @@ namespace LuaGlobalFunctions
int GetRealmID(lua_State* L)
{
#ifdef MANGOS
Eluna::Push(L, eWorld->GetRealmID());
Eluna::Push(L, realmID);
#else
Eluna::Push(L, sConfigMgr->GetIntDefault("RealmID", 1));
#endif
@@ -495,7 +495,11 @@ namespace LuaGlobalFunctions
if (!areaEntry)
return luaL_argerror(L, 1, "valid Area or Zone ID expected");
#if defined(TRINITY)
Eluna::Push(L, areaEntry->AreaName[locale]);
#else
Eluna::Push(L, areaEntry->area_name[locale]);
#endif
return 1;
}