diff --git a/src/Client/PseuWoW.cpp b/src/Client/PseuWoW.cpp index dc7813a..7012ed2 100644 --- a/src/Client/PseuWoW.cpp +++ b/src/Client/PseuWoW.cpp @@ -112,16 +112,6 @@ bool PseuInstance::Init(void) { return true; } -void PseuInstance::SetConfDir(std::string path) -{ - _confdir=path; -} - -void PseuInstance::SetScpDir(std::string path) -{ - _scpdir=path; -} - void PseuInstance::Run(void) { if(!_initialized) diff --git a/src/Client/PseuWoW.h b/src/Client/PseuWoW.h index 250c491..0b8025f 100644 --- a/src/Client/PseuWoW.h +++ b/src/Client/PseuWoW.h @@ -53,9 +53,9 @@ class PseuInstance RealmSocket *GetRSession(void) { return _rsession; } PseuInstanceConf *GetConf(void) { return _conf; } DefScriptPackage *GetScripts(void) { return _scp; } - void SetConfDir(std::string); - void SetScpDir(std::string); - void SetSessionKey(BigNumber); + void SetConfDir(std::string dir) { _confdir = dir; } + void SetScpDir(std::string dir) { _scpdir = dir; } + void SetSessionKey(BigNumber key) { _sessionkey = key; } BigNumber GetSessionKey(void) { return _sessionkey; } diff --git a/src/PseuWoW.vcproj b/src/PseuWoW.vcproj index 6ad919e..6fb4604 100644 --- a/src/PseuWoW.vcproj +++ b/src/PseuWoW.vcproj @@ -47,7 +47,7 @@ OutputFile="$(OutDir)/$(InputName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="./dep/lib/release/" + AdditionalLibraryDirectories="" ProgramDatabaseFile="$(SolutionDir)/temp/$(ProjectName)/Release/PseuWoW.pdb" SubSystem="1" TargetMachine="1"/> @@ -108,7 +108,7 @@ OutputFile="$(OutDir)/$(InputName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="./deb/lib/" + AdditionalLibraryDirectories="" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(SolutionDir)/temp/$(ProjectName)/PseuWoW.pdb" SubSystem="1" diff --git a/src/shared/common.h b/src/shared/common.h index 2c6f58d..3dbee03 100644 --- a/src/shared/common.h +++ b/src/shared/common.h @@ -14,7 +14,6 @@ #include #include -//#include "../zthread/ZThread.h" #include "zthread/FastMutex.h" #include "zthread/LockedQueue.h" #include "zthread/Runnable.h" diff --git a/src/shared/tools.cpp b/src/shared/tools.cpp index 23f3c2b..7f10da1 100644 --- a/src/shared/tools.cpp +++ b/src/shared/tools.cpp @@ -177,8 +177,7 @@ std::string stringToUpper(std::string s) return s; } -template -std::string toString(T num){ +std::string toString(uint64 num){ std::stringstream ss; ss << num; return ss.str(); diff --git a/src/shared/tools.h b/src/shared/tools.h index 9e32c45..3da2b22 100644 --- a/src/shared/tools.h +++ b/src/shared/tools.h @@ -23,8 +23,7 @@ void printchex(std::string,bool); // new functions std::string stringToUpper(std::string); std::string stringToLower(std::string); -std::string toString(uint64 num); -std::string toString(int64 num); +std::string toString(uint64); std::string getDateString(void); #endif \ No newline at end of file