pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into StringFormatting

Browse Source 
Conflicts:
	common/debug.cpp
This commit is contained in:
Arthur Ice
2013-05-22 18:01:16 -07:00
parent d41331d948 5c6e95f921
commit ea2a1651d5
190 changed files with 1834 additions and 2050 deletions
Download Patch File Download Diff File Expand all files Collapse all files
queryserv/database.cpp
-1
View File
@@ -20,7 +20,6 @@
#include "../common/debug.h"
#include <iostream>
using namespace std;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
queryserv/database.h
-1
View File
@@ -31,7 +31,6 @@
#include <string>
#include <vector>
#include <map>
using namespace std;
//atoi is not uint32 or uint32 safe!!!!
#define atoul(str) strtoul(str, nullptr, 10)
queryserv/queryserv.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ TimeoutManager timeout_manager;
Database database;
LFGuildManager lfguildmanager;
string WorldShortName;
std::string WorldShortName;
const queryservconfig *Config;
queryserv/queryservconfig.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
queryservconfig *queryservconfig::_chat_config = nullptr;
string queryservconfig::GetByName(const string &var_name) const {
std::string queryservconfig::GetByName(const std::string &var_name) const {
return(EQEmuConfig::GetByName(var_name));
}
queryserv/queryservconfig.h
+1 -1
View File
@@ -24,7 +24,7 @@
class queryservconfig : public EQEmuConfig {
public:
virtual string GetByName(const string &var_name) const;
virtual std::string GetByName(const std::string &var_name) const;
private:
queryserv/worldserver.cpp
+2 -3
View File
@@ -17,7 +17,6 @@
*/
#include "../common/debug.h"
#include <iostream>
using namespace std;
#include <string.h>
#include <stdio.h>
#include <iomanip>
@@ -81,8 +80,8 @@ void WorldServer::Process()
{
Server_Speech_Struct *SSS = (Server_Speech_Struct*)pack->pBuffer;
string tmp1 = SSS->from;
string tmp2 = SSS->to;
std::string tmp1 = SSS->from;
std::string tmp2 = SSS->to;
database.AddSpeech(tmp1.c_str(), tmp2.c_str(), SSS->message, SSS->minstatus, SSS->guilddbid, SSS->type);
break;