Skip to content

[pull] master from beyond-all-reason:master #74

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 21, 2026
Merged

[pull] master from beyond-all-reason:master #74

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be25d4b
docs: spGetIconData can return nil (#3247)
sparr Aug 21, 2026
0f6b013
docs: spGetMouseState returns bools for pressed (#3248)
sparr Aug 21, 2026
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
10 changes: 5 additions & 5 deletions rts/Lua/LuaUnsyncedRead.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,7 @@ namespace Impl {
* @function Spring.GetUnitIconData
* @param unitID number
* @param fullData boolean? (Default: false) Whether additional information about the icon is returned, otherwise only `name` and `atlasTexCoords` are returned
* @return IconData iconData
* @return IconData? `nil` if unit is not found or unit currentIconIndex is invalid
* @see Spring.GetIconData
*/
int LuaUnsyncedRead::GetUnitIconData(lua_State* L)
Expand Down Expand Up @@ -1578,7 +1578,7 @@ int LuaUnsyncedRead::GetUnitIcon(lua_State* L)
* @function Spring.GetIconData
* @param iconName string
* @param fullData boolean? (Default: false) Whether additional information about the icon is returned, otherwise only `name` and `atlasTexCoords` are returned
* @return IconData iconData
* @return IconData? `nil` if iconName lookup fails
* @see Spring.GetUnitIconData
*/
int LuaUnsyncedRead::GetIconData(lua_State* L)
Expand Down Expand Up @@ -3899,9 +3899,9 @@ int LuaUnsyncedRead::GetActivePage(lua_State* L)
* @function Spring.GetMouseState
* @return number x
* @return number y
* @return number lmbPressed left mouse button pressed
* @return number mmbPressed middle mouse button pressed
* @return number rmbPressed right mouse button pressed
* @return boolean lmbPressed left mouse button pressed
* @return boolean mmbPressed middle mouse button pressed
* @return boolean rmbPressed right mouse button pressed
* @return boolean offscreen
* @return boolean mmbScroll
*/
Expand Down
Loading