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

Merge branch 'main' into npc-pathing

Browse Source
This commit is contained in:
Aaron Kimbre
2022-11-05 20:43:35 -05:00
parent f546f4d18c 9c58ea5c41
commit 59ddeb095c
4 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dGame/dComponents/CharacterComponent.cpp
View File

@@ -47,6 +47,7 @@ bool CharacterComponent::LandingAnimDisabled(int zoneID) {
case 1202:
case 1203:
case 1204:
case 1261:
case 1301:
case 1302:
case 1303:

16
dGame/dComponents/PetComponent.cpp
View File

@@ -194,21 +194,7 @@ void PetComponent::OnUse(Entity* originator) {
return;
}
auto lxfAsset = std::string(result.getStringField(0));
std::vector<std::string> lxfAssetSplit = GeneralUtils::SplitString(lxfAsset, '\\');
lxfAssetSplit.erase(lxfAssetSplit.begin());
buildFile = "res/BrickModels";
for (auto part : lxfAssetSplit) {
std::transform(part.begin(), part.end(), part.begin(), [](unsigned char c) {
return std::tolower(c);
});
buildFile += "/" + part;
}
buildFile = std::string(result.getStringField(0));
PetPuzzleData data;
data.buildFile = buildFile;

2
dGame/dUtilities/BrickDatabase.cpp
View File

@@ -18,7 +18,7 @@ std::vector<Brick>& BrickDatabase::GetBricks(const std::string& lxfmlPath) {
return cached->second;
}
AssetMemoryBuffer buffer = Game::assetManager->GetFileAsBuffer(("client/" + lxfmlPath).c_str());
AssetMemoryBuffer buffer = Game::assetManager->GetFileAsBuffer((lxfmlPath).c_str());
std::istream file(&buffer);
if (!file.good()) {
return emptyCache;