voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-07 20:11:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: PVS-Studio warnings fixes

Browse source
This commit is contained in:
MihailRis 2024-08-04 01:12:42 +03:00
parent 7bc96affbb
commit 245b39be62
22 changed files with 311 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/content/Content.hpp
View file

@ -59,13 +59,25 @@ public:
ContentUnitIndices(std::vector<T*> defs) : defs(std::move(defs)) {
}
inline T* get(blockid_t id) const {
inline const T* get(blockid_t id) const {
if (id >= defs.size()) {
return nullptr;
}
return defs[id];
}
[[deprecated]]
inline T* getWriteable(blockid_t id) const { // TODO: remove
if (id >= defs.size()) {
return nullptr;
}
return defs[id];
}
inline const T& require(blockid_t id) const {
return *defs.at(id);
}
inline size_t count() const {
return defs.size();
}

6
src/content/ContentPack.cpp
View file

@ -132,11 +132,7 @@ fs::path ContentPack::findPack(
if (fs::is_directory(folder)) {
return folder;
}
folder = paths->getResources() / fs::path("content") / fs::path(name);
if (fs::is_directory(folder)) {
return folder; //-V523
}
return folder; // FIXME: V523 The 'then' statement is equivalent to the subsequent code fragment //-V523
return paths->getResources() / fs::path("content") / fs::path(name);
}
ContentPackRuntime::ContentPackRuntime(ContentPack info, scriptenv env)