pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-22 02:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

repaired dependency issues for protobuf

Browse Source
This commit is contained in:
Xackery 2018-02-11 13:24:03 -08:00
parent c69b9a95b7
commit dd5ef6523f
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -38,4 +38,5 @@ logs/
protobuf/csharp/*
protobuf/go/*
protobuf/java/*
protobuf/python/*
protobuf/python/*
.vscode

2
CMakeLists.txt
View File

@ -157,7 +157,7 @@ IF(MSVC)
ELSE(MSVC)
SET(NATS_LIBRARY "${NATS_ROOT}/lib_x64/libnats.so")
SET(PROTOBUF_LIBRARY "${PROTOBUF_ROOT}/lib_x64/libprotobuf.so")
SET(PROTOBUF_LIBRARY "${PROTOBUF_ROOT}/lib_x64/libprotobuf.so.15")
#Normally set by perl but we don't use the perl flags anymore so we set it.
ADD_DEFINITIONS(-DHAS_UNION_SEMUN)

3
world/cliententry.cpp
View File

@ -25,10 +25,12 @@
#include "world_config.h"
#include "../common/guilds.h"
#include "../common/string_util.h"
#include "nats_manager.h"
extern uint32 numplayers;
extern LoginServerList loginserverlist;
extern ClientList client_list;
extern NatsManager nats;
extern volatile bool RunLoops;
ClientListEntry::ClientListEntry(uint32 in_id, uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin, uint32 ip, uint8 local)
@ -286,6 +288,7 @@ bool ClientListEntry::CheckAuth(uint32 iLSID, const char* iKey) {
Log(Logs::Detail, Logs::World_Server,"Error adding local account for LS login: '%s', duplicate name?" ,plsname);
return false;
}
nats.SendAdminMessage(StringFormat("New account was created for %s, accountid: %u", plsname, paccountid));
strn0cpy(paccountname, plsname, sizeof(paccountname));
padmin = tmpStatus;
}

4
zone/nats_manager.h
View File

@ -2,8 +2,8 @@
#define _NATS_H
#include "nats.h"
#include "event_codes.h"
#include "entity.h";
#include "mob.h";
#include "entity.h"
#include "mob.h"
#include "../common/opcodemgr.h"
#include "../common/global_define.h"