vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103 from notpeelz/fix-gui-lua-converter-nre

Browse Source 
Fix NRE in GUI lua converters
This commit is contained in:
Evil Factory
2022-08-17 20:58:59 -03:00
committed by GitHub
parent b8707c1f32 860449aaed
commit da7ab6b205
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaCustomConverters.cs
+15 -15
View File
@@ -51,27 +51,27 @@ namespace Barotrauma
=> Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(T), v => converter(v.Function)); => Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(T), v => converter(v.Function));
RegisterHandler(f => (GUIComponent.SecondaryButtonDownHandler)( RegisterHandler(f => (GUIComponent.SecondaryButtonDownHandler)(
(a1, a2) => Call(f, a1, a2).CastToBool())); (a1, a2) => Call(f, a1, a2)?.CastToBool() ?? default));
RegisterHandler(f => (GUIButton.OnClickedHandler)( RegisterHandler(f => (GUIButton.OnClickedHandler)(
(a1, a2) => Call(f, a1, a2).CastToBool())); (a1, a2) => Call(f, a1, a2)?.CastToBool() ?? default));
RegisterHandler(f => (GUIButton.OnButtonDownHandler)( RegisterHandler(f => (GUIButton.OnButtonDownHandler)(
() => Call(f).CastToBool())); () => Call(f)?.CastToBool() ?? default));
RegisterHandler(f => (GUIButton.OnPressedHandler)( RegisterHandler(f => (GUIButton.OnPressedHandler)(
() => Call(f).CastToBool())); () => Call(f)?.CastToBool() ?? default));
RegisterHandler(f => (GUIColorPicker.OnColorSelectedHandler)( RegisterHandler(f => (GUIColorPicker.OnColorSelectedHandler)(
(a1, a2) => Call(f, a1, a2).CastToBool())); (a1, a2) => Call(f, a1, a2)?.CastToBool() ?? default));
RegisterHandler(f => (GUIDropDown.OnSelectedHandler)( RegisterHandler(f => (GUIDropDown.OnSelectedHandler)(
(a1, a2) => Call(f, a1, a2).CastToBool())); (a1, a2) => Call(f, a1, a2)?.CastToBool() ?? default));
RegisterHandler(f => (GUIListBox.OnSelectedHandler)( RegisterHandler(f => (GUIListBox.OnSelectedHandler)(
(a1, a2) => Call(f, a1, a2).CastToBool())); (a1, a2) => Call(f, a1, a2)?.CastToBool() ?? default));
RegisterHandler(f => (GUIListBox.OnRearrangedHandler)( RegisterHandler(f => (GUIListBox.OnRearrangedHandler)(
(a1, a2) => Call(f, a1, a2))); (a1, a2) => Call(f, a1, a2)));
RegisterHandler(f => (GUIListBox.CheckSelectedHandler)( RegisterHandler(f => (GUIListBox.CheckSelectedHandler)(
() => Call(f).ToObject())); () => Call(f)?.ToObject() ?? default));
RegisterHandler(f => (GUINumberInput.OnValueEnteredHandler)( RegisterHandler(f => (GUINumberInput.OnValueEnteredHandler)(
(a1) => Call(f, a1))); (a1) => Call(f, a1)));
@@ -79,28 +79,28 @@ namespace Barotrauma
(a1) => Call(f, a1))); (a1) => Call(f, a1)));
RegisterHandler(f => (GUIProgressBar.ProgressGetterHandler)( RegisterHandler(f => (GUIProgressBar.ProgressGetterHandler)(
() => (float)(Call(f).CastToNumber() ?? 0))); () => (float)(Call(f)?.CastToNumber() ?? default)));
RegisterHandler(f => (GUIRadioButtonGroup.RadioButtonGroupDelegate)( RegisterHandler(f => (GUIRadioButtonGroup.RadioButtonGroupDelegate)(
(a1, a2) => Call(f, a1, a2))); (a1, a2) => Call(f, a1, a2)));
RegisterHandler(f => (GUIScrollBar.OnMovedHandler)( RegisterHandler(f => (GUIScrollBar.OnMovedHandler)(
(a1, a2) => Call(f, a1, a2).CastToBool())); (a1, a2) => Call(f, a1, a2)?.CastToBool() ?? default));
RegisterHandler(f => (GUIScrollBar.ScrollConversion)( RegisterHandler(f => (GUIScrollBar.ScrollConversion)(
(a1, a2) => (float)(Call(f, a1, a2).CastToNumber() ?? 0))); (a1, a2) => (float)(Call(f, a1, a2)?.CastToNumber() ?? default)));
RegisterHandler(f => (GUITextBlock.TextGetterHandler)( RegisterHandler(f => (GUITextBlock.TextGetterHandler)(
() => Call(f, new object[0]).CastToString())); () => Call(f, new object[0])?.CastToString() ?? default));
RegisterHandler(f => (GUITextBox.OnEnterHandler)( RegisterHandler(f => (GUITextBox.OnEnterHandler)(
(a1, a2) => Call(f, a1, a2).CastToBool())); (a1, a2) => Call(f, a1, a2)?.CastToBool() ?? default));
RegisterHandler(f => (GUITextBox.OnTextChangedHandler)( RegisterHandler(f => (GUITextBox.OnTextChangedHandler)(
(a1, a2) => Call(f, a1, a2).CastToBool())); (a1, a2) => Call(f, a1, a2)?.CastToBool() ?? default));
RegisterHandler(f => (TextBoxEvent)( RegisterHandler(f => (TextBoxEvent)(
(a1, a2) => Call(f, a1, a2))); (a1, a2) => Call(f, a1, a2)));
RegisterHandler(f => (GUITickBox.OnSelectedHandler)( RegisterHandler(f => (GUITickBox.OnSelectedHandler)(
(a1) => Call(f, a1).CastToBool())); (a1) => Call(f, a1)?.CastToBool() ?? default));
} }
#endif #endif