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

post merge fixing

Browse Source
This commit is contained in:
Akkadius 2014-12-16 00:29:38 -06:00
parent fffe59c52e
commit 240b066f34
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/eqemu_config.cpp
View File

@ -220,6 +220,29 @@ void EQEmuConfig::do_qsdatabase(TiXmlElement *ele)
} }
} }
void EQEmuConfig::do_web_interface(TiXmlElement *ele) {
const char *text;
text = ParseTextBlock(ele, "port", true);
if (text)
WebInterfacePort = atoi(text);
text = ParseTextBlock(ele, "cert", true);
if (text)
WebInterfaceCert = text;
text = ParseTextBlock(ele, "priv_key", true);
if (text)
WebInterfacePrivKey = text;
TiXmlElement *sub_ele = ele->FirstChildElement("ssl");
if (sub_ele != nullptr) {
WebInterfaceUseSSL = true;
}
}
void EQEmuConfig::do_zones(TiXmlElement *ele) void EQEmuConfig::do_zones(TiXmlElement *ele)
{ {
const char *text; const char *text;
@ -450,6 +473,8 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const
return (""); return ("");
} }
void EQEmuConfig::Dump() const void EQEmuConfig::Dump() const
{ {
std::cout << "ShortName = " << ShortName << std::endl; std::cout << "ShortName = " << ShortName << std::endl;

6
common/eqemu_config.h
View File

@ -76,6 +76,12 @@ class EQEmuConfig : public XMLParser
std::string QSDatabaseDB; std::string QSDatabaseDB;
uint16 QSDatabasePort; uint16 QSDatabasePort;
// from <web_interface>
uint16 WebInterfacePort;
bool WebInterfaceUseSSL;
std::string WebInterfaceCert;
std::string WebInterfacePrivKey;
// From <files/> // From <files/>
std::string SpellsFile; std::string SpellsFile;
std::string OpCodesFile; std::string OpCodesFile;

3
common/shareddb.h
View File

@ -81,6 +81,9 @@ class SharedDatabase : public Database
ItemInst* CreateItem(const Item_Struct* item, int16 charges = 0, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, uint8 attuned = 0); ItemInst* CreateItem(const Item_Struct* item, int16 charges = 0, uint32 aug1 = 0, uint32 aug2 = 0, uint32 aug3 = 0, uint32 aug4 = 0, uint32 aug5 = 0, uint32 aug6 = 0, uint8 attuned = 0);
ItemInst* CreateBaseItem(const Item_Struct* item, int16 charges = 0); ItemInst* CreateBaseItem(const Item_Struct* item, int16 charges = 0);
// Web Token Verification
bool VerifyToken(std::string token, int& status);
/* /*
Shared Memory crap Shared Memory crap
*/ */