Adds ignoreValue param to AdjustMenuStyle to prevent needing to reset it to 0 after each call.
This commit is contained in:
@@ -631,8 +631,7 @@ Sub PrintMenu (items() As String, count As Integer)
|
|||||||
Call NewMenuItem(mi, items(i), i)
|
Call NewMenuItem(mi, items(i), i)
|
||||||
menuItems(i) = mi
|
menuItems(i) = mi
|
||||||
Next
|
Next
|
||||||
Call AdjustMenuStyle(ms, menuItems(), count)
|
Call AdjustMenuStyle(ms, menuItems(), count, TRUE)
|
||||||
ms.valueWidth = 0
|
|
||||||
Call pm(menuItems(), count, ms)
|
Call pm(menuItems(), count, ms)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -646,7 +645,7 @@ Sub PrintMenuWithValues (items() As String, values() As Integer, count As Intege
|
|||||||
Call NewMenuItemWithValue(mi, items(i), i, values(i))
|
Call NewMenuItemWithValue(mi, items(i), i, values(i))
|
||||||
menuItems(i) = mi
|
menuItems(i) = mi
|
||||||
Next
|
Next
|
||||||
Call AdjustMenuStyle(ms, menuItems(), count)
|
Call AdjustMenuStyle(ms, menuItems(), count, FALSE)
|
||||||
Call pm(menuItems(), count, ms)
|
Call pm(menuItems(), count, ms)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -1224,8 +1223,7 @@ Sub CharacterGenerator ()
|
|||||||
rankSum = 1
|
rankSum = 1
|
||||||
For i = 1 To ATTRIBUTE_GROUPS_COUNT - 1
|
For i = 1 To ATTRIBUTE_GROUPS_COUNT - 1
|
||||||
Cls
|
Cls
|
||||||
Call AdjustMenuStyle(attributeGroupsMenuStyle, mnuAttributeGroups(), ATTRIBUTE_GROUPS_COUNT)
|
Call AdjustMenuStyle(attributeGroupsMenuStyle, mnuAttributeGroups(), ATTRIBUTE_GROUPS_COUNT, TRUE)
|
||||||
attributeGroupsMenuStyle.valueWidth = 0
|
|
||||||
' TODO: Pull this from an array like ranks or rank_names so "Choose your primary attribute?" instead
|
' TODO: Pull this from an array like ranks or rank_names so "Choose your primary attribute?" instead
|
||||||
Print "Choose your next attribute?"
|
Print "Choose your next attribute?"
|
||||||
Call pm(mnuAttributeGroups(), ATTRIBUTE_GROUPS_COUNT, attributeGroupsMenuStyle)
|
Call pm(mnuAttributeGroups(), ATTRIBUTE_GROUPS_COUNT, attributeGroupsMenuStyle)
|
||||||
@@ -1273,8 +1271,7 @@ Sub CharacterGenerator ()
|
|||||||
rankSum = 1
|
rankSum = 1
|
||||||
For i = 1 To ABILITIES_COUNT - 1
|
For i = 1 To ABILITIES_COUNT - 1
|
||||||
Cls
|
Cls
|
||||||
Call AdjustMenuStyle(abilityGroupsMenuStyle, mnuAbilityGroups(), ABILITIES_COUNT)
|
Call AdjustMenuStyle(abilityGroupsMenuStyle, mnuAbilityGroups(), ABILITIES_COUNT, TRUE)
|
||||||
abilityGroupsMenuStyle.valueWidth = 0
|
|
||||||
' TODO: Pull this from an array like ranks or rank_names so "Choose your primary ability?" instead
|
' TODO: Pull this from an array like ranks or rank_names so "Choose your primary ability?" instead
|
||||||
Print "Choose your next ability?"
|
Print "Choose your next ability?"
|
||||||
Call pm(mnuAbilityGroups(), ABILITIES_COUNT, abilityGroupsMenuStyle)
|
Call pm(mnuAbilityGroups(), ABILITIES_COUNT, abilityGroupsMenuStyle)
|
||||||
@@ -1615,7 +1612,7 @@ End Sub
|
|||||||
Sub Test
|
Sub Test
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub AdjustMenuStyle (style As MenuStyle, items() As MenuItem, count As Integer)
|
Sub AdjustMenuStyle (style As MenuStyle, items() As MenuItem, count As Integer, ignoreValue As Integer)
|
||||||
maxIdWidth = 0
|
maxIdWidth = 0
|
||||||
maxItemWidth = 0
|
maxItemWidth = 0
|
||||||
maxValueWidth = 0
|
maxValueWidth = 0
|
||||||
@@ -1633,7 +1630,7 @@ Sub AdjustMenuStyle (style As MenuStyle, items() As MenuItem, count As Integer)
|
|||||||
End If
|
End If
|
||||||
style.idWidth = maxIdWidth
|
style.idWidth = maxIdWidth
|
||||||
style.labelWidth = maxItemWidth
|
style.labelWidth = maxItemWidth
|
||||||
style.valueWidth = maxValueWidth
|
If Not ignoreValue Then style.valueWidth = maxValueWidth Else style.valueWidth = 0
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub pm (items() As MenuItem, count As Integer, style As MenuStyle)
|
Sub pm (items() As MenuItem, count As Integer, style As MenuStyle)
|
||||||
|
|||||||
Reference in New Issue
Block a user