pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-22 12:18:27 +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
zone/forage.cpp
+1 -2
View File
@@ -17,7 +17,6 @@
*/
#include "../common/debug.h"
#include <iostream>
using namespace std;
#include <stdlib.h>
#include <math.h>
@@ -177,7 +176,7 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id,
mysql_free_result(result);
}
else {
cerr << "Error in Fishing query '" << query << "' " << errbuf << endl;
std::cerr << "Error in Fishing query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
return 0;
}