Skip to content

Commit 090d4dc

Browse files
committed
segdisp: Add more frame format enums.
1 parent 9b7398b commit 090d4dc

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

VisualPinball.Engine.PinMAME.Unity/Editor/PinMameGamelogicEngineInspector.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,23 @@ private void OnEnable()
8181
public override void OnInspectorGUI()
8282
{
8383
// game dropdown
84-
//_gle.romId = EditorGUILayout.TextField("ROM ID", _gle.romId);
85-
86-
EditorGUI.BeginChangeCheck();
87-
_selectedGameIndex = EditorGUILayout.Popup("Game", _selectedGameIndex, _gameNames);
88-
if (EditorGUI.EndChangeCheck()) {
89-
_selectedRomIndex = 0;
90-
if (_selectedGameIndex > 0) {
91-
_gle.Game = _games[_selectedGameIndex - 1];
92-
_gle.romId = Rom.Id;
93-
_romNames = _gle.Game.Roms.Select(g => g.ToString()).ToArray();
94-
95-
} else {
96-
_gle.Game = null;
97-
_gle.romId = string.Empty;
98-
_romNames = new string[0];
99-
}
100-
}
84+
_gle.romId = EditorGUILayout.TextField("ROM ID", _gle.romId);
85+
86+
// EditorGUI.BeginChangeCheck();
87+
// _selectedGameIndex = EditorGUILayout.Popup("Game", _selectedGameIndex, _gameNames);
88+
// if (EditorGUI.EndChangeCheck()) {
89+
// _selectedRomIndex = 0;
90+
// if (_selectedGameIndex > 0) {
91+
// _gle.Game = _games[_selectedGameIndex - 1];
92+
// _gle.romId = Rom.Id;
93+
// _romNames = _gle.Game.Roms.Select(g => g.ToString()).ToArray();
94+
//
95+
// } else {
96+
// _gle.Game = null;
97+
// _gle.romId = string.Empty;
98+
// _romNames = new string[0];
99+
// }
100+
// }
101101

102102
// rom dropdown
103103
EditorGUI.BeginDisabledGroup(_gle.Game == null);

VisualPinball.Engine.PinMAME.Unity/Runtime/PinMameGamelogicEngine.cs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,21 +304,29 @@ public static DisplayFrameFormat GetDisplayType(PinMameDisplayType dp)
304304
{
305305
switch (dp) {
306306
case PinMameDisplayType.Seg8: // 7 segments and comma
307+
case PinMameDisplayType.Seg7SC: // 7 segments, small, with comma
308+
return DisplayFrameFormat.Segment7Comma;
307309
case PinMameDisplayType.Seg8D: // 7 segments and period
308-
case PinMameDisplayType.Seg7: // 7 segments
310+
return DisplayFrameFormat.Segment7Dot;
311+
case PinMameDisplayType.Seg7: // 7 segments
312+
case PinMameDisplayType.Seg7S: // 7 segments, small
313+
return DisplayFrameFormat.Segment7;
309314
case PinMameDisplayType.Seg87: // 7 segments, comma every three
315+
return DisplayFrameFormat.Segment7CommaEvery3;
310316
case PinMameDisplayType.Seg87F: // 7 segments, forced comma every three
311-
case PinMameDisplayType.Seg7S: // 7 segments, small
312-
case PinMameDisplayType.Seg7SC: // 7 segments, small, with comma
313-
return DisplayFrameFormat.Segment7;
317+
return DisplayFrameFormat.Segment7CommaEvery3Forced;
314318

315319
case PinMameDisplayType.Seg10: // 9 segments and comma
320+
return DisplayFrameFormat.Segment9Comma;
316321
case PinMameDisplayType.Seg9: // 9 segments
322+
return DisplayFrameFormat.Segment9;
317323
case PinMameDisplayType.Seg98: // 9 segments, comma every three
324+
return DisplayFrameFormat.Segment9CommaEvery3;
318325
case PinMameDisplayType.Seg98F: // 9 segments, forced comma every three
319-
return DisplayFrameFormat.Segment9;
326+
return DisplayFrameFormat.Segment9CommaEvery3Forced;
320327

321328
case PinMameDisplayType.Seg16: // 16 segments
329+
return DisplayFrameFormat.Segment16;
322330
case PinMameDisplayType.Seg16R: // 16 segments with comma and period reversed
323331
case PinMameDisplayType.Seg16N: // 16 segments without commas
324332
case PinMameDisplayType.Seg16D: // 16 segments with periods only

0 commit comments

Comments
 (0)