pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LoadZoneObjects converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-08-20 15:32:14 -07:00
parent 87efd22394
commit f0abaad84f
1 changed files with 106 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

225
zone/zone.cpp
View File

@ -156,140 +156,127 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
//this really loads the objects into entity_list //this really loads the objects into entity_list
bool Zone::LoadZoneObjects() { bool Zone::LoadZoneObjects() {
char errbuf[MYSQL_ERRMSG_SIZE];
char* query = nullptr;
MYSQL_RES *result;
MYSQL_ROW row;
uint32 len_query = MakeAnyLenString(&query, "SELECT " std::string query = StringFormat("SELECT id, zoneid, xpos, ypos, zpos, heading, "
"id,zoneid,xpos,ypos,zpos,heading,itemid,charges,objectname,type,icon," "itemid, charges, objectname, type, icon, unknown08, "
"unknown08,unknown10,unknown20,unknown24,unknown76" "unknown10, unknown20, unknown24, unknown76 fROM object "
" from object where zoneid=%i and (version=%u or version=-1)", zoneid, instanceversion); "WHERE zoneid = %i AND (version = %u OR version = -1)",
zoneid, instanceversion);
auto results = database.QueryDatabase(query);
if (!results.Success()) {
LogFile->write(EQEMuLog::Error, "Error Loading Objects from DB: %s",results.ErrorMessage().c_str());
return false;
}
if (database.RunQuery(query, len_query, errbuf, &result)) { LogFile->write(EQEMuLog::Status, "Loading Objects from DB...");
safe_delete_array(query); for (auto row = results.begin(); row != results.end(); ++row) {
LogFile->write(EQEMuLog::Status, "Loading Objects from DB..."); if (atoi(row[9]) == 0)
while ((row = mysql_fetch_row(result))) { {
if (atoi(row[9]) == 0) // Type == 0 - Static Object
{ const char* shortname = database.GetZoneName(atoi(row[1]), false); // zoneid -> zone_shortname
// Type == 0 - Static Object
const char* shortname = database.GetZoneName(atoi(row[1]), false); // zoneid -> zone_shortname
if (shortname) if (!shortname)
{ continue;
Door d;
memset(&d, 0, sizeof(d));
strn0cpy(d.zone_name, shortname, sizeof(d.zone_name)); Door d;
d.db_id = 1000000000 + atoi(row[0]); // Out of range of normal use for doors.id memset(&d, 0, sizeof(d));
d.door_id = -1; // Client doesn't care if these are all the same door_id
d.pos_x = atof(row[2]); // xpos
d.pos_y = atof(row[3]); // ypos
d.pos_z = atof(row[4]); // zpos
d.heading = atof(row[5]); // heading
strn0cpy(d.door_name, row[8], sizeof(d.door_name)); // objectname strn0cpy(d.zone_name, shortname, sizeof(d.zone_name));
// Strip trailing "_ACTORDEF" if present. Client won't accept it for doors. d.db_id = 1000000000 + atoi(row[0]); // Out of range of normal use for doors.id
int len = strlen(d.door_name); d.door_id = -1; // Client doesn't care if these are all the same door_id
if ((len > 9) && (memcmp(&d.door_name[len - 9], "_ACTORDEF", 10) == 0)) d.pos_x = atof(row[2]); // xpos
{ d.pos_y = atof(row[3]); // ypos
d.door_name[len - 9] = '\0'; d.pos_z = atof(row[4]); // zpos
} d.heading = atof(row[5]); // heading
memcpy(d.dest_zone, "NONE", 5); strn0cpy(d.door_name, row[8], sizeof(d.door_name)); // objectname
// Strip trailing "_ACTORDEF" if present. Client won't accept it for doors.
int len = strlen(d.door_name);
if ((len > 9) && (memcmp(&d.door_name[len - 9], "_ACTORDEF", 10) == 0))
d.door_name[len - 9] = '\0';
if ((d.size = atoi(row[11])) == 0) // unknown08 = optional size percentage memcpy(d.dest_zone, "NONE", 5);
{
d.size = 100;
}
switch (d.opentype = atoi(row[12])) // unknown10 = optional request_nonsolid (0 or 1 or experimental number) if ((d.size = atoi(row[11])) == 0) // unknown08 = optional size percentage
{ d.size = 100;
case 0:
d.opentype = 31;
break;
case 1:
d.opentype = 9;
break;
}
d.incline = atoi(row[13]); // unknown20 = optional model incline value switch (d.opentype = atoi(row[12])) // unknown10 = optional request_nonsolid (0 or 1 or experimental number)
d.client_version_mask = 0xFFFFFFFF; //We should load the mask from the zone. {
case 0:
d.opentype = 31;
break;
case 1:
d.opentype = 9;
break;
}
Doors* door = new Doors(&d); d.incline = atoi(row[13]); // unknown20 = optional model incline value
entity_list.AddDoor(door); d.client_version_mask = 0xFFFFFFFF; //We should load the mask from the zone.
}
continue; Doors* door = new Doors(&d);
} entity_list.AddDoor(door);
Object_Struct data = {0}; }
uint32 id = 0;
uint32 icon = 0;
uint32 type = 0;
uint32 itemid = 0;
uint32 idx = 0;
int16 charges = 0;
id = (uint32)atoi(row[0]); Object_Struct data = {0};
data.zone_id = atoi(row[1]); uint32 id = 0;
data.x = atof(row[2]); uint32 icon = 0;
data.y = atof(row[3]); uint32 type = 0;
data.z = atof(row[4]); uint32 itemid = 0;
data.heading = atof(row[5]); uint32 idx = 0;
itemid = (uint32)atoi(row[6]); int16 charges = 0;
charges = (int16)atoi(row[7]);
strcpy(data.object_name, row[8]);
type = (uint8)atoi(row[9]);
icon = (uint32)atoi(row[10]);
data.object_type = type;
data.linked_list_addr[0] = 0;
data.linked_list_addr[1] = 0;
data.unknown008 = (uint32)atoi(row[11]);
data.unknown010 = (uint32)atoi(row[12]);
data.unknown020 = (uint32)atoi(row[13]);
data.unknown024 = (uint32)atoi(row[14]);
data.unknown076 = (uint32)atoi(row[15]);
data.unknown084 = 0;
ItemInst* inst = nullptr; id = (uint32)atoi(row[0]);
//FatherNitwit: this dosent seem to work... data.zone_id = atoi(row[1]);
//tradeskill containers do not have an itemid of 0... at least what I am seeing data.x = atof(row[2]);
if (itemid == 0) { data.y = atof(row[3]);
// Generic tradeskill container data.z = atof(row[4]);
inst = new ItemInst(ItemInstWorldContainer); data.heading = atof(row[5]);
} itemid = (uint32)atoi(row[6]);
else { charges = (int16)atoi(row[7]);
// Groundspawn object strcpy(data.object_name, row[8]);
inst = database.CreateItem(itemid); type = (uint8)atoi(row[9]);
} icon = (uint32)atoi(row[10]);
data.object_type = type;
data.linked_list_addr[0] = 0;
data.linked_list_addr[1] = 0;
data.unknown008 = (uint32)atoi(row[11]);
data.unknown010 = (uint32)atoi(row[12]);
data.unknown020 = (uint32)atoi(row[13]);
data.unknown024 = (uint32)atoi(row[14]);
data.unknown076 = (uint32)atoi(row[15]);
data.unknown084 = 0;
//Father Nitwit's fix... not perfect... ItemInst* inst = nullptr;
if(inst == nullptr && type != OT_DROPPEDITEM) { //FatherNitwit: this dosent seem to work...
inst = new ItemInst(ItemInstWorldContainer); //tradeskill containers do not have an itemid of 0... at least what I am seeing
} if (itemid == 0) {
// Generic tradeskill container
inst = new ItemInst(ItemInstWorldContainer);
}
else {
// Groundspawn object
inst = database.CreateItem(itemid);
}
// Load child objects if container //Father Nitwit's fix... not perfect...
if (inst && inst->IsType(ItemClassContainer)) { if(inst == nullptr && type != OT_DROPPEDITEM) {
database.LoadWorldContainer(id, inst); inst = new ItemInst(ItemInstWorldContainer);
} }
Object* object = new Object(id, type, icon, data, inst); // Load child objects if container
entity_list.AddObject(object, false); if (inst && inst->IsType(ItemClassContainer)) {
if(type == OT_DROPPEDITEM && itemid != 0) database.LoadWorldContainer(id, inst);
{ }
entity_list.RemoveObject(object->GetID());
}
safe_delete(inst); Object* object = new Object(id, type, icon, data, inst);
} entity_list.AddObject(object, false);
mysql_free_result(result); if(type == OT_DROPPEDITEM && itemid != 0)
} entity_list.RemoveObject(object->GetID());
else {
safe_delete_array(query); safe_delete(inst);
LogFile->write(EQEMuLog::Error, "Error Loading Objects from DB: %s",errbuf); }
return(false);
} return true;
return(true);
} }
//this also just loads into entity_list, not really into zone //this also just loads into entity_list, not really into zone
@ -789,7 +776,7 @@ void Zone::Shutdown(bool quite)
if (!quite) if (!quite)
LogFile->write(EQEMuLog::Normal, "Zone shutdown: going to sleep"); LogFile->write(EQEMuLog::Normal, "Zone shutdown: going to sleep");
ZoneLoaded = false; ZoneLoaded = false;
zone->ResetAuth(); zone->ResetAuth();
safe_delete(zone); safe_delete(zone);
dbasync->CommitWrites(); dbasync->CommitWrites();
@ -1381,7 +1368,7 @@ bool Zone::Process() {
return true; return true;
} }
void Zone::ChangeWeather() void Zone::ChangeWeather()
{ {
if(!HasWeather()) if(!HasWeather())
{ {