Merge branch 'main' into entities

This commit is contained in:
MihailRis 2024-07-08 23:29:48 +03:00
commit 3cafc39555
15 changed files with 554 additions and 9 deletions

View file

@ -293,4 +293,4 @@ void Player::convert(dynamic::Map* data, const ContentLUT* lut) {
Inventory::convert(inventory.get(), lut);
}
}
}
}

View file

@ -104,4 +104,4 @@ public:
}
};
#endif // SRC_OBJECTS_PLAYER_HPP_
#endif // SRC_OBJECTS_PLAYER_HPP_