pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 15:38:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source 
Conflicts:
	common/eqemu_logsys.h
This commit is contained in:
Akkadius
2015-02-01 15:56:05 -06:00
parent b3ea1a9da7 cced57f56a
commit f9ba99e99f
53 changed files with 366 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/string_util.cpp
+2 -2
View File
@@ -255,7 +255,7 @@ bool atobool(const char* iBool) {
return false;
}
// solar: removes the crap and turns the underscores into spaces.
// removes the crap and turns the underscores into spaces.
char *CleanMobName(const char *in, char *out)
{
unsigned i, j;
@@ -414,4 +414,4 @@ void find_replace(std::string& string_subject, std::string& search_string, std::
string_subject.replace(index, index + 1, replace_string);
index = string_subject.find_first_of(search_string);
}
}
}