Skip to content

Commit

Permalink
rename to GetObjectLODOfModel
Browse files Browse the repository at this point in the history
  • Loading branch information
Fernando-A-Rocha committed Oct 30, 2024
1 parent d0419a3 commit 62cb6e8
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void CLuaObjectDefs::LoadFunctions()
{"setObjectProperty", SetObjectProperty},

// Object util functions
{"getObjectLODModel", ArgumentParser<GetObjectLODModel>},
{"getObjectLODOfModel", ArgumentParser<GetObjectLODOfModel>},
};

// Add functions
Expand Down Expand Up @@ -726,9 +726,9 @@ bool CLuaObjectDefs::IsObjectRespawnable(CClientEntity* const pEntity) noexcept
return pObject->IsRespawnEnabled();
}

std::variant<bool, std::uint32_t> CLuaObjectDefs::GetObjectLODModel(lua_State* const luaVM, std::uint32_t objectID)
std::variant<bool, std::uint32_t> CLuaObjectDefs::GetObjectLODOfModel(lua_State* const luaVM, std::uint32_t objectID)
{
std::uint32_t lodModel = CLodModels::GetObjectLODModel(objectID);
std::uint32_t lodModel = CLodModels::GetObjectLODOfModel(objectID);
if (lodModel == 0) // LOD Model not found for Object Model provided
return false;
return lodModel;
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ class CLuaObjectDefs : public CLuaDefs
LUA_DECLARE(SetObjectProperty);

// Object util funcs
static std::variant<bool, std::uint32_t> GetObjectLODModel(lua_State* const luaVM, std::uint32_t objectID);
static std::variant<bool, std::uint32_t> GetObjectLODOfModel(lua_State* const luaVM, std::uint32_t objectID);
};
6 changes: 3 additions & 3 deletions Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void CLuaObjectDefs::LoadFunctions()
{"toggleObjectRespawn", ArgumentParser<ToggleObjectRespawn>},

// Object util functions
{"getObjectLODModel", ArgumentParser<GetObjectLODModel>},
{"getObjectLODOfModel", ArgumentParser<GetObjectLODOfModel>},
};

// Add functions
Expand Down Expand Up @@ -338,9 +338,9 @@ bool CLuaObjectDefs::IsObjectRespawnable(CObject* const pObject) noexcept
return pObject->IsRespawnEnabled();
}

std::variant<bool, std::uint32_t> CLuaObjectDefs::GetObjectLODModel(lua_State* const luaVM, std::uint32_t objectID)
std::variant<bool, std::uint32_t> CLuaObjectDefs::GetObjectLODOfModel(lua_State* const luaVM, std::uint32_t objectID)
{
std::uint32_t lodModel = CLodModels::GetObjectLODModel(objectID);
std::uint32_t lodModel = CLodModels::GetObjectLODOfModel(objectID);
if (lodModel == 0) // LOD Model not found for Object Model provided
return false;
return lodModel;
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ class CLuaObjectDefs : public CLuaDefs
static bool ToggleObjectRespawn(CObject* const pObject, const bool bRespawn) noexcept;

// Object util funcs
static std::variant<bool, std::uint32_t> GetObjectLODModel(lua_State* const luaVM, std::uint32_t objectID);
static std::variant<bool, std::uint32_t> GetObjectLODOfModel(lua_State* const luaVM, std::uint32_t objectID);
};
2 changes: 1 addition & 1 deletion Shared/mods/deathmatch/logic/CLodModels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ std::unique_ptr<const std::map<std::uint32_t, std::uint32_t>> CLodModels::LOD_MO
});


std::uint32_t CLodModels::GetObjectLODModel(std::uint32_t objectID)
std::uint32_t CLodModels::GetObjectLODOfModel(std::uint32_t objectID)
{
const auto it = LOD_MODELS->find(objectID);
if (it != LOD_MODELS->end())
Expand Down
2 changes: 1 addition & 1 deletion Shared/mods/deathmatch/logic/CLodModels.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class CLodModels
{
public:
static std::uint32_t GetObjectLODModel(std::uint32_t objectID);
static std::uint32_t GetObjectLODOfModel(std::uint32_t objectID);
static std::uint32_t GetObjectModelOfLOD(std::uint32_t lodModelID);

private:
Expand Down

0 comments on commit 62cb6e8

Please sign in to comment.