Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-15 04:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Zone.cpp

Browse Source
This commit is contained in:
David Markowitz 2023-11-21 17:49:55 -08:00
parent 1ea65b3549
commit 3f9d1a18f0
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dZoneManager/Zone.cpp
View File

@ -241,33 +241,15 @@ void Zone::LoadScene(std::istream& file) {
m_Scenes.insert(std::make_pair(lwoSceneID, scene)); m_Scenes.insert(std::make_pair(lwoSceneID, scene));
} }
<<<<<<< Updated upstream
void Zone::LoadLUTriggers(std::string triggerFile, SceneRef& scene) { void Zone::LoadLUTriggers(std::string triggerFile, SceneRef& scene) {
auto buffer = Game::assetManager->GetFileAsBuffer((m_ZonePath + triggerFile).c_str());
=======
std::vector<LUTriggers::Trigger*> Zone::LoadLUTriggers(std::string triggerFile, LWOSCENEID sceneID) {
std::vector<LUTriggers::Trigger*> lvlTriggers;
auto file = Game::assetManager->GetFile((m_ZonePath + triggerFile).c_str()); auto file = Game::assetManager->GetFile((m_ZonePath + triggerFile).c_str());
>>>>>>> Stashed changes
if (!file) {
LOG("Failed to load %s from disk. Skipping loading triggers", (m_ZonePath + triggerFile).c_str());
return;
}
std::stringstream data; std::stringstream data;
data << file.rdbuf(); data << file.rdbuf();
<<<<<<< Updated upstream
buffer.close();
data.seekg(0, std::ios::end); data.seekg(0, std::ios::end);
int32_t size = data.tellg(); int32_t size = data.tellg();
data.seekg(0, std::ios::beg); data.seekg(0, std::ios::beg);
=======
if (data.str().size() == 0) return lvlTriggers;
>>>>>>> Stashed changes
if (size == 0) return; if (size == 0) return;