Skip to content

Commit

Permalink
Fix GameSpeed DropDown in Skirmish
Browse files Browse the repository at this point in the history
  • Loading branch information
Belonit committed Aug 26, 2023
1 parent cf10bc1 commit 0eecc0c
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 8 deletions.
79 changes: 74 additions & 5 deletions package/Resources/MultiplayerGameLobby.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,44 @@ TeamWidth=36
$CC00=btnLaunchGame:GameLaunchButton
$CC01=btnLeaveGame:XNAClientButton
$CC03=MapPreviewBox:MapPreviewBox
$CC04=GameOptionsPanel:XNAPanel
$CC04=MultiplayerOptionsPanel:XNAPanel
$CC05=PlayerOptionsPanel:XNAPanel
$CC06=lblMapName:XNALabel
$CC07=lblMapAuthor:XNALabel
$CC08=lblGameMode:XNALabel
$CC09=lblMapSize:XNALabel
$CC12=lbMapList:XNAMultiColumnListBox
$CC13=lblGameModeSelect:XNALabel
$CC14=ddGameMode:XNAClientDropDown
$CC15=tbMapSearch:XNASuggestionTextBox
$CC16=btnPickRandomMap:XNAClientButton
$CC17=PlayerExtraOptionsPanel:PlayerExtraOptionsPanel
$CC18=lbChatMessages:ChatListBox
$CC19=tbChatInput:XNAChatTextBox
$CC20=btnLockGame:XNAClientButton
$CC21=chkAutoReady:XNAClientCheckBox
$CC22=btnChangeTunnel:XNAClientButton

[SkirmishGameLobby]
$BaseSection=FullWindow
PlayerStatusIndicatorY=0
PlayerStatusIndicatorX=2
PlayerOptionLocationX=24
PlayerOptionLocationY=25
PlayerOptionVerticalMargin=7
PlayerOptionHorizontalMargin=2
PlayerOptionCaptionLocationY=6
PlayerNameWidth=132
SideWidth=106
ColorWidth=70
StartWidth=36
TeamWidth=36

; controls
$CC00=btnLaunchGame:GameLaunchButton
$CC01=btnLeaveGame:XNAClientButton
$CC03=MapPreviewBox:MapPreviewBox
$CC04=SkirmishOptionsPanel:XNAPanel
$CC05=PlayerOptionsPanel:XNAPanel
$CC06=lblMapName:XNALabel
$CC07=lblMapAuthor:XNALabel
Expand Down Expand Up @@ -157,7 +194,7 @@ $Height=BTN_MENU_OPEN_HEIGHT
IdleTexture=optionsButton.png
HoverTexture=optionsButton_c.png

[GameOptionsPanel]
[MultiplayerOptionsPanel]
SolidColorBackgroundTexture=0,0,0,200
Location=0,14
Size=306,250
Expand Down Expand Up @@ -190,6 +227,39 @@ $CC-GO06=chkNoDogEngiEat:GameLobbyCheckBox

$CC01=BtnSaveLoadGameOptions:XNAClientButton

[SkirmishOptionsPanel]
SolidColorBackgroundTexture=0,0,0,200
Location=0,14
Size=306,250
DistanceFromRightBorder=12

; Left column
$CC-GO01=chkShortGame:GameLobbyCheckBox
$CC-GO02=chkRedeplMCV:GameLobbyCheckBox
$CC-GO03=chkCrates:GameLobbyCheckBox
$CC-GO04=chkMultiEng:GameLobbyCheckBox
$CC-GO05=chkIngameAllying:GameLobbyCheckBox
$CC-GO07=lblGameSpeedCap:XNALabel
$CC-GO08=cmbSkirmishGameSpeedCap:GameLobbyDropDown
$CC-GO09=lblCredits:XNALabel
$CC-GO10=cmbCredits:GameLobbyDropDown
$CC-GO11=lblStartingUnits:XNALabel
$CC-GO12=cmbStartingUnits:GameLobbyDropDown

; Right column
$CC-GO13=chkBrutalAI:GameLobbyCheckBox
$CC-GO14=chkDestrBridges:GameLobbyCheckBox
$CC-GO15=chkSuperWeapons:GameLobbyCheckBox
$CC-GO16=chkBuildOffAlly:GameLobbyCheckBox
$CC-GO17=chkRA2Mode:GameLobbyCheckBox
$CC-GO18=chkBalancePatch:GameLobbyCheckBox
$CC-GO19=chkNoSpawnPreviews:GameLobbyCheckBox
$CC-GO20=chkNoYuriNoFrance:GameLobbyCheckBox
$CC-GO21=chkNoSpy:GameLobbyCheckBox
$CC-GO06=chkNoDogEngiEat:GameLobbyCheckBox

$CC01=BtnSaveLoadGameOptions:XNAClientButton

[BtnSaveLoadGameOptions]
$Width=BTN_MENU_OPEN_WIDTH
$Height=BTN_MENU_OPEN_WIDTH
Expand Down Expand Up @@ -319,7 +389,6 @@ $Y=getBottom(chkIngameAllying) + 15
[cmbGameSpeedCap]
OptionName=Game Speed
Items=Fastest (60 FPS),Faster (45 FPS),Fast (30 FPS),Medium (20 FPS),Slow (15 FPS),Slower (12 FPS),Slowest (10 FPS)
;Items=Fastest (60 FPS),Faster (52 FPS),Fast (45 FPS),Medium (40 FPS),Slow (30 FPS),Slower (20 FPS),Slowest (15 FPS)
DefaultIndex=0
SpawnIniOption=GameSpeed
DataWriteMode=Index
Expand All @@ -341,8 +410,8 @@ $Height=DEFAULT_CONTROL_HEIGHT
[lblCredits]
Text=Credits:
$X=getX(cmbGameSpeedCap)
$Y=getBottom(cmbGameSpeedCap) + GAME_OPTION_GAP
$X=getX(lblGameSpeedCap)
$Y=getBottom(lblGameSpeedCap) + DEFAULT_CONTROL_HEIGHT + GAME_OPTION_GAP
[cmbCredits]
OptionName=Starting Credits
Expand Down
4 changes: 1 addition & 3 deletions package/Resources/SkirmishLobby.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BasedOn=MultiplayerGameLobby.ini

[SkirmishLobby]
$BaseSection=MultiplayerGameLobby
$BaseSection=SkirmishGameLobby

[lblGameModeSelect]
Location=12,16
Expand All @@ -26,5 +26,3 @@ Visible=false
[tbChatInput]
Visible=false

[cmbGameSpeedCap]
Items=Fastest (MAX),Faster (60 FPS),Fast (30 FPS),Medium (20 FPS),Slow (15 FPS),Slower (12 FPS),Slowest (10 FPS)

0 comments on commit 0eecc0c

Please sign in to comment.