mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-15 16:41:29 +00:00
Removed the logging now that the issue is resolved
This commit is contained in:
parent
39cbdbd5c2
commit
0483e8bd1b
13
zone/map.cpp
13
zone/map.cpp
@ -42,7 +42,6 @@ uint32 InflateData(const char* buffer, uint32 len, char* out_buffer, uint32 out_
|
|||||||
}
|
}
|
||||||
|
|
||||||
zerror = inflateEnd(&zstream);
|
zerror = inflateEnd(&zstream);
|
||||||
LogFile->write(EQEMuLog::Debug, "Map InflateData ended with code: %d", zerror);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -216,7 +215,6 @@ bool Map::Load(std::string filename) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
LogFile->write(EQEMuLog::Debug, "Map loaded with version 0x%x", version);
|
|
||||||
if(version == 0x01000000) {
|
if(version == 0x01000000) {
|
||||||
bool v = LoadV1(f);
|
bool v = LoadV1(f);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
@ -229,8 +227,6 @@ bool Map::Load(std::string filename) {
|
|||||||
fclose(f);
|
fclose(f);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
LogFile->write(EQEMuLog::Debug, "Failed to load map file: %s", filename.c_str());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -319,25 +315,20 @@ struct ModelEntry
|
|||||||
bool Map::LoadV2(FILE *f) {
|
bool Map::LoadV2(FILE *f) {
|
||||||
uint32 data_size;
|
uint32 data_size;
|
||||||
if (fread(&data_size, sizeof(data_size), 1, f) != 1) {
|
if (fread(&data_size, sizeof(data_size), 1, f) != 1) {
|
||||||
LogFile->write(EQEMuLog::Debug, "Failed to load map v2 data_size");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32 buffer_size;
|
uint32 buffer_size;
|
||||||
if (fread(&buffer_size, sizeof(buffer_size), 1, f) != 1) {
|
if (fread(&buffer_size, sizeof(buffer_size), 1, f) != 1) {
|
||||||
LogFile->write(EQEMuLog::Debug, "Failed to load map v2 buffer_size");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<char> data;
|
std::vector<char> data;
|
||||||
data.resize(data_size);
|
data.resize(data_size);
|
||||||
if (fread(&data[0], data_size, 1, f) != 1) {
|
if (fread(&data[0], data_size, 1, f) != 1) {
|
||||||
LogFile->write(EQEMuLog::Debug, "Failed to load map v2 data");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
LogFile->write(EQEMuLog::Debug, "Map v2 data size: %u buffer size: %u", data_size, buffer_size);
|
|
||||||
|
|
||||||
std::vector<char> buffer;
|
std::vector<char> buffer;
|
||||||
buffer.resize(buffer_size);
|
buffer.resize(buffer_size);
|
||||||
uint32 v = InflateData(&data[0], data_size, &buffer[0], buffer_size);
|
uint32 v = InflateData(&data[0], data_size, &buffer[0], buffer_size);
|
||||||
@ -848,8 +839,6 @@ bool Map::LoadV2(FILE *f) {
|
|||||||
|
|
||||||
uint32 face_count = indices.size() / 3;
|
uint32 face_count = indices.size() / 3;
|
||||||
|
|
||||||
LogFile->write(EQEMuLog::Debug, "Loaded %u verts, %u faces (%u indicies)", verts.size(), face_count, indices.size());
|
|
||||||
|
|
||||||
if (imp) {
|
if (imp) {
|
||||||
imp->rm->release();
|
imp->rm->release();
|
||||||
imp->rm = nullptr;
|
imp->rm = nullptr;
|
||||||
@ -861,13 +850,11 @@ bool Map::LoadV2(FILE *f) {
|
|||||||
imp->rm = createRaycastMesh((RmUint32)verts.size(), (const RmReal*)&verts[0], face_count, &indices[0]);
|
imp->rm = createRaycastMesh((RmUint32)verts.size(), (const RmReal*)&verts[0], face_count, &indices[0]);
|
||||||
|
|
||||||
if (!imp->rm) {
|
if (!imp->rm) {
|
||||||
LogFile->write(EQEMuLog::Debug, "Map could not create raycast mesh");
|
|
||||||
delete imp;
|
delete imp;
|
||||||
imp = nullptr;
|
imp = nullptr;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
LogFile->write(EQEMuLog::Debug, "Map loaded successfully.");
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user