pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 03:31:08 +00:00
Code Issues Actions 1 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
world/client.cpp
+1 -3
View File
@@ -3,9 +3,7 @@
#include "../common/EQStreamIntf.h"
#include "../common/misc.h"
#include <iostream>
using namespace std;
#include <iomanip>
using namespace std;
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -130,7 +128,7 @@ void Client::SendLogServer()
safe_delete(outapp);
}
void Client::SendEnterWorld(string name)
void Client::SendEnterWorld(std::string name)
{
char char_name[32]= { 0 };
if (pZoning && database.GetLiveChar(GetAccountID(), char_name)) {