Skip to content

Commit

Permalink
Change erroneous ifdefs
Browse files Browse the repository at this point in the history
  • Loading branch information
Foereaper committed Jan 28, 2024
1 parent df0c097 commit 85bde11
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ElunaLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <sstream>
#include <boost/filesystem.hpp>

#ifdef TRINITYCORE
#ifdef TRINITY
#include "MapManager.h"
#endif

Expand Down
4 changes: 2 additions & 2 deletions LuaEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -979,13 +979,13 @@ int Eluna::Register(lua_State* L, uint8 regtype, uint32 entry, ObjectGuid guid,
void Eluna::UpdateEluna(uint32 diff)
{
if (reload)
#ifdef TRINITYCORE
#ifdef TRINITY
if(!GetQueryProcessor().HasPendingCallbacks())
#endif
_ReloadEluna();

eventMgr->globalProcessor->Update(diff);
#ifdef TRINITYCORE
#ifdef TRINITY
GetQueryProcessor().ProcessReadyCallbacks();
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion LuaEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ class ELUNA_GAME_API Eluna
lua_State* L;
EventMgr* eventMgr;

#ifdef TRINITYCORE
#ifdef TRINITY
QueryCallbackProcessor queryProcessor;
QueryCallbackProcessor& GetQueryProcessor() { return queryProcessor; }
#endif
Expand Down
4 changes: 2 additions & 2 deletions PlayerHooks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ bool Eluna::OnCommand(Player* player, const char* text)
if (mapid_reload_cache_only != mapId)
{
if (mapId == mapid_reload_global || mapId == mapid_reload_all)
#ifdef TRINITYCORE
#ifdef TRINITY
sWorld->GetEluna()->ReloadEluna();
#else
sWorld.GetEluna()->ReloadEluna();
#endif

#ifdef TRINITYCORE
#ifdef TRINITY
sMapMgr->DoForAllMaps([&](Map* map)
#else
sMapMgr.DoForAllMaps([&](Map* map)
Expand Down

0 comments on commit 85bde11

Please sign in to comment.