Skip to content

Server side getColPolygonHeight fix #3946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 10, 2025
Merged

Server side getColPolygonHeight fix #3946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b17362
Add SetPaused to timer class
jjustns Aug 27, 2024
06f2afd
Add new timer function defs
jjustns Aug 27, 2024
4bcf4af
Add new timer function defs
jjustns Aug 27, 2024
cf73137
A few minor adjustments
jjustns Aug 27, 2024
bc0b60a
Update to ArgumentParser
jjustns Aug 27, 2024
fc287ac
Update to ArgumentParser
jjustns Aug 27, 2024
11d75ab
Fix server-side getColPolygonHeight
tederis Jan 10, 2025
7a29cac
Implicit conversion
tederis Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,11 +805,11 @@ int CLuaColShapeDefs::RemoveColPolygonPoint(lua_State* luaVM)
return luaL_error(luaVM, argStream.GetFullErrorMessage());
}

std::tuple<float, float> CLuaColShapeDefs::GetColPolygonHeight(CColPolygon* pColPolygon)
CLuaMultiReturn<float, float> CLuaColShapeDefs::GetColPolygonHeight(CColPolygon* pColPolygon)
{
float fFloor, fCeil;
pColPolygon->GetHeight(fFloor, fCeil);
return std::make_tuple(fFloor, fCeil);
return {fFloor, fCeil};
}

bool CLuaColShapeDefs::SetColPolygonHeight(CColPolygon* pColPolygon, std::variant<bool, float> floor, std::variant<bool, float> ceil)
Expand Down
4 changes: 2 additions & 2 deletions Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ class CLuaColShapeDefs : public CLuaDefs
LUA_DECLARE(IsInsideColShape);
LUA_DECLARE(GetColShapeType);

static std::tuple<float, float> GetColPolygonHeight(CColPolygon* pColPolygon);
static bool SetColPolygonHeight(CColPolygon* pColPolygon, std::variant<bool, float> floor, std::variant<bool, float> ceil);
static CLuaMultiReturn<float, float> GetColPolygonHeight(CColPolygon* pColPolygon);
static bool SetColPolygonHeight(CColPolygon* pColPolygon, std::variant<bool, float> floor, std::variant<bool, float> ceil);
};
Loading