pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 11:48:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

Browse Source
This commit is contained in:
j883376
2013-05-23 21:12:07 -04:00
parent d6ff01d63c 815c3dc73f
commit b47597b813
219 changed files with 2420 additions and 2489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spawngroup.cpp
+11 -11
View File
@@ -21,10 +21,10 @@
#include <string.h>
#include <stdlib.h>
#include <iostream>
using namespace std;
#include "../common/types.h"
#include "zonedb.h"
#include "../common/MiscFunctions.h"
#include "../common/StringUtil.h"
extern EntityList entity_list;
@@ -60,8 +60,8 @@ uint32 SpawnGroup::GetNPCType() {
if(!entity_list.LimitCheckGroup(id, group_spawn_limit))
return(0);
list<SpawnEntry*>::iterator cur,end;
list<SpawnEntry*> possible;
std::list<SpawnEntry*>::iterator cur,end;
std::list<SpawnEntry*> possible;
cur = list_.begin();
end = list_.end();
for(; cur != end; cur++) {
@@ -101,7 +101,7 @@ void SpawnGroup::AddSpawnEntry( SpawnEntry* newEntry ) {
}
SpawnGroup::~SpawnGroup() {
list<SpawnEntry*>::iterator cur,end;
std::list<SpawnEntry*>::iterator cur,end;
cur = list_.begin();
end = list_.end();
for(; cur != end; cur++) {
@@ -112,7 +112,7 @@ SpawnGroup::~SpawnGroup() {
}
SpawnGroupList::~SpawnGroupList() {
map<uint32, SpawnGroup*>::iterator cur,end;
std::map<uint32, SpawnGroup*>::iterator cur,end;
cur = groups.begin();
end = groups.end();
for(; cur != end; cur++) {
@@ -161,7 +161,7 @@ bool ZoneDatabase::LoadSpawnGroups(const char* zone_name, uint16 version, SpawnG
}
else
{
cerr << "Error2 in PopulateZoneLists query '" << query << "' " << errbuf << endl;
std::cerr << "Error2 in PopulateZoneLists query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
return false;
}
@@ -181,13 +181,13 @@ bool ZoneDatabase::LoadSpawnGroups(const char* zone_name, uint16 version, SpawnG
if (sg)
sg->AddSpawnEntry(newSpawnEntry);
else
cout << "Error in SpawngroupID: " << row[0] << endl;
std::cout << "Error in SpawngroupID: " << row[0] << std::endl;
}
mysql_free_result(result);
}
else
{
cerr << "Error3 in PopulateZoneLists query '" << query << "' " << errbuf << endl;
std::cerr << "Error3 in PopulateZoneLists query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
return false;
}
@@ -216,7 +216,7 @@ bool ZoneDatabase::LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList* spawn_g
}
else
{
cerr << "Error2 in PopulateZoneLists query '" << query << "' " << errbuf << endl;
std::cerr << "Error2 in PopulateZoneLists query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
return false;
}
@@ -232,13 +232,13 @@ bool ZoneDatabase::LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList* spawn_g
if (sg)
sg->AddSpawnEntry(newSpawnEntry);
else
cout << "Error in SpawngroupID: " << row[0] << endl;
std::cout << "Error in SpawngroupID: " << row[0] << std::endl;
}
mysql_free_result(result);
}
else
{
cerr << "Error3 in PopulateZoneLists query '" << query << "' " << errbuf << endl;
std::cerr << "Error3 in PopulateZoneLists query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
return false;
}